diff --git a/.hound.yml b/.hound.yml index 4010fa02a..a8568704c 100644 --- a/.hound.yml +++ b/.hound.yml @@ -1,5 +1,6 @@ rubocop: config_file: .rubocop_basic.yml + version: 0.72.0 scss: config_file: .scss-lint.yml erblint: diff --git a/.rubocop_basic.yml b/.rubocop_basic.yml index 4cb8f19bc..a348f705b 100644 --- a/.rubocop_basic.yml +++ b/.rubocop_basic.yml @@ -1,4 +1,7 @@ -require: rubocop-rspec +require: + - rubocop-performance + - rubocop-rails + - rubocop-rspec AllCops: DisplayCopNames: true @@ -30,7 +33,7 @@ FactoryBot/AttributeDefinedStatically: Enabled: true Layout/IndentationConsistency: - EnforcedStyle: rails + EnforcedStyle: indented_internal_methods Layout/IndentationWidth: Enabled: true diff --git a/Gemfile b/Gemfile index 653a433c9..e9d665a48 100644 --- a/Gemfile +++ b/Gemfile @@ -96,7 +96,9 @@ group :development do gem "capistrano3-delayed-job", "~> 1.7.3" gem "erb_lint", require: false gem "mdl", "~> 0.5.0", require: false - gem "rubocop", "~> 0.60.0", require: false + gem "rubocop", "~> 0.75.0", require: false + gem "rubocop-performance", "~> 1.4.1", require: false + gem "rubocop-rails", "~> 2.3.2", require: false gem "rubocop-rspec", "~> 1.35.0", require: false gem "rvm1-capistrano3", "~> 1.4.0", require: false gem "scss_lint", "~> 0.55.0", require: false diff --git a/Gemfile.lock b/Gemfile.lock index 4c44713f2..f86ab3ced 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -387,7 +387,6 @@ GEM activerecord (>= 4.2) activesupport (>= 4.2) arel (>= 6) - powerpack (0.1.2) public_suffix (4.0.1) puma (4.1.1) nio4r (~> 2.0) @@ -460,14 +459,18 @@ GEM rspec-mocks (~> 3.8.0) rspec-support (~> 3.8.0) rspec-support (3.8.0) - rubocop (0.60.0) + rubocop (0.75.0) jaro_winkler (~> 1.5.1) parallel (~> 1.10) - parser (>= 2.5, != 2.5.1.1) - powerpack (~> 0.1) + parser (>= 2.6) rainbow (>= 2.2.2, < 4.0) ruby-progressbar (~> 1.7) - unicode-display_width (~> 1.4.0) + unicode-display_width (>= 1.4.0, < 1.7) + rubocop-performance (1.4.1) + rubocop (>= 0.71.0) + rubocop-rails (2.3.2) + rack (>= 1.1) + rubocop (>= 0.72.0) rubocop-rspec (1.35.0) rubocop (>= 0.60.0) ruby-progressbar (1.10.1) @@ -550,7 +553,7 @@ GEM thread_safe (~> 0.1) uglifier (4.1.19) execjs (>= 0.3.0, < 3) - unicode-display_width (1.4.1) + unicode-display_width (1.6.0) unicorn (5.4.1) kgio (~> 2.6) raindrops (~> 0.7) @@ -648,7 +651,9 @@ DEPENDENCIES rinku (~> 2.0.2) rollbar (~> 2.18.0) rspec-rails (~> 3.8) - rubocop (~> 0.60.0) + rubocop (~> 0.75.0) + rubocop-performance (~> 1.4.1) + rubocop-rails (~> 2.3.2) rubocop-rspec (~> 1.35.0) rvm1-capistrano3 (~> 1.4.0) sass-rails (~> 5.0, >= 5.0.4)