Merge branch 'patch-2' of https://github.com/Tigerfell/chef into pr257

[chef.git] / hooks / pre-commit

diff --git a/hooks/pre-commit b/hooks/pre-commit
index 6f7912f1f726a46b28449e8cf007d58c650f23cd..60d6659326ff7908b9cf25fa8f9d1553c42523e5 100755 (executable)
--- a/hooks/pre-commit
+++ b/hooks/pre-commit
@@ -3,17 +3,23 @@
 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?
+  ok &&= system("bundle", "exec", "rubocop", *ruby_files) unless ruby_files.empty?
+
+  cookbooks = files.grep(%r{(cookbooks/[^/]+)/}) { Regexp.last_match(1) }.uniq
+
+  ok &&= system("bundle", "exec", "foodcritic", *cookbooks) unless cookbooks.empty?
 
   system("git", "stash", "pop", "--quiet") if need_stash
 else