Merge pull request #295 from blarghmatey/install_dependencies

Added the additional_dependencies config parameter

tests/languages/all_test.py

@@ -11,10 +11,10 @@ from pre_commit.languages.all import languages
 @pytest.mark.parametrize('language', all_languages)
 def test_install_environment_argspec(language):
     expected_argspec = inspect.ArgSpec(
-        args=['repo_cmd_runner', 'version'],
+        args=['repo_cmd_runner', 'version', 'additional_dependencies'],
         varargs=None,
         keywords=None,
-        defaults=('default',),
+        defaults=('default', None),
     )
     argspec = inspect.getargspec(languages[language].install_environment)
     assert argspec == expected_argspec

tests/repository_test.py

@@ -13,8 +13,9 @@ from pre_commit import five
 from pre_commit.clientlib.validate_config import CONFIG_JSON_SCHEMA
 from pre_commit.clientlib.validate_config import validate_config_extra
 from pre_commit.jsonschema_extensions import apply_defaults
-from pre_commit.languages.python import norm_version
-from pre_commit.languages.python import PythonEnv
+from pre_commit.languages import node
+from pre_commit.languages import python
+from pre_commit.languages import ruby
 from pre_commit.repository import Repository
 from pre_commit.util import cmd_output
 from pre_commit.util import cwd
@@ -293,6 +294,7 @@ def mock_repo_config():
         'hooks': [{
             'id': 'pyflakes',
             'files': '\\.py$',
+            'additional_dependencies': ['pep8']
         }],
     }
     config_wrapped = apply_defaults([config], CONFIG_JSON_SCHEMA)
@@ -318,6 +320,53 @@ def test_languages(tempdir_factory, store):
     assert repo.languages == set([('python', 'default')])
 
 
+@pytest.mark.integration
+def test_additional_dependencies(tempdir_factory, store):
+    path = make_repo(tempdir_factory, 'python_hooks_repo')
+    config = make_config_from_repo(path)
+    config['hooks'][0]['additional_dependencies'] = ['pep8']
+    repo = Repository.create(config, store)
+    assert repo.additional_dependencies['python']['default'] == set(('pep8',))
+
+
+@pytest.mark.integration
+def test_additional_python_dependencies_installed(tempdir_factory, store):
+    path = make_repo(tempdir_factory, 'python_hooks_repo')
+    config = make_config_from_repo(path)
+    config['hooks'][0]['additional_dependencies'] = ['mccabe']
+    repo = Repository.create(config, store)
+    repo.run_hook(repo.hooks[0][1], [])
+    with python.in_env(repo.cmd_runner, 'default') as env:
+        output = env.run('pip freeze -l')[1]
+        assert 'mccabe' in output
+
+
+@pytest.mark.integration
+def test_additional_ruby_dependencies_installed(tempdir_factory, store):
+    path = make_repo(tempdir_factory, 'ruby_hooks_repo')
+    config = make_config_from_repo(path)
+    config['hooks'][0]['additional_dependencies'] = ['mime-types']
+    repo = Repository.create(config, store)
+    repo.run_hook(repo.hooks[0][1], [])
+    with ruby.in_env(repo.cmd_runner, 'default') as env:
+        output = env.run('gem list --local')[1]
+        assert 'mime-types' in output
+
+
+@pytest.mark.integration
+def test_additional_node_dependencies_installed(tempdir_factory, store):
+    path = make_repo(tempdir_factory, 'node_hooks_repo')
+    config = make_config_from_repo(path)
+    # Careful to choose a small package that's not depped by npm
+    config['hooks'][0]['additional_dependencies'] = ['lodash']
+    repo = Repository.create(config, store)
+    repo.run_hook(repo.hooks[0][1], [])
+    with node.in_env(repo.cmd_runner, 'default') as env:
+        env.run('npm config set global true')
+        output = env.run(('npm ls'))[1]
+        assert 'lodash' in output
+
+
 def test_reinstall(tempdir_factory, store, log_info_mock):
     path = make_repo(tempdir_factory, 'python_hooks_repo')
     config = make_config_from_repo(path)
@@ -350,7 +399,7 @@ def test_control_c_control_c_on_install(tempdir_factory, store):
     # raise as well.
     with pytest.raises(MyKeyboardInterrupt):
         with mock.patch.object(
-            PythonEnv, 'run', side_effect=MyKeyboardInterrupt,
+            python.PythonEnv, 'run', side_effect=MyKeyboardInterrupt,
         ):
             with mock.patch.object(
                 shutil, 'rmtree', side_effect=MyKeyboardInterrupt,
@@ -441,5 +490,5 @@ def test_norm_version_expanduser():  # pragma: no cover
     else:
         path = '~/.pyenv/versions/3.4.3/bin/python'
         expected_path = home + '/.pyenv/versions/3.4.3/bin/python'
-    result = norm_version(path)
+    result = python.norm_version(path)
     assert result == expected_path