Make changes to let Rubocop pass in CI

Author: Andrew Lee

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?

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,

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