feat: Make YAML file extensions configurable
This commit is contained in:
@@ -27,13 +27,14 @@ from yamllint.config import YamlLintConfig, YamlLintConfigError
|
||||
from yamllint.linter import PROBLEM_LEVELS
|
||||
|
||||
|
||||
def find_files_recursively(items):
|
||||
def find_files_recursively(items, conf):
|
||||
for item in items:
|
||||
if os.path.isdir(item):
|
||||
for root, dirnames, filenames in os.walk(item):
|
||||
for filename in [f for f in filenames
|
||||
if f.endswith(('.yml', '.yaml'))]:
|
||||
yield os.path.join(root, filename)
|
||||
for f in filenames:
|
||||
filepath = os.path.join(root, f)
|
||||
if conf.is_yaml_file(filepath):
|
||||
yield filepath
|
||||
else:
|
||||
yield item
|
||||
|
||||
@@ -163,7 +164,7 @@ def run(argv=None):
|
||||
|
||||
max_level = 0
|
||||
|
||||
for file in find_files_recursively(args.files):
|
||||
for file in find_files_recursively(args.files, conf):
|
||||
filepath = file[2:] if file.startswith('./') else file
|
||||
try:
|
||||
with open(file) as f:
|
||||
|
||||
@@ -1,5 +1,9 @@
|
||||
---
|
||||
|
||||
yaml-files:
|
||||
- '*.yaml'
|
||||
- '*.yml'
|
||||
|
||||
rules:
|
||||
braces: enable
|
||||
brackets: enable
|
||||
|
||||
@@ -32,6 +32,9 @@ class YamlLintConfig(object):
|
||||
|
||||
self.ignore = None
|
||||
|
||||
self.yaml_files = pathspec.PathSpec.from_lines(
|
||||
'gitwildmatch', ['*.yaml', '*.yml'])
|
||||
|
||||
if file is not None:
|
||||
with open(file) as f:
|
||||
content = f.read()
|
||||
@@ -42,6 +45,9 @@ class YamlLintConfig(object):
|
||||
def is_file_ignored(self, filepath):
|
||||
return self.ignore and self.ignore.match_file(filepath)
|
||||
|
||||
def is_yaml_file(self, filepath):
|
||||
return self.yaml_files.match_file(filepath)
|
||||
|
||||
def enabled_rules(self, filepath):
|
||||
return [yamllint.rules.get(id) for id, val in self.rules.items()
|
||||
if val is not False and (
|
||||
@@ -96,6 +102,15 @@ class YamlLintConfig(object):
|
||||
self.ignore = pathspec.PathSpec.from_lines(
|
||||
'gitwildmatch', conf['ignore'].splitlines())
|
||||
|
||||
if 'yaml-files' in conf:
|
||||
if not (isinstance(conf['yaml-files'], list)
|
||||
and all(isinstance(i, str) for i in conf['yaml-files'])):
|
||||
raise YamlLintConfigError(
|
||||
'invalid config: yaml-files '
|
||||
'should be a list of file patterns')
|
||||
self.yaml_files = pathspec.PathSpec.from_lines('gitwildmatch',
|
||||
conf['yaml-files'])
|
||||
|
||||
def validate(self):
|
||||
for id in self.rules:
|
||||
try:
|
||||
|
||||
Reference in New Issue
Block a user