[pathspec >= 1.0.0] Update with GitIgnoreSpec.from_lines

To follow Git's implementation, use GitIgnoreSpec.from_lines(...). The
change for using this is Git allows including files from excluded
directories which directly contradicts the gitignore docs.

See #800 (comment)

Fixes #800

Signed-off-by: Wong Hoi Sing Edison <[email protected]>

Author: hswong3i

yamllint/config.py

@@ -32,8 +32,8 @@ def __init__(self, content=None, file=None):
 
         self.ignore = None
 
-        self.yaml_files = pathspec.PathSpec.from_lines(
-            'gitwildmatch', ['*.yaml', '*.yml', '.yamllint'])
+        self.yaml_files = pathspec.GitIgnoreSpec.from_lines(
+            'gitignore', ['*.yaml', '*.yml', '.yamllint'])
 
         self.locale = None
 
@@ -112,18 +112,18 @@ def parse(self, raw_content):
                 raise YamlLintConfigError(
                     'invalid config: ignore-from-file should contain '
                     'filename(s), either as a list or string')
-            self.ignore = pathspec.PathSpec.from_lines(
-                'gitwildmatch',
+            self.ignore = pathspec.GitIgnoreSpec.from_lines(
+                'gitignore',
                 decoder.lines_in_files(conf['ignore-from-file'])
             )
         elif 'ignore' in conf:
             if isinstance(conf['ignore'], str):
-                self.ignore = pathspec.PathSpec.from_lines(
-                    'gitwildmatch', conf['ignore'].splitlines())
+                self.ignore = pathspec.GitIgnoreSpec.from_lines(
+                    'gitignore', conf['ignore'].splitlines())
             elif (isinstance(conf['ignore'], list) and
                     all(isinstance(line, str) for line in conf['ignore'])):
-                self.ignore = pathspec.PathSpec.from_lines(
-                    'gitwildmatch', conf['ignore'])
+                self.ignore = pathspec.GitIgnoreSpec.from_lines(
+                    'gitignore', conf['ignore'])
             else:
                 raise YamlLintConfigError(
                     'invalid config: ignore should contain file patterns')
@@ -134,8 +134,8 @@ def parse(self, raw_content):
                 raise YamlLintConfigError(
                     'invalid config: yaml-files '
                     'should be a list of file patterns')
-            self.yaml_files = pathspec.PathSpec.from_lines('gitwildmatch',
-                                                           conf['yaml-files'])
+            self.yaml_files = pathspec.GitIgnoreSpec.from_lines(
+                'gitignore', conf['yaml-files'])
 
         if 'locale' in conf:
             if not isinstance(conf['locale'], str):
@@ -168,19 +168,19 @@ def validate_rule_conf(rule, conf):
                 raise YamlLintConfigError(
                     'invalid config: ignore-from-file should contain '
                     'valid filename(s), either as a list or string')
-            conf['ignore'] = pathspec.PathSpec.from_lines(
-                'gitwildmatch',
+            conf['ignore'] = pathspec.GitIgnoreSpec.from_lines(
+                'gitignore',
                 decoder.lines_in_files(conf['ignore-from-file'])
             )
         elif ('ignore' in conf and not isinstance(
                 conf['ignore'], pathspec.pathspec.PathSpec)):
             if isinstance(conf['ignore'], str):
-                conf['ignore'] = pathspec.PathSpec.from_lines(
-                    'gitwildmatch', conf['ignore'].splitlines())
+                conf['ignore'] = pathspec.GitIgnoreSpec.from_lines(
+                    'gitignore', conf['ignore'].splitlines())
             elif (isinstance(conf['ignore'], list) and
                     all(isinstance(line, str) for line in conf['ignore'])):
-                conf['ignore'] = pathspec.PathSpec.from_lines(
-                    'gitwildmatch', conf['ignore'])
+                conf['ignore'] = pathspec.GitIgnoreSpec.from_lines(
+                    'gitignore', conf['ignore'])
             else:
                 raise YamlLintConfigError(
                     'invalid config: ignore should contain file patterns')