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