From af669eb4ba696a8c5f2aaef77da6a2dfda961952 Mon Sep 17 00:00:00 2001 From: Mike Perham Date: Fri, 4 Feb 2022 14:06:08 -0800 Subject: [PATCH] Update dev dependencies, fix issues --- Gemfile.lock | 188 +++++++++++++++++-------------- lib/sidekiq/cli.rb | 2 +- lib/sidekiq/web.rb | 6 +- test/dummy/config/application.rb | 2 +- 4 files changed, 106 insertions(+), 92 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index b0c17da0..e6097458 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -9,85 +9,95 @@ PATH GEM remote: https://rubygems.org/ specs: - actioncable (6.1.4.4) - actionpack (= 6.1.4.4) - activesupport (= 6.1.4.4) + actioncable (7.0.1) + actionpack (= 7.0.1) + activesupport (= 7.0.1) nio4r (~> 2.0) websocket-driver (>= 0.6.1) - actionmailbox (6.1.4.4) - actionpack (= 6.1.4.4) - activejob (= 6.1.4.4) - activerecord (= 6.1.4.4) - activestorage (= 6.1.4.4) - activesupport (= 6.1.4.4) + actionmailbox (7.0.1) + actionpack (= 7.0.1) + activejob (= 7.0.1) + activerecord (= 7.0.1) + activestorage (= 7.0.1) + activesupport (= 7.0.1) mail (>= 2.7.1) - actionmailer (6.1.4.4) - actionpack (= 6.1.4.4) - actionview (= 6.1.4.4) - activejob (= 6.1.4.4) - activesupport (= 6.1.4.4) + net-imap + net-pop + net-smtp + actionmailer (7.0.1) + actionpack (= 7.0.1) + actionview (= 7.0.1) + activejob (= 7.0.1) + activesupport (= 7.0.1) mail (~> 2.5, >= 2.5.4) + net-imap + net-pop + net-smtp rails-dom-testing (~> 2.0) - actionpack (6.1.4.4) - actionview (= 6.1.4.4) - activesupport (= 6.1.4.4) - rack (~> 2.0, >= 2.0.9) + actionpack (7.0.1) + actionview (= 7.0.1) + activesupport (= 7.0.1) + rack (~> 2.0, >= 2.2.0) rack-test (>= 0.6.3) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.2.0) - actiontext (6.1.4.4) - actionpack (= 6.1.4.4) - activerecord (= 6.1.4.4) - activestorage (= 6.1.4.4) - activesupport (= 6.1.4.4) + actiontext (7.0.1) + actionpack (= 7.0.1) + activerecord (= 7.0.1) + activestorage (= 7.0.1) + activesupport (= 7.0.1) + globalid (>= 0.6.0) nokogiri (>= 1.8.5) - actionview (6.1.4.4) - activesupport (= 6.1.4.4) + actionview (7.0.1) + activesupport (= 7.0.1) builder (~> 3.1) erubi (~> 1.4) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.1, >= 1.2.0) - activejob (6.1.4.4) - activesupport (= 6.1.4.4) + activejob (7.0.1) + activesupport (= 7.0.1) globalid (>= 0.3.6) - activemodel (6.1.4.4) - activesupport (= 6.1.4.4) - activerecord (6.1.4.4) - activemodel (= 6.1.4.4) - activesupport (= 6.1.4.4) - activestorage (6.1.4.4) - actionpack (= 6.1.4.4) - activejob (= 6.1.4.4) - activerecord (= 6.1.4.4) - activesupport (= 6.1.4.4) - marcel (~> 1.0.0) + activemodel (7.0.1) + activesupport (= 7.0.1) + activerecord (7.0.1) + activemodel (= 7.0.1) + activesupport (= 7.0.1) + activerecord-jdbc-adapter (50.0) + activerecord (>= 2.2) + activerecord-jdbcsqlite3-adapter (50.0) + activerecord-jdbc-adapter (~> 50.0) + jdbc-sqlite3 (~> 3.8, < 3.30) + activestorage (7.0.1) + actionpack (= 7.0.1) + activejob (= 7.0.1) + activerecord (= 7.0.1) + activesupport (= 7.0.1) + marcel (~> 1.0) mini_mime (>= 1.1.0) - activesupport (6.1.4.4) + activesupport (7.0.1) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 1.6, < 2) minitest (>= 5.1) tzinfo (~> 2.0) - zeitwerk (~> 2.3) ast (2.4.2) builder (3.2.4) - codecov (0.2.8) - json - simplecov + codecov (0.6.0) + simplecov (>= 0.15, < 0.22) concurrent-ruby (1.1.9) connection_pool (2.2.5) crass (1.0.6) digest (3.1.0) - docile (1.3.2) + digest (3.1.0-java) + docile (1.4.0) erubi (1.10.0) globalid (1.0.0) activesupport (>= 5.0) hiredis (0.6.3) hiredis (0.6.3-java) - i18n (1.8.11) + i18n (1.9.1) concurrent-ruby (~> 1.0) io-wait (0.2.1) - json (2.3.1) - json (2.3.1-java) + jdbc-sqlite3 (3.28.0) loofah (2.13.0) crass (~> 1.0.2) nokogiri (>= 1.5.9) @@ -96,8 +106,16 @@ GEM marcel (1.0.2) method_source (1.0.0) mini_mime (1.1.2) - mini_portile2 (2.6.1) + mini_portile2 (2.7.1) minitest (5.15.0) + net-imap (0.2.3) + digest + net-protocol + strscan + net-pop (0.1.1) + digest + net-protocol + timeout net-protocol (0.1.2) io-wait timeout @@ -107,10 +125,10 @@ GEM timeout nio4r (2.5.8) nio4r (2.5.8-java) - nokogiri (1.12.5) - mini_portile2 (~> 2.6.1) + nokogiri (1.13.1) + mini_portile2 (~> 2.7.0) racc (~> 1.4) - nokogiri (1.12.5-java) + nokogiri (1.13.1-java) racc (~> 1.4) parallel (1.21.0) parser (3.1.0.0) @@ -120,42 +138,42 @@ GEM rack (2.2.3) rack-test (1.1.0) rack (>= 1.0, < 3) - rails (6.1.4.4) - actioncable (= 6.1.4.4) - actionmailbox (= 6.1.4.4) - actionmailer (= 6.1.4.4) - actionpack (= 6.1.4.4) - actiontext (= 6.1.4.4) - actionview (= 6.1.4.4) - activejob (= 6.1.4.4) - activemodel (= 6.1.4.4) - activerecord (= 6.1.4.4) - activestorage (= 6.1.4.4) - activesupport (= 6.1.4.4) + rails (7.0.1) + actioncable (= 7.0.1) + actionmailbox (= 7.0.1) + actionmailer (= 7.0.1) + actionpack (= 7.0.1) + actiontext (= 7.0.1) + actionview (= 7.0.1) + activejob (= 7.0.1) + activemodel (= 7.0.1) + activerecord (= 7.0.1) + activestorage (= 7.0.1) + activesupport (= 7.0.1) bundler (>= 1.15.0) - railties (= 6.1.4.4) - sprockets-rails (>= 2.0.0) + railties (= 7.0.1) rails-dom-testing (2.0.3) activesupport (>= 4.2.0) nokogiri (>= 1.6) rails-html-sanitizer (1.4.2) loofah (~> 2.3) - railties (6.1.4.4) - actionpack (= 6.1.4.4) - activesupport (= 6.1.4.4) + railties (7.0.1) + actionpack (= 7.0.1) + activesupport (= 7.0.1) method_source - rake (>= 0.13) + rake (>= 12.2) thor (~> 1.0) - rainbow (3.0.0) + zeitwerk (~> 2.5) + rainbow (3.1.1) rake (13.0.6) - redis (4.5.1) + redis (4.6.0) redis-namespace (1.8.1) redis (>= 3.0.4) regexp_parser (2.2.0) rexml (3.2.5) - rubocop (1.24.1) + rubocop (1.25.0) parallel (~> 1.10) - parser (>= 3.0.0.0) + parser (>= 3.1.0.0) rainbow (>= 2.2.2, < 4.0) regexp_parser (>= 1.8, < 3.0) rexml @@ -164,28 +182,24 @@ GEM unicode-display_width (>= 1.4.0, < 3.0) rubocop-ast (1.15.1) parser (>= 3.0.1.1) - rubocop-performance (1.13.1) + rubocop-performance (1.13.2) rubocop (>= 1.7.0, < 2.0) rubocop-ast (>= 0.4.0) ruby-progressbar (1.11.0) - simplecov (0.19.0) + simplecov (0.21.2) docile (~> 1.1) simplecov-html (~> 0.11) + simplecov_json_formatter (~> 0.1) simplecov-html (0.12.3) - sprockets (4.0.2) - concurrent-ruby (~> 1.0) - rack (> 1, < 3) - sprockets-rails (3.4.2) - actionpack (>= 5.2) - activesupport (>= 5.2) - sprockets (>= 3.0.0) + simplecov_json_formatter (0.1.3) sqlite3 (1.4.2) - standard (1.6.0) - rubocop (= 1.24.1) - rubocop-performance (= 1.13.1) + standard (1.7.0) + rubocop (= 1.25.0) + rubocop-performance (= 1.13.2) + strscan (3.0.1) thor (1.2.1) timeout (0.2.0) - toxiproxy (1.0.3) + toxiproxy (2.0.0) tzinfo (2.0.4) concurrent-ruby (~> 1.0) unicode-display_width (2.1.0) @@ -194,7 +208,7 @@ GEM websocket-driver (0.7.5-java) websocket-extensions (>= 0.1.0) websocket-extensions (0.1.5) - zeitwerk (2.5.3) + zeitwerk (2.5.4) PLATFORMS java diff --git a/lib/sidekiq/cli.rb b/lib/sidekiq/cli.rb index eeccb926..74f578d0 100644 --- a/lib/sidekiq/cli.rb +++ b/lib/sidekiq/cli.rb @@ -115,7 +115,7 @@ module Sidekiq begin launcher.run - while (readable_io = IO.select([self_read])) + while (readable_io = self_read.wait_readable) signal = readable_io.first[0].gets.strip handle_signal(signal) end diff --git a/lib/sidekiq/web.rb b/lib/sidekiq/web.rb index 04e7ef45..c7023562 100644 --- a/lib/sidekiq/web.rb +++ b/lib/sidekiq/web.rb @@ -148,9 +148,9 @@ module Sidekiq ::Rack::Builder.new do use Rack::Static, urls: ["/stylesheets", "/images", "/javascripts"], - root: ASSETS, - cascade: true, - header_rules: rules + root: ASSETS, + cascade: true, + header_rules: rules m.each { |middleware, block| use(*middleware, &block) } use Sidekiq::Web::CsrfProtection unless $TESTING run WebApplication.new(klass) diff --git a/test/dummy/config/application.rb b/test/dummy/config/application.rb index f7fb6414..367b87fb 100644 --- a/test/dummy/config/application.rb +++ b/test/dummy/config/application.rb @@ -14,6 +14,6 @@ module Dummy config.root = File.expand_path("../..", __FILE__) config.eager_load = false config.logger = Logger.new('/dev/null') - config.load_defaults "6.0" + config.load_defaults "7.0" end end