From 9ecb5a2ed950a638f314e1e11fad6a373feba1f1 Mon Sep 17 00:00:00 2001
From: Andrew Lee <andrew.lee@gusto.com>
Date: Mon, 15 Apr 2019 10:06:50 -0700
Subject: [PATCH] Make changes to let Rubocop pass in CI

---
 bin/annotate                                           | 2 --
 spec/annotate/annotate_models_spec.rb                  | 4 ++--
 spec/integration/rails_2.3_with_bundler/config/boot.rb | 4 ++--
 3 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/bin/annotate b/bin/annotate
index 3e0d8ad39..2f27d5d73 100755
--- a/bin/annotate
+++ b/bin/annotate
@@ -22,7 +22,6 @@ has_set_position = {}
 target_action = :do_annotations
 positions = %w(before top after bottom)
 
-# rubocop:disable Metrics/BlockLength
 OptionParser.new do |opts|
   opts.banner = 'Usage: annotate [options] [model_file]*'
 
@@ -207,7 +206,6 @@ OptionParser.new do |opts|
     ENV['with_comment'] = 'true'
   end
 end.parse!
-# rubocop:enable Metrics/BlockLength
 
 options = Annotate.setup_options(
   is_rake: ENV['is_rake'] && !ENV['is_rake'].empty?
diff --git a/spec/annotate/annotate_models_spec.rb b/spec/annotate/annotate_models_spec.rb
index 01db9ce99..049bf7335 100644
--- a/spec/annotate/annotate_models_spec.rb
+++ b/spec/annotate/annotate_models_spec.rb
@@ -5,7 +5,7 @@
 require 'active_support/core_ext/string'
 require 'files'
 
-describe AnnotateModels do
+describe AnnotateModels do # rubocop:disable Metrics/BlockLength
   def mock_index(name, params = {})
     double('IndexKeyDefinition',
            name:          name,
@@ -1804,4 +1804,4 @@ class Foo < ActiveRecord::Base; end
       expect(annotate_model_file).to eq nil
     end
   end
-end
+end # rubocop:enable Metrics/BlockLength
diff --git a/spec/integration/rails_2.3_with_bundler/config/boot.rb b/spec/integration/rails_2.3_with_bundler/config/boot.rb
index 190b37add..1be033ee9 100644
--- a/spec/integration/rails_2.3_with_bundler/config/boot.rb
+++ b/spec/integration/rails_2.3_with_bundler/config/boot.rb
@@ -61,8 +61,8 @@ def load_rails_gem
       else
         gem 'rails'
       end
-    rescue Gem::LoadError => load_error
-      if load_error.message =~ /Could not find RubyGem rails/
+    rescue Gem::LoadError => e
+      if e.message =~ /Could not find RubyGem rails/
         $stderr.puts "Missing the Rails #{version} gem. Please `gem install -v=#{version} rails`, update your RAILS_GEM_VERSION setting in config/environment.rb for the Rails version you do have installed, or comment out RAILS_GEM_VERSION to use the latest version installed."
         exit 1
       else