Add 'types' to the schema

asottile · asottile · commit a68c1ab0d2a2 · 2017-07-02T13:20:39.000-07:00
diff --git a/pre_commit/clientlib.py b/pre_commit/clientlib.py
@@ -5,6 +5,7 @@
 import functools
 
 from aspy.yaml import ordered_load
+from identify.identify import ALL_TAGS
 
 import pre_commit.constants as C
 from pre_commit import schema
@@ -19,6 +20,14 @@ def check_language(v):
         )
 
 
+def check_type_tag(tag):
+    if tag not in ALL_TAGS:
+        raise schema.ValidationError(
+            'Type tag {!r} is not recognized.  '
+            'Try upgrading identify and pre-commit?'.format(tag),
+        )
+
+
 def _make_argparser(filenames_help):
     parser = argparse.ArgumentParser()
     parser.add_argument('filenames', nargs='*', help=filenames_help)
@@ -36,10 +45,11 @@ def _make_argparser(filenames_help):
         'language', schema.check_and(schema.check_string, check_language),
     ),
 
-    schema.Conditional(
+    schema.Optional(
         'files', schema.check_and(schema.check_string, schema.check_regex),
-        condition_key='always_run', condition_value=False,
+        '',
     ),
+    schema.Optional('types', schema.check_array(check_type_tag), ['file']),
 
     schema.Optional(
         'additional_dependencies', schema.check_array(schema.check_string), [],
diff --git a/pre_commit/commands/run.py b/pre_commit/commands/run.py
@@ -58,7 +58,7 @@ def get_filenames(args, include_expr, exclude_expr):
 
 
 def _run_single_hook(hook, repo, args, skips, cols):
-    filenames = get_filenames(args, hook.get('files', '^$'), hook['exclude'])
+    filenames = get_filenames(args, hook['files'], hook['exclude'])
     if hook['id'] in skips:
         output.write(get_hook_message(
             _hook_msg_start(hook, args.verbose),
diff --git a/setup.py b/setup.py
@@ -41,6 +41,7 @@
     install_requires=[
         'aspy.yaml',
         'cached-property',
+        'identify>=1.0.0',
         'nodeenv>=0.11.1',
         'pyyaml',
         'six',
diff --git a/tests/clientlib_test.py b/tests/clientlib_test.py
@@ -4,6 +4,7 @@
 
 from pre_commit import schema
 from pre_commit.clientlib import check_language
+from pre_commit.clientlib import check_type_tag
 from pre_commit.clientlib import CONFIG_HOOK_DICT
 from pre_commit.clientlib import CONFIG_SCHEMA
 from pre_commit.clientlib import is_local_repo
@@ -27,6 +28,12 @@ def test_check_language_failures(value):
         check_language(value)
 
 
+@pytest.mark.parametrize('value', ('definitely-not-a-tag', 'fiel'))
+def test_check_type_tag_failures(value):
+    with pytest.raises(schema.ValidationError):
+        check_type_tag(value)
+
+
 @pytest.mark.parametrize('value', ('python', 'node', 'pcre'))
 def test_check_language_ok(value):
     check_language(value)
diff --git a/tests/manifest_test.py b/tests/manifest_test.py
@@ -34,6 +34,7 @@ def test_manifest_contents(manifest):
         'name': 'Bash hook',
         'pass_filenames': True,
         'stages': [],
+        'types': ['file'],
     }]
 
 
@@ -54,6 +55,7 @@ def test_hooks(manifest):
         'name': 'Bash hook',
         'pass_filenames': True,
         'stages': [],
+        'types': ['file'],
     }
 
 
