From b6e9c953b3c2199a4333d4382af4d452f0638e52 Mon Sep 17 00:00:00 2001 From: Clay Allsopp Date: Thu, 3 Aug 2017 13:54:15 -0700 Subject: [PATCH] Support rubocop binstub --- lib/fix_db_schema_conflicts/tasks/db.rake | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/lib/fix_db_schema_conflicts/tasks/db.rake b/lib/fix_db_schema_conflicts/tasks/db.rake index 11c7ca7..4594dac 100644 --- a/lib/fix_db_schema_conflicts/tasks/db.rake +++ b/lib/fix_db_schema_conflicts/tasks/db.rake @@ -12,8 +12,10 @@ namespace :db do "#{Rails.root}/db/schema.rb" end autocorrect_config = FixDBSchemaConflicts::AutocorrectConfiguration.load + rubocop_binary = "#{Rails.root}/bin/rubocop" + rubocop_binary = "bundle exec rubocop" unless File.exists?(rubocop_binary) rubocop_yml = File.expand_path("../../../../#{autocorrect_config}", __FILE__) - `bundle exec rubocop --auto-correct --config #{rubocop_yml} #{filename.shellescape}` + `#{rubocop_binary} --auto-correct --config #{rubocop_yml} #{filename.shellescape}` end end end