Merge remote-tracking branch 'github/pull/704'

[chef.git] / hooks / pre-commit

diff --git a/hooks/pre-commit b/hooks/pre-commit
index 55d23300cee8c20ff844da2a421821cd7bd7da7b..449a8c6f2b2166e4bcd9d5bdbe0ae8f675ef4c21 100755 (executable)
--- a/hooks/pre-commit
+++ b/hooks/pre-commit
@@ -1,9 +1,9 @@
-#!/usr/bin/ruby
+#!/usr/bin/env ruby

 
 ok = true
 
 if IO.popen(["git", "ls-files", "--unmerged"]).read.empty?
 
 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
 
 
   system("git", "stash", "save", "--keep-index", "--quiet") if need_stash
 


@@ -12,14 +12,10 @@ if IO.popen(["git", "ls-files", "--unmerged"]).read.empty?
   end.compact
 
   ruby_files = files.select do |file|
   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
 
   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
 
   system("git", "stash", "pop", "--quiet") if need_stash
 else