diff --git a/.rubocop.yml b/.rubocop.yml index ae6487830151a..923c506f3ca10 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -1,4 +1,5 @@ require: + - rubocop-packaging - rubocop-performance - rubocop-rails diff --git a/Gemfile b/Gemfile index 74f63c8ec11f0..cb6593e5b4d7c 100644 --- a/Gemfile +++ b/Gemfile @@ -29,7 +29,8 @@ gem "uglifier", ">= 1.3.0", require: false gem "json", ">= 2.0.0" group :rubocop do - gem "rubocop", ">= 0.47", require: false + gem "rubocop", ">= 0.90", require: false + gem "rubocop-packaging", require: false gem "rubocop-performance", require: false gem "rubocop-rails", require: false end diff --git a/Gemfile.lock b/Gemfile.lock index aa5d89771a0c0..25189c0098cba 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -115,7 +115,7 @@ GEM public_suffix (>= 2.0.2, < 5.0) amq-protocol (2.3.0) ansi (1.5.0) - ast (2.4.0) + ast (2.4.1) aws-eventstream (1.0.3) aws-partitions (1.260.0) aws-sdk-core (3.86.0) @@ -282,8 +282,6 @@ GEM image_processing (1.10.2) mini_magick (>= 4.9.5, < 5) ruby-vips (>= 2.0.17, < 3) - jaro_winkler (1.5.4) - jaro_winkler (1.5.4-java) jdbc-mysql (5.1.47) jdbc-postgres (42.2.6) jdbc-sqlite3 (3.28.0) @@ -346,9 +344,9 @@ GEM nokogiri (1.10.9-x86-mingw32) mini_portile2 (~> 2.4.0) os (1.0.1) - parallel (1.19.1) - parser (2.7.1.2) - ast (~> 2.4.0) + parallel (1.19.2) + parser (2.7.1.4) + ast (~> 2.4.1) path_expander (1.1.0) pg (1.2.3) pg (1.2.3-x64-mingw32) @@ -389,7 +387,7 @@ GEM redis (4.2.0) redis-namespace (1.7.0) redis (>= 3.0.4) - regexp_parser (1.6.0) + regexp_parser (1.7.1) representable (3.0.4) declarative (< 0.1.0) declarative-option (< 0.2.0) @@ -408,14 +406,17 @@ GEM retriable (3.1.2) rexml (3.2.4) rouge (3.20.0) - rubocop (0.82.0) - jaro_winkler (~> 1.5.1) + rubocop (0.90.0) parallel (~> 1.10) - parser (>= 2.7.0.1) + parser (>= 2.7.1.1) rainbow (>= 2.2.2, < 4.0) + regexp_parser (>= 1.7) rexml + rubocop-ast (>= 0.3.0, < 1.0) ruby-progressbar (~> 1.7) unicode-display_width (>= 1.4.0, < 2.0) + rubocop-ast (0.3.0) + parser (>= 2.7.1.4) rubocop-performance (1.6.1) rubocop (>= 0.71.0) rubocop-rails (2.5.2) @@ -587,7 +588,7 @@ DEPENDENCIES resque-scheduler rexml rouge - rubocop (>= 0.47) + rubocop (>= 0.90) rubocop-performance rubocop-rails sass-rails