From 0c75dc27cd9fc43589eabdc7060b61905345d7bc Mon Sep 17 00:00:00 2001 From: Daniel Colson Date: Fri, 5 Jun 2020 15:12:27 -0400 Subject: [PATCH] Replace Rubocop with standard Following an [update to the thoughtbot guide][guides PR], this commit removes Rubocop and replaces it with [standard]. [guides PR]: https://github.com/thoughtbot/guides/pull/606 [standard]: https://github.com/testdouble/standard --- .rubocop.yml | 33 --------------------------------- Gemfile.lock | 18 ++++++++---------- factory_bot.gemspec | 4 +--- gemfiles/5.0.gemfile.lock | 25 ++++++++++++------------- gemfiles/5.1.gemfile.lock | 25 ++++++++++++------------- gemfiles/5.2.gemfile.lock | 25 ++++++++++++------------- gemfiles/6.0.gemfile.lock | 25 ++++++++++++------------- 7 files changed, 57 insertions(+), 98 deletions(-) delete mode 100644 .rubocop.yml diff --git a/.rubocop.yml b/.rubocop.yml deleted file mode 100644 index 0735d59..0000000 --- a/.rubocop.yml +++ /dev/null @@ -1,33 +0,0 @@ -require: rubocop-performance - -inherit_from: - - https://raw.githubusercontent.com/thoughtbot/guides/master/style/ruby/.rubocop.yml - -AllCops: - TargetRubyVersion: 2.5 - Exclude: - - 'gemfiles/*' - - 'tmp/**/*' - -Rails: - Enabled: false - -Metrics/BlockLength: - CountComments: true - Max: 25 - ExcludedMethods: [] - Exclude: - - "spec/**/*" - - '*.gemspec' - -Style/SymbolArray: - EnforcedStyle: brackets - -Style/FormatStringToken: - Enabled: false - -# TODO: gradually bring this down to 80 as we fix files -# Let's not open a big PR to fix all of these at once - -# we can fix gradually if we happen to be editing a file that has a violation -Layout/LineLength: - Max: 110 diff --git a/Gemfile.lock b/Gemfile.lock index eff13ee..ebe53a0 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -63,9 +63,9 @@ GEM parallel (1.19.1) parser (2.7.1.3) ast (~> 2.4.0) - rack (2.2.2) rainbow (3.0.0) rake (13.0.1) + regexp_parser (1.7.0) rexml (3.2.4) rspec (3.9.0) rspec-core (~> 3.9.0) @@ -83,28 +83,28 @@ GEM diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.9.0) rspec-support (3.9.3) - rubocop (0.84.0) + rubocop (0.85.0) parallel (~> 1.10) parser (>= 2.7.0.1) rainbow (>= 2.2.2, < 4.0) + regexp_parser (>= 1.7) rexml rubocop-ast (>= 0.0.3) ruby-progressbar (~> 1.7) unicode-display_width (>= 1.4.0, < 2.0) rubocop-ast (0.0.3) parser (>= 2.7.0.1) - rubocop-performance (1.6.0) + rubocop-performance (1.6.1) rubocop (>= 0.71.0) - rubocop-rails (2.5.2) - activesupport - rack (>= 1.1) - rubocop (>= 0.72.0) ruby-progressbar (1.10.1) simplecov (0.18.5) docile (~> 1.1) simplecov-html (~> 0.11) simplecov-html (0.12.2) sqlite3 (1.4.2) + standard (0.4.7) + rubocop (~> 0.85.0) + rubocop-performance (~> 1.6.0) thor (1.0.1) thread_safe (0.3.6) tzinfo (1.2.7) @@ -126,11 +126,9 @@ DEPENDENCIES rake rspec rspec-its - rubocop - rubocop-performance - rubocop-rails simplecov sqlite3 + standard yard BUNDLED WITH diff --git a/factory_bot.gemspec b/factory_bot.gemspec index e6a2b94..fe82e41 100644 --- a/factory_bot.gemspec +++ b/factory_bot.gemspec @@ -32,9 +32,7 @@ Gem::Specification.new do |s| s.add_development_dependency("rake") s.add_development_dependency("rspec") s.add_development_dependency("rspec-its") - s.add_development_dependency("rubocop") - s.add_development_dependency("rubocop-performance") - s.add_development_dependency("rubocop-rails") + s.add_development_dependency("standard") s.add_development_dependency("simplecov") s.add_development_dependency("yard") diff --git a/gemfiles/5.0.gemfile.lock b/gemfiles/5.0.gemfile.lock index 2d89e45..b2c866f 100644 --- a/gemfiles/5.0.gemfile.lock +++ b/gemfiles/5.0.gemfile.lock @@ -58,16 +58,15 @@ GEM gherkin (5.1.0) i18n (1.8.2) concurrent-ruby (~> 1.0) - jaro_winkler (1.5.4) minitest (5.14.0) multi_json (1.14.1) multi_test (0.1.2) parallel (1.19.1) - parser (2.7.1.1) + parser (2.7.1.3) ast (~> 2.4.0) - rack (2.2.2) rainbow (3.0.0) rake (13.0.1) + regexp_parser (1.7.0) rexml (3.2.4) rspec (3.9.0) rspec-core (~> 3.9.0) @@ -85,26 +84,28 @@ GEM diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.9.0) rspec-support (3.9.2) - rubocop (0.82.0) - jaro_winkler (~> 1.5.1) + rubocop (0.85.0) parallel (~> 1.10) parser (>= 2.7.0.1) rainbow (>= 2.2.2, < 4.0) + regexp_parser (>= 1.7) rexml + rubocop-ast (>= 0.0.3) ruby-progressbar (~> 1.7) unicode-display_width (>= 1.4.0, < 2.0) - rubocop-performance (1.5.2) + rubocop-ast (0.0.3) + parser (>= 2.7.0.1) + rubocop-performance (1.6.1) rubocop (>= 0.71.0) - rubocop-rails (2.5.2) - activesupport - rack (>= 1.1) - rubocop (>= 0.72.0) ruby-progressbar (1.10.1) simplecov (0.18.5) docile (~> 1.1) simplecov-html (~> 0.11) simplecov-html (0.12.2) sqlite3 (1.3.13) + standard (0.4.7) + rubocop (~> 0.85.0) + rubocop-performance (~> 1.6.0) thor (1.0.1) thread_safe (0.3.6) tzinfo (1.2.7) @@ -125,11 +126,9 @@ DEPENDENCIES rake rspec rspec-its - rubocop - rubocop-performance - rubocop-rails simplecov sqlite3 (~> 1.3.6) + standard yard BUNDLED WITH diff --git a/gemfiles/5.1.gemfile.lock b/gemfiles/5.1.gemfile.lock index b8b489d..c1a4d0f 100644 --- a/gemfiles/5.1.gemfile.lock +++ b/gemfiles/5.1.gemfile.lock @@ -58,16 +58,15 @@ GEM gherkin (5.1.0) i18n (1.8.2) concurrent-ruby (~> 1.0) - jaro_winkler (1.5.4) minitest (5.14.0) multi_json (1.14.1) multi_test (0.1.2) parallel (1.19.1) - parser (2.7.1.1) + parser (2.7.1.3) ast (~> 2.4.0) - rack (2.2.2) rainbow (3.0.0) rake (13.0.1) + regexp_parser (1.7.0) rexml (3.2.4) rspec (3.9.0) rspec-core (~> 3.9.0) @@ -85,26 +84,28 @@ GEM diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.9.0) rspec-support (3.9.2) - rubocop (0.82.0) - jaro_winkler (~> 1.5.1) + rubocop (0.85.0) parallel (~> 1.10) parser (>= 2.7.0.1) rainbow (>= 2.2.2, < 4.0) + regexp_parser (>= 1.7) rexml + rubocop-ast (>= 0.0.3) ruby-progressbar (~> 1.7) unicode-display_width (>= 1.4.0, < 2.0) - rubocop-performance (1.5.2) + rubocop-ast (0.0.3) + parser (>= 2.7.0.1) + rubocop-performance (1.6.1) rubocop (>= 0.71.0) - rubocop-rails (2.5.2) - activesupport - rack (>= 1.1) - rubocop (>= 0.72.0) ruby-progressbar (1.10.1) simplecov (0.18.5) docile (~> 1.1) simplecov-html (~> 0.11) simplecov-html (0.12.2) sqlite3 (1.4.2) + standard (0.4.7) + rubocop (~> 0.85.0) + rubocop-performance (~> 1.6.0) thor (1.0.1) thread_safe (0.3.6) tzinfo (1.2.7) @@ -125,11 +126,9 @@ DEPENDENCIES rake rspec rspec-its - rubocop - rubocop-performance - rubocop-rails simplecov sqlite3 + standard yard BUNDLED WITH diff --git a/gemfiles/5.2.gemfile.lock b/gemfiles/5.2.gemfile.lock index 543cfbb..14da07e 100644 --- a/gemfiles/5.2.gemfile.lock +++ b/gemfiles/5.2.gemfile.lock @@ -58,16 +58,15 @@ GEM gherkin (5.1.0) i18n (1.8.2) concurrent-ruby (~> 1.0) - jaro_winkler (1.5.4) minitest (5.14.0) multi_json (1.14.1) multi_test (0.1.2) parallel (1.19.1) - parser (2.7.1.1) + parser (2.7.1.3) ast (~> 2.4.0) - rack (2.2.2) rainbow (3.0.0) rake (13.0.1) + regexp_parser (1.7.0) rexml (3.2.4) rspec (3.9.0) rspec-core (~> 3.9.0) @@ -85,26 +84,28 @@ GEM diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.9.0) rspec-support (3.9.2) - rubocop (0.82.0) - jaro_winkler (~> 1.5.1) + rubocop (0.85.0) parallel (~> 1.10) parser (>= 2.7.0.1) rainbow (>= 2.2.2, < 4.0) + regexp_parser (>= 1.7) rexml + rubocop-ast (>= 0.0.3) ruby-progressbar (~> 1.7) unicode-display_width (>= 1.4.0, < 2.0) - rubocop-performance (1.5.2) + rubocop-ast (0.0.3) + parser (>= 2.7.0.1) + rubocop-performance (1.6.1) rubocop (>= 0.71.0) - rubocop-rails (2.5.2) - activesupport - rack (>= 1.1) - rubocop (>= 0.72.0) ruby-progressbar (1.10.1) simplecov (0.18.5) docile (~> 1.1) simplecov-html (~> 0.11) simplecov-html (0.12.2) sqlite3 (1.4.2) + standard (0.4.7) + rubocop (~> 0.85.0) + rubocop-performance (~> 1.6.0) thor (1.0.1) thread_safe (0.3.6) tzinfo (1.2.7) @@ -125,11 +126,9 @@ DEPENDENCIES rake rspec rspec-its - rubocop - rubocop-performance - rubocop-rails simplecov sqlite3 + standard yard BUNDLED WITH diff --git a/gemfiles/6.0.gemfile.lock b/gemfiles/6.0.gemfile.lock index f971c2c..c64ac9b 100644 --- a/gemfiles/6.0.gemfile.lock +++ b/gemfiles/6.0.gemfile.lock @@ -57,16 +57,15 @@ GEM gherkin (5.1.0) i18n (1.8.2) concurrent-ruby (~> 1.0) - jaro_winkler (1.5.4) minitest (5.14.0) multi_json (1.14.1) multi_test (0.1.2) parallel (1.19.1) - parser (2.7.1.1) + parser (2.7.1.3) ast (~> 2.4.0) - rack (2.2.2) rainbow (3.0.0) rake (13.0.1) + regexp_parser (1.7.0) rexml (3.2.4) rspec (3.9.0) rspec-core (~> 3.9.0) @@ -84,26 +83,28 @@ GEM diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.9.0) rspec-support (3.9.2) - rubocop (0.82.0) - jaro_winkler (~> 1.5.1) + rubocop (0.85.0) parallel (~> 1.10) parser (>= 2.7.0.1) rainbow (>= 2.2.2, < 4.0) + regexp_parser (>= 1.7) rexml + rubocop-ast (>= 0.0.3) ruby-progressbar (~> 1.7) unicode-display_width (>= 1.4.0, < 2.0) - rubocop-performance (1.5.2) + rubocop-ast (0.0.3) + parser (>= 2.7.0.1) + rubocop-performance (1.6.1) rubocop (>= 0.71.0) - rubocop-rails (2.5.2) - activesupport - rack (>= 1.1) - rubocop (>= 0.72.0) ruby-progressbar (1.10.1) simplecov (0.18.5) docile (~> 1.1) simplecov-html (~> 0.11) simplecov-html (0.12.2) sqlite3 (1.4.2) + standard (0.4.7) + rubocop (~> 0.85.0) + rubocop-performance (~> 1.6.0) thor (1.0.1) thread_safe (0.3.6) tzinfo (1.2.7) @@ -125,11 +126,9 @@ DEPENDENCIES rake rspec rspec-its - rubocop - rubocop-performance - rubocop-rails simplecov sqlite3 + standard yard BUNDLED WITH