pre-commit: pep8 is now pycodestyle

[fdroidserver.git] / hooks / pre-commit

diff --git a/hooks/pre-commit b/hooks/pre-commit
index 1ea732e45d760da1381d5c3503eab2c3ead1853f..45a5b05234da3ecd3b4e5dea4f8b8cb0dcf0ebe5 100755 (executable)
--- a/hooks/pre-commit
+++ b/hooks/pre-commit
@@ -11,8 +11,8 @@ if [ -z "$files" ]; then
     PY_FILES="fdroid makebuildserver setup.py examples/*.py buildserver/*.py fdroidserver/*.py"
     PY_TEST_FILES="tests/*.TestCase"
     SH_FILES="hooks/pre-commit"
-    BASH_FILES="fd-commit jenkins-build docs/update.sh completion/bash-completion"
-    RB_FILES="buildserver/cookbooks/*/recipes/*.rb"
+    BASH_FILES="fd-commit jenkins-build docs/update.sh completion/bash-completion buildserver/provision-*"
+    RB_FILES="buildserver/cookbooks/*/recipes/*.rb buildserver/Vagrantfile"
 else
     # if actually committing right now, then only run on the files
     # that are going to be committed at this moment
@@ -23,6 +23,7 @@ else
     RB_FILES=
 
     for f in $files; do
+        test -e $f || continue
         case $f in
             *.py)
                 PY_FILES+=" $f"
@@ -46,47 +47,46 @@ else
     done
 fi
 
-# In the default configuration, the checks E123, E133, E226, E241 and E242 are
-# ignored because they are not rules unanimously accepted
-# On top of those, we ignore:
+# We ignore the following PEP8 warnings
+# * E123: closing bracket does not match indentation of opening bracket's line
+#   - Broken if multiple indentation levels start on a single line
 # * E501: line too long (82 > 79 characters)
 #   - Recommended for readability but not enforced
 #   - Some lines are awkward to wrap around a char limit
 # * W503: line break before binary operator
-#   - It's quite new
 #   - Quite pedantic
 
-PEP8_IGNORE="E123,E133,E226,E241,E242,E501,W503"
+PEP8_IGNORE="E123,E501,W503"
 
 err() {
-       echo ERROR: "$@"
+       echo >&2 ERROR: "$@"
        exit 1
 }
 
 warn() {
-       echo WARNING: "$@"
+       echo >&2 WARNING: "$@"
 }
 
 cmd_exists() {
        command -v $1 1>/dev/null
 }
 
-if cmd_exists pyflakes-python3; then
-       PYFLAKES=pyflakes-python3
-elif cmd_exists pyflakes; then
-       PYFLAKES=pyflakes
-else
-       PYFLAKES=echo
-       warn "pyflakes is not installed, using dummy placeholder!"
-fi
+find_command() {
+       for name in $@; do
+               for suff in "3" "-python3" ""; do
+                       cmd=${name}${suff}
+                       if cmd_exists $cmd; then
+                               echo $cmd
+                               return 0
+                       fi
+               done
+       done
+       warn "$1 is not installed, using dummy placeholder!"
+       echo :
+}
 
-if cmd_exists pep8-python3; then
-       PEP8=pep8-python3
-elif cmd_exists pep8; then
-       PEP8=pep8
-else
-       err "pep8 is not installed!"
-fi
+PYFLAKES=$(find_command pyflakes)
+PEP8=$(find_command pycodestyle pep8)
 
 if [ "$PY_FILES $PY_TEST_FILES" != " " ]; then
     if ! $PYFLAKES $PY_FILES $PY_TEST_FILES; then