X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/29e2c1a969f226660eac316bd713c0c8c31e9133..24bda5b91ff2677a586d2c8c16e0e44eafaa37bc:/hooks/pre-commit diff --git a/hooks/pre-commit b/hooks/pre-commit index 57c23a35a..4ad3c1576 100755 --- a/hooks/pre-commit +++ b/hooks/pre-commit @@ -15,11 +15,11 @@ if IO.popen(["git", "ls-files", "--unmerged"]).read.empty? file =~ /\.rb$/ || `file --brief --mime-type #{file}` == "text/x-ruby\n" end - ok &&= system("rubocop", *ruby_files) unless ruby_files.empty? + ok &&= system("bundle", "exec", "rubocop", *ruby_files) unless ruby_files.empty? cookbooks = files.grep(%r{(cookbooks/[^/]+)/}) { Regexp.last_match(1) }.uniq - ok &&= system("foodcritic", "-f", "any", *cookbooks) unless cookbooks.empty? + ok &&= system("bundle", "exec", "foodcritic", *cookbooks) unless cookbooks.empty? system("git", "stash", "pop", "--quiet") if need_stash else