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

[chef.git] / hooks / pre-commit

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

 
 ok = true
 
 
 ok = true
 


@@ -15,11 +15,7 @@ if IO.popen(["git", "ls-files", "--unmerged"]).read.empty?
     file =~ /\.rb$/ || (file !~ /\.erb$/ && %x(file --brief --mime-type #{file}) == "text/x-ruby\n")
   end
 
     file =~ /\.rb$/ || (file !~ /\.erb$/ && %x(file --brief --mime-type #{file}) == "text/x-ruby\n")
   end
 

-  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?
+  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