Merge pull request #91 from Klaas-/Klaas--patch-1

Fixes #79 - correctly pass future parser option

Author: drwahl

README.md

@@ -103,3 +103,17 @@ fi
 ```
 
 Additionally you can call pre-commit script with two options `-s` and `-a`. First one silence standard informations, which file is currently being checked. Second one allow you to check whole repo, not only files changed locally.
+
+Configuration
+===============
+You can set configuration options in commit_hooks/config.cfg
+This file is sourced by the pre-commit/receive hooks.
+
+Current options:
+* CHECK_PUPPET_LINT
+* USE_PUPPET_FUTURE_PARSER (only used by Puppet < 4)
+* CHECK_INITIAL_COMMIT
+* CHECK_RSPEC
+* PUPPET_LINT_OPTIONS
+* PUPPET_LINT_FAIL_ON_WARNINGS
+* UNSET_RUBY_ENV (for GitLab users)

pre-commit

@@ -42,6 +42,11 @@ if [[ -f "$git_root/.git" ]]; then
     fi
 fi
 
+# Only puppet 3.2.1 - 3.8 support "--parser future" option.
+case $(puppet --version) in
+  4*) USE_PUPPET_FUTURE_PARSER="disabled" ;;
+esac
+
 # Decide if we want puppet-lint
 CHECK_PUPPET_LINT="enabled"
 if [[ -e ${subhook_root}/config.cfg ]] ; then
@@ -68,7 +73,7 @@ for changedfile in $files_to_check; do
                 failures=$((failures + 1))
             fi
         elif [[ $(echo "$changedfile" | grep -q '\.*\.pp$'; echo $?) -eq 0 ]]; then
-            ${subhook_root}/puppet_manifest_syntax_check.sh "$changedfile"
+            ${subhook_root}/puppet_manifest_syntax_check.sh "$changedfile" "" "$USE_PUPPET_FUTURE_PARSER"
             RC=$?
             if [[ "$RC" -ne 0 ]]; then
                 failures=$((failures + 1))