sidekiq-web_custom 0.3.1 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 33751169bc37e3ce515c82a40cceef962731d790aa317a9637b18914a46190a3
-  data.tar.gz: 91eb14067a2e743cc3022cea2147958210db08bfb29c51ce0fd7949ae3781780
+  metadata.gz: 815bd23151114eb4c72a9f191c8038a394a8f3dd50b8209eb11cd1df03a70246
+  data.tar.gz: 3be935aeb2523cbe18febb5f1e173bb4b5fe8c1e9cad07f1a2338d4a81010e0a
 SHA512:
-  metadata.gz: fb1ffa2cc81485ae694b25fc0f24bbe963cc3cbba4868014ca726ac310247d1b24bab5faf8650c55cb16a0aa0d61ec2f3ba733767a453eb0b66d5267328311f5
-  data.tar.gz: c209d5562abc1426237b51290dac6e5575b4c0ea63241758795d42f061f1c0130c158fbbe320453e68a632a479af59f9dbf5e2d053cda1b0c42631ffe196a57c
+  metadata.gz: b3f0257f49ef4d2170e50923489f70404d792ede869b3298f415b3c9d56f32edb5d9564adb2c50ab9e319598752f19a1515531901f8f357754111ea23a042887
+  data.tar.gz: dceab9cddad2591ddc1d9ba657c0958443684616557bd0c51653996369c415ba7911119bf9a20a7f5d9f7a8e8a85145654eba59a5e6920fc5c1f4e3f17f0364c

data/.circleci/config.yml

@@ -2,103 +2,27 @@ version: 2.1
 
 orbs:
   ruby: circleci/ruby@1.0
-
-jobs:
-  build:
-    docker:
-      - image: cimg/ruby:2.7-node
-    steps:
-      - checkout
-      - ruby/install-deps
-    environment:
-  publish-rubygems:
-    docker:
-      - image: cimg/ruby:2.7-node # this is our primary docker image, where step commands run.
-    environment:
-      BUNDLE_JOBS: "3"
-      BUNDLE_RETRY: "3"
-      RAILS_ENV: test
-    steps:
-      - checkout
-      - ruby/install-deps
-      - run:
-          name: Publish Ruby Gems
-          command: |
-            bin/publish_ruby_gems
-  publish-github:
-    docker:
-      - image: cimg/ruby:2.7-node
-    environment:
-      BUNDLE_JOBS: "3"
-      BUNDLE_RETRY: "3"
-      RAILS_ENV: test
-    steps:
-      - checkout
-      - ruby/install-deps
-      - run:
-          name: 'Get Go'
-          command: |
-            sudo apt-get update -qq
-            sudo apt-get -y --no-install-recommends install golang-go
-      - run:
-          name: 'Set Git stats'
-          command: |
-            git config user.name $GITHUB_USER
-            git config user.email $GITHUB_EMAIL
-      - run:
-          name: 'Download GHR'
-          command: |
-            curl -sSL https://github.com/tcnksm/ghr/releases/download/v0.13.0/ghr_v0.13.0_linux_amd64.tar.gz | tar xz -f - -C . ghr_v0.13.0_linux_amd64/ghr
-            mv ghr_v0.13.0_linux_amd64/ghr .
-            rm -rf ghr_v0.13.0_linux_amd64
-            chmod 0755 ghr
-      - run:
-          name: Publish Git
-          command: |
-            export GHRLOCATION=ghr
-            bin/publish_git
-  test:
-    docker:
-      - image: cimg/ruby:2.7-node
-      - image: circleci/redis:latest
-    environment:
-      BUNDLE_JOBS: "3"
-      BUNDLE_RETRY: "3"
-      RAILS_ENV: test
-    # A series of steps to run, some are similar to those in "build".
-    steps:
-      - checkout
-      - ruby/install-deps
-      - run:
-          name: Setup Climate Control test-reporter
-          command: |
-            curl -L https://codeclimate.com/downloads/test-reporter/test-reporter-latest-linux-amd64 > ./cc-test-reporter
-            chmod +x ./cc-test-reporter
-      - run:
-          name: Run le tests
-          command: |
-            ./cc-test-reporter before-build
-            SIMPLE_COV_RUN=true bundle exec rspec --format RspecJunitFormatter --out test-results/rspec/rspec.xml --format progress --color
-            ./cc-test-reporter after-build format-coverage -t simplecov
+  node: circleci/node@2
+  cst: cst/framework@1
 
 workflows:
   version: 2
   yeet-le-jobs:
     jobs:
-      - build
-      - test:
-          requires:
-            - build
-      - publish-github:
-          requires:
-            - test
-          filters:
-            branches:
-              only:
-                - main
-      - publish-rubygems:
+      - cst/enforce-gem-version-bump
+      - cst/rspec-ruby:
+          rspec-system-args: "SIMPLE_COV_RUN=true"
+          cc-report-collect-ruby: "2.7.5"
+          matrix:
+            parameters:
+              ruby-version: ["2.7.5" , "3.0.0", "3.0.3"]
+            alias: required-matrix-tests
+          name: test-ruby<< matrix.ruby-version >>
+      - cst/publish-gem:
+          publish-git: true
+          publish-default-gem: true
           requires:
-            - test
+            - required-matrix-tests
           filters:
             branches:
               only:

data/Dockerfile

@@ -1,4 +1,4 @@
-FROM ruby:2.5.5
+FROM ruby:2.7.5
 RUN cd /tmp && curl -L --output ghr.tar.gz https://github.com/tcnksm/ghr/releases/download/v0.12.0/ghr_v0.12.0_linux_amd64.tar.gz && \
     tar -xzvf ghr.tar.gz && chmod +x ghr_v0.12.0_linux_amd64/ghr && mv ghr_v0.12.0_linux_amd64/ghr /usr/local/bin/ghr && rm -rf /tmp/*
 

data/Gemfile

@@ -7,7 +7,7 @@ gemspec
 
 
 gem 'rails'
-gem 'byebug'
+gem 'pry'
 gem "rake", "~> 13.0"
 gem "rspec", "~> 3.0"
 gem 'rspec_junit_formatter'

data/Gemfile.lock

@@ -1,176 +1,194 @@
 PATH
   remote: .
   specs:
-    sidekiq-web_custom (0.3.1)
-      sidekiq (>= 6.0)
+    sidekiq-web_custom (0.4.1)
+      sidekiq (~> 6.5)
       timeoutable (>= 1.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    actioncable (6.1.3.2)
-      actionpack (= 6.1.3.2)
-      activesupport (= 6.1.3.2)
+    actioncable (7.0.3.1)
+      actionpack (= 7.0.3.1)
+      activesupport (= 7.0.3.1)
       nio4r (~> 2.0)
       websocket-driver (>= 0.6.1)
-    actionmailbox (6.1.3.2)
-      actionpack (= 6.1.3.2)
-      activejob (= 6.1.3.2)
-      activerecord (= 6.1.3.2)
-      activestorage (= 6.1.3.2)
-      activesupport (= 6.1.3.2)
+    actionmailbox (7.0.3.1)
+      actionpack (= 7.0.3.1)
+      activejob (= 7.0.3.1)
+      activerecord (= 7.0.3.1)
+      activestorage (= 7.0.3.1)
+      activesupport (= 7.0.3.1)
       mail (>= 2.7.1)
-    actionmailer (6.1.3.2)
-      actionpack (= 6.1.3.2)
-      actionview (= 6.1.3.2)
-      activejob (= 6.1.3.2)
-      activesupport (= 6.1.3.2)
+      net-imap
+      net-pop
+      net-smtp
+    actionmailer (7.0.3.1)
+      actionpack (= 7.0.3.1)
+      actionview (= 7.0.3.1)
+      activejob (= 7.0.3.1)
+      activesupport (= 7.0.3.1)
       mail (~> 2.5, >= 2.5.4)
+      net-imap
+      net-pop
+      net-smtp
       rails-dom-testing (~> 2.0)
-    actionpack (6.1.3.2)
-      actionview (= 6.1.3.2)
-      activesupport (= 6.1.3.2)
-      rack (~> 2.0, >= 2.0.9)
+    actionpack (7.0.3.1)
+      actionview (= 7.0.3.1)
+      activesupport (= 7.0.3.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.3.2)
-      actionpack (= 6.1.3.2)
-      activerecord (= 6.1.3.2)
-      activestorage (= 6.1.3.2)
-      activesupport (= 6.1.3.2)
+    actiontext (7.0.3.1)
+      actionpack (= 7.0.3.1)
+      activerecord (= 7.0.3.1)
+      activestorage (= 7.0.3.1)
+      activesupport (= 7.0.3.1)
+      globalid (>= 0.6.0)
       nokogiri (>= 1.8.5)
-    actionview (6.1.3.2)
-      activesupport (= 6.1.3.2)
+    actionview (7.0.3.1)
+      activesupport (= 7.0.3.1)
       builder (~> 3.1)
       erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.1, >= 1.2.0)
-    activejob (6.1.3.2)
-      activesupport (= 6.1.3.2)
+    activejob (7.0.3.1)
+      activesupport (= 7.0.3.1)
       globalid (>= 0.3.6)
-    activemodel (6.1.3.2)
-      activesupport (= 6.1.3.2)
-    activerecord (6.1.3.2)
-      activemodel (= 6.1.3.2)
-      activesupport (= 6.1.3.2)
-    activestorage (6.1.3.2)
-      actionpack (= 6.1.3.2)
-      activejob (= 6.1.3.2)
-      activerecord (= 6.1.3.2)
-      activesupport (= 6.1.3.2)
-      marcel (~> 1.0.0)
-      mini_mime (~> 1.0.2)
-    activesupport (6.1.3.2)
+    activemodel (7.0.3.1)
+      activesupport (= 7.0.3.1)
+    activerecord (7.0.3.1)
+      activemodel (= 7.0.3.1)
+      activesupport (= 7.0.3.1)
+    activestorage (7.0.3.1)
+      actionpack (= 7.0.3.1)
+      activejob (= 7.0.3.1)
+      activerecord (= 7.0.3.1)
+      activesupport (= 7.0.3.1)
+      marcel (~> 1.0)
+      mini_mime (>= 1.1.0)
+    activesupport (7.0.3.1)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
       tzinfo (~> 2.0)
-      zeitwerk (~> 2.3)
     builder (3.2.4)
-    byebug (11.1.3)
-    concurrent-ruby (1.1.9)
+    coderay (1.1.3)
+    concurrent-ruby (1.1.10)
     connection_pool (2.2.5)
     crass (1.0.6)
-    diff-lcs (1.4.4)
+    diff-lcs (1.5.0)
+    digest (3.1.0)
     docile (1.4.0)
-    erubi (1.10.0)
-    globalid (0.4.2)
-      activesupport (>= 4.2.0)
-    i18n (1.8.10)
+    erubi (1.11.0)
+    globalid (1.0.0)
+      activesupport (>= 5.0)
+    i18n (1.12.0)
       concurrent-ruby (~> 1.0)
-    loofah (2.10.0)
+    loofah (2.18.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
     mail (2.7.1)
       mini_mime (>= 0.1.1)
-    marcel (1.0.1)
+    marcel (1.0.2)
     method_source (1.0.0)
-    mini_mime (1.0.3)
-    minitest (5.14.4)
-    nio4r (2.5.7)
-    nokogiri (1.11.7-x86_64-linux)
+    mini_mime (1.1.2)
+    minitest (5.16.3)
+    net-imap (0.2.3)
+      digest
+      net-protocol
+      strscan
+    net-pop (0.1.1)
+      digest
+      net-protocol
+      timeout
+    net-protocol (0.1.3)
+      timeout
+    net-smtp (0.3.1)
+      digest
+      net-protocol
+      timeout
+    nio4r (2.5.8)
+    nokogiri (1.13.8-x86_64-linux)
       racc (~> 1.4)
-    racc (1.5.2)
-    rack (2.2.3)
-    rack-test (1.1.0)
-      rack (>= 1.0, < 3)
-    rails (6.1.3.2)
-      actioncable (= 6.1.3.2)
-      actionmailbox (= 6.1.3.2)
-      actionmailer (= 6.1.3.2)
-      actionpack (= 6.1.3.2)
-      actiontext (= 6.1.3.2)
-      actionview (= 6.1.3.2)
-      activejob (= 6.1.3.2)
-      activemodel (= 6.1.3.2)
-      activerecord (= 6.1.3.2)
-      activestorage (= 6.1.3.2)
-      activesupport (= 6.1.3.2)
+    pry (0.14.1)
+      coderay (~> 1.1)
+      method_source (~> 1.0)
+    racc (1.6.0)
+    rack (2.2.4)
+    rack-test (2.0.2)
+      rack (>= 1.3)
+    rails (7.0.3.1)
+      actioncable (= 7.0.3.1)
+      actionmailbox (= 7.0.3.1)
+      actionmailer (= 7.0.3.1)
+      actionpack (= 7.0.3.1)
+      actiontext (= 7.0.3.1)
+      actionview (= 7.0.3.1)
+      activejob (= 7.0.3.1)
+      activemodel (= 7.0.3.1)
+      activerecord (= 7.0.3.1)
+      activestorage (= 7.0.3.1)
+      activesupport (= 7.0.3.1)
       bundler (>= 1.15.0)
-      railties (= 6.1.3.2)
-      sprockets-rails (>= 2.0.0)
+      railties (= 7.0.3.1)
     rails-dom-testing (2.0.3)
       activesupport (>= 4.2.0)
       nokogiri (>= 1.6)
-    rails-html-sanitizer (1.3.0)
+    rails-html-sanitizer (1.4.3)
       loofah (~> 2.3)
-    railties (6.1.3.2)
-      actionpack (= 6.1.3.2)
-      activesupport (= 6.1.3.2)
+    railties (7.0.3.1)
+      actionpack (= 7.0.3.1)
+      activesupport (= 7.0.3.1)
       method_source
-      rake (>= 0.8.7)
+      rake (>= 12.2)
       thor (~> 1.0)
-    rake (13.0.3)
-    redis (4.3.1)
-    rspec (3.10.0)
-      rspec-core (~> 3.10.0)
-      rspec-expectations (~> 3.10.0)
-      rspec-mocks (~> 3.10.0)
-    rspec-core (3.10.1)
-      rspec-support (~> 3.10.0)
-    rspec-expectations (3.10.1)
+      zeitwerk (~> 2.5)
+    rake (13.0.6)
+    redis (4.7.1)
+    rspec (3.11.0)
+      rspec-core (~> 3.11.0)
+      rspec-expectations (~> 3.11.0)
+      rspec-mocks (~> 3.11.0)
+    rspec-core (3.11.0)
+      rspec-support (~> 3.11.0)
+    rspec-expectations (3.11.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.10.0)
-    rspec-mocks (3.10.2)
+      rspec-support (~> 3.11.0)
+    rspec-mocks (3.11.1)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.10.0)
-    rspec-support (3.10.2)
-    rspec_junit_formatter (0.4.1)
+      rspec-support (~> 3.11.0)
+    rspec-support (3.11.0)
+    rspec_junit_formatter (0.5.1)
       rspec-core (>= 2, < 4, != 2.12.0)
-    sidekiq (6.2.1)
+    sidekiq (6.5.4)
       connection_pool (>= 2.2.2)
       rack (~> 2.0)
-      redis (>= 4.2.0)
+      redis (>= 4.5.0)
     simplecov (0.21.2)
       docile (~> 1.1)
       simplecov-html (~> 0.11)
       simplecov_json_formatter (~> 0.1)
     simplecov-html (0.12.3)
-    simplecov_json_formatter (0.1.3)
-    sprockets (4.0.2)
-      concurrent-ruby (~> 1.0)
-      rack (> 1, < 3)
-    sprockets-rails (3.2.2)
-      actionpack (>= 4.0)
-      activesupport (>= 4.0)
-      sprockets (>= 3.0.0)
-    thor (1.1.0)
-    timeout (0.1.1)
-    timeoutable (1.0.0)
+    simplecov_json_formatter (0.1.4)
+    strscan (3.0.4)
+    thor (1.2.1)
+    timeout (0.3.0)
+    timeoutable (1.1.1)
       timeout
-    tzinfo (2.0.4)
+    tzinfo (2.0.5)
       concurrent-ruby (~> 1.0)
     websocket-driver (0.7.5)
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.5)
-    zeitwerk (2.4.2)
+    zeitwerk (2.6.0)
 
 PLATFORMS
   x86_64-linux
 
 DEPENDENCIES
-  byebug
+  pry
   rails
   rake (~> 13.0)
   rspec (~> 3.0)
@@ -179,4 +197,4 @@ DEPENDENCIES
   simplecov
 
 BUNDLED WITH
-   2.2.19
+   2.3.20

data/README.md

@@ -9,10 +9,8 @@ This Custom add on to the Sidekiq Web framework allows you to continue to drain
 ## Installation
 
 Add this line to your application's Gemfile:
-
-Working on Adding a gem source. For now directly pull it from git
 ```ruby
-gem 'sidekiq-web_custom', source: 'https://github.com/matt-taylor/sidekiq-web_custom'
+gem 'sidekiq-web_custom'
 ```
 
 And then execute:

data/dummy_rails/config/application.rb

@@ -5,7 +5,6 @@ require 'action_mailer/railtie'
 require 'sprockets/railtie'
 require 'rails/test_unit/railtie'
 
-require 'byebug'
 Bundler.require(*Rails.groups)
 require 'sidekiq/web_custom'
 

data/lib/load_random_workers.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require 'byebug'
-
 worker_files = Dir[Rails.root.join('app','workers','**','*_worker.rb').to_s]
 require_workers = worker_files.map { |path| File.basename(path, '.rb') }
 require_workers.each do |worker|

data/lib/sidekiq/web_custom/processor.rb

@@ -4,49 +4,50 @@ module Sidekiq
   module WebCustom
     class Processor < ::Sidekiq::Processor
 
-      def self.execute(max:, queue:, options: Sidekiq.options)
+      def self.execute(max:, queue:, options: Sidekiq)
         __processor__(queue: queue, options: options).__execute(max: max)
       end
 
-      def self.execute_job(job:, options: Sidekiq.options)
+      def self.execute_job(job:, options: Sidekiq)
         __processor__(queue: job.queue, options: options).__execute_job(job: job)
       rescue StandardError => _
         false # error gets loggged downstream
       end
 
-      def self.__processor__(queue:, options: Sidekiq.options)
-        options_temp = options.clone
+      def self.__processor__(queue:, options: Sidekiq)
+        options_temp = options.dup
         queue = queue.is_a?(String) ? Sidekiq::Queue.new(queue) : queue
 
         options_temp[:queues] = [queue.name]
         klass = options_temp[:fetch]&.class || BasicFetch
         options_temp[:fetch] = klass.new(options_temp)
-        new(manager: nil, options: options_temp, queue: queue)
+
+        new(options: options_temp, queue: queue)
       end
 
-      def initialize(manager:, options:, queue:)
+      def initialize(options:, queue:)
         @__queue = queue
         @__basic_fetch = options[:fetch].class == BasicFetch
 
-        super(manager, options)
+        super(options)
       end
 
       def __execute_job(job:)
         queue_name = "queue:#{job.queue}"
         work_unit = Sidekiq::BasicFetch::UnitOfWork.new(queue_name, job.item.to_json)
         begin
-          Sidekiq.logger.info "Manually processing individual work unit for #{work_unit.queue_name}"
+          logger.info "Manually processing individual work unit for #{work_unit.queue_name}"
           process(work_unit)
         rescue StandardError => e
-          Sidekiq.logger.error "Manually processed work unit failed with #{e.message}. Work unit will not be dequeued"
+          logger.error "Manually processed work unit failed with #{e.message}. Work unit will not be dequeued"
           raise e
         end
 
         begin
           job.delete
-          Sidekiq.logger.info { "Manually processed work unit sucessfully dequeued." }
+          logger.info { "Manually processed work unit sucessfully dequeued." }
         rescue StandardError => e
-          Sidekiq.logger.fatal "Manually processed work unit failed to be dequeued. #{e.message}."
+          logger.fatal "Manually processed work unit failed to be dequeued. #{e.message}."
           raise e
         end
 
@@ -59,21 +60,21 @@ module Sidekiq
           break if @__queue.size <= 0
 
           if Thread.current[Sidekiq::WebCustom::BREAK_BIT]
-            Sidekiq.logger.warn "Yikes -- Break bit has been set. Attempting to return in time. Completed #{count} of attempted #{max}"
+            logger.warn "Yikes -- Break bit has been set. Attempting to return in time. Completed #{count} of attempted #{max}"
             break
           end
 
-          Sidekiq.logger.info { "Manually processing next item in queue:[#{@__queue.name}]" }
+          logger.info { "Manually processing next item in queue:[#{@__queue.name}]" }
           process_one
           count += 1
-
         end
+
         count
       rescue Exception => ex
         if @job && @__basic_fetch
-          Sidekiq.logger.fatal "Processor Execution interrupted. Lost Job #{@job.job}"
+          logger.fatal "Processor Execution interrupted. Lost Job #{@job.job}"
         end
-        Sidekiq.logger.warn "Manual execution has terminated. Received error [#{ex.message}]"
+        logger.warn "Manual execution has terminated. Received error [#{ex.message}]"
         return count
       end
     end

data/lib/sidekiq/web_custom/version.rb

@@ -3,8 +3,8 @@
 module Sidekiq
   module WebCustom
     MAJOR = 0  # With backwards incompatability. Requires annoucment and update documentation
-    MINOR = 3  # With feature launch. Documentation of upgrade is useful via a changelog
-    PATCH = 1  # With minor upgrades or patcing a small bug. No changelog necessary
+    MINOR = 5  # With feature launch. Documentation of upgrade is useful via a changelog
+    PATCH = 0  # With minor upgrades or patcing a small bug. No changelog necessary
     VERSION = [MAJOR,MINOR,PATCH].join('.')
 
     def self.get_version

data/lib/sidekiq/web_custom/web_app.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require 'timeoutable'
+
 module Sidekiq
   module WebCustom
     class WebApp
@@ -15,7 +17,7 @@ module Sidekiq
             proc: ->(thread, seconds) { thread[Sidekiq::WebCustom::BREAK_BIT] = 1; Sidekiq.logger.warn "set bit #{thread[Sidekiq::WebCustom::BREAK_BIT]}" }
           }
           Thread.current[Sidekiq::WebCustom::BREAK_BIT] = nil
-          Sidekiq::WebCustom::Timeout.timeout(timeout_params) do
+          ::Timeoutable.timeout(**timeout_params) do
             Sidekiq::Queue.new(params[:name]).drain(max: Sidekiq::WebCustom.config.drain_rate)
           end
           redirect_with_query("#{root_path}queues")

data/lib/sidekiq/web_custom.rb

@@ -1,6 +1,5 @@
 # frozen_string_literal: true
 
-require 'byebug'
 require_relative 'web_custom/version'
 
 # require sidekiq/web first to ensure web_Action will prepend correctly
@@ -85,11 +84,10 @@ module Sidekiq
       @__already_called = true
       ::Sidekiq::WebAction.prepend WebAction
       ::Sidekiq::Queue.prepend Queue
-      ::Sidekiq::Job.prepend Job
+      ::Sidekiq::JobRecord.prepend Job
+
       ::Sidekiq::Web.register WebApp
     end
   end
 end
 
-# dependent the error classes loaded on boot, requie after code is loaded
-require 'sidekiq/web_custom/timeout'

data/sidekiq-web_custom.gemspec

@@ -16,7 +16,7 @@ Gem::Specification.new do |spec|
   DOC
   spec.homepage      = "https://github.com/matt-taylor/sidekiq-web_custom"
   spec.license       = "MIT"
-  spec.required_ruby_version = Gem::Requirement.new(">= 2.4.0")
+  spec.required_ruby_version = Gem::Requirement.new(">= 2.7")
 
   # spec.metadata["allowed_push_host"] = "Set to 'http://mygemserver.com'"
 
@@ -33,6 +33,6 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{\Aexe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_dependency 'sidekiq', '>= 6.0'
+  spec.add_dependency 'sidekiq', '~> 6.5'
   spec.add_dependency 'timeoutable', '>= 1.0'
 end

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: sidekiq-web_custom
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.5.0
 platform: ruby
 authors:
 - Matt Taylor
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-07-05 00:00:00.000000000 Z
+date: 2022-08-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sidekiq
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '6.5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '6.5'
 - !ruby/object:Gem::Dependency
   name: timeoutable
   requirement: !ruby/object:Gem::Requirement
@@ -120,7 +120,6 @@ files:
 - lib/sidekiq/web_custom/job.rb
 - lib/sidekiq/web_custom/processor.rb
 - lib/sidekiq/web_custom/queue.rb
-- lib/sidekiq/web_custom/timeout.rb
 - lib/sidekiq/web_custom/version.rb
 - lib/sidekiq/web_custom/web_action.rb
 - lib/sidekiq/web_custom/web_app.rb
@@ -140,14 +139,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.4.0
+      version: '2.7'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.15
+rubygems_version: 3.3.11
 signing_key: 
 specification_version: 4
 summary: This gem adds on custom capabilities to the Sidekiq Web UI

data/lib/sidekiq/web_custom/timeout.rb

@@ -1,64 +0,0 @@
-module Sidekiq
-  module WebCustom
-    module Timeout
-      module_function
-      DEFAULT_EXCEPTION = Sidekiq::WebCustom::ExecutionTimeExceeded
-      PROC = Proc.new do |warn_sec, timeout_sec, proc, exception, message, debug, &block|
-        puts "at: PROC; begining" if debug
-
-        sec_to_raise = timeout_sec - warn_sec
-        begin
-          from = debug ? "from #{caller_locations(1, 1)[0]}" : nil
-          x = Thread.current
-          # do everything in a new thread
-          y = Thread.start {
-            puts "at: PROC; second thread; about to start" if debug
-            Thread.current.name = from
-            # block for warning in new thread
-            begin
-              puts "at: PROC; second thread; starting warn time for #{warn_sec}'s " if debug
-              sleep warn_sec
-            rescue => e
-              x.raise e
-            else
-              # yield back during warning time so downstream can do some prep work
-              puts "at: PROC; second thread; trying to warn in main thread" if debug
-              proc.call(x, warn_sec)
-            end
-
-            # block additional seconds to raise for
-            begin
-              puts "at: PROC; second thread; starting violent exection time for #{sec_to_raise}'s " if debug
-              sleep sec_to_raise
-            rescue => e
-              puts "at: PROC; second thread; Error occured" if debug
-              x.raise e
-            else
-              puts "at: PROC; second thread; trying to raise in main thread" if debug
-              x.raise exception, message
-            end
-          }
-          puts "at: PROC; second thread; fully spooled" if debug
-          # after thread starts, yield back to calle function with max timout
-          block.call(timeout_sec)
-        ensure
-          if y
-            puts "at: PROC; Second thread still exists. Returned in time" if debug
-            y.kill
-            y.join
-          else
-            puts "at: PROC; Second thread no longer exists. Failed to return in time" if debug
-          end
-        end
-      end
-
-      def timeout(warn:, timeout:, proc: ->(_, _) {}, exception: DEFAULT_EXCEPTION, message: nil, debug: false, &block)
-        raise Sidekiq::WebCustom::ArgumentError, 'Block not given' unless block_given?
-
-        puts "at: timeout; valid bock given" if debug
-        message ||= "Execution exceeded #{timeout} seconds." if debug
-        PROC.call(warn, timeout, proc, exception, message, debug, &block)
-      end
-    end
-  end
-end