sidekiq-undertaker 1.0.1 → 1.2.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (34) hide show
  1. checksums.yaml +4 -4
  2. data/.codeclimate.yml +1 -1
  3. data/.github/dependabot.yml +8 -0
  4. data/.github/workflows/ruby-build.yml +51 -0
  5. data/.rspec +2 -0
  6. data/.rubocop.yml +5 -0
  7. data/.rubocop_todo.yml +5 -5
  8. data/.travis.yml +21 -19
  9. data/CHANGELOG.md +100 -0
  10. data/README.md +4 -1
  11. data/Rakefile +2 -0
  12. data/lib/sidekiq/undertaker/dead_job.rb +1 -1
  13. data/lib/sidekiq/undertaker/version.rb +1 -1
  14. data/lib/sidekiq/undertaker/web_extension.rb +2 -0
  15. data/lib/sidekiq/undertaker.rb +1 -1
  16. data/renovate.json +5 -0
  17. data/sidekiq-undertaker.gemspec +15 -10
  18. data/spec/fixtures/approvals/sidekiq_undertaker_webextension/show_filter/when_filter_page_is_called/behaves_like_a_page/the_displayed_page_is_correct_for_sidekiqv6.approved.txt +15 -16
  19. data/spec/fixtures/approvals/sidekiq_undertaker_webextension/show_filter/when_job_classbucket_page_is_called/behaves_like_a_page/the_displayed_page_is_correct_for_sidekiqv6.approved.txt +15 -16
  20. data/spec/fixtures/approvals/sidekiq_undertaker_webextension/show_filter/when_job_classbucket_page_is_polled/behaves_like_a_page/the_displayed_page_is_correct_for_sidekiqv6.approved.txt +15 -16
  21. data/spec/fixtures/approvals/sidekiq_undertaker_webextension/show_morgue/when_job_classerrorbucket_is_called/with_all_failures_and_errors/behaves_like_a_page/the_displayed_page_is_correct_for_sidekiqv6.approved.txt +18 -19
  22. data/spec/fixtures/approvals/sidekiq_undertaker_webextension/show_morgue/when_job_classerrorbucket_is_called/with_specific_job_class_and_a_specific_error/behaves_like_a_page/the_displayed_page_is_correct_for_sidekiqv6.approved.txt +18 -19
  23. data/spec/fixtures/approvals/sidekiq_undertaker_webextension/show_morgue/when_job_classerrorbucket_is_called/with_specific_job_class_and_a_specific_error/with_pagination/behaves_like_a_page/the_displayed_page_is_correct_for_sidekiqv6.approved.txt +18 -19
  24. data/spec/sidekiq/undertaker/job_distributor_spec.rb +6 -6
  25. data/spec/sidekiq/undertaker/job_filter_spec.rb +3 -3
  26. data/spec/sidekiq/undertaker/web_extension_spec.rb +18 -2
  27. data/spec/spec_helper.rb +4 -5
  28. metadata +40 -37
  29. data/spec/fixtures/approvals/sidekiq_undertaker_webextension/show_filter/when_filter_page_is_called/behaves_like_a_page/the_displayed_page_is_correct_for_sidekiqv5.approved.txt +0 -240
  30. data/spec/fixtures/approvals/sidekiq_undertaker_webextension/show_filter/when_job_classbucket_page_is_called/behaves_like_a_page/the_displayed_page_is_correct_for_sidekiqv5.approved.txt +0 -241
  31. data/spec/fixtures/approvals/sidekiq_undertaker_webextension/show_filter/when_job_classbucket_page_is_polled/behaves_like_a_page/the_displayed_page_is_correct_for_sidekiqv5.approved.txt +0 -241
  32. data/spec/fixtures/approvals/sidekiq_undertaker_webextension/show_morgue/when_job_classerrorbucket_is_called/with_all_failures_and_errors/behaves_like_a_page/the_displayed_page_is_correct_for_sidekiqv5.approved.txt +0 -319
  33. data/spec/fixtures/approvals/sidekiq_undertaker_webextension/show_morgue/when_job_classerrorbucket_is_called/with_specific_job_class_and_a_specific_error/behaves_like_a_page/the_displayed_page_is_correct_for_sidekiqv5.approved.txt +0 -277
  34. data/spec/fixtures/approvals/sidekiq_undertaker_webextension/show_morgue/when_job_classerrorbucket_is_called/with_specific_job_class_and_a_specific_error/with_pagination/behaves_like_a_page/the_displayed_page_is_correct_for_sidekiqv5.approved.txt +0 -1303
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 84ea1142410fa8e5e4bce66533d039fc07713e5efc04cdc2bb11e5d669139154
4
- data.tar.gz: b083a31341c8a3bc757f650a4c8ad5c4a9432e3c88a90834bbee3798fb7eba16
3
+ metadata.gz: fbe7e0e84ffed4be546988e142fadfef4b8ec6643f16f8c48507a11227a6a2f5
4
+ data.tar.gz: 798f2e9631d028423fcf5b10d403f4c7074d20014310293413af767866404610
5
5
  SHA512:
6
- metadata.gz: 53a728eb87a908f4329a5d5ffb882d9a107ae4244bd684e7e6198e509e24aa58f8d10b126a8425e3c4852508ef2409c5fe38b9a3543693ff2425bcb8cd03be1f
7
- data.tar.gz: 4312adefb75d7c6d2e794a15ad98fb442a73fa3acd43042f25807d47daf826a864e6c05f5824a2c834e560fe4b993f3386e680111c45094dc06b7723a444fec2
6
+ metadata.gz: ccb8eaf232d8f751ea3f75f80c4eaf91eff50bda583a392c7206ba0c69bec4d32d0fe95e3feac947430d713caf65583a18f31ce37e80d0b327058bb7b4fca401
7
+ data.tar.gz: 21380b3857b132a5e7fa7016c05a698d40808d86f02f260604b61ffe718f5810c921508088a696970e77149f8877848175f008dfd3b4034c7c50081dd641b7d9
data/.codeclimate.yml CHANGED
@@ -8,6 +8,6 @@ plugins:
8
8
  enabled: true
9
9
  rubocop:
10
10
  enabled: true
11
- channel: rubocop-0-77
11
+ channel: rubocop-1-8-1
12
12
  config:
13
13
  file: .rubocop_codeclimate.yml
@@ -0,0 +1,8 @@
1
+ version: 2
2
+ updates:
3
+ - package-ecosystem: bundler
4
+ directory: "/"
5
+ schedule:
6
+ interval: monthly
7
+ open-pull-requests-limit: 10
8
+ versioning-strategy: increase
@@ -0,0 +1,51 @@
1
+ # This workflow uses actions that are not certified by GitHub.
2
+ # They are provided by a third-party and are governed by
3
+ # separate terms of service, privacy policy, and support
4
+ # documentation.
5
+ # This workflow will download a prebuilt Ruby version, install dependencies and run tests with Rake
6
+ # For more information see: https://github.com/marketplace/actions/setup-ruby-jruby-and-truffleruby
7
+
8
+ name: Ruby-Build
9
+
10
+ on:
11
+ push:
12
+ branches: [ master ]
13
+ pull_request:
14
+ branches: [ master ]
15
+
16
+ jobs:
17
+ test:
18
+
19
+ runs-on: ubuntu-latest
20
+
21
+ services:
22
+ redis:
23
+ image: redis
24
+ ports:
25
+ - 6379:6379
26
+
27
+ strategy:
28
+ fail-fast: false
29
+ matrix:
30
+ # SEE: https://github.com/ruby/setup-ruby#supported-versions
31
+ ruby-version:
32
+ - 'ruby'
33
+ - '3.1'
34
+ - '2.7'
35
+ - 'jruby'
36
+ - 'jruby-9.3.2.0'
37
+ - 'jruby-9.2.20.0'
38
+ - 'truffleruby'
39
+ - 'truffleruby+graalvm'
40
+
41
+ steps:
42
+ - uses: actions/checkout@v2
43
+ - name: Set up Ruby
44
+ # To automatically get bug fixes and new Ruby versions for ruby/setup-ruby,
45
+ # change this to (see https://github.com/ruby/setup-ruby#versioning):
46
+ uses: ruby/setup-ruby@v1
47
+ with:
48
+ ruby-version: ${{ matrix.ruby-version }}
49
+ bundler-cache: true # runs 'bundle install' and caches installed gems automatically
50
+ - name: Run tests
51
+ run: bundle exec rspec spec
data/.rspec ADDED
@@ -0,0 +1,2 @@
1
+ --color
2
+ -r ./spec/spec_helper.rb
data/.rubocop.yml CHANGED
@@ -1,4 +1,9 @@
1
1
  require:
2
+ - rubocop-rake
2
3
  - rubocop-rspec
3
4
  - rt_rubocop_defaults
5
+
4
6
  inherit_from: .rubocop_todo.yml
7
+
8
+ AllCops:
9
+ TargetRubyVersion: 2.5
data/.rubocop_todo.yml CHANGED
@@ -1,20 +1,20 @@
1
1
  # This configuration was generated by
2
2
  # `rubocop --auto-gen-config`
3
- # on 2020-01-30 23:52:34 +0100 using RuboCop version 0.77.0.
3
+ # on 2021-01-26 20:10:48 UTC using RuboCop version 1.8.1.
4
4
  # The point is for the user to remove these configuration records
5
5
  # one by one as the offenses are removed from the code base.
6
6
  # Note that changes in the inspected code, or installation of new
7
7
  # versions of RuboCop, may require this file to be generated again.
8
8
 
9
9
  # Offense count: 2
10
- # Configuration parameters: Severity.
10
+ # Configuration parameters: IgnoredMethods, CountRepeatedAttributes, Severity.
11
11
  Metrics/AbcSize:
12
12
  Max: 22
13
13
 
14
- # Offense count: 3
15
- # Configuration parameters: CountComments, ExcludedMethods, Severity.
14
+ # Offense count: 2
15
+ # Configuration parameters: CountComments, CountAsOne, ExcludedMethods, IgnoredMethods, Severity.
16
16
  Metrics/MethodLength:
17
- Max: 19
17
+ Max: 14
18
18
 
19
19
  # Offense count: 5
20
20
  # Configuration parameters: .
data/.travis.yml CHANGED
@@ -1,44 +1,46 @@
1
1
  language: ruby
2
2
  cache: bundler
3
3
  rvm:
4
- - 2.7.0
5
- - 2.6.5
6
- - 2.5.7
7
- - 2.4.9
8
- - jruby-9.2.9.0
9
- - jruby-9.1.17.0
10
- # - truffleruby # https://github.com/oracle/truffleruby/issues/1398
4
+ - 3.0.1
5
+ - 2.7.3
6
+ - 2.6.7
7
+ - 2.5.8
8
+ - jruby # latest
9
+ - jruby-9.2.17.0
10
+ #
11
+ # 1. https://github.com/oracle/truffleruby/issues/1398
12
+ # 2. Nokogiri build fails
13
+ # - truffleruby # latest
14
+ # - truffleruby-21.0.0
11
15
  jdk:
12
16
  - oraclejdk11
13
17
  env:
14
18
  global:
15
19
  - CC_TEST_REPORTER_ID=7b2f0f3c9e20e50573e293fe3743a322a74e54087f95abc98d0f1dd1f3dd0a97
16
20
  matrix:
17
- - "JRUBY_OPTS='--dev --debug'"
21
+ - "JRUBY_OPTS='--debug'"
18
22
  - "JRUBY_OPTS='-Xcompile.invokedynamic=true --debug'"
19
23
 
20
24
  matrix:
21
25
  exclude:
22
- - rvm: 2.7.0
26
+ - rvm: 3.0.1
23
27
  env: "JRUBY_OPTS='-Xcompile.invokedynamic=true --debug'"
24
- - rvm: 2.6.5
28
+ - rvm: 2.7.3
25
29
  env: "JRUBY_OPTS='-Xcompile.invokedynamic=true --debug'"
26
- - rvm: 2.5.7
30
+ - rvm: 2.6.7
27
31
  env: "JRUBY_OPTS='-Xcompile.invokedynamic=true --debug'"
28
- - rvm: 2.4.9
32
+ - rvm: 2.5.8
33
+ env: "JRUBY_OPTS='-Xcompile.invokedynamic=true --debug'"
34
+ - rvm: truffleruby-21.0.0
35
+ env: "JRUBY_OPTS='-Xcompile.invokedynamic=true --debug'"
36
+ - rvm: truffleruby
29
37
  env: "JRUBY_OPTS='-Xcompile.invokedynamic=true --debug'"
30
38
  allow_failures:
31
- - rvm: 2.4.9
32
39
  - rvm: truffleruby
33
- - env: "JRUBY_OPTS='-Xcompile.invokedynamic=true --debug'"
40
+ - rvm: truffleruby-21.0.0
34
41
  services:
35
42
  - redis-server
36
43
 
37
- # before_install:
38
- # - gem update --system
39
- # - gem install bundler -v "~> 2.0"
40
- # # - gem update bundler
41
-
42
44
  before_script:
43
45
  - curl -L https://codeclimate.com/downloads/test-reporter/test-reporter-latest-linux-amd64 > ./cc-test-reporter
44
46
  - chmod +x ./cc-test-reporter
data/CHANGELOG.md ADDED
@@ -0,0 +1,100 @@
1
+ # Changelog
2
+
3
+ ## Unreleased
4
+
5
+ ## [1.2.0] - 2022-02-03
6
+ ### Changed
7
+ - Updated sidekiq dependency to 6.4.0
8
+
9
+ ## [1.1.1] - 2022-02-03
10
+ ### Added
11
+ - Added CHANGELOG.md
12
+
13
+ ## [1.1.0] - 2022-01-19
14
+ ### Added
15
+ - Added renovate.json
16
+ - Added ruby-build github workflow
17
+ - Added .rspec config file
18
+
19
+ ### Changed
20
+ - Updated support for Sidekiq 6.2.2 and higher
21
+ - Updated travis CI config to use latest ruby versions
22
+ - Updated to use GitHub-native Dependabot
23
+ - Updated spech_helper
24
+ - Updated approvals to version 0.0.25
25
+
26
+ ## [1.0.2] - 2021-01-27
27
+ ### Added
28
+ - Consider also explicitly stating that PRs must pass RuboCop to be accepted
29
+ - Added rubocop badge to README.md
30
+
31
+ ### Changed
32
+ - Upgraded rubocop and rt_rubocop_defaults
33
+ - Updated rake requirement from ~> 12.3 to ~> 13.0
34
+ - Updated Travis CI to use JRuby-9.2.10.0
35
+ - Updated README to clarify RuboCop install
36
+
37
+ ## [1.0.1] - 2020-02-03
38
+ ### Added
39
+ - Added ruby 2.7.0 to travis file and mark ruby 2.4.9 as optional
40
+
41
+ ### Changed
42
+ - Updated codeclimate.yml to enable rubocop
43
+
44
+ ### Fixed
45
+ - Fixed pagination on morgue page
46
+ - Fixed rubocopo issues
47
+
48
+ ## [1.0.0] - 2019-12-24
49
+ ### Added
50
+ - Added RubyGems badge
51
+ - Added custom locales
52
+
53
+ ### Changed
54
+ - Renamed gem from sidekiq-cleaner to sidekiq-undertaker
55
+ - Updated do not show 'all' as job or error name in titles
56
+ - Updated gemspec, .travis.yml and README.md
57
+ - Updated rename buckets and add the 'older' bucket
58
+ - Refactored move sort into JobAggregator
59
+ - Renamed JobAggregator to JobDistributor
60
+ - Updated translations
61
+ - Updated add '/filter' and '/morgue' prefixes to URLs
62
+ - Renamed Helpers to APIHelpers
63
+ - Moved view files to top level web folder
64
+ - Renamed views
65
+ - Moved WebExtension::Helper into separate file
66
+
67
+ ### Removed
68
+ - Removed before install steps from .travis.yml
69
+
70
+ ### Fixed
71
+ - Updated README.md to fix broken members link
72
+ - Fixed approvals specs after sidekiq ref update
73
+ - Fixed sidekiq dependency in gemspec
74
+ - Fixed broken links in filter view
75
+ - Fixed Travis link
76
+ - Fixed paths in views
77
+
78
+ ## [0.3.6] - 2019-12-04
79
+ ### Added
80
+ - Added Test Coverage Badge
81
+ - Added CodeClimate configuration
82
+ - Added support for JRuby
83
+ - Added .travis.yml
84
+ - Added support for csrf and allowed this to be used with newer versions of sidekiq
85
+
86
+ ### Changed
87
+ - Updated travis config
88
+ - Updated Rubocop and RtRubocopDefaults gems
89
+ - Updated README.md
90
+ - Updated gemspec
91
+ - Renamed approvals specs to shorten file path
92
+ - Updated approval specs to exclude Sidekiq::VERSION
93
+ - Removed celluloid dependency
94
+ - Allowed developers to use other Rubies
95
+ - Removed .ruby-version and added .ruby-version and .rvmrc to the .gitignore
96
+
97
+ ### Fixed
98
+ - Fixed "Retry All" and "Delete All" function
99
+ - Fixed Csrf and sidekiq version compatibility
100
+ - Fixed Cleaner Redirect Bug
data/README.md CHANGED
@@ -4,6 +4,7 @@
4
4
  [![Build Status](https://travis-ci.org/ThomasKoppensteiner/sidekiq-undertaker.svg?branch=master)](https://travis-ci.org/ThomasKoppensteiner/sidekiq-undertaker)
5
5
  [![Code Climate](https://codeclimate.com/github/ThomasKoppensteiner/sidekiq-undertaker.svg)](https://codeclimate.com/github/ThomasKoppensteiner/sidekiq-undertaker)
6
6
  [![Test Coverage](https://api.codeclimate.com/v1/badges/d442eb0a323d8911661f/test_coverage)](https://codeclimate.com/github/ThomasKoppensteiner/sidekiq-undertaker/test_coverage)
7
+ [![Ruby Style Guide](https://img.shields.io/badge/code_style-rubocop-brightgreen.svg)](https://github.com/rubocop-hq/rubocop)
7
8
 
8
9
  ## About
9
10
 
@@ -32,7 +33,7 @@ Or install it yourself as:
32
33
  $ gem install sidekiq-undertaker
33
34
  ````
34
35
 
35
- #### Install the Rubocop Pre-Commit Hook
36
+ #### Development: Install the Rubocop Pre-Commit Hook
36
37
 
37
38
  ````sh
38
39
  $ rake rubocop:install
@@ -80,6 +81,8 @@ this fork was renamed to `sidekiq-undertaker`.
80
81
 
81
82
  The [Sidekiq-Cleaner](https://github.com/HackingHabits/sidekiq-cleaner) gem was originally created by [Madan Thangavelu](https://github.com/HackingHabits).
82
83
  [Tout](https://github.com/Tout/sidekiq-cleaner) and [TheWudu](https://github.com/TheWudu/sidekiq-cleaner) also contributed to it.
84
+ Thank you [Zlatko Rednjak](https://github.com/Rednjak) for adding the initial version of the `CHANGELOG.md`.
85
+
83
86
  For the complete list of network members have a look at the [fork overview](https://github.com/ThomasKoppensteiner/sidekiq-undertaker/network/members).
84
87
 
85
88
  ## Alternative Projects
data/Rakefile CHANGED
@@ -28,6 +28,8 @@ begin
28
28
  RSpec::Core::RakeTask.new(:spec)
29
29
 
30
30
  task default: :spec
31
+
32
+ desc "run specs"
31
33
  task test: :spec
32
34
  rescue LoadError
33
35
  puts "RSpec not available!"
@@ -50,7 +50,7 @@ module Sidekiq
50
50
 
51
51
  attr_writer :job_class, :time_elapsed_since_failure, :error_class, :bucket_name, :job
52
52
 
53
- def job_eql?(other_job) # rubocop:disable Metrics/AbcSize, Metrics/CyclomaticComplexity
53
+ def job_eql?(other_job) # rubocop:disable Metrics/AbcSize
54
54
  job.jid == other_job.jid &&
55
55
  job.item == other_job.item &&
56
56
  job.args == other_job.args &&
@@ -2,6 +2,6 @@
2
2
 
3
3
  module Sidekiq
4
4
  module Undertaker
5
- VERSION = "1.0.1"
5
+ VERSION = "1.2.0"
6
6
  end
7
7
  end
@@ -5,6 +5,7 @@ require "sidekiq/undertaker/web_extension/api_helpers"
5
5
  module Sidekiq
6
6
  module Undertaker
7
7
  module WebExtension
8
+ # rubocop:disable Metrics/MethodLength
8
9
  def self.registered(app)
9
10
  app.helpers APIHelpers
10
11
 
@@ -32,6 +33,7 @@ module Sidekiq
32
33
  post_undertaker_job_class_error_class_buckent_name_retry
33
34
  end
34
35
  end
36
+ # rubocop:enable Metrics/MethodLength
35
37
  end
36
38
  end
37
39
  end
@@ -5,7 +5,7 @@ require "sidekiq/undertaker/web_extension"
5
5
 
6
6
  begin
7
7
  require "sidekiq/web"
8
- rescue LoadError # rubocop:disable Lint/SuppressedException
8
+ rescue LoadError
9
9
  # client-only usage
10
10
  end
11
11
 
data/renovate.json ADDED
@@ -0,0 +1,5 @@
1
+ {
2
+ "extends": [
3
+ "config:base"
4
+ ]
5
+ }
@@ -19,21 +19,25 @@ Gem::Specification.new do |spec|
19
19
 
20
20
  spec.homepage = "https://github.com/ThomasKoppensteiner/sidekiq-undertaker"
21
21
  spec.metadata = {
22
- "homepage_uri" => "https://github.com/ThomasKoppensteiner/sidekiq-undertaker",
23
- "source_code_uri" => "https://github.com/ThomasKoppensteiner/sidekiq-undertaker",
24
- "bug_tracker_uri" => "https://github.com/ThomasKoppensteiner/sidekiq-undertaker/issues",
25
- "build_status_uri" => "https://travis-ci.org/ThomasKoppensteiner/sidekiq-undertaker"
22
+ "homepage_uri" => "https://github.com/ThomasKoppensteiner/sidekiq-undertaker",
23
+ "source_code_uri" => "https://github.com/ThomasKoppensteiner/sidekiq-undertaker",
24
+ "changelog_uri" => "https://github.com/ThomasKoppensteiner/sidekiq-undertaker/blob/master/CHANGELOG.md",
25
+ "bug_tracker_uri" => "https://github.com/ThomasKoppensteiner/sidekiq-undertaker/issues",
26
+ "build_status_uri" => "https://travis-ci.org/ThomasKoppensteiner/sidekiq-undertaker",
27
+ "rubygems_mfa_required" => "true"
26
28
  }
27
29
 
30
+ spec.required_ruby_version = ">= 2.5.0"
31
+
28
32
  spec.files = `git ls-files -z`.split("\x0")
29
33
  spec.executables = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
30
34
  spec.test_files = spec.files.grep(%r{^(test|spec|features)/})
31
35
  spec.require_paths = ["lib", "lib/sidekiq/undertaker"]
32
36
 
33
37
  spec.add_development_dependency "bundler", ">= 1.17", "<3"
34
- spec.add_development_dependency "rake", "~> 12.3"
38
+ spec.add_development_dependency "rake", "~> 13.0"
35
39
 
36
- spec.add_development_dependency "approvals", "~> 0.0", ">= 0.0.24"
40
+ spec.add_development_dependency "approvals", "~> 0.0.25"
37
41
  spec.add_development_dependency "mock_redis", "~> 0.19"
38
42
  spec.add_development_dependency "pry", "~> 0.12"
39
43
  spec.add_development_dependency "rack-test", "~> 1.1"
@@ -42,13 +46,14 @@ Gem::Specification.new do |spec|
42
46
  spec.add_development_dependency "rspec-core", "~> 3.8"
43
47
  spec.add_development_dependency "rspec-mocks", "~> 3.8"
44
48
  spec.add_development_dependency "rspec-sidekiq", "~> 3.0"
45
- spec.add_development_dependency "rt_rubocop_defaults", "~> 1.2"
46
- spec.add_development_dependency "rubocop", "~> 0.77"
47
- spec.add_development_dependency "rubocop-rspec", "~> 1.30"
49
+ spec.add_development_dependency "rt_rubocop_defaults", "~> 2.3"
50
+ spec.add_development_dependency "rubocop", "~> 1.8"
51
+ spec.add_development_dependency "rubocop-rake", "~> 0.5"
52
+ spec.add_development_dependency "rubocop-rspec", "~> 2.0"
48
53
  spec.add_development_dependency "rubocop_runner", "~> 2.1"
49
54
  spec.add_development_dependency "simplecov", "~> 0.14"
50
55
  spec.add_development_dependency "sinatra", "~> 2.0"
51
56
  spec.add_development_dependency "timecop", "~> 0.9"
52
57
 
53
- spec.add_runtime_dependency "sidekiq", ">= 5.2", "< 7"
58
+ spec.add_runtime_dependency "sidekiq", ">= 6.4", "< 7"
54
59
  end
@@ -9,15 +9,16 @@
9
9
 
10
10
 
11
11
  <link href="/sidekiq/stylesheets/application.css" media="screen" rel="stylesheet" type="text/css" />
12
- <link href="/sidekiq/stylesheets/application-dark.css" media="screen" rel="stylesheet" type="text/css" />
12
+ <link href="/sidekiq/stylesheets/application-dark.css" media="screen and (prefers-color-scheme: dark)" rel="stylesheet" type="text/css" />
13
13
 
14
14
 
15
+ <link rel="apple-touch-icon" href="/sidekiq/images/apple-touch-icon.png">
15
16
  <link rel="shortcut icon" type="image/ico" href="/sidekiq/images/favicon.ico" />
16
17
  <script type="text/javascript" src="/sidekiq/javascripts/application.js"></script>
17
18
  <meta name="google" content="notranslate" />
18
19
 
19
20
  </head>
20
- <body class="admin" data-poll-path="" data-locale="en">
21
+ <body class="admin" data-locale="en">
21
22
  <div class="navbar navbar-default navbar-fixed-top">
22
23
  <div class="container-fluid">
23
24
  <div class="navbar-header" data-navbar="static">
@@ -28,9 +29,8 @@
28
29
  </button>
29
30
  <div class="navbar-toggle collapsed navbar-livereload">
30
31
 
31
-
32
- <a id="live-poll" class="btn btn-primary" href="/sidekiq/undertaker/filter?poll=true">Live Poll</a>
33
-
32
+ <a class="live-poll-start live-poll btn btn-primary">Live Poll</a>
33
+ <a class="live-poll-stop live-poll btn btn-primary active">Stop Polling</a>
34
34
 
35
35
 
36
36
 
@@ -94,9 +94,8 @@
94
94
  <li class="navbar-livereload">
95
95
  <div class="poll-wrapper">
96
96
 
97
-
98
- <a id="live-poll" class="btn btn-primary" href="/sidekiq/undertaker/filter?poll=true">Live Poll</a>
99
-
97
+ <a class="live-poll-start live-poll btn btn-primary">Live Poll</a>
98
+ <a class="live-poll-stop live-poll btn btn-primary active">Stop Polling</a>
100
99
 
101
100
 
102
101
 
@@ -113,40 +112,40 @@
113
112
  <div class="col-sm-12 summary_bar">
114
113
  <ul class="list-unstyled summary row">
115
114
  <li class="processed col-sm-1">
116
- <span class="count">0</span>
115
+ <span id="txtProcessed" class="count">0</span>
117
116
  <span class="desc">Processed</span>
118
117
  </li>
119
118
  <li class="failed col-sm-1">
120
- <span class="count">0</span>
119
+ <span id="txtFailed" class="count">0</span>
121
120
  <span class="desc">Failed</span>
122
121
  </li>
123
122
  <li class="busy col-sm-1">
124
123
  <a href="/sidekiq/busy">
125
- <span class="count">0</span>
124
+ <span id="txtBusy" class="count">0</span>
126
125
  <span class="desc">Busy</span>
127
126
  </a>
128
127
  </li>
129
128
  <li class="enqueued col-sm-1">
130
129
  <a href="/sidekiq/queues">
131
- <span class="count">0</span>
130
+ <span id="txtEnqueued" class="count">0</span>
132
131
  <span class="desc">Enqueued</span>
133
132
  </a>
134
133
  </li>
135
134
  <li class="retries col-sm-1">
136
135
  <a href="/sidekiq/retries">
137
- <span class="count">0</span>
136
+ <span id="txtRetries" class="count">0</span>
138
137
  <span class="desc">Retries</span>
139
138
  </a>
140
139
  </li>
141
140
  <li class="scheduled col-sm-1">
142
141
  <a href="/sidekiq/scheduled">
143
- <span class="count">0</span>
142
+ <span id="txtScheduled" class="count">0</span>
144
143
  <span class="desc">Scheduled</span>
145
144
  </a>
146
145
  </li>
147
146
  <li class="dead col-sm-1">
148
147
  <a href="/sidekiq/morgue">
149
- <span class="count">4</span>
148
+ <span id="txtDead" class="count">4</span>
150
149
  <span class="desc">Dead</span>
151
150
  </a>
152
151
  </li>
@@ -227,7 +226,7 @@
227
226
  <p class="navbar-text redis-url" title="redis://127.0.0.1:6379/0">redis://127.0.0.1:6379/0</p>
228
227
  </li>
229
228
  <li>
230
- <p class="navbar-text server-utc-time">20:57:00 UTC</p>
229
+ <p id="serverUtcTime" class="navbar-text server-utc-time">20:57:00 UTC</p>
231
230
  </li>
232
231
  <li>
233
232
  <p class="navbar-text"><a style="color: gray;" href="https://github.com/mperham/sidekiq/wiki">docs</a></p>
@@ -9,15 +9,16 @@
9
9
 
10
10
 
11
11
  <link href="/sidekiq/stylesheets/application.css" media="screen" rel="stylesheet" type="text/css" />
12
- <link href="/sidekiq/stylesheets/application-dark.css" media="screen" rel="stylesheet" type="text/css" />
12
+ <link href="/sidekiq/stylesheets/application-dark.css" media="screen and (prefers-color-scheme: dark)" rel="stylesheet" type="text/css" />
13
13
 
14
14
 
15
+ <link rel="apple-touch-icon" href="/sidekiq/images/apple-touch-icon.png">
15
16
  <link rel="shortcut icon" type="image/ico" href="/sidekiq/images/favicon.ico" />
16
17
  <script type="text/javascript" src="/sidekiq/javascripts/application.js"></script>
17
18
  <meta name="google" content="notranslate" />
18
19
 
19
20
  </head>
20
- <body class="admin" data-poll-path="" data-locale="en">
21
+ <body class="admin" data-locale="en">
21
22
  <div class="navbar navbar-default navbar-fixed-top">
22
23
  <div class="container-fluid">
23
24
  <div class="navbar-header" data-navbar="static">
@@ -28,9 +29,8 @@
28
29
  </button>
29
30
  <div class="navbar-toggle collapsed navbar-livereload">
30
31
 
31
-
32
- <a id="live-poll" class="btn btn-primary" href="/sidekiq/undertaker/filter/HardWorker/1_hour?poll=true">Live Poll</a>
33
-
32
+ <a class="live-poll-start live-poll btn btn-primary">Live Poll</a>
33
+ <a class="live-poll-stop live-poll btn btn-primary active">Stop Polling</a>
34
34
 
35
35
 
36
36
 
@@ -94,9 +94,8 @@
94
94
  <li class="navbar-livereload">
95
95
  <div class="poll-wrapper">
96
96
 
97
-
98
- <a id="live-poll" class="btn btn-primary" href="/sidekiq/undertaker/filter/HardWorker/1_hour?poll=true">Live Poll</a>
99
-
97
+ <a class="live-poll-start live-poll btn btn-primary">Live Poll</a>
98
+ <a class="live-poll-stop live-poll btn btn-primary active">Stop Polling</a>
100
99
 
101
100
 
102
101
 
@@ -113,40 +112,40 @@
113
112
  <div class="col-sm-12 summary_bar">
114
113
  <ul class="list-unstyled summary row">
115
114
  <li class="processed col-sm-1">
116
- <span class="count">0</span>
115
+ <span id="txtProcessed" class="count">0</span>
117
116
  <span class="desc">Processed</span>
118
117
  </li>
119
118
  <li class="failed col-sm-1">
120
- <span class="count">0</span>
119
+ <span id="txtFailed" class="count">0</span>
121
120
  <span class="desc">Failed</span>
122
121
  </li>
123
122
  <li class="busy col-sm-1">
124
123
  <a href="/sidekiq/busy">
125
- <span class="count">0</span>
124
+ <span id="txtBusy" class="count">0</span>
126
125
  <span class="desc">Busy</span>
127
126
  </a>
128
127
  </li>
129
128
  <li class="enqueued col-sm-1">
130
129
  <a href="/sidekiq/queues">
131
- <span class="count">0</span>
130
+ <span id="txtEnqueued" class="count">0</span>
132
131
  <span class="desc">Enqueued</span>
133
132
  </a>
134
133
  </li>
135
134
  <li class="retries col-sm-1">
136
135
  <a href="/sidekiq/retries">
137
- <span class="count">0</span>
136
+ <span id="txtRetries" class="count">0</span>
138
137
  <span class="desc">Retries</span>
139
138
  </a>
140
139
  </li>
141
140
  <li class="scheduled col-sm-1">
142
141
  <a href="/sidekiq/scheduled">
143
- <span class="count">0</span>
142
+ <span id="txtScheduled" class="count">0</span>
144
143
  <span class="desc">Scheduled</span>
145
144
  </a>
146
145
  </li>
147
146
  <li class="dead col-sm-1">
148
147
  <a href="/sidekiq/morgue">
149
- <span class="count">4</span>
148
+ <span id="txtDead" class="count">4</span>
150
149
  <span class="desc">Dead</span>
151
150
  </a>
152
151
  </li>
@@ -228,7 +227,7 @@
228
227
  <p class="navbar-text redis-url" title="redis://127.0.0.1:6379/0">redis://127.0.0.1:6379/0</p>
229
228
  </li>
230
229
  <li>
231
- <p class="navbar-text server-utc-time">20:57:00 UTC</p>
230
+ <p id="serverUtcTime" class="navbar-text server-utc-time">20:57:00 UTC</p>
232
231
  </li>
233
232
  <li>
234
233
  <p class="navbar-text"><a style="color: gray;" href="https://github.com/mperham/sidekiq/wiki">docs</a></p>