From 70d217c72f894e2f2fb655cd0e051ff4cc5654bb Mon Sep 17 00:00:00 2001 From: Ben Aluan Date: Tue, 29 Oct 2019 12:52:17 +1300 Subject: [PATCH 1/3] Update dependencies --- Gemfile.lock | 63 ++++++++++++++++++++++---------------------- boost-styles.gemspec | 6 ++--- 2 files changed, 34 insertions(+), 35 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 1cf4472..9637a09 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -3,9 +3,9 @@ PATH specs: boost-styles (0.1.0) haml_lint (~> 0.33) - rubocop (~> 0.74) - rubocop-performance (~> 1.4.1) - rubocop-rspec (~> 1.35) + rubocop (~> 0.76) + rubocop-performance (~> 1.5) + rubocop-rspec (~> 1.36) GEM remote: https://rubygems.org/ @@ -55,24 +55,23 @@ GEM ast (2.4.0) builder (3.2.3) concurrent-ruby (1.1.5) - crass (1.0.4) + crass (1.0.5) diff-lcs (1.3) - erubi (1.8.0) + erubi (1.9.0) globalid (0.4.2) activesupport (>= 4.2.0) haml (5.1.2) temple (>= 0.8.0) tilt - haml_lint (0.33.0) + haml_lint (0.34.0) haml (>= 4.0, < 5.2) rainbow - rake (>= 10, < 13) rubocop (>= 0.50.0) sysexits (~> 1.1) - i18n (1.6.0) + i18n (1.7.0) concurrent-ruby (~> 1.0) jaro_winkler (1.5.3) - loofah (2.2.3) + loofah (2.3.1) crass (~> 1.0.2) nokogiri (>= 1.5.9) mail (2.7.1) @@ -83,12 +82,12 @@ GEM mimemagic (0.3.3) mini_mime (1.0.2) mini_portile2 (2.4.0) - minitest (5.11.3) - nio4r (2.5.1) + minitest (5.12.2) + nio4r (2.5.2) nokogiri (1.10.4) mini_portile2 (~> 2.4.0) - parallel (1.17.0) - parser (2.6.4.1) + parallel (1.18.0) + parser (2.6.5.0) ast (~> 2.4.0) rack (2.0.7) rack-test (1.1.0) @@ -109,8 +108,8 @@ GEM rails-dom-testing (2.0.3) activesupport (>= 4.2.0) nokogiri (>= 1.6) - rails-html-sanitizer (1.2.0) - loofah (~> 2.2, >= 2.2.2) + rails-html-sanitizer (1.3.0) + loofah (~> 2.3) railties (5.2.3) actionpack (= 5.2.3) activesupport (= 5.2.3) @@ -119,32 +118,32 @@ GEM thor (>= 0.19.0, < 2.0) rainbow (3.0.0) rake (10.5.0) - rspec (3.8.0) - rspec-core (~> 3.8.0) - rspec-expectations (~> 3.8.0) - rspec-mocks (~> 3.8.0) - rspec-core (3.8.2) - rspec-support (~> 3.8.0) - rspec-expectations (3.8.4) + rspec (3.9.0) + rspec-core (~> 3.9.0) + rspec-expectations (~> 3.9.0) + rspec-mocks (~> 3.9.0) + rspec-core (3.9.0) + rspec-support (~> 3.9.0) + rspec-expectations (3.9.0) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.8.0) - rspec-mocks (3.8.1) + rspec-support (~> 3.9.0) + rspec-mocks (3.9.0) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.8.0) - rspec-support (3.8.2) - rubocop (0.74.0) + rspec-support (~> 3.9.0) + rspec-support (3.9.0) + rubocop (0.76.0) jaro_winkler (~> 1.5.1) parallel (~> 1.10) parser (>= 2.6) rainbow (>= 2.2.2, < 4.0) ruby-progressbar (~> 1.7) unicode-display_width (>= 1.4.0, < 1.7) - rubocop-performance (1.4.1) + rubocop-performance (1.5.0) rubocop (>= 0.71.0) - rubocop-rspec (1.35.0) - rubocop (>= 0.60.0) + rubocop-rspec (1.36.0) + rubocop (>= 0.68.1) ruby-progressbar (1.10.1) - sprockets (3.7.2) + sprockets (4.0.0) concurrent-ruby (~> 1.0) rack (> 1, < 3) sprockets-rails (3.2.1) @@ -155,7 +154,7 @@ GEM temple (0.8.2) thor (0.20.3) thread_safe (0.3.6) - tilt (2.0.9) + tilt (2.0.10) tzinfo (1.2.5) thread_safe (~> 0.1) unicode-display_width (1.6.0) diff --git a/boost-styles.gemspec b/boost-styles.gemspec index 7fe622f..e8340d6 100644 --- a/boost-styles.gemspec +++ b/boost-styles.gemspec @@ -43,7 +43,7 @@ Gem::Specification.new do |spec| spec.add_development_dependency 'rspec', '~> 3.0' spec.add_dependency 'haml_lint', '~> 0.33' - spec.add_dependency 'rubocop', '~> 0.74' - spec.add_dependency 'rubocop-performance', '~> 1.4.1' - spec.add_dependency 'rubocop-rspec', '~> 1.35' + spec.add_dependency 'rubocop', '~> 0.76' + spec.add_dependency 'rubocop-performance', '~> 1.5' + spec.add_dependency 'rubocop-rspec', '~> 1.36' end From ddcdec3c22f729c4d49e667c183ecc94e209a85a Mon Sep 17 00:00:00 2001 From: Ben Aluan Date: Tue, 29 Oct 2019 12:54:52 +1300 Subject: [PATCH 2/3] Fix deprecated cops --- rubocop_lint.yml | 2 +- rubocop_style.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/rubocop_lint.yml b/rubocop_lint.yml index 1b9375c..29f7405 100644 --- a/rubocop_lint.yml +++ b/rubocop_lint.yml @@ -142,7 +142,7 @@ Lint/UnifiedInteger: Enabled: true # This cop checks for unneeded usages of splat expansion -Lint/UnneededSplatExpansion: +Lint/RedundantSplatExpansion: Enabled: false # Unreachable code. diff --git a/rubocop_style.yml b/rubocop_style.yml index 20538fc..2fee196 100644 --- a/rubocop_style.yml +++ b/rubocop_style.yml @@ -60,7 +60,7 @@ Style/Documentation: Enabled: false # Use quotes for string literals when they are enough. -Style/UnneededPercentQ: +Style/RedundantPercentQ: Enabled: true # Check quotes usage according to lint rule below. From 304c55efc2ba57513911c76a4ed2c7ce16f11286 Mon Sep 17 00:00:00 2001 From: Ben Aluan Date: Tue, 29 Oct 2019 14:45:26 +1300 Subject: [PATCH 3/3] Ignore bin folders --- rubocop_all.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/rubocop_all.yml b/rubocop_all.yml index 0270e15..71fdc3e 100644 --- a/rubocop_all.yml +++ b/rubocop_all.yml @@ -6,4 +6,5 @@ AllCops: - '**/vendor/**/*' - 'actionpack/lib/action_dispatch/journey/parser.rb' - 'railties/test/fixtures/tmp/**/*' - - 'node_modules/**/*' \ No newline at end of file + - 'node_modules/**/*' + - 'bin/**/*' \ No newline at end of file