sidekiq-undertaker 1.4.1 → 1.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8bb9cb0de79a210eecb875abea9d75cf30f228c294ac9af748a0e90bd2634433
-  data.tar.gz: efeafbf06536b5ce50ea2d0f13286c92829d11c9168dbd608bf60ade9ad80cde
+  metadata.gz: f75ca3784fd83c8eecbaa7cd9a8159577b0f1fe8dd6b7a0d05a7873d58650778
+  data.tar.gz: 59c031dc4a5d2aceeea04a099fce4935ab7f43989e50f4353c03d0c5a6690c89
 SHA512:
-  metadata.gz: f4c2faf722ee34829c0de7d9c403f42cc148784a735a036de962651e5f7eb02b385a6044cf72da3d8b9290c247b8fcca751ef161ab89f1ef658ce9312e7151bf
-  data.tar.gz: e599c728949f5363b1d19dcbacc590e606adcd6c15ce4ef2866bc73924f906c5a2b51b6f6533df5d147a2f97fea790fec68cb8f63200aefe00bd0cde792c3f02
+  metadata.gz: f5a04ed46664c16dcea8107c76b9421bea08516d08a343d82bfeebd2323d97ff4b57ec1f5c1c1c0ad400af09746341db141d2fdcd35533ca5c5d6b2330182efd
+  data.tar.gz: 52f8e24affefceed9019eb88c82318ff391096fa00c17ea2200da4d69297edc0f238b072a2446154678a4e5c4de38eed818f1025aac896ab06cd73a7e7c33ff0

data/.codeclimate.yml

@@ -8,6 +8,6 @@ plugins:
     enabled: true
   rubocop:
     enabled: true
-    channel: rubocop-1-8-1
+    channel: rubocop-1-31-0
     config:
       file: .rubocop_codeclimate.yml

data/.github/workflows/ruby-build.yml

@@ -17,6 +17,7 @@ jobs:
   test:
 
     runs-on: ubuntu-latest
+    continue-on-error: ${{ matrix.experimental }} # https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idcontinue-on-error
 
     services:
       redis:
@@ -28,15 +29,14 @@ jobs:
       fail-fast: false
       matrix:
         # SEE: https://github.com/ruby/setup-ruby#supported-versions
-        ruby-version:
-          - 'ruby'
-          - '3.1'
-          - '2.7'
-          - 'jruby'
-          - 'jruby-9.3.2.0'
-          - 'jruby-9.2.20.1'
-          - 'truffleruby'
-          - 'truffleruby+graalvm'
+        # https://docs.github.com/en/actions/using-jobs/using-a-matrix-for-your-jobs#expanding-or-adding-matrix-configurations
+        ruby-version: ['ruby', '3.1', '2.7.6', 'jruby', 'jruby-9.3.9.0']
+        experimental: [false]
+        include: # HINT: Do not use arrays for values here
+          - ruby-version: 'truffleruby'
+            experimental: true
+          - ruby-version: 'truffleruby+graalvm'
+            experimental: true
 
     env:
       JRUBY_OPTS: '--debug'
@@ -71,7 +71,7 @@ jobs:
       with:
         name: coverage-report
         path: ./coverage
-    - uses: paambaati/codeclimate-action@v3.0.0
+    - uses: paambaati/codeclimate-action@v3.2.0
       env:
         # Set CC_TEST_REPORTER_ID as secret of your repo
         CC_TEST_REPORTER_ID: ${{secrets.CC_TEST_REPORTER_ID}}

data/.rubocop.yml

@@ -6,7 +6,7 @@ require:
 inherit_from: .rubocop_todo.yml
 
 AllCops:
-  TargetRubyVersion: 2.5
+  TargetRubyVersion: 2.6
 
 Layout/LineLength:
   Exclude:

data/.rubocop_codeclimate.yml

@@ -7,7 +7,7 @@ inherit_from:
   - .rubocop_todo.yml
 
 AllCops:
-  TargetRubyVersion: 2.5
+  TargetRubyVersion: 2.6
 
 Layout/LineLength:
   Exclude:

data/CHANGELOG.md

@@ -2,6 +2,18 @@
 
 ## Unreleased
 
+## [1.6.0] - 2022-11-02
+
+### Changed
+- Updated rubocop to version 1.37 and set the required_ruby_version to >= 2.6
+- Update sidekiq dependency to allow version 7
+
+## [1.5.0] - 2022-09-06
+
+### Changed
+- Updated max error message length to be configurable
+- Updated rack-test requirement from ~> 1.1 to ~> 2.0
+
 ## [1.4.1] - 2022-06-03
 ### Fixed
 - Fix downgrade rubocop to '1.28' to keep support for JRuby '9.2.20.1'

data/lib/sidekiq/undertaker/dead_job.rb

@@ -53,7 +53,7 @@ module Sidekiq
       attr_writer :job_class, :time_elapsed_since_failure, :error_class, :error_message, :bucket_name, :job
 
       def shorten_error_msg(msg)
-        max_error_msg_length = 30
+        max_error_msg_length = Sidekiq::Undertaker.max_error_msg_length
 
         msg.length > max_error_msg_length ? "#{msg[0, max_error_msg_length]}..." : msg
       end

data/lib/sidekiq/undertaker/version.rb

@@ -2,6 +2,6 @@
 
 module Sidekiq
   module Undertaker
-    VERSION = "1.4.1"
+    VERSION = "1.6.0"
   end
 end

data/lib/sidekiq/undertaker.rb

@@ -14,3 +14,19 @@ if defined?(Sidekiq::Web)
   Sidekiq::Web.tabs["Undertaker"] = "undertaker/filter"
   Sidekiq::Web.settings.locales << File.join(File.dirname(__FILE__), "../../web/locales")
 end
+
+module Sidekiq
+  module Undertaker
+    @config = {
+      max_error_msg_length: 30
+    }
+
+    def self.max_error_msg_length=(value)
+      @config[:max_error_msg_length] = Integer(value)
+    end
+
+    def self.max_error_msg_length
+      @config[:max_error_msg_length]
+    end
+  end
+end

data/sidekiq-undertaker.gemspec

@@ -27,7 +27,7 @@ Gem::Specification.new do |spec|
     "rubygems_mfa_required" => "true"
   }
 
-  spec.required_ruby_version = ">= 2.5.0"
+  spec.required_ruby_version = ">= 2.6.0"
 
   spec.files         = `git ls-files -z`.split("\x0")
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
@@ -39,21 +39,21 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "approvals", "~> 0.0.25"
   spec.add_development_dependency "mock_redis", "~> 0.19"
   spec.add_development_dependency "pry", "~> 0.12"
-  spec.add_development_dependency "rack-test", "~> 1.1"
+  spec.add_development_dependency "rack-test", "~> 2.0"
   spec.add_development_dependency "rb-readline", "~> 0.5"
   spec.add_development_dependency "rspec", "~> 3.8"
   spec.add_development_dependency "rspec-core", "~> 3.8"
   spec.add_development_dependency "rspec-mocks", "~> 3.8"
   spec.add_development_dependency "rspec-sidekiq", "~> 3.0"
-  spec.add_development_dependency "rt_rubocop_defaults", "~> 2.3"
-  spec.add_development_dependency "rubocop", "~> 1.28"
-  spec.add_development_dependency "rubocop-rake", "~> 0.5"
-  spec.add_development_dependency "rubocop-rspec", "~> 2.0"
-  spec.add_development_dependency "rubocop_runner", "~> 2.1"
+  spec.add_development_dependency "rt_rubocop_defaults", "~> 2.4"
+  spec.add_development_dependency "rubocop", "~> 1.37"
+  spec.add_development_dependency "rubocop-rake", "~> 0.6"
+  spec.add_development_dependency "rubocop-rspec", "~> 2.14"
+  spec.add_development_dependency "rubocop_runner", "~> 2.2"
   spec.add_development_dependency "simplecov", "~> 0.21"
   spec.add_development_dependency "sinatra", "~> 2.0"
   spec.add_development_dependency "timecop", "~> 0.9"
 
   spec.add_runtime_dependency "rubyzip", "~> 2.3"
-  spec.add_runtime_dependency "sidekiq", ">= 6.4", "< 7"
+  spec.add_runtime_dependency "sidekiq", ">= 6.4", "< 8"
 end

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

@@ -22,7 +22,7 @@
     <div class="navbar navbar-default navbar-fixed-top">
   <div class="container-fluid">
     <div class="navbar-header" data-navbar="static">
-      <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#navbar-menu">
+      <button type="button" class="navbar-toggle collapsed" data-toggle="navbar-menu" data-target="#navbar-menu">
         <span class="icon-bar"></span>
         <span class="icon-bar"></span>
         <span class="icon-bar"></span>

data/spec/fixtures/approvals/sidekiq_undertaker_webextension/show_filter/when_filter_page_is_called/behaves_like_a_page/the_displayed_page_is_correct_for_sidekiqv7.approved.txt

@@ -0,0 +1,265 @@
+<!doctype html>
+<html dir="ltr">
+  <head>
+    <title>[TEST] Sidekiq</title>
+    <meta charset="utf-8" />
+    <meta name="viewport" content="width=device-width,initial-scale=1.0" />
+
+    <link href="/sidekiq/stylesheets/bootstrap.css" media="screen" rel="stylesheet" type="text/css" />
+    
+
+    <link href="/sidekiq/stylesheets/application.css" media="screen" rel="stylesheet" type="text/css" />
+    <link href="/sidekiq/stylesheets/application-dark.css" media="screen and (prefers-color-scheme: dark)" rel="stylesheet" type="text/css" />
+    
+
+    <link rel="apple-touch-icon" href="/sidekiq/images/apple-touch-icon.png">
+    <link rel="shortcut icon" type="image/ico" href="/sidekiq/images/favicon.ico" />
+    <script type="text/javascript" src="/sidekiq/javascripts/application.js"></script>
+    <meta name="google" content="notranslate" />
+    
+  </head>
+  <body class="admin" data-locale="en">
+    <div class="navbar navbar-default navbar-fixed-top">
+  <div class="container-fluid">
+    <div class="navbar-header" data-navbar="static">
+      <button type="button" class="navbar-toggle collapsed" data-toggle="navbar-menu" data-target="#navbar-menu">
+        <span class="icon-bar"></span>
+        <span class="icon-bar"></span>
+        <span class="icon-bar"></span>
+      </button>
+      <div class="navbar-toggle collapsed navbar-livereload">
+        
+    <a class="live-poll-start live-poll btn btn-primary">Live Poll</a>
+    <a class="live-poll-stop live-poll btn btn-primary active">Stop Polling</a>
+
+
+        
+      </div>
+      <a class="navbar-brand" href="/sidekiq/">
+        Sidekiq
+        <span class="status">
+  <i class="status-sprite status-idle"></i>
+  idle
+</span>
+
+      </a>
+    </div>
+
+    <div class="collapse navbar-collapse" id="navbar-menu">
+      <ul class="nav navbar-nav" data-navbar="static">
+        
+          
+            <li class="">
+            <a href="/sidekiq/">Dashboard</a>
+            </li>
+          
+        
+          
+            <li class="">
+            <a href="/sidekiq/busy">Busy</a>
+            </li>
+          
+        
+          
+            <li class="">
+            <a href="/sidekiq/queues">Queues</a>
+            </li>
+          
+        
+          
+            <li class="">
+            <a href="/sidekiq/retries">Retries</a>
+            </li>
+          
+        
+          
+            <li class="">
+            <a href="/sidekiq/scheduled">Scheduled</a>
+            </li>
+          
+        
+          
+            <li class="">
+            <a href="/sidekiq/morgue">Dead</a>
+            </li>
+          
+        
+          
+            <li class="">
+            <a href="/sidekiq/metrics">Metrics</a>
+            </li>
+          
+        
+
+        
+          <li class="active" data-navbar="custom-tab">
+            <a href="/sidekiq/undertaker/filter">Undertaker</a>
+          </li>
+        
+
+        <li class="navbar-livereload">
+          <div class="poll-wrapper">
+            
+    <a class="live-poll-start live-poll btn btn-primary">Live Poll</a>
+    <a class="live-poll-stop live-poll btn btn-primary active">Stop Polling</a>
+
+
+            
+          </div>
+        </li>
+      </ul>
+    </div>
+  </div>
+</div>
+
+    <div id="page">
+      <div class="container">
+        <div class="row">
+          <div class="col-sm-12 summary_bar">
+            <ul class="list-unstyled summary row">
+  <li class="processed col-sm-1">
+    <span id="txtProcessed" class="count">0</span>
+    <span class="desc">Processed</span>
+  </li>
+  <li class="failed col-sm-1">
+    <span id="txtFailed" class="count">0</span>
+    <span class="desc">Failed</span>
+  </li>
+  <li class="busy col-sm-1">
+    <a href="/sidekiq/busy">
+      <span id="txtBusy" class="count">0</span>
+      <span class="desc">Busy</span>
+    </a>
+  </li>
+  <li class="enqueued col-sm-1">
+    <a href="/sidekiq/queues">
+      <span id="txtEnqueued" class="count">0</span>
+      <span class="desc">Enqueued</span>
+    </a>
+  </li>
+  <li class="retries col-sm-1">
+    <a href="/sidekiq/retries">
+      <span id="txtRetries" class="count">0</span>
+      <span class="desc">Retries</span>
+    </a>
+  </li>
+  <li class="scheduled col-sm-1">
+    <a href="/sidekiq/scheduled">
+      <span id="txtScheduled" class="count">0</span>
+      <span class="desc">Scheduled</span>
+    </a>
+  </li>
+  <li class="dead col-sm-1">
+    <a href="/sidekiq/morgue">
+      <span id="txtDead" class="count">4</span>
+      <span class="desc">Dead</span>
+    </a>
+  </li>
+</ul>
+
+          </div>
+
+          <div class="col-sm-12">
+            <header class="row header">
+  <div class="col-sm-12">
+    <h3>
+      <b>4</b> dead jobs
+    </h3>
+  </div>
+</header>
+
+<table class="table table-striped table-bordered table-white">
+  <thead>
+    <tr>
+      <th style="width: 20%">Jobs</th>
+      <th style="width: 10%">All</th>
+      <th style="width: 10%">1 hour</th>
+      <th style="width: 10%">3 hours</th>
+      <th style="width: 10%">1 day</th>
+      <th style="width: 10%">3 days</th>
+      <th style="width: 10%">1 week</th>
+      <th style="width: 10%">Older</th>
+    </tr>
+  </thead>
+  
+      <tr>
+        <td><a href='/sidekiq/undertaker/morgue/all/all/all/total_dead'> all</a></td>
+        <td><a href='/sidekiq/undertaker/filter/all/total_dead'>4</a></td>
+        <td><a href='/sidekiq/undertaker/filter/all/1_hour'>4</a></td>
+        <td><a href='/sidekiq/undertaker/filter/all/3_hours'>0</a></td>
+        <td><a href='/sidekiq/undertaker/filter/all/1_day'>0</a></td>
+        <td><a href='/sidekiq/undertaker/filter/all/3_days'>0</a></td>
+        <td><a href='/sidekiq/undertaker/filter/all/1_week'>0</a></td>
+        <td><a href='/sidekiq/undertaker/filter/all/older'>0</a></td>
+      </tr>
+  
+      <tr>
+        <td><a href='/sidekiq/undertaker/morgue/HardWorker/all/all/total_dead'> HardWorker</a></td>
+        <td><a href='/sidekiq/undertaker/filter/HardWorker/total_dead'>3</a></td>
+        <td><a href='/sidekiq/undertaker/filter/HardWorker/1_hour'>3</a></td>
+        <td><a href='/sidekiq/undertaker/filter/HardWorker/3_hours'>0</a></td>
+        <td><a href='/sidekiq/undertaker/filter/HardWorker/1_day'>0</a></td>
+        <td><a href='/sidekiq/undertaker/filter/HardWorker/3_days'>0</a></td>
+        <td><a href='/sidekiq/undertaker/filter/HardWorker/1_week'>0</a></td>
+        <td><a href='/sidekiq/undertaker/filter/HardWorker/older'>0</a></td>
+      </tr>
+  
+      <tr>
+        <td><a href='/sidekiq/undertaker/morgue/HardWorker1/all/all/total_dead'> HardWorker1</a></td>
+        <td><a href='/sidekiq/undertaker/filter/HardWorker1/total_dead'>1</a></td>
+        <td><a href='/sidekiq/undertaker/filter/HardWorker1/1_hour'>1</a></td>
+        <td><a href='/sidekiq/undertaker/filter/HardWorker1/3_hours'>0</a></td>
+        <td><a href='/sidekiq/undertaker/filter/HardWorker1/1_day'>0</a></td>
+        <td><a href='/sidekiq/undertaker/filter/HardWorker1/3_days'>0</a></td>
+        <td><a href='/sidekiq/undertaker/filter/HardWorker1/1_week'>0</a></td>
+        <td><a href='/sidekiq/undertaker/filter/HardWorker1/older'>0</a></td>
+      </tr>
+  
+</table>
+
+<header class="row header">
+  <div class="col-sm-12">
+    <h3>
+      Import Jobs
+    </h3>
+  </div>
+</header>
+
+<form enctype="multipart/form-data" method="post" action='/sidekiq/undertaker/import_jobs'>
+  <input type='hidden' name='authenticity_token' value='stubbed-csrf-token'/>
+    <input type="file" id=upload_file" name="upload_file" >
+    <button class="btn btn-danger" style="margin-top: 10px" type="submit">
+      Import
+    </button>
+</form>
+
+          </div>
+        </div>
+      </div>
+    </div>
+    <div class="navbar navbar-fixed-bottom navbar-inverse ltr">
+  <div class="navbar-inner">
+    <div class="container text-center">
+        <ul class="nav">
+          <li>
+            <p class="navbar-text product-version">Sidekiq v*EXCLUDED*</p>
+          </li>
+          <li>
+            <p class="navbar-text redis-url" title="redis://localhost:6379/0">redis://localhost:6379/0</p>
+          </li>
+          <li>
+            <p id="serverUtcTime" class="navbar-text server-utc-time">20:57:00 UTC</p>
+          </li>
+          <li>
+            <p class="navbar-text"><a rel=help href="https://github.com/mperham/sidekiq/wiki">docs</a></p>
+          </li>
+          <li>
+            <p class="navbar-text"><a rel=external href="https://github.com/mperham/sidekiq/tree/main/web/locales">en</a></p>
+          </li>
+        </ul>
+    </div>
+  </div>
+</div>
+
+  </body>
+</html>

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

@@ -22,7 +22,7 @@
     <div class="navbar navbar-default navbar-fixed-top">
   <div class="container-fluid">
     <div class="navbar-header" data-navbar="static">
-      <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#navbar-menu">
+      <button type="button" class="navbar-toggle collapsed" data-toggle="navbar-menu" data-target="#navbar-menu">
         <span class="icon-bar"></span>
         <span class="icon-bar"></span>
         <span class="icon-bar"></span>