From 73ec2dea6c1a07b08206ec37e588b8a6795e210b Mon Sep 17 00:00:00 2001 From: Tom Hughes Date: Mon, 31 Oct 2016 21:24:45 +0000 Subject: [PATCH] Update hooks to run rubocop and foodcritic via bundler --- hooks/pre-commit | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hooks/pre-commit b/hooks/pre-commit index 57c23a35a..4e45ba7b5 100755 --- a/hooks/pre-commit +++ b/hooks/pre-commit @@ -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 -- 2.43.2