Commit 00ae33a9 by dependabot[bot] Committed by Andrew W. Lee

Update rubocop requirement from ~> 0.46.0 to ~> 0.67.2 (#611)

* Update rubocop requirement from ~> 0.46.0 to ~> 0.67.2 Updates the requirements on [rubocop](https://github.com/rubocop-hq/rubocop) to permit the latest version. - [Release notes](https://github.com/rubocop-hq/rubocop/releases) - [Changelog](https://github.com/rubocop-hq/rubocop/blob/master/CHANGELOG.md) - [Commits](https://github.com/rubocop-hq/rubocop/compare/v0.46.0...v0.67.2) Signed-off-by: 's avatardependabot[bot] <support@dependabot.com> * Make changes to let Rubocop pass in CI
parent fe172282
...@@ -19,7 +19,7 @@ group :development, :test do ...@@ -19,7 +19,7 @@ group :development, :test do
gem 'guard-rspec', require: false gem 'guard-rspec', require: false
gem 'rspec', require: false gem 'rspec', require: false
gem 'rubocop', '~> 0.65.0', require: false unless RUBY_VERSION =~ /^1.8/ gem 'rubocop', '~> 0.67.2', require: false unless RUBY_VERSION =~ /^1.8/
gem 'simplecov', require: false gem 'simplecov', require: false
gem 'terminal-notifier-guard', require: false gem 'terminal-notifier-guard', require: false
......
...@@ -22,7 +22,6 @@ has_set_position = {} ...@@ -22,7 +22,6 @@ has_set_position = {}
target_action = :do_annotations target_action = :do_annotations
positions = %w(before top after bottom) positions = %w(before top after bottom)
# rubocop:disable Metrics/BlockLength
OptionParser.new do |opts| OptionParser.new do |opts|
opts.banner = 'Usage: annotate [options] [model_file]*' opts.banner = 'Usage: annotate [options] [model_file]*'
...@@ -207,7 +206,6 @@ OptionParser.new do |opts| ...@@ -207,7 +206,6 @@ OptionParser.new do |opts|
ENV['with_comment'] = 'true' ENV['with_comment'] = 'true'
end end
end.parse! end.parse!
# rubocop:enable Metrics/BlockLength
options = Annotate.setup_options( options = Annotate.setup_options(
is_rake: ENV['is_rake'] && !ENV['is_rake'].empty? is_rake: ENV['is_rake'] && !ENV['is_rake'].empty?
......
...@@ -5,7 +5,7 @@ require 'annotate/active_record_patch' ...@@ -5,7 +5,7 @@ require 'annotate/active_record_patch'
require 'active_support/core_ext/string' require 'active_support/core_ext/string'
require 'files' require 'files'
describe AnnotateModels do describe AnnotateModels do # rubocop:disable Metrics/BlockLength
def mock_index(name, params = {}) def mock_index(name, params = {})
double('IndexKeyDefinition', double('IndexKeyDefinition',
name: name, name: name,
......
...@@ -61,8 +61,8 @@ module Rails ...@@ -61,8 +61,8 @@ module Rails
else else
gem 'rails' gem 'rails'
end end
rescue Gem::LoadError => load_error rescue Gem::LoadError => e
if load_error.message =~ /Could not find RubyGem rails/ 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." $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 exit 1
else else
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment