From 8312cbe682c92d7898661d9f75501f4d0970474a Mon Sep 17 00:00:00 2001 From: Charlie Morris <523381+cdmo@users.noreply.github.com> Date: Thu, 9 Jul 2020 17:03:24 -0400 Subject: [PATCH] Gem update (#598) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Pegs simplecov * Pegs Blacklight to no greater than 7.5.0 * UPDATE gems * rubocop 0.87.1 → 0.86.0 [changelog](https://github.com/rubocop-hq/rubocop/blob/master/CHANGELOG.md#0860-2020-06-22) * Had to downgrade rubocop due to https://github.com/Shopify/erb-lint/pull/179 --- .erb-lint.yml | 2 + .rubocop.yml | 1 + .rubocop_todo.yml | 22 ++++- Gemfile | 5 +- Gemfile.lock | 201 ++++++++++++++++++++++++---------------------- config/puma.rb | 6 +- 6 files changed, 131 insertions(+), 106 deletions(-) diff --git a/.erb-lint.yml b/.erb-lint.yml index 4c1249ec..040543d0 100644 --- a/.erb-lint.yml +++ b/.erb-lint.yml @@ -21,6 +21,8 @@ linters: niftany: - niftany_rubocop_ruby.yml - niftany_rubocop_rails.yml + Rails/ContentTag: + Enabled: false Layout/InitialIndentation: Enabled: false Layout/TrailingEmptyLines: diff --git a/.rubocop.yml b/.rubocop.yml index a86c7ac0..4bab6d27 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -10,6 +10,7 @@ AllCops: - 'node_modules/**/*' - 'tmp/**/*' - 'vendor/**/*' + NewCops: enable Metrics/BlockLength: Exclude: diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml index 14d385aa..afd244b6 100644 --- a/.rubocop_todo.yml +++ b/.rubocop_todo.yml @@ -1,21 +1,29 @@ # This configuration was generated by # `rubocop --auto-gen-config` -# on 2020-06-16 23:44:45 -0400 using RuboCop version 0.83.0. +# on 2020-07-09 03:11:59 UTC using RuboCop version 0.87.1. # The point is for the user to remove these configuration records # one by one as the offenses are removed from the code base. # Note that changes in the inspected code, or installation of new # versions of RuboCop, may require this file to be generated again. # Offense count: 1 -# Configuration parameters: CountComments, ExcludedMethods. +# Cop supports --auto-correct. +# Configuration parameters: TreatCommentsAsGroupSeparators, ConsiderPunctuation, Include. +# Include: **/*.gemfile, **/Gemfile, **/gems.rb +Bundler/OrderedGems: + Exclude: + - 'Gemfile' + +# Offense count: 1 +# Configuration parameters: CountComments, CountAsOne, ExcludedMethods. # ExcludedMethods: refine Metrics/BlockLength: Max: 32 # Offense count: 1 -# Configuration parameters: CountComments. +# Configuration parameters: CountComments, CountAsOne. Metrics/ClassLength: - Max: 263 + Max: 261 # Offense count: 3 # Cop supports --auto-correct. @@ -23,3 +31,9 @@ RSpec/ExpectActual: Exclude: - 'spec/routing/**/*' - 'spec/controllers/catalog_controller_spec.rb' + +# Offense count: 11 +# Cop supports --auto-correct. +Rails/ContentTag: + Exclude: + - 'app/helpers/catalog_helper.rb' diff --git a/Gemfile b/Gemfile index 04fd1656..acf3fcb1 100644 --- a/Gemfile +++ b/Gemfile @@ -18,7 +18,7 @@ gem 'rsolr', '>= 1.0' gem 'sprockets', '< 4.0' gem 'webpacker', '~> 4.0' -gem 'blacklight', '~> 7.0' +gem 'blacklight', '~> 7.5.0' gem 'blacklight-marc', '>= 7.0.0.rc1' gem 'blacklight_advanced_search', '~> 7.0' gem 'blacklight_range_limit', '~> 7.1' @@ -37,10 +37,11 @@ group :development, :test do gem 'capybara' gem 'niftany' gem 'pry-byebug' + gem 'rubocop', '< 0.87' gem 'rails-controller-testing' gem 'rspec-rails' gem 'selenium-webdriver' - gem 'simplecov', require: false + gem 'simplecov', '< 0.18', require: false # CodeClimate does not work with .18 or later gem 'sqlite3' gem 'webdrivers', '~> 4.0' gem 'webmock' diff --git a/Gemfile.lock b/Gemfile.lock index 2d83d81c..d3c81e9f 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -42,16 +42,16 @@ GEM i18n (>= 0.7, < 2) minitest (~> 5.1) tzinfo (~> 1.1) - addressable (2.6.0) - public_suffix (>= 2.0.2, < 4.0) + addressable (2.7.0) + public_suffix (>= 2.0.2, < 5.0) arel (9.0.0) - ast (2.4.0) + ast (2.4.1) bcrypt (3.1.13) - better_errors (2.5.1) + better_errors (2.7.1) coderay (>= 1.0.0) erubi (>= 1.0.0) rack (>= 0.9.0) - better_html (1.0.14) + better_html (1.0.15) actionview (>= 4.0) activesupport (>= 4.0) ast (~> 2.0) @@ -61,7 +61,7 @@ GEM smart_properties binding_of_caller (0.8.0) debug_inspector (>= 0.0.1) - blacklight (7.5.0) + blacklight (7.5.1) deprecation globalid jbuilder (~> 2.7) @@ -77,14 +77,13 @@ GEM blacklight_advanced_search (7.0.0) blacklight (~> 7.0) parslet - blacklight_range_limit (7.1.0) - blacklight (>= 7.0) - rails (>= 3.0) - bootsnap (1.4.4) + blacklight_range_limit (7.9.0) + blacklight (~> 7.0) + bootsnap (1.4.6) msgpack (~> 1.0) builder (3.2.4) - byebug (11.0.1) - capybara (3.28.0) + byebug (11.1.3) + capybara (3.33.0) addressable mini_mime (>= 0.1.3) nokogiri (~> 1.8) @@ -92,9 +91,8 @@ GEM rack-test (>= 0.6.3) regexp_parser (~> 1.5) xpath (~> 3.2) - childprocess (1.0.1) - rake (< 13.0) - coderay (1.1.2) + childprocess (3.0.0) + coderay (1.1.3) colorize (0.8.1) concurrent-ruby (1.1.6) config (2.2.1) @@ -107,7 +105,7 @@ GEM deep_merge (1.2.1) deprecation (1.0.0) activesupport - devise (4.7.1) + devise (4.7.2) bcrypt (~> 3.0) orm_adapter (~> 0.1) railties (>= 4.1.0) @@ -115,13 +113,13 @@ GEM warden (~> 1.2.3) devise-guests (0.7.0) devise - diff-lcs (1.3) + diff-lcs (1.4.4) docile (1.3.2) domain_name (0.5.20190701) unf (>= 0.0.5, < 1.0.0) dot-properties (0.1.3) dotenv (2.7.5) - dry-configurable (0.11.5) + dry-configurable (0.11.6) concurrent-ruby (~> 1.0) dry-core (~> 0.4, >= 0.4.7) dry-equalizer (~> 0.2) @@ -137,7 +135,7 @@ GEM concurrent-ruby (~> 1.0) dry-core (~> 0.2) dry-equalizer (~> 0.2) - dry-schema (1.5.0) + dry-schema (1.5.2) concurrent-ruby (~> 1.0) dry-configurable (~> 0.8, >= 0.8.3) dry-core (~> 0.4) @@ -152,14 +150,14 @@ GEM dry-equalizer (~> 0.3) dry-inflector (~> 0.1, >= 0.1.2) dry-logic (~> 1.0, >= 1.0.2) - dry-validation (1.5.0) + dry-validation (1.5.1) concurrent-ruby (~> 1.0) dry-container (~> 0.7, >= 0.7.1) dry-core (~> 0.4) dry-equalizer (~> 0.2) dry-initializer (~> 3.0) dry-schema (~> 1.5) - erb_lint (0.0.32) + erb_lint (0.0.34) activesupport better_html (~> 1.0.7) html_tokenizer @@ -167,33 +165,37 @@ GEM rubocop (~> 0.79) smart_properties erubi (1.9.0) - faraday (0.15.4) + faraday (1.0.1) multipart-post (>= 1.2, < 3) - ffi (1.12.2) + ffi (1.13.1) + ffi-compiler (1.0.1) + ffi (>= 1.0.0) + rake foreman (0.63.0) dotenv (>= 0.7) thor (>= 0.13.6) globalid (0.4.2) activesupport (>= 4.2.0) - hashdiff (1.0.0) - hashie (3.6.0) + hashdiff (1.0.1) + hashie (4.1.0) high_voltage (3.1.2) html_tokenizer (0.0.7) - http (3.3.0) + http (4.4.1) addressable (~> 2.3) http-cookie (~> 1.0) - http-form_data (~> 2.0) - http_parser.rb (~> 0.6.0) + http-form_data (~> 2.2) + http-parser (~> 1.2.0) http-cookie (1.0.3) domain_name (~> 0.5) - http-form_data (2.1.1) - http_parser.rb (0.6.0) + http-form_data (2.3.0) + http-parser (1.2.1) + ffi-compiler (>= 1.0, < 2.0) httpclient (2.8.3) - i18n (1.8.2) + i18n (1.8.3) concurrent-ruby (~> 1.0) - jbuilder (2.9.1) - activesupport (>= 4.2.0) - json (2.2.0) + jbuilder (2.10.0) + activesupport (>= 5.0.0) + json (2.3.1) kaminari (1.2.1) activesupport (>= 4.1.0) kaminari-actionview (= 1.2.1) @@ -211,7 +213,7 @@ GEM rb-fsevent (~> 0.9, >= 0.9.4) rb-inotify (~> 0.9, >= 0.9.7) ruby_dep (~> 1.2) - loofah (2.5.0) + loofah (2.6.0) crass (~> 1.0.2) nokogiri (>= 1.5.9) mail (2.7.1) @@ -223,14 +225,14 @@ GEM marc (~> 1.0) marcel (0.3.3) mimemagic (~> 0.3.2) - method_source (0.9.2) + method_source (1.0.0) mimemagic (0.3.5) mini_mime (1.0.2) mini_portile2 (2.4.0) minitest (5.14.1) - msgpack (1.3.1) + msgpack (1.3.3) multipart-post (2.1.1) - mysql2 (0.5.2) + mysql2 (0.5.3) niftany (0.8.0) colorize (~> 0.8.1) erb_lint (~> 0.0.22) @@ -240,20 +242,20 @@ GEM rubocop-rspec (~> 1.3) scss_lint (~> 0.55) nio4r (2.5.2) - nokogiri (1.10.9) + nokogiri (1.10.10) mini_portile2 (~> 2.4.0) orm_adapter (0.5.0) - parallel (1.19.1) - parser (2.7.1.2) - ast (~> 2.4.0) - parslet (1.8.2) - pry (0.12.2) - coderay (~> 1.1.0) - method_source (~> 0.9.0) - pry-byebug (3.7.0) + parallel (1.19.2) + parser (2.7.1.4) + ast (~> 2.4.1) + parslet (2.0.0) + pry (0.13.1) + coderay (~> 1.1) + method_source (~> 1.0) + pry-byebug (3.9.0) byebug (~> 11.0) - pry (~> 0.10) - public_suffix (3.1.1) + pry (~> 0.13.0) + public_suffix (4.0.5) puma (3.12.6) rack (2.2.3) rack-proxy (0.6.5) @@ -273,10 +275,10 @@ GEM bundler (>= 1.3.0) railties (= 5.2.4.3) sprockets-rails (>= 2.0.0) - rails-controller-testing (1.0.4) - actionpack (>= 5.0.1.x) - actionview (>= 5.0.1.x) - activesupport (>= 5.0.1.x) + rails-controller-testing (1.0.5) + actionpack (>= 5.0.1.rc1) + actionview (>= 5.0.1.rc1) + activesupport (>= 5.0.1.rc1) rails-dom-testing (2.0.3) activesupport (>= 4.2.0) nokogiri (>= 1.6) @@ -289,53 +291,57 @@ GEM rake (>= 0.8.7) thor (>= 0.19.0, < 2.0) rainbow (3.0.0) - rake (12.3.3) + rake (13.0.1) rb-fsevent (0.10.4) rb-inotify (0.10.1) ffi (~> 1.0) - regexp_parser (1.6.0) - responders (3.0.0) + regexp_parser (1.7.1) + responders (3.0.1) actionpack (>= 5.0) railties (>= 5.0) rexml (3.2.4) - rsolr (2.2.1) + rsolr (2.3.0) builder (>= 2.1.2) faraday (>= 0.9.0) - rspec-core (3.8.2) - rspec-support (~> 3.8.0) - rspec-expectations (3.8.4) + rspec-core (3.9.2) + rspec-support (~> 3.9.3) + rspec-expectations (3.9.2) 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.1) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.8.0) - rspec-rails (3.8.2) - actionpack (>= 3.0) - activesupport (>= 3.0) - railties (>= 3.0) - rspec-core (~> 3.8.0) - rspec-expectations (~> 3.8.0) - rspec-mocks (~> 3.8.0) - rspec-support (~> 3.8.0) - rspec-support (3.8.2) - rubocop (0.83.0) + rspec-support (~> 3.9.0) + rspec-rails (4.0.1) + actionpack (>= 4.2) + activesupport (>= 4.2) + railties (>= 4.2) + rspec-core (~> 3.9) + rspec-expectations (~> 3.9) + rspec-mocks (~> 3.9) + rspec-support (~> 3.9) + rspec-support (3.9.3) + rubocop (0.86.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, < 1.0) ruby-progressbar (~> 1.7) unicode-display_width (>= 1.4.0, < 2.0) - rubocop-performance (1.5.2) - rubocop (>= 0.71.0) - rubocop-rails (2.5.2) - activesupport + rubocop-ast (0.1.0) + parser (>= 2.7.0.1) + rubocop-performance (1.7.0) + rubocop (>= 0.82.0) + rubocop-rails (2.6.0) + activesupport (>= 4.2.0) rack (>= 1.1) - rubocop (>= 0.72.0) - rubocop-rspec (1.39.0) + rubocop (>= 0.82.0) + rubocop-rspec (1.41.0) rubocop (>= 0.68.1) ruby-progressbar (1.10.1) ruby_dep (1.5.0) - rubyzip (1.3.0) + rubyzip (2.3.0) safe_yaml (1.0.5) sass (3.7.4) sass-listen (~> 4.0.0) @@ -345,10 +351,10 @@ GEM scrub_rb (1.0.1) scss_lint (0.59.0) sass (~> 3.5, >= 3.5.5) - selenium-webdriver (3.142.3) - childprocess (>= 0.5, < 2.0) - rubyzip (~> 1.2, >= 1.2.2) - simplecov (0.16.1) + selenium-webdriver (3.142.7) + childprocess (>= 0.5, < 4.0) + rubyzip (>= 1.2.2) + simplecov (0.17.1) docile (~> 1.1) json (>= 1.8, < 3) simplecov-html (~> 0.10.0) @@ -366,14 +372,14 @@ GEM actionpack (>= 4.0) activesupport (>= 4.0) sprockets (>= 3.0.0) - sqlite3 (1.4.1) + sqlite3 (1.4.2) thor (1.0.1) thread_safe (0.3.6) - traject (3.2.0) + traject (3.4.0) concurrent-ruby (>= 0.8.0) dot-properties (>= 0.1.1) - hashie (~> 3.1) - http (~> 3.0) + hashie (>= 3.1, < 5) + http (>= 3.0, < 5) httpclient (~> 2.5) marc (~> 1.0) marc-fastxmlwriter (~> 1.0) @@ -384,28 +390,28 @@ GEM thread_safe (~> 0.1) unf (0.1.4) unf_ext - unf_ext (0.0.7.6) + unf_ext (0.0.7.7) unicode-display_width (1.7.0) warden (1.2.8) rack (>= 2.0.6) - webdrivers (4.1.2) + webdrivers (4.4.1) nokogiri (~> 1.6) - rubyzip (~> 1.0) + rubyzip (>= 1.3.0) selenium-webdriver (>= 3.0, < 4.0) - webmock (3.7.2) + webmock (3.8.3) addressable (>= 2.3.6) crack (>= 0.3.2) hashdiff (>= 0.4.0, < 2.0.0) - webpacker (4.0.7) + webpacker (4.2.2) activesupport (>= 4.2) rack-proxy (>= 0.6.1) railties (>= 4.2) - websocket-driver (0.7.1) + websocket-driver (0.7.2) websocket-extensions (>= 0.1.0) websocket-extensions (0.1.5) xpath (3.2.0) nokogiri (~> 1.8) - yell (2.2.0) + yell (2.2.2) PLATFORMS ruby @@ -413,7 +419,7 @@ PLATFORMS DEPENDENCIES better_errors binding_of_caller - blacklight (~> 7.0) + blacklight (~> 7.5.0) blacklight-marc (>= 7.0.0.rc1) blacklight_advanced_search (~> 7.0) blacklight_range_limit (~> 7.1) @@ -434,8 +440,9 @@ DEPENDENCIES rails-controller-testing rsolr (>= 1.0) rspec-rails + rubocop (< 0.87) selenium-webdriver - simplecov + simplecov (< 0.18) spring spring-watcher-listen (~> 2.0.0) sprockets (< 4.0) diff --git a/config/puma.rb b/config/puma.rb index 940c8ba4..0455aee5 100644 --- a/config/puma.rb +++ b/config/puma.rb @@ -6,16 +6,16 @@ # the maximum value specified for Puma. Default is set to 5 threads for minimum # and maximum; this matches the default thread size of Active Record. # -threads_count = ENV.fetch('RAILS_MAX_THREADS') { 5 } +threads_count = fetch 'RAILS_MAX_THREADS', 5 threads threads_count, threads_count # Specifies the `port` that Puma will listen on to receive requests; default is 3000. # -port ENV.fetch('PORT') { 3000 } +port ENV.fetch 'PORT', 3000 # Specifies the `environment` that Puma will run in. # -environment ENV.fetch('RAILS_ENV') { 'development' } +environment ENV.fetch 'RAILS_ENV', 'development' # Specifies the number of `workers` to boot in clustered mode. # Workers are forked webserver processes. If using threads and workers together