From 91d991f9affd0cef93568b7190ac575019614785 Mon Sep 17 00:00:00 2001 From: Malaber <32635600+Malaber@users.noreply.github.com> Date: Tue, 7 May 2019 11:44:55 +0200 Subject: [PATCH 1/9] Update dependencies --- Gemfile.lock | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 0fee2e0..02aa2fe 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -49,20 +49,20 @@ GEM tzinfo (~> 1.1) arel (9.0.0) ast (2.4.0) - backport (0.3.0) + backport (1.0.0) bcrypt (3.1.12) - bootsnap (1.4.2) + bootsnap (1.4.4) msgpack (~> 1.0) builder (3.2.3) byebug (11.0.1) case_transform (0.2) activesupport concurrent-ruby (1.1.5) - coveralls (0.8.22) + coveralls (0.8.23) json (>= 1.8, < 3) simplecov (~> 0.16.1) term-ansicolor (~> 1.3) - thor (~> 0.19.4) + thor (>= 0.19.4, < 2.0) tins (~> 1.6) crass (1.0.4) devise (4.6.2) @@ -81,8 +81,8 @@ GEM erubi (1.8.0) factory_bot (5.0.2) activesupport (>= 4.2.0) - factory_bot_rails (5.0.1) - factory_bot (~> 5.0.0) + factory_bot_rails (5.0.2) + factory_bot (~> 5.0.2) railties (>= 4.2.0) faker (1.9.3) i18n (>= 0.7) @@ -123,14 +123,14 @@ GEM mini_mime (1.0.1) mini_portile2 (2.4.0) minitest (5.11.3) - msgpack (1.2.9) + msgpack (1.2.10) netrc (0.11.0) nio4r (2.3.1) - nokogiri (1.10.2) + nokogiri (1.10.3) mini_portile2 (~> 2.4.0) orm_adapter (0.5.0) parallel (1.17.0) - parser (2.6.2.0) + parser (2.6.3.0) ast (~> 2.4.0) pg (1.1.4) psych (3.1.0) @@ -180,7 +180,7 @@ GEM nokogiri rspec-core (3.8.0) rspec-support (~> 3.8.0) - rspec-expectations (3.8.2) + rspec-expectations (3.8.3) diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.8.0) rspec-mocks (3.8.0) @@ -195,11 +195,10 @@ GEM rspec-mocks (~> 3.8.0) rspec-support (~> 3.8.0) rspec-support (3.8.0) - rubocop (0.66.0) + rubocop (0.68.1) jaro_winkler (~> 1.5.1) parallel (~> 1.10) parser (>= 2.5, != 2.5.1.1) - psych (>= 3.1.0) rainbow (>= 2.2.2, < 4.0) ruby-progressbar (~> 1.7) unicode-display_width (>= 1.4.0, < 1.6) @@ -212,8 +211,9 @@ GEM json (>= 1.8, < 3) simplecov-html (~> 0.10.0) simplecov-html (0.10.2) - solargraph (0.31.3) - backport (~> 0.3) + solargraph (0.32.2) + backport (~> 1.0) + bundler (>= 1.17.2) htmlentities (~> 4.3, >= 4.3.4) jaro_winkler (~> 1.5) kramdown (~> 1.16) @@ -235,10 +235,10 @@ GEM actionpack (>= 4.0) activesupport (>= 4.0) sprockets (>= 3.0.0) - sqlite3 (1.4.0) + sqlite3 (1.4.1) term-ansicolor (1.7.1) tins (~> 1.0) - thor (0.19.4) + thor (0.20.3) thread_safe (0.3.6) tilt (2.0.9) tins (1.20.2) From 8bc6504dd52595c7feb35d91cf22068cd2ad0edf Mon Sep 17 00:00:00 2001 From: Malaber <32635600+Malaber@users.noreply.github.com> Date: Tue, 7 May 2019 11:46:04 +0200 Subject: [PATCH 2/9] Add rubocop-performance This feature was moved from rubocop to this gem. --- .rubocop.yml | 2 ++ Gemfile | 1 + Gemfile.lock | 3 +++ 3 files changed, 6 insertions(+) diff --git a/.rubocop.yml b/.rubocop.yml index bfbb3af..34c74c8 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -1,3 +1,5 @@ +require: rubocop-performance + # Stolen from https://gist.github.com/jhass/a5ae80d87f18e53e7b56 AllCops: Exclude: diff --git a/Gemfile b/Gemfile index dc06bea..2196a9d 100644 --- a/Gemfile +++ b/Gemfile @@ -57,6 +57,7 @@ group :development do # Spring speeds up development by keeping your application running in the background. Read more: https://github.com/rails/spring gem 'railroady' gem 'rubocop' + gem 'rubocop-performance' gem 'solargraph' gem 'spring' gem 'spring-watcher-listen', '~> 2.0.0' diff --git a/Gemfile.lock b/Gemfile.lock index 02aa2fe..03ff1a8 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -202,6 +202,8 @@ GEM rainbow (>= 2.2.2, < 4.0) ruby-progressbar (~> 1.7) unicode-display_width (>= 1.4.0, < 1.6) + rubocop-performance (1.2.0) + rubocop (>= 0.68.0) ruby-progressbar (1.10.0) ruby_dep (1.5.0) shoulda-matchers (4.0.1) @@ -278,6 +280,7 @@ DEPENDENCIES rails (~> 5.2.1) rspec-rails rubocop + rubocop-performance shoulda-matchers solargraph spring From 0c480b1deb77e26948f169c0dab39d6873e1403c Mon Sep 17 00:00:00 2001 From: Malaber <32635600+Malaber@users.noreply.github.com> Date: Mon, 13 May 2019 14:58:18 +0200 Subject: [PATCH 3/9] Update dependencies --- Gemfile.lock | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 03ff1a8..9f6f643 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -86,7 +86,7 @@ GEM railties (>= 4.2.0) faker (1.9.3) i18n (>= 0.7) - ffi (1.10.0) + ffi (1.11.1) globalid (0.4.2) activesupport (>= 4.2.0) htmlentities (4.3.4) @@ -195,14 +195,14 @@ GEM rspec-mocks (~> 3.8.0) rspec-support (~> 3.8.0) rspec-support (3.8.0) - rubocop (0.68.1) + rubocop (0.70.0) jaro_winkler (~> 1.5.1) parallel (~> 1.10) - parser (>= 2.5, != 2.5.1.1) + parser (>= 2.6) rainbow (>= 2.2.2, < 4.0) ruby-progressbar (~> 1.7) - unicode-display_width (>= 1.4.0, < 1.6) - rubocop-performance (1.2.0) + unicode-display_width (>= 1.4.0, < 1.7) + rubocop-performance (1.3.0) rubocop (>= 0.68.0) ruby-progressbar (1.10.0) ruby_dep (1.5.0) @@ -213,7 +213,7 @@ GEM json (>= 1.8, < 3) simplecov-html (~> 0.10.0) simplecov-html (0.10.2) - solargraph (0.32.2) + solargraph (0.32.3) backport (~> 1.0) bundler (>= 1.17.2) htmlentities (~> 4.3, >= 4.3.4) @@ -246,10 +246,10 @@ GEM tins (1.20.2) tzinfo (1.2.5) thread_safe (~> 0.1) + unicode-display_width (1.6.0) unf (0.1.4) unf_ext unf_ext (0.0.7.6) - unicode-display_width (1.5.0) warden (1.2.8) rack (>= 2.0.6) websocket-driver (0.7.0) From 26ebce7b0074fd7812635503c7ab92b61d37501e Mon Sep 17 00:00:00 2001 From: Malaber <32635600+Malaber@users.noreply.github.com> Date: Thu, 23 May 2019 15:03:16 +0200 Subject: [PATCH 4/9] Add rubocop-rails --- .rubocop.yml | 4 +++- Gemfile | 1 + Gemfile.lock | 4 ++++ 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/.rubocop.yml b/.rubocop.yml index 34c74c8..472e0f0 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -1,4 +1,6 @@ -require: rubocop-performance +require: + - rubocop-performance + - rubocop-rails # Stolen from https://gist.github.com/jhass/a5ae80d87f18e53e7b56 AllCops: diff --git a/Gemfile b/Gemfile index 2196a9d..0f5f62d 100644 --- a/Gemfile +++ b/Gemfile @@ -58,6 +58,7 @@ group :development do gem 'railroady' gem 'rubocop' gem 'rubocop-performance' + gem 'rubocop-rails' gem 'solargraph' gem 'spring' gem 'spring-watcher-listen', '~> 2.0.0' diff --git a/Gemfile.lock b/Gemfile.lock index 9f6f643..c9351c6 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -204,6 +204,9 @@ GEM unicode-display_width (>= 1.4.0, < 1.7) rubocop-performance (1.3.0) rubocop (>= 0.68.0) + rubocop-rails (2.0.0) + rack (>= 2.0) + rubocop (>= 0.70.0) ruby-progressbar (1.10.0) ruby_dep (1.5.0) shoulda-matchers (4.0.1) @@ -281,6 +284,7 @@ DEPENDENCIES rspec-rails rubocop rubocop-performance + rubocop-rails shoulda-matchers solargraph spring From 9ca44e1de15bffb46c7f9ed83c2717b966621c8d Mon Sep 17 00:00:00 2001 From: Malaber <32635600+Malaber@users.noreply.github.com> Date: Mon, 27 May 2019 15:20:35 +0200 Subject: [PATCH 5/9] Breaking Change in Fallback configuration --- config/environments/production.rb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/config/environments/production.rb b/config/environments/production.rb index 99d3cb3..e77ac60 100644 --- a/config/environments/production.rb +++ b/config/environments/production.rb @@ -55,7 +55,8 @@ Rails.application.configure do # Enable locale fallbacks for I18n (makes lookups for any locale fall back to # the I18n.default_locale when a translation cannot be found). - config.i18n.fallbacks = true + # https://github.com/ruby-i18n/i18n/releases/tag/v1.1.0 + config.i18n.fallbacks = [I18n.default_locale] # Send deprecation notices to registered listeners. config.active_support.deprecation = :notify From b8324acef3d58646c863a274c6a1509a253957d7 Mon Sep 17 00:00:00 2001 From: Malaber <32635600+Malaber@users.noreply.github.com> Date: Fri, 21 Jun 2019 10:45:51 +0200 Subject: [PATCH 6/9] Update dependencies --- Gemfile.lock | 112 +++++++++++++++++++++++++-------------------------- 1 file changed, 55 insertions(+), 57 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index c9351c6..98a811d 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -24,9 +24,9 @@ GEM erubi (~> 1.4) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.0.3) - active_model_serializers (0.10.9) - actionpack (>= 4.1, < 6) - activemodel (>= 4.1, < 6) + active_model_serializers (0.10.10) + actionpack (>= 4.1, < 6.1) + activemodel (>= 4.1, < 6.1) case_transform (>= 0.2) jsonapi-renderer (>= 0.1.1.beta1, < 0.3) activejob (5.2.3) @@ -49,9 +49,9 @@ GEM tzinfo (~> 1.1) arel (9.0.0) ast (2.4.0) - backport (1.0.0) - bcrypt (3.1.12) - bootsnap (1.4.4) + backport (1.1.2) + bcrypt (3.1.13) + bootsnap (1.4.5) msgpack (~> 1.0) builder (3.2.3) byebug (11.0.1) @@ -65,18 +65,19 @@ GEM thor (>= 0.19.4, < 2.0) tins (~> 1.6) crass (1.0.4) - devise (4.6.2) + devise (4.7.1) bcrypt (~> 3.0) orm_adapter (~> 0.1) - railties (>= 4.1.0, < 6.0) + railties (>= 4.1.0) responders warden (~> 1.2.3) - devise_token_auth (1.1.0) - devise (> 3.5.2, < 4.7) - rails (>= 4.2.0, < 6) + devise_token_auth (1.1.2) + bcrypt (~> 3.0) + devise (> 3.5.2, < 5) + rails (>= 4.2.0, < 6.1) diff-lcs (1.3) - docile (1.3.1) - domain_name (0.5.20180417) + docile (1.3.2) + domain_name (0.5.20190701) unf (>= 0.0.5, < 1.0.0) erubi (1.8.0) factory_bot (5.0.2) @@ -84,8 +85,8 @@ GEM factory_bot_rails (5.0.2) factory_bot (~> 5.0.2) railties (>= 4.2.0) - faker (1.9.3) - i18n (>= 0.7) + faker (2.3.0) + i18n (~> 1.6.0) ffi (1.11.1) globalid (0.4.2) activesupport (>= 4.2.0) @@ -95,13 +96,12 @@ GEM i18n (1.6.0) concurrent-ruby (~> 1.0) interactor (3.1.1) - interactor-rails (2.2.0) + interactor-rails (2.2.1) interactor (~> 3.0) - rails (>= 4.2, < 5.3) - jaro_winkler (1.5.2) + rails (>= 4.2) + jaro_winkler (1.5.3) json (2.2.0) - jsonapi-renderer (0.2.0) - kramdown (1.17.0) + jsonapi-renderer (0.2.2) listen (3.1.5) rb-fsevent (~> 0.9, >= 0.9.4) rb-inotify (~> 0.9, >= 0.9.7) @@ -111,29 +111,28 @@ GEM nokogiri (>= 1.5.9) mail (2.7.1) mini_mime (>= 0.1.1) - mailgun-ruby (1.1.11) + mailgun-ruby (1.2.0) rest-client (~> 2.0.2) marcel (0.3.3) mimemagic (~> 0.3.2) method_source (0.9.2) - mime-types (3.2.2) + mime-types (3.3) mime-types-data (~> 3.2015) - mime-types-data (3.2019.0331) + mime-types-data (3.2019.0904) mimemagic (0.3.3) - mini_mime (1.0.1) + mini_mime (1.0.2) mini_portile2 (2.4.0) minitest (5.11.3) - msgpack (1.2.10) + msgpack (1.3.1) netrc (0.11.0) - nio4r (2.3.1) - nokogiri (1.10.3) + nio4r (2.5.1) + nokogiri (1.10.4) mini_portile2 (~> 2.4.0) orm_adapter (0.5.0) parallel (1.17.0) - parser (2.6.3.0) + parser (2.6.4.1) ast (~> 2.4.0) pg (1.1.4) - psych (3.1.0) puma (3.12.1) rack (2.0.7) rack-cors (1.0.3) @@ -156,7 +155,7 @@ GEM rails-dom-testing (2.0.3) activesupport (>= 4.2.0) nokogiri (>= 1.6) - rails-html-sanitizer (1.0.4) + rails-html-sanitizer (1.2.0) loofah (~> 2.2, >= 2.2.2) railties (5.2.3) actionpack (= 5.2.3) @@ -165,25 +164,25 @@ GEM rake (>= 0.8.7) thor (>= 0.19.0, < 2.0) rainbow (3.0.0) - rake (12.3.2) + rake (12.3.3) rb-fsevent (0.10.3) rb-inotify (0.10.0) ffi (~> 1.0) - responders (2.4.1) - actionpack (>= 4.2.0, < 6.0) - railties (>= 4.2.0, < 6.0) + responders (3.0.0) + actionpack (>= 5.0) + railties (>= 5.0) rest-client (2.0.2) http-cookie (>= 1.0.2, < 2.0) mime-types (>= 1.16, < 4.0) netrc (~> 0.8) - reverse_markdown (1.1.0) + reverse_markdown (1.3.0) nokogiri - rspec-core (3.8.0) + rspec-core (3.8.2) rspec-support (~> 3.8.0) - rspec-expectations (3.8.3) + rspec-expectations (3.8.4) diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.8.0) - rspec-mocks (3.8.0) + rspec-mocks (3.8.1) diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.8.0) rspec-rails (3.8.2) @@ -194,42 +193,41 @@ GEM rspec-expectations (~> 3.8.0) rspec-mocks (~> 3.8.0) rspec-support (~> 3.8.0) - rspec-support (3.8.0) - rubocop (0.70.0) + rspec-support (3.8.2) + rubocop (0.74.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.3.0) - rubocop (>= 0.68.0) - rubocop-rails (2.0.0) - rack (>= 2.0) - rubocop (>= 0.70.0) - ruby-progressbar (1.10.0) + rubocop-performance (1.4.1) + rubocop (>= 0.71.0) + rubocop-rails (2.3.2) + rack (>= 1.1) + rubocop (>= 0.72.0) + ruby-progressbar (1.10.1) ruby_dep (1.5.0) - shoulda-matchers (4.0.1) + shoulda-matchers (4.1.2) activesupport (>= 4.2.0) simplecov (0.16.1) docile (~> 1.1) json (>= 1.8, < 3) simplecov-html (~> 0.10.0) simplecov-html (0.10.2) - solargraph (0.32.3) - backport (~> 1.0) + solargraph (0.37.2) + backport (~> 1.1) bundler (>= 1.17.2) htmlentities (~> 4.3, >= 4.3.4) jaro_winkler (~> 1.5) - kramdown (~> 1.16) + nokogiri (~> 1.9, >= 1.9.1) parser (~> 2.3) reverse_markdown (~> 1.0, >= 1.0.5) rubocop (~> 0.52) thor (~> 0.19, >= 0.19.4) tilt (~> 2.0) yard (~> 0.9) - spring (2.0.2) - activesupport (>= 4.2) + spring (2.1.0) spring-watcher-listen (2.0.1) listen (>= 2.7, < 4.0) spring (>= 1.2, < 3.0) @@ -246,19 +244,19 @@ GEM thor (0.20.3) thread_safe (0.3.6) tilt (2.0.9) - tins (1.20.2) + tins (1.21.1) tzinfo (1.2.5) thread_safe (~> 0.1) - unicode-display_width (1.6.0) unf (0.1.4) unf_ext unf_ext (0.0.7.6) + unicode-display_width (1.6.0) warden (1.2.8) rack (>= 2.0.6) - websocket-driver (0.7.0) + websocket-driver (0.7.1) websocket-extensions (>= 0.1.0) - websocket-extensions (0.1.3) - yard (0.9.19) + websocket-extensions (0.1.4) + yard (0.9.20) PLATFORMS ruby From 013648f919ea15ec7e2876bca045f2412b94fc59 Mon Sep 17 00:00:00 2001 From: Thor77 Date: Sat, 14 Sep 2019 09:48:39 +0200 Subject: [PATCH 7/9] Set rubocop version to 0.72.0 --- .hound.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.hound.yml b/.hound.yml index cdf1016..8d8597f 100644 --- a/.hound.yml +++ b/.hound.yml @@ -1,4 +1,7 @@ fail_on_violations: true +rubocop: + version: 0.72.0 + ruby: config_file: .rubocop.yml From a7566cb97a074e041ac591868e34d78ead9b31c1 Mon Sep 17 00:00:00 2001 From: Thor77 Date: Sat, 14 Sep 2019 09:50:57 +0200 Subject: [PATCH 8/9] Remove ruby section --- .hound.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.hound.yml b/.hound.yml index 8d8597f..39fc2a5 100644 --- a/.hound.yml +++ b/.hound.yml @@ -2,6 +2,5 @@ fail_on_violations: true rubocop: version: 0.72.0 - -ruby: config_file: .rubocop.yml + From be0c1a61358a3f37ca97b4cb88020106be9f2f0f Mon Sep 17 00:00:00 2001 From: Thor77 Date: Sat, 14 Sep 2019 10:15:03 +0200 Subject: [PATCH 9/9] Lock rubocop to version 0.72.0 --- Gemfile | 2 +- Gemfile.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index 0f5f62d..88893f0 100644 --- a/Gemfile +++ b/Gemfile @@ -56,7 +56,7 @@ group :development do gem 'listen', '>= 3.0.5', '< 3.2' # Spring speeds up development by keeping your application running in the background. Read more: https://github.com/rails/spring gem 'railroady' - gem 'rubocop' + gem 'rubocop', '0.72.0' gem 'rubocop-performance' gem 'rubocop-rails' gem 'solargraph' diff --git a/Gemfile.lock b/Gemfile.lock index 98a811d..76af414 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -194,7 +194,7 @@ GEM rspec-mocks (~> 3.8.0) rspec-support (~> 3.8.0) rspec-support (3.8.2) - rubocop (0.74.0) + rubocop (0.72.0) jaro_winkler (~> 1.5.1) parallel (~> 1.10) parser (>= 2.6) @@ -280,7 +280,7 @@ DEPENDENCIES railroady rails (~> 5.2.1) rspec-rails - rubocop + rubocop (= 0.72.0) rubocop-performance rubocop-rails shoulda-matchers