sidekiq-web_custom 0.4.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ba5e4d42e9ce8e83d27b2ff2a0ca2de8e42d1328f3aa5e8fc9c395d7bbb2dfdf
-  data.tar.gz: 67b5719e8efe439529a2966bdd555d7807785d20c416e745d32ed439bfa8d161
+  metadata.gz: 4b843dd9ee6f1e39c88bea10dacd981c943cce580ae2f8fefa699cc4f98a148c
+  data.tar.gz: 822d7ddf7bdff16b66ea2d0259355d98e9abb140e33d89043f2b3fb04aa8de50
 SHA512:
-  metadata.gz: 2e477f2deb50b291e55ad812a3d54a2c9b83b5d14b917641f5fe7663a7f8c95c57c9933f95e6bc1d6005fa5abb514018d374c47bc11b7762f9f8ca85d93101bd
-  data.tar.gz: 3a65411a4af069f947362e1854bdf05af826759a3fab9862cf32a8d5ff2e6a54984459badf0ff8d85dbc9f900f6fd0b1e8d35af887fb139c9d4c8b7c4552cb66
+  metadata.gz: 440af8e263e8e989282afa19601b296c11eb370304b37d4e8089c912c9990aae485412627e353132daa772090fc43c2ba62d2a377f8c8cfa265d9b3d31d97a49
+  data.tar.gz: 639231fad41d053fc900801985b1650c37c94eb0128e3b72a8825f1ef3c6e3092fabc2b2809f11db453c28e413e6ffbbfbbc7e31c2d0168dc14c8cb3f01c66da

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-byebug'
 gem "rake", "~> 13.0"
 gem "rspec", "~> 3.0"
 gem 'rspec_junit_formatter'

data/Gemfile.lock

@@ -1,8 +1,8 @@
 PATH
   remote: .
   specs:
-    sidekiq-web_custom (0.4.0)
-      sidekiq (>= 6.0)
+    sidekiq-web_custom (0.4.1)
+      sidekiq (~> 6.0)
       timeoutable (>= 1.0)
 
 GEM
@@ -69,6 +69,7 @@ GEM
       zeitwerk (~> 2.3)
     builder (3.2.4)
     byebug (11.1.3)
+    coderay (1.1.3)
     concurrent-ruby (1.1.9)
     connection_pool (2.2.5)
     crass (1.0.6)
@@ -91,6 +92,12 @@ GEM
     nio4r (2.5.7)
     nokogiri (1.11.7-x86_64-linux)
       racc (~> 1.4)
+    pry (0.13.1)
+      coderay (~> 1.1)
+      method_source (~> 1.0)
+    pry-byebug (3.9.0)
+      byebug (~> 11.0)
+      pry (~> 0.13.0)
     racc (1.5.2)
     rack (2.2.3)
     rack-test (1.1.0)
@@ -122,7 +129,7 @@ GEM
       rake (>= 0.8.7)
       thor (~> 1.0)
     rake (13.0.3)
-    redis (4.3.1)
+    redis (4.6.0)
     rspec (3.10.0)
       rspec-core (~> 3.10.0)
       rspec-expectations (~> 3.10.0)
@@ -138,7 +145,7 @@ GEM
     rspec-support (3.10.2)
     rspec_junit_formatter (0.4.1)
       rspec-core (>= 2, < 4, != 2.12.0)
-    sidekiq (6.2.1)
+    sidekiq (6.4.1)
       connection_pool (>= 2.2.2)
       rack (~> 2.0)
       redis (>= 4.2.0)
@@ -156,8 +163,8 @@ GEM
       activesupport (>= 4.0)
       sprockets (>= 3.0.0)
     thor (1.1.0)
-    timeout (0.1.1)
-    timeoutable (1.0.0)
+    timeout (0.2.0)
+    timeoutable (1.1.1)
       timeout
     tzinfo (2.0.4)
       concurrent-ruby (~> 1.0)
@@ -170,7 +177,7 @@ PLATFORMS
   x86_64-linux
 
 DEPENDENCIES
-  byebug
+  pry-byebug
   rails
   rake (~> 13.0)
   rspec (~> 3.0)

data/lib/sidekiq/web_custom/version.rb

@@ -4,7 +4,7 @@ module Sidekiq
   module WebCustom
     MAJOR = 0  # With backwards incompatability. Requires annoucment and update documentation
     MINOR = 4  # With feature launch. Documentation of upgrade is useful via a changelog
-    PATCH = 0  # With minor upgrades or patcing a small bug. No changelog necessary
+    PATCH = 1  # 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

@@ -84,11 +84,15 @@ module Sidekiq
       @__already_called = true
       ::Sidekiq::WebAction.prepend WebAction
       ::Sidekiq::Queue.prepend Queue
-      ::Sidekiq::Job.prepend Job
+
+      if ::Sidekiq::VERSION >= "6.4.0"
+        ::Sidekiq::JobRecord.prepend Job
+      else
+        ::Sidekiq::Job.prepend Job
+      end
+
       ::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

@@ -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.0'
   spec.add_dependency 'timeoutable', '>= 1.0'
 end

metadata

@@ -1,27 +1,27 @@
 --- !ruby/object:Gem::Specification
 name: sidekiq-web_custom
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors:
 - Matt Taylor
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-09-04 00:00:00.000000000 Z
+date: 2022-04-09 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'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '6.0'
 - !ruby/object:Gem::Dependency
@@ -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
@@ -147,7 +146,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.22
+rubygems_version: 3.2.32
 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