Merge pull request #192 from pre-commit/quote_params

asottile · asottile · commit 097b365ad64c · 2015-02-04T19:21:51.000-08:00
Quote args in venv'd languages
diff --git a/pre_commit/languages/helpers.py b/pre_commit/languages/helpers.py
@@ -1,13 +1,16 @@
 from __future__ import unicode_literals
 
+import pipes
+
 
 def file_args_to_stdin(file_args):
     return '\0'.join(list(file_args) + [''])
 
 
 def run_hook(env, hook, file_args):
+    quoted_args = [pipes.quote(arg) for arg in hook['args']]
     return env.run(
-        ' '.join(['xargs', '-0', hook['entry']] + hook['args']),
+        ' '.join(['xargs', '-0', hook['entry']] + quoted_args),
         stdin=file_args_to_stdin(file_args),
         retcode=None,
     )
diff --git a/requirements-dev.txt b/requirements-dev.txt
@@ -1,5 +1,6 @@
 -e .
 
+astroid<1.3.3
 coverage
 flake8
 mock
diff --git a/tests/repository_test.py b/tests/repository_test.py
@@ -27,9 +27,10 @@ def _test_hook_repo(
         args,
         expected,
         expected_return_code=0,
+        config_kwargs=None
 ):
     path = make_repo(tmpdir_factory, repo_path)
-    config = make_config_from_repo(path)
+    config = make_config_from_repo(path, **(config_kwargs or {}))
     repo = Repository.create(config, store)
     hook_dict = [
         hook for repo_hook_id, hook in repo.hooks if repo_hook_id == hook_id
@@ -47,6 +48,23 @@ def test_python_hook(tmpdir_factory, store):
     )
 
 
+@pytest.mark.integration
+def test_python_hook_args_with_spaces(tmpdir_factory, store):
+    _test_hook_repo(
+        tmpdir_factory, store, 'python_hooks_repo',
+        'foo',
+        [],
+        "['i have spaces', 'and\"\\'quotes', '$and !this']\n"
+        'Hello World\n',
+        config_kwargs={
+            'hooks': [{
+                'id': 'foo',
+                'args': ['i have spaces', 'and"\'quotes', '$and !this'],
+            }]
+        },
+    )
+
+
 @pytest.mark.integration
 def test_versioned_python_hook(tmpdir_factory, store):
     _test_hook_repo(

-Original file line number
+Diff line change
@@ @@ -1,5 +1,6 @@ @@
 -e .
 +astroid<1.3.3
 coverage
 flake8
 mock