diff --git a/.rubocop.yml b/.rubocop.yml index 1fda459..d4f9f88 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -71,7 +71,7 @@ Style/HashSyntax: Style/RescueModifier: Enabled: false -Style/AccessorMethodName: +Naming/AccessorMethodName: Enabled: false # allow larger modules @@ -90,7 +90,7 @@ Lint/ParenthesesAsGroupedExpression: # Enabled: false # allow multiple spaces between methofs and first arg -Style/SpaceBeforeFirstArg: +Layout/SpaceBeforeFirstArg: Enabled: false # There are too many non-ruby files that run up against rubocop rules in a cookbook @@ -105,3 +105,7 @@ Metrics/BlockLength: # allow longer argument lists Metrics/ParameterLists: Max: 6 + +# allow using $stderr +Style/StderrPuts: + Enabled: false diff --git a/.travis.yml b/.travis.yml index c1a0a14..679d260 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,8 +7,9 @@ before_install: - gem install bundler rvm: - - 2.3.3 - - 2.4.1 + - 2.3.6 + - 2.4.3 + - 2.5.0 script: - bundle exec rake diff --git a/aws-cleaner.gemspec b/aws-cleaner.gemspec index 47cf702..90a0f7f 100644 --- a/aws-cleaner.gemspec +++ b/aws-cleaner.gemspec @@ -13,7 +13,7 @@ Gem::Specification.new do |s| s.add_development_dependency 'bundler', '~> 1.12' s.add_development_dependency 'rake', '~> 12.0' s.add_development_dependency 'rspec', '~> 3.5' - s.add_development_dependency 'rubocop', '~> 0.46.0' + s.add_development_dependency 'rubocop', '~> 0.52.1' s.add_runtime_dependency 'aws-sdk-core', '~> 2.0' s.add_runtime_dependency 'chef-api', '~> 0.5' diff --git a/lib/aws-cleaner.rb b/lib/aws-cleaner.rb index cddd3e7..4e94325 100644 --- a/lib/aws-cleaner.rb +++ b/lib/aws-cleaner.rb @@ -49,7 +49,7 @@ def self.remove_from_chef(node_name, chef, config) client.destroy node = chef.nodes.fetch(node_name) node.destroy - rescue => e + rescue StandardError => e puts "Failed to remove chef node: #{e}" else # puts "Removed #{node_name} from chef" @@ -68,7 +68,7 @@ def self.in_sensu?(node_name, config) ) rescue RestClient::ResourceNotFound return false - rescue => e + rescue StandardError => e puts "Sensu request failed: #{e}" return false else