Skip to content

Commit

Permalink
Update rubocop to version 0.34.0
Browse files Browse the repository at this point in the history
  • Loading branch information
sferik committed Sep 6, 2015
1 parent 1a41b27 commit 4e82f25
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 4 deletions.
5 changes: 5 additions & 0 deletions .rubocop.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
Lint/NestedMethodDefinition:
Enabled: false

Metrics/BlockNesting:
Max: 2

Expand All @@ -20,8 +23,10 @@ Style/ClassVars:
Enabled: false

Style/CollectionMethods:
Enabled: true
PreferredMethods:
map: 'collect'
map!: 'collect!'
reduce: 'inject'
find: 'detect'
find_all: 'select'
Expand Down
4 changes: 2 additions & 2 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ gemspec
gem 'rake'

group :development do
platforms :ruby_19, :ruby_20, :ruby_21 do
platforms :ruby_19, :ruby_20, :ruby_21, :ruby_22 do
gem 'guard'
gem 'guard-bundler'
gem 'guard-rspec'
Expand All @@ -21,5 +21,5 @@ group :test do
gem 'mime-types', '~> 1.25', :platforms => [:jruby, :ruby_18]
gem 'rest-client', '~> 1.6.0', :platforms => [:jruby, :ruby_18]
gem 'rspec', '>= 2.14'
gem 'rubocop', '~> 0.31.0', :platforms => [:ruby_19, :ruby_20, :ruby_21]
gem 'rubocop', '~> 0.34.0', :platforms => [:ruby_19, :ruby_20, :ruby_21, :ruby_22]
end
2 changes: 1 addition & 1 deletion lib/naught/null_class_builder/commands/mimic.rb
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ def initialize(builder, class_to_mimic_or_options, options = {})
@singleton_class = NULL_SINGLETON_CLASS
@class_to_mimic = class_to_mimic_or_options
end
@include_super = options.fetch(:include_super) { true }
@include_super = options.fetch(:include_super) { true }

builder.base_class = root_class_of(@class_to_mimic)
class_to_mimic = @class_to_mimic
Expand Down
2 changes: 1 addition & 1 deletion lib/naught/null_class_builder/commands/pebble.rb
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ def call
defer do |subject|
subject.module_exec(@output) do |output|
define_method(:method_missing) do |method_name, *args|
pretty_args = args.collect(&:inspect).join(', ').gsub("\"", "'")
pretty_args = args.collect(&:inspect).join(', ').tr("\"", "'")
output.puts "#{method_name}(#{pretty_args}) from #{parse_caller}"
self
end
Expand Down

0 comments on commit 4e82f25

Please sign in to comment.