From: Tom Hughes <tom@compton.nu>
Date: Sun, 5 Feb 2017 10:28:54 +0000 (+0000)
Subject: Update foodcritic
X-Git-Url: https://git.openstreetmap.org/chef.git/commitdiff_plain/eaf36fca1326b92df12cfceed82167f51ddf1e69

Update foodcritic
---

diff --git a/Gemfile.lock b/Gemfile.lock
index 54dd64532..ba26104ac 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -9,7 +9,7 @@ GEM
       gherkin (~> 4.0)
     diff-lcs (1.2.5)
     erubis (2.7.0)
-    foodcritic (8.1.0)
+    foodcritic (9.0.0)
       cucumber-core (>= 1.3)
       erubis
       nokogiri (>= 1.5, < 2.0)
@@ -35,14 +35,14 @@ GEM
     net-ssh-gateway (1.2.0)
       net-ssh (>= 2.6.5)
     net-telnet (0.1.1)
-    nokogiri (1.6.8.1)
+    nokogiri (1.7.0.1)
       mini_portile2 (~> 2.1.0)
     parser (2.3.3.1)
       ast (~> 2.2)
     polyglot (0.3.5)
     powerpack (0.1.1)
     rainbow (2.2.1)
-    rake (11.3.0)
+    rake (12.0.0)
     rspec (3.5.0)
       rspec-core (~> 3.5.0)
       rspec-expectations (~> 3.5.0)
diff --git a/hooks/pre-commit b/hooks/pre-commit
index 4e45ba7b5..4ad3c1576 100755
--- a/hooks/pre-commit
+++ b/hooks/pre-commit
@@ -19,7 +19,7 @@ if IO.popen(["git", "ls-files", "--unmerged"]).read.empty?
 
   cookbooks = files.grep(%r{(cookbooks/[^/]+)/}) { Regexp.last_match(1) }.uniq
 
-  ok &&= system("bundle", "exec", "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