Merge pull request #185 from pre-commit/default_args_from_hooks_yaml

asottile · asottile · commit b6845208be40 · 2015-01-13T12:13:49.000-08:00
Default arguments from hooks.yaml
diff --git a/pre_commit/clientlib/validate_config.py b/pre_commit/clientlib/validate_config.py
@@ -30,7 +30,6 @@ class InvalidConfigError(FatalError):
                         'language_version': {'type': 'string'},
                         'args': {
                             'type': 'array',
-                            'default': [],
                             'items': {'type': 'string'},
                         },
                     },
diff --git a/pre_commit/clientlib/validate_manifest.py b/pre_commit/clientlib/validate_manifest.py
@@ -24,6 +24,13 @@ class InvalidManifestError(ValueError):
             'language_version': {'type': 'string', 'default': 'default'},
             'files': {'type': 'string'},
             'expected_return_value': {'type': 'number', 'default': 0},
+            'args': {
+                'type': 'array',
+                'default': [],
+                'items': {
+                    'type': 'string',
+                },
+            },
         },
         'required': ['id', 'name', 'entry', 'language', 'files'],
     },
diff --git a/testing/resources/arg_per_line_hooks_repo/hooks.yaml b/testing/resources/arg_per_line_hooks_repo/hooks.yaml
@@ -3,3 +3,4 @@
     entry: bin/hook.sh
     language: script
     files: ''
+    args: [hello, world]
diff --git a/tests/manifest_test.py b/tests/manifest_test.py
@@ -19,6 +19,7 @@ def manifest(store, tmpdir_factory):
 def test_manifest_contents(manifest):
     # Should just retrieve the manifest contents
     assert manifest.manifest_contents == [{
+        'args': [],
         'description': '',
         'entry': 'bin/hook.sh',
         'expected_return_value': 0,
@@ -32,6 +33,7 @@ def test_manifest_contents(manifest):
 
 def test_hooks(manifest):
     assert manifest.hooks['bash_hook'] == {
+        'args': [],
         'description': '',
         'entry': 'bin/hook.sh',
         'expected_return_value': 0,
diff --git a/tests/repository_test.py b/tests/repository_test.py
@@ -113,7 +113,9 @@ def test_run_a_script_hook(tmpdir_factory, store):
 def test_run_hook_with_spaced_args(tmpdir_factory, store):
     _test_hook_repo(
         tmpdir_factory, store, 'arg_per_line_hooks_repo',
-        'arg-per-line', ['foo bar', 'baz'], 'arg: foo bar\narg: baz\n',
+        'arg-per-line',
+        ['foo bar', 'baz'],
+        'arg: hello\narg: world\narg: foo bar\narg: baz\n',
     )
 
 

Original file line number	Diff line number	Diff line change
`@@ -113,7 +113,9 @@ def test_run_a_script_hook(tmpdir_factory, store):`
`113`	`113`	`def test_run_hook_with_spaced_args(tmpdir_factory, store):`
`114`	`114`	`_test_hook_repo(`
`115`	`115`	`tmpdir_factory, store, 'arg_per_line_hooks_repo',`
`116`		`- 'arg-per-line', ['foo bar', 'baz'], 'arg: foo bar\narg: baz\n',`
	`116`	`+ 'arg-per-line',`
	`117`	`+ ['foo bar', 'baz'],`
	`118`	`+ 'arg: hello\narg: world\narg: foo bar\narg: baz\n',`
`117`	`119`	`)`
`118`	`120`
`119`	`121`