From 7ca01aa9855bee73c8270aa92080814ecd1dbf0b Mon Sep 17 00:00:00 2001 From: Evan Sharp Date: Tue, 30 Dec 2014 14:22:19 -0500 Subject: [PATCH] Update RuboCop --- .rubocop.yml | 30 ++++++++++++++++++++++++++++-- .travis.yml | 1 + Rakefile | 2 +- ttfunk.gemspec | 2 +- 4 files changed, 31 insertions(+), 4 deletions(-) diff --git a/.rubocop.yml b/.rubocop.yml index d39888e7..744ff84c 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -13,8 +13,6 @@ DotPosition: Enabled: false EmptyLinesAroundAccessModifier: Enabled: false -EmptyLinesAroundBody: - Enabled: false IndentationConsistency: Enabled: false TrailingWhitespace: @@ -73,6 +71,34 @@ FormatString: Enabled: false AlignArray: Enabled: false +EmptyLinesAroundBlockBody: + Enabled: false +EmptyLinesAroundClassBody: + Enabled: false +UnusedMethodArgument: + Enabled: false +EmptyElse: + Enabled: false +GuardClause: + Enabled: false +AbcSize: + Enabled: false +SymbolProc: + Enabled: false +ElseAlignment: + Enabled: false +PerceivedComplexity: + Enabled: false +EachWithObject: + Enabled: false +MultilineOperationIndentation: + Enabled: false +EmptyLinesAroundModuleBody: + Enabled: false +Next: + Enabled: false +UnusedBlockArgument: + Enabled: false # Possibly won't remove due to intentional style decisions SignalException: diff --git a/.travis.yml b/.travis.yml index 9cddd920..f98478c0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,6 +4,7 @@ rvm: - 1.9.3 - 2.0.0 - 2.1.2 + - 2.2.0 - rbx-2 - jruby-19mode diff --git a/Rakefile b/Rakefile index cb62ffec..6457cbea 100644 --- a/Rakefile +++ b/Rakefile @@ -10,4 +10,4 @@ task :default => [:rubocop, :spec] desc "Run all rspec files" RSpec::Core::RakeTask.new("spec") -Rubocop::RakeTask.new +RuboCop::RakeTask.new diff --git a/ttfunk.gemspec b/ttfunk.gemspec index 92f67f4f..7c19b787 100644 --- a/ttfunk.gemspec +++ b/ttfunk.gemspec @@ -11,7 +11,7 @@ Gem::Specification.new do |spec| spec.add_development_dependency('rdoc') spec.add_development_dependency('rspec') spec.add_development_dependency('rake') - spec.add_development_dependency('rubocop', '0.20.1') + spec.add_development_dependency('rubocop', '0.28.0') spec.authors = ["Gregory Brown","Brad Ediger","Daniel Nelson", "Jonathan Greenberg","James Healy"]