Merge pull request #77 from adrienverge/add-yamllint-linter

Use yamllint to check YAML source

Author: sk-

README.rst

@@ -73,7 +73,7 @@ Current linters:
 
 - YAML
 
-  * Custom via `PyYAML <http://pyyaml.org/>`_
+  * `yamllint <https://github.com/adrienverge/yamllint>`_
 
 - INI
 
@@ -256,6 +256,7 @@ Contributors
 
 * `Rovanion Luckey <https://github.com/Rovanion>`_
 * `Radek Simko <https://github.com/radeksimko>`_
+* `Adrien Vergé <https://github.com/adrienverge>`_
 
 
 Changelog

gitlint/configs/config.yaml

@@ -180,9 +180,19 @@ yaml:
   extensions:
   - .yaml
   - .yml
-  command: yaml_linter.py
-  filter: "(?P<message>.+)$"
-  installation: "Run pip install PyYAML."
+  command: yamllint
+  arguments:
+  - "--format"
+  - "parsable"
+  - "--config-data"
+  - "relaxed"
+  # Matches either:
+  # - syntax error, on any line
+  # - other error, on a modified line only
+  filter: "^{filename}:(?P<line>{lines}|\\d+\
+           (?=:\\d+: \\[error\\] syntax error:)):(?P<column>\\d+): \
+           \\[(?P<severity>\\S+)\\] (?P<message>.+)$"
+  installation: "Run pip install yamllint."
 
 # INI
 ini:

scripts/custom_linters/yaml_linter.py

@@ -26,7 +26,7 @@ gem install scss-lint
 pip install http://closure-linter.googlecode.com/files/closure_linter-latest.tar.gz
 pip install pylint
 pip install pep8
-pip install pyYAML
+pip install yamllint
 pip install docutils
 pip install html-linter
 

scripts/install-linters.sh

@@ -31,7 +31,6 @@
         'scripts/pre-commit.git-lint.sh',
         'scripts/pre-commit.hg-lint.sh',
         'scripts/custom_linters/ini_linter.py',
-        'scripts/custom_linters/yaml_linter.py',
         'scripts/custom_linters/jpegtran-linter.sh',
         'scripts/custom_linters/optipng-linter.sh',
         'scripts/custom_linters/pngcrush-linter.sh',

setup.py

@@ -1 +1,5 @@
+already-present error:
+  duplicated-key: number 1
+  duplicated-key: number 2
+
 "foo": "bar

test/e2etest/data/yaml/error.yaml

@@ -1 +1,5 @@
+already-present error:
+  duplicated-key: number 1
+  duplicated-key: number 2
+
 "foo": "bar"

test/e2etest/data/yaml/nonewerror.yaml

@@ -1 +1,5 @@
+already-present error:
+  duplicated-key: number 1
+  duplicated-key: number 2
+
 "foo"