X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/ae2ef9ff4f0542d2bb2f8bbe6d6b6f27ec5c55f8..e1f6c061b179924fc5cda43270592fc6a17fb236:/hooks/pre-commit

diff --git a/hooks/pre-commit b/hooks/pre-commit
index de3142ea0..449a8c6f2 100755
--- a/hooks/pre-commit
+++ b/hooks/pre-commit
@@ -1,23 +1,21 @@
-#!/usr/bin/ruby
+#!/usr/bin/env ruby
 
 ok = true
 
 if IO.popen(["git", "ls-files", "--unmerged"]).read.empty?
-  need_stash = IO.popen(%w(git diff)).read.length > 0
+  need_stash = !IO.popen(%w[git diff]).read.empty?
 
   system("git", "stash", "save", "--keep-index", "--quiet") if need_stash
 
-  files = IO.popen(["git", "diff", "--staged", "--name-only"]).readlines.map(&:chomp)
+  files = IO.popen(["git", "diff", "--staged", "--name-status"]).map do |line|
+    Regexp.last_match(1) if line =~ /^[AM]\s+(.*)$/
+  end.compact
 
   ruby_files = files.select do |file|
-    file =~ /\.rb$/ || `file --brief --mime-type #{file}` == "text/x-ruby\n"
+    file =~ /\.rb$/ || (file !~ /\.erb$/ && %x(file --brief --mime-type #{file}) == "text/x-ruby\n")
   end
 
-  ok &&= system("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", "cookstyle", *ruby_files) unless ruby_files.empty?
 
   system("git", "stash", "pop", "--quiet") if need_stash
 else