Skip to content

Commit

Permalink
Update rubocop requirement from ~> 0.46.0 to ~> 0.67.2 (#611)
Browse files Browse the repository at this point in the history
* 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](rubocop/rubocop@v0.46.0...v0.67.2)

Signed-off-by: dependabot[bot] <support@dependabot.com>

* Make changes to let Rubocop pass in CI
  • Loading branch information
dependabot[bot] authored and drwl committed Apr 18, 2019
1 parent fe17228 commit 00ae33a
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 6 deletions.
2 changes: 1 addition & 1 deletion Gemfile
Expand Up @@ -19,7 +19,7 @@ group :development, :test do
gem 'guard-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 'terminal-notifier-guard', require: false

Expand Down
2 changes: 0 additions & 2 deletions bin/annotate
Expand Up @@ -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]*'

Expand Down Expand Up @@ -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?
Expand Down
2 changes: 1 addition & 1 deletion spec/annotate/annotate_models_spec.rb
Expand Up @@ -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,
Expand Down
4 changes: 2 additions & 2 deletions spec/integration/rails_2.3_with_bundler/config/boot.rb
Expand Up @@ -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
Expand Down

0 comments on commit 00ae33a

Please sign in to comment.