From 67ed2cd91db3523899bbcf1c7c955941c7e15937 Mon Sep 17 00:00:00 2001 From: Jenkins Date: Mon, 11 Sep 2023 02:24:29 -0700 Subject: [PATCH 1/2] Update Ruby dependencies --- Gemfile.lock | 134 +++++++++++++++++++++++++-------------------------- 1 file changed, 67 insertions(+), 67 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 549e2789..f33d37ac 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -9,67 +9,67 @@ GIT GEM remote: https://rubygems.org/ specs: - actioncable (7.0.7.2) - actionpack (= 7.0.7.2) - activesupport (= 7.0.7.2) + actioncable (7.0.8) + actionpack (= 7.0.8) + activesupport (= 7.0.8) nio4r (~> 2.0) websocket-driver (>= 0.6.1) - actionmailbox (7.0.7.2) - actionpack (= 7.0.7.2) - activejob (= 7.0.7.2) - activerecord (= 7.0.7.2) - activestorage (= 7.0.7.2) - activesupport (= 7.0.7.2) + actionmailbox (7.0.8) + actionpack (= 7.0.8) + activejob (= 7.0.8) + activerecord (= 7.0.8) + activestorage (= 7.0.8) + activesupport (= 7.0.8) mail (>= 2.7.1) net-imap net-pop net-smtp - actionmailer (7.0.7.2) - actionpack (= 7.0.7.2) - actionview (= 7.0.7.2) - activejob (= 7.0.7.2) - activesupport (= 7.0.7.2) + actionmailer (7.0.8) + actionpack (= 7.0.8) + actionview (= 7.0.8) + activejob (= 7.0.8) + activesupport (= 7.0.8) mail (~> 2.5, >= 2.5.4) net-imap net-pop net-smtp rails-dom-testing (~> 2.0) - actionpack (7.0.7.2) - actionview (= 7.0.7.2) - activesupport (= 7.0.7.2) + actionpack (7.0.8) + actionview (= 7.0.8) + activesupport (= 7.0.8) rack (~> 2.0, >= 2.2.4) rack-test (>= 0.6.3) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.2.0) - actiontext (7.0.7.2) - actionpack (= 7.0.7.2) - activerecord (= 7.0.7.2) - activestorage (= 7.0.7.2) - activesupport (= 7.0.7.2) + actiontext (7.0.8) + actionpack (= 7.0.8) + activerecord (= 7.0.8) + activestorage (= 7.0.8) + activesupport (= 7.0.8) globalid (>= 0.6.0) nokogiri (>= 1.8.5) - actionview (7.0.7.2) - activesupport (= 7.0.7.2) + actionview (7.0.8) + activesupport (= 7.0.8) builder (~> 3.1) erubi (~> 1.4) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.1, >= 1.2.0) - activejob (7.0.7.2) - activesupport (= 7.0.7.2) + activejob (7.0.8) + activesupport (= 7.0.8) globalid (>= 0.3.6) - activemodel (7.0.7.2) - activesupport (= 7.0.7.2) - activerecord (7.0.7.2) - activemodel (= 7.0.7.2) - activesupport (= 7.0.7.2) - activestorage (7.0.7.2) - actionpack (= 7.0.7.2) - activejob (= 7.0.7.2) - activerecord (= 7.0.7.2) - activesupport (= 7.0.7.2) + activemodel (7.0.8) + activesupport (= 7.0.8) + activerecord (7.0.8) + activemodel (= 7.0.8) + activesupport (= 7.0.8) + activestorage (7.0.8) + actionpack (= 7.0.8) + activejob (= 7.0.8) + activerecord (= 7.0.8) + activesupport (= 7.0.8) marcel (~> 1.0) mini_mime (>= 1.1.0) - activesupport (7.0.7.2) + activesupport (7.0.8) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 1.6, < 2) minitest (>= 5.1) @@ -79,7 +79,7 @@ GEM airbrussh (1.4.2) sshkit (>= 1.6.1, != 1.7.0) ast (2.4.2) - autoprefixer-rails (10.4.13.0) + autoprefixer-rails (10.4.15.0) execjs (~> 2) base64 (0.1.1) bcrypt (3.1.19) @@ -253,7 +253,7 @@ GEM git (1.18.0) addressable (~> 2.8) rchardet (~> 1.8) - globalid (1.2.0) + globalid (1.2.1) activesupport (>= 6.1) handlebars_assets (0.23.9) execjs (~> 2.0) @@ -272,9 +272,9 @@ GEM i18n (1.14.1) concurrent-ruby (~> 1.0) io-console (0.6.0) - irb (1.8.0) - rdoc (~> 6.5) - reline (>= 0.3.6) + irb (1.8.1) + rdoc + reline (>= 0.3.8) jbuilder (2.11.5) actionview (>= 5.0.0) activesupport (>= 5.0.0) @@ -317,7 +317,7 @@ GEM mime-types-data (3.2023.0808) mini_mime (1.1.5) minitar (0.9) - minitest (5.19.0) + minitest (5.20.0) msgpack (1.7.2) net-http-persistent (4.0.2) connection_pool (~> 2.2) @@ -361,20 +361,20 @@ GEM rack (>= 1.2.0) rack-test (2.1.0) rack (>= 1.3) - rails (7.0.7.2) - actioncable (= 7.0.7.2) - actionmailbox (= 7.0.7.2) - actionmailer (= 7.0.7.2) - actionpack (= 7.0.7.2) - actiontext (= 7.0.7.2) - actionview (= 7.0.7.2) - activejob (= 7.0.7.2) - activemodel (= 7.0.7.2) - activerecord (= 7.0.7.2) - activestorage (= 7.0.7.2) - activesupport (= 7.0.7.2) + rails (7.0.8) + actioncable (= 7.0.8) + actionmailbox (= 7.0.8) + actionmailer (= 7.0.8) + actionpack (= 7.0.8) + actiontext (= 7.0.8) + actionview (= 7.0.8) + activejob (= 7.0.8) + activemodel (= 7.0.8) + activerecord (= 7.0.8) + activestorage (= 7.0.8) + activesupport (= 7.0.8) bundler (>= 1.15.0) - railties (= 7.0.7.2) + railties (= 7.0.8) rails-dom-testing (2.2.0) activesupport (>= 5.0.0) minitest @@ -382,9 +382,9 @@ GEM rails-html-sanitizer (1.6.0) loofah (~> 2.21) nokogiri (~> 1.14) - railties (7.0.7.2) - actionpack (= 7.0.7.2) - activesupport (= 7.0.7.2) + railties (7.0.8) + actionpack (= 7.0.8) + activesupport (= 7.0.8) method_source rake (>= 12.2) thor (~> 1.0) @@ -397,7 +397,7 @@ GEM recaptcha (5.15.0) redis (5.0.7) redis-client (>= 0.9.0) - redis-client (0.16.0) + redis-client (0.17.0) connection_pool regexp_parser (2.8.1) reline (0.3.8) @@ -430,7 +430,7 @@ GEM rspec-mocks (~> 3.12) rspec-support (~> 3.12) rspec-support (3.12.1) - rubocop (1.56.2) + rubocop (1.56.3) base64 (~> 0.1.1) json (~> 2.3) language_server-protocol (>= 3.17.0) @@ -451,11 +451,11 @@ GEM rubocop-performance (1.19.0) rubocop (>= 1.7.0, < 2.0) rubocop-ast (>= 0.4.0) - rubocop-rails (2.20.2) + rubocop-rails (2.21.0) activesupport (>= 4.2.0) rack (>= 1.1) rubocop (>= 1.33.0, < 2.0) - rubocop-rspec (2.23.2) + rubocop-rspec (2.24.0) rubocop (~> 1.33) rubocop-capybara (~> 2.17) rubocop-factory_bot (~> 2.22) @@ -493,15 +493,15 @@ GEM minitar retriable ruby-progressbar - sprockets (4.2.0) + sprockets (4.2.1) concurrent-ruby (~> 1.0) rack (>= 2.2.4, < 4) sprockets-rails (3.4.2) actionpack (>= 5.2) activesupport (>= 5.2) sprockets (>= 3.0.0) - sqlite3 (1.6.4-x86_64-darwin) - sqlite3 (1.6.4-x86_64-linux) + sqlite3 (1.6.5-x86_64-darwin) + sqlite3 (1.6.5-x86_64-linux) sshkit (1.21.5) net-scp (>= 1.1.2) net-ssh (>= 2.8.0) @@ -525,7 +525,7 @@ GEM method_source (~> 1.0) warden (1.2.9) rack (>= 2.0.9) - web-console (4.2.0) + web-console (4.2.1) actionview (>= 6.0.0) activemodel (>= 6.0.0) bindex (>= 0.4.0) From 82b5341cf1d8993eec7ebf35cb3be1947560c815 Mon Sep 17 00:00:00 2001 From: Cory Lown Date: Mon, 11 Sep 2023 06:00:52 -0400 Subject: [PATCH 2/2] Regenerate rubocop todo --- .rubocop_todo.yml | 67 ++++++++++++++++++++--------------------------- 1 file changed, 29 insertions(+), 38 deletions(-) diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml index d7435bcd..8f4b55d2 100644 --- a/.rubocop_todo.yml +++ b/.rubocop_todo.yml @@ -1,26 +1,34 @@ # This configuration was generated by # `rubocop --auto-gen-config` -# on 2022-10-24 14:06:42 UTC using RuboCop version 1.37.1. +# on 2023-09-11 10:00:10 UTC using RuboCop version 1.56.3. # 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: 6 +Capybara/VisibilityMatcher: + Exclude: + - 'spec/features/blacklight_customizations/layout_spec.rb' + - 'spec/features/canonical_urls_spec.rb' + - 'spec/features/feedback_form_spec.rb' + # Offense count: 1 +# This cop supports unsafe autocorrection (--autocorrect-all). Lint/UselessAssignment: Exclude: - 'lib/tasks/earthworks.rake' # Offense count: 6 -# Configuration parameters: AllowedMethods, AllowedPatterns, IgnoredMethods, CountRepeatedAttributes. +# Configuration parameters: AllowedMethods, AllowedPatterns, CountRepeatedAttributes. Metrics/AbcSize: Max: 114 # Offense count: 9 -# Configuration parameters: CountComments, CountAsOne, ExcludedMethods, AllowedMethods, AllowedPatterns, IgnoredMethods, inherit_mode. +# Configuration parameters: CountComments, CountAsOne, AllowedMethods, AllowedPatterns, inherit_mode. # AllowedMethods: refine Metrics/BlockLength: - Max: 181 + Max: 169 # Offense count: 2 # Configuration parameters: CountComments, CountAsOne. @@ -28,23 +36,23 @@ Metrics/ClassLength: Max: 136 # Offense count: 4 -# Configuration parameters: AllowedMethods, AllowedPatterns, IgnoredMethods. +# Configuration parameters: AllowedMethods, AllowedPatterns. Metrics/CyclomaticComplexity: Max: 29 # Offense count: 9 -# Configuration parameters: CountComments, CountAsOne, ExcludedMethods, AllowedMethods, AllowedPatterns, IgnoredMethods. +# Configuration parameters: CountComments, CountAsOne, AllowedMethods, AllowedPatterns. Metrics/MethodLength: Max: 58 # Offense count: 4 -# Configuration parameters: AllowedMethods, AllowedPatterns, IgnoredMethods. +# Configuration parameters: AllowedMethods, AllowedPatterns. Metrics/PerceivedComplexity: Max: 29 # Offense count: 7 # Configuration parameters: MinNameLength, AllowNamesEndingInNumbers, AllowedNames, ForbiddenNames. -# AllowedNames: as, at, by, db, id, in, io, ip, of, on, os, pp, to +# AllowedNames: as, at, by, cc, db, id, if, in, io, ip, of, on, os, pp, to Naming/MethodParameterName: Exclude: - 'scripts/indexing/ogp/download.rb' @@ -69,13 +77,6 @@ RSpec/AnyInstance: - 'spec/controllers/feedback_forms_controller_spec.rb' - 'spec/support/stub_current_user.rb' -# Offense count: 6 -RSpec/Capybara/VisibilityMatcher: - Exclude: - - 'spec/features/blacklight_customizations/layout_spec.rb' - - 'spec/features/canonical_urls_spec.rb' - - 'spec/features/feedback_form_spec.rb' - # Offense count: 4 # Configuration parameters: Prefixes, AllowedPatterns. # Prefixes: when, with, without @@ -103,21 +104,7 @@ RSpec/ExpectInHook: Exclude: - 'spec/controllers/feedback_forms_controller_spec.rb' -# Offense count: 4 -# This cop supports unsafe autocorrection (--autocorrect-all). -RSpec/FactoryBot/SyntaxMethods: - Exclude: - - 'spec/controllers/restricted_proxy_controller_spec.rb' - - 'spec/models/user_spec.rb' - -# Offense count: 1 -# Configuration parameters: Include, CustomTransform, IgnoreMethods, SpecSuffixOnly. -# Include: **/*_spec*rb*, **/spec/**/* -RSpec/FilePath: - Exclude: - - 'spec/features/copyright_license.rb' - -# Offense count: 5 +# Offense count: 9 # Configuration parameters: . # SupportedStyles: have_received, receive RSpec/MessageSpies: @@ -129,12 +116,13 @@ RSpec/MultipleDescribes: - 'spec/features/feedback_form_spec.rb' - 'spec/features/page_title_spec.rb' -# Offense count: 17 +# Offense count: 20 RSpec/MultipleExpectations: Max: 6 # Offense count: 14 -# Configuration parameters: IgnoreSharedExamples. +# Configuration parameters: EnforcedStyle, IgnoreSharedExamples. +# SupportedStyles: always, named_only RSpec/NamedSubject: Exclude: - 'spec/jobs/check_layer_job_spec.rb' @@ -173,9 +161,8 @@ RSpec/VerifiedDoubles: - 'spec/controllers/feedback_forms_controller_spec.rb' - 'spec/controllers/restricted_proxy_controller_spec.rb' -# Offense count: 2 -# This cop supports safe autocorrection (--autocorrect). -# Configuration parameters: SafeAutocorrect. +# Offense count: 1 +# This cop supports unsafe autocorrection (--autocorrect-all). Rails/ActionControllerFlashBeforeRender: Exclude: - 'app/controllers/feedback_forms_controller.rb' @@ -187,6 +174,7 @@ Rails/ApplicationRecord: - 'app/models/user.rb' # Offense count: 1 +# This cop supports unsafe autocorrection (--autocorrect-all). # Configuration parameters: EnforcedStyle, AllowToTime. # SupportedStyles: strict, flexible Rails/Date: @@ -194,6 +182,7 @@ Rails/Date: - 'lib/tasks/earthworks.rake' # Offense count: 4 +# This cop supports safe autocorrection (--autocorrect). # Configuration parameters: EnforcedStyle. # SupportedStyles: slashes, arguments Rails/FilePath: @@ -214,7 +203,7 @@ Rails/I18nLocaleTexts: Exclude: - 'app/mailers/feedback_mailer.rb' -# Offense count: 6 +# Offense count: 9 # This cop supports unsafe autocorrection (--autocorrect-all). # Configuration parameters: Include. # Include: **/Rakefile, **/*.rake @@ -236,7 +225,7 @@ Style/ClassAndModuleChildren: - 'config/initializers/rack_attack.rb' - 'test/test_helper.rb' -# Offense count: 27 +# Offense count: 29 # Configuration parameters: AllowedConstants. Style/Documentation: Enabled: false @@ -255,6 +244,7 @@ Style/GlobalStdStream: - 'config/environments/production.rb' # Offense count: 2 +# This cop supports safe autocorrection (--autocorrect). # Configuration parameters: MinBodyLength, AllowConsecutiveConditionals. Style/GuardClause: Exclude: @@ -264,6 +254,7 @@ Style/GuardClause: # Offense count: 1 # This cop supports unsafe autocorrection (--autocorrect-all). # Configuration parameters: AllowedReceivers. +# AllowedReceivers: Thread.current Style/HashEachMethods: Exclude: - 'lib/tasks/earthworks.rake' @@ -278,7 +269,7 @@ Style/MutableConstant: # Offense count: 1 # This cop supports unsafe autocorrection (--autocorrect-all). -# Configuration parameters: EnforcedStyle, AllowedMethods, AllowedPatterns, IgnoredMethods. +# Configuration parameters: EnforcedStyle, AllowedMethods, AllowedPatterns. # SupportedStyles: predicate, comparison Style/NumericPredicate: Exclude: