]> git.openstreetmap.org Git - chef.git/commitdiff
Update hooks to run rubocop and foodcritic via bundler
authorTom Hughes <tom@compton.nu>
Mon, 31 Oct 2016 21:24:45 +0000 (21:24 +0000)
committerTom Hughes <tom@compton.nu>
Mon, 31 Oct 2016 21:24:45 +0000 (21:24 +0000)
hooks/pre-commit

index 57c23a35a1026fa3c805278c392fd36b2e3aff62..4e45ba7b50d47fe1d74a957851c40ef05696f692 100755 (executable)
@@ -15,11 +15,11 @@ if IO.popen(["git", "ls-files", "--unmerged"]).read.empty?
     file =~ /\.rb$/ || `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("foodcritic", "-f", "any", *cookbooks) unless cookbooks.empty?
+  ok &&= system("bundle", "exec", "foodcritic", "-f", "any", *cookbooks) unless cookbooks.empty?
 
   system("git", "stash", "pop", "--quiet") if need_stash
 else