diff --git a/.rubocop.yml b/.rubocop.yml deleted file mode 100644 index f3705f5..0000000 --- a/.rubocop.yml +++ /dev/null @@ -1,11 +0,0 @@ -inherit_from: - - https://raw.githubusercontent.com/thoughtbot/guides/master/style/ruby/.rubocop.yml - -AllCops: - TargetRubyVersion: 2.3 - Exclude: - - "tmp/**/*" - - "gemfiles/*" - -Style/EmptyMethod: - EnforcedStyle: expanded diff --git a/Gemfile b/Gemfile index 24dc0a5..d352d11 100644 --- a/Gemfile +++ b/Gemfile @@ -7,5 +7,4 @@ gem "aruba" gem "cucumber", "1.3.19" gem "rake" gem "rspec-rails" - -gem "rubocop", "0.54", require: false +gem "standard" diff --git a/Gemfile.lock b/Gemfile.lock index 83b1697..edaf99d 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -76,7 +76,6 @@ GEM parallel (1.19.1) parser (2.7.1.3) ast (~> 2.4.0) - powerpack (0.1.2) rack (2.2.2) rack-test (1.1.0) rack (>= 1.0, < 3) @@ -93,6 +92,8 @@ GEM thor (>= 0.20.3, < 2.0) rainbow (3.0.0) rake (13.0.1) + regexp_parser (1.7.0) + rexml (3.2.4) rspec-core (3.9.2) rspec-support (~> 3.9.3) rspec-expectations (3.9.2) @@ -110,14 +111,23 @@ GEM rspec-mocks (~> 3.9) rspec-support (~> 3.9) rspec-support (3.9.3) - rubocop (0.54.0) + rubocop (0.85.0) parallel (~> 1.10) - parser (>= 2.5) - powerpack (~> 0.1) + 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.0, >= 1.0.1) + unicode-display_width (>= 1.4.0, < 2.0) + rubocop-ast (0.0.3) + parser (>= 2.7.0.1) + rubocop-performance (1.6.1) + rubocop (>= 0.71.0) ruby-progressbar (1.10.1) + standard (0.4.7) + rubocop (~> 0.85.0) + rubocop-performance (~> 1.6.0) thor (1.0.1) thread_safe (0.3.6) thread_safe (0.3.6-java) @@ -137,7 +147,7 @@ DEPENDENCIES factory_bot_rails! rake rspec-rails - rubocop (= 0.54) + standard BUNDLED WITH 2.1.4 diff --git a/gemfiles/rails5.0.gemfile b/gemfiles/rails5.0.gemfile index 080cb16..9d38bc3 100644 --- a/gemfiles/rails5.0.gemfile +++ b/gemfiles/rails5.0.gemfile @@ -7,7 +7,7 @@ gem "aruba" gem "cucumber", "1.3.19" gem "rake" gem "rspec-rails" -gem "rubocop", "0.54", require: false +gem "standard" gem "byebug" gem "listen", "~> 3.0.5" gem "puma", "~> 3.0" diff --git a/gemfiles/rails5.1.gemfile b/gemfiles/rails5.1.gemfile index aea8955..5744131 100644 --- a/gemfiles/rails5.1.gemfile +++ b/gemfiles/rails5.1.gemfile @@ -7,7 +7,7 @@ gem "aruba" gem "cucumber", "1.3.19" gem "rake" gem "rspec-rails" -gem "rubocop", "0.54", require: false +gem "standard" gem "byebug" gem "listen", ">= 3.0.5", "< 3.2" gem "puma", "~> 3.7" diff --git a/gemfiles/rails5.2.gemfile b/gemfiles/rails5.2.gemfile index 5cc71b1..4baa2f7 100644 --- a/gemfiles/rails5.2.gemfile +++ b/gemfiles/rails5.2.gemfile @@ -7,7 +7,7 @@ gem "aruba" gem "cucumber", "1.3.19" gem "rake" gem "rspec-rails" -gem "rubocop", "0.54", require: false +gem "standard" gem "byebug" gem "listen", ">= 3.0.5", "< 3.2" gem "puma", "~> 3.11" diff --git a/gemfiles/rails6.0.gemfile b/gemfiles/rails6.0.gemfile index 65d263f..556751d 100644 --- a/gemfiles/rails6.0.gemfile +++ b/gemfiles/rails6.0.gemfile @@ -7,7 +7,7 @@ gem "aruba" gem "cucumber", "1.3.19" gem "rake" gem "rspec-rails" -gem "rubocop", "0.54", require: false +gem "standard" gem "byebug" gem "listen", "~> 3.2" gem "puma", "~> 4.1"