sidekiq-throttled 0.16.2 → 0.18.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8f13258e6221758892919e37d8d233b33b52f46d3e6ae4f61700f009f1bb0553
-  data.tar.gz: a50132e8af4521c5c2d4f8edc3bcdc8d823160bd7c7ad2980bce6c4b10a29087
+  metadata.gz: 9709e5805bd1bf11ef204afb08a988a4c5998e16ecf8a7a0b8e0c1b4b753ce4d
+  data.tar.gz: 21b5bdd50945f807e11884a18449be0155cb8bdf2b6ee37b633148b198db615d
 SHA512:
-  metadata.gz: 5cb7186478fa6eced7c69086aee8b7ba626b504db5d2b594bd416a3ce24254d9670047216c92290cc023c578c8cb83ab4cce952f6dc568055ca00a7707b8ef27
-  data.tar.gz: 44d7b64362ef7fd1fbf97e588c3048f249610f6613d3517ad3aa8a78f31447c93dd52ee2fa9fde84f84dc602620c1fa78081e29d96e78c43f327527f683ac953
+  metadata.gz: 613164a091883655c4bd879b3dab25198ffc88e49eb7f1e1b0bab33eb2a7eb004b2f6d407e65ccfea52727e347f1b5d8c05015117b5da8500a2a933228044ef4
+  data.tar.gz: 9b2dde3fd9ecdf25301597bd86609f531f7a8b5d8a90833f7f0d42399501a3d49252fa78af3cc576007cdf8b7025b86223c1a9d1391ab9069c6277220adb7524

data/.github/workflows/ci.yml

@@ -14,7 +14,7 @@ jobs:
       fail-fast: false
       matrix:
         ruby: [ "2.7", "3.0", "3.1" ]
-        sidekiq: [ "6.0", "6.1", "6.2", "6.3", "6.4", "6.5" ]
+        sidekiq: [ "6.4", "6.5" ]
 
     runs-on: ubuntu-latest
 

data/.travis.yml

@@ -33,7 +33,5 @@ matrix:
       gemfile: Gemfile
 
 gemfile:
-  - gemfiles/sidekiq_5.0.gemfile
-  - gemfiles/sidekiq_5.1.gemfile
-  - gemfiles/sidekiq_5.2.gemfile
-  - gemfiles/sidekiq_6.0.gemfile
+  - gemfiles/sidekiq_6.4.gemfile
+  - gemfiles/sidekiq_6.5.gemfile

data/Appraisals

@@ -1,21 +1,5 @@
 # frozen_string_literal: true
 
-appraise "sidekiq-6.0" do
-  gem "sidekiq", "~> 6.0.0"
-end
-
-appraise "sidekiq-6.1" do
-  gem "sidekiq", "~> 6.1.0"
-end
-
-appraise "sidekiq-6.2" do
-  gem "sidekiq", "~> 6.2.0"
-end
-
-appraise "sidekiq-6.3" do
-  gem "sidekiq", "~> 6.3.0"
-end
-
 appraise "sidekiq-6.4" do
   gem "sidekiq", "~> 6.4.0"
 end

data/CHANGES.md

@@ -1,3 +1,21 @@
+## 0.18.0 (2023-04-10)
+
+* Fix redis-prescription dependency usage
+
+## 0.17.0 (2022-09-14)
+
+* [#13](https://github.com/ixti/sidekiq-throttled/pull/13)
+  Fix redis-4.8+ deprecation warnings
+
+* [#8](https://github.com/ixti/sidekiq-throttled/pull/8)
+  Drop Sidekiq < 6.4 support
+
+## 0.16.2 (2022-07-19)
+
+* [#5](https://github.com/ixti/sidekiq-throttled/issues/5)
+  [#6](https://github.com/ixti/sidekiq-throttled/pull/6)
+  Add Sidekiq 6.5+ support
+
 ## 0.16.1 (2022-06-14)
 
 * [#2](https://github.com/ixti/sidekiq-throttled/pull/2)

data/README.md

@@ -266,10 +266,6 @@ dropped.
 
 This library aims to support work with following [Sidekiq][sidekiq] versions:
 
-* Sidekiq 6.0.x
-* Sidekiq 6.1.x
-* Sidekiq 6.2.x
-* Sidekiq 6.3.x
 * Sidekiq 6.4.x
 * Sidekiq 6.5.x
 

data/lib/sidekiq/throttled/fetch.rb

@@ -12,33 +12,6 @@ module Sidekiq
     #
     # @private
     class Fetch
-      module BulkRequeue
-        # Requeues all given units as a single operation.
-        #
-        # @see http://www.rubydoc.info/github/redis/redis-rb/master/Redis#pipelined-instance_method
-        # @param [Array<Fetch::UnitOfWork>] units
-        # @return [void]
-        def bulk_requeue(units, _options)
-          return if units.empty?
-
-          Sidekiq.logger.debug { "Re-queueing terminated jobs" }
-          Sidekiq.redis do |conn|
-            conn.pipelined do |pipeline|
-              units.each { |unit| unit.requeue(pipeline) }
-            end
-          end
-          Sidekiq.logger.info("Pushed #{units.size} jobs back to Redis")
-        rescue => e
-          Sidekiq.logger.warn("Failed to requeue #{units.size} jobs: #{e}")
-        end
-      end
-
-      # https://github.com/mperham/sidekiq/commit/fce05c9d4b4c0411c982078a4cf3a63f20f739bc
-      if Gem::Version.new(Sidekiq::VERSION) < Gem::Version.new("6.1.0")
-        extend BulkRequeue
-      else
-        include BulkRequeue
-      end
       # Timeout to sleep between fetch retries in case of no job received,
       # as well as timeout to wait for redis to give us something to work.
       TIMEOUT = 2
@@ -77,6 +50,20 @@ module Sidekiq
         nil
       end
 
+      def bulk_requeue(units, _options)
+        return if units.empty?
+
+        Sidekiq.logger.debug { "Re-queueing terminated jobs" }
+        Sidekiq.redis do |conn|
+          conn.pipelined do |pipeline|
+            units.each { |unit| unit.requeue(pipeline) }
+          end
+        end
+        Sidekiq.logger.info("Pushed #{units.size} jobs back to Redis")
+      rescue => e
+        Sidekiq.logger.warn("Failed to requeue #{units.size} jobs: #{e}")
+      end
+
       private
 
       # Tries to pop pair of `queue` and job `message` out of sidekiq queues.
@@ -91,7 +78,7 @@ module Sidekiq
           return
         end
 
-        Sidekiq.redis { |conn| conn.brpop(*queues, TIMEOUT) }
+        Sidekiq.redis { |conn| conn.brpop(*queues, :timeout => TIMEOUT) }
       end
 
       # Returns list of queues to try to fetch jobs from.

data/lib/sidekiq/throttled/strategy/concurrency.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require "redis/prescription"
+require "redis_prescription"
 
 require "sidekiq/throttled/strategy/base"
 
@@ -20,7 +20,7 @@ module Sidekiq
         #       PUSH(@key, @jid)
         #       return 0
         #     end
-        SCRIPT = Redis::Prescription.read "#{__dir__}/concurrency.lua"
+        SCRIPT = RedisPrescription.new(File.read("#{__dir__}/concurrency.lua"))
         private_constant :SCRIPT
 
         # @param [#to_s] strategy_key
@@ -50,7 +50,7 @@ module Sidekiq
           argv = [jid.to_s, job_limit, @ttl, Time.now.to_f]
 
           Sidekiq.redis do |redis|
-            1 == SCRIPT.eval(redis, :keys => keys, :argv => argv)
+            1 == SCRIPT.call(redis, :keys => keys, :argv => argv)
           end
         end
 

data/lib/sidekiq/throttled/strategy/threshold.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require "redis/prescription"
+require "redis_prescription"
 
 require "sidekiq/throttled/strategy/base"
 
@@ -30,7 +30,7 @@ module Sidekiq
         #
         #     increase!
         #     return 0
-        SCRIPT = Redis::Prescription.read "#{__dir__}/threshold.lua"
+        SCRIPT = RedisPrescription.new(File.read("#{__dir__}/threshold.lua"))
         private_constant :SCRIPT
 
         # @param [#to_s] strategy_key
@@ -67,7 +67,7 @@ module Sidekiq
           argv = [job_limit, period(job_args), Time.now.to_f]
 
           Sidekiq.redis do |redis|
-            1 == SCRIPT.eval(redis, :keys => keys, :argv => argv)
+            1 == SCRIPT.call(redis, :keys => keys, :argv => argv)
           end
         end
 

data/lib/sidekiq/throttled/version.rb

@@ -3,6 +3,6 @@
 module Sidekiq
   module Throttled
     # Gem version
-    VERSION = "0.16.2"
+    VERSION = "0.18.0"
   end
 end

data/lib/sidekiq/throttled.rb

@@ -97,18 +97,10 @@ module Sidekiq
       def setup_strategy!(sidekiq_config)
         require "sidekiq/throttled/fetch"
 
-        sidekiq_version = Gem::Version.new(Sidekiq::VERSION)
-
         # https://github.com/mperham/sidekiq/commit/67daa7a408b214d593100f782271ed108686c147
-        sidekiq_config = sidekiq_config.options if sidekiq_version < Gem::Version.new("6.5.0")
-
-        # https://github.com/mperham/sidekiq/commit/fce05c9d4b4c0411c982078a4cf3a63f20f739bc
-        sidekiq_config[:fetch] =
-          if Gem::Version.new(Sidekiq::VERSION) < Gem::Version.new("6.1.0")
-            Sidekiq::Throttled::Fetch
-          else
-            Sidekiq::Throttled::Fetch.new(sidekiq_config)
-          end
+        sidekiq_config = sidekiq_config.options if Gem::Version.new(Sidekiq::VERSION) < Gem::Version.new("6.5.0")
+
+        sidekiq_config[:fetch] = Sidekiq::Throttled::Fetch.new(sidekiq_config)
       end
 
       # Tries to preload constant by it's name once.

data/sidekiq-throttled.gemspec

@@ -29,8 +29,8 @@ Gem::Specification.new do |spec|
   spec.required_ruby_version = ">= 2.7"
 
   spec.add_runtime_dependency "concurrent-ruby"
-  spec.add_runtime_dependency "redis-prescription"
-  spec.add_runtime_dependency "sidekiq"
+  spec.add_runtime_dependency "redis-prescription", "~> 2.2"
+  spec.add_runtime_dependency "sidekiq", "~> 6.4"
 
   spec.add_development_dependency "bundler", ">= 2.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sidekiq-throttled
 version: !ruby/object:Gem::Version
-  version: 0.16.2
+  version: 0.18.0
 platform: ruby
 authors:
 - Alexey Zapparov
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-07-19 00:00:00.000000000 Z
+date: 2023-04-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby
@@ -28,30 +28,30 @@ dependencies:
   name: redis-prescription
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.2'
 - !ruby/object:Gem::Dependency
   name: sidekiq
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '6.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '6.4'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -89,10 +89,6 @@ files:
 - LICENSE.md
 - README.md
 - Rakefile
-- gemfiles/sidekiq_6.0.gemfile
-- gemfiles/sidekiq_6.1.gemfile
-- gemfiles/sidekiq_6.2.gemfile
-- gemfiles/sidekiq_6.3.gemfile
 - gemfiles/sidekiq_6.4.gemfile
 - gemfiles/sidekiq_6.5.gemfile
 - lib/sidekiq/throttled.rb
@@ -155,7 +151,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
+rubygems_version: 3.3.26
 signing_key:
 specification_version: 4
 summary: Concurrency and threshold throttling for Sidekiq.

data/gemfiles/sidekiq_6.0.gemfile

@@ -1,33 +0,0 @@
-# This file was generated by Appraisal
-
-source "https://rubygems.org"
-
-gem "appraisal"
-gem "rake"
-gem "rspec"
-gem "sidekiq", "~> 6.0.0"
-
-group :development do
-  gem "byebug"
-  gem "guard", require: false
-  gem "guard-rspec", require: false
-  gem "guard-rubocop", require: false
-end
-
-group :test do
-  gem "apparition"
-  gem "capybara"
-  gem "puma"
-  gem "rack-test"
-  gem "sinatra"
-  gem "timecop"
-end
-
-group :lint do
-  gem "rubocop", require: false
-  gem "rubocop-performance", require: false
-  gem "rubocop-rake", require: false
-  gem "rubocop-rspec", require: false
-end
-
-gemspec path: "../"

data/gemfiles/sidekiq_6.1.gemfile

@@ -1,33 +0,0 @@
-# This file was generated by Appraisal
-
-source "https://rubygems.org"
-
-gem "appraisal"
-gem "rake"
-gem "rspec"
-gem "sidekiq", "~> 6.1.0"
-
-group :development do
-  gem "byebug"
-  gem "guard", require: false
-  gem "guard-rspec", require: false
-  gem "guard-rubocop", require: false
-end
-
-group :test do
-  gem "apparition"
-  gem "capybara"
-  gem "puma"
-  gem "rack-test"
-  gem "sinatra"
-  gem "timecop"
-end
-
-group :lint do
-  gem "rubocop", require: false
-  gem "rubocop-performance", require: false
-  gem "rubocop-rake", require: false
-  gem "rubocop-rspec", require: false
-end
-
-gemspec path: "../"

data/gemfiles/sidekiq_6.2.gemfile

@@ -1,33 +0,0 @@
-# This file was generated by Appraisal
-
-source "https://rubygems.org"
-
-gem "appraisal"
-gem "rake"
-gem "rspec"
-gem "sidekiq", "~> 6.2.0"
-
-group :development do
-  gem "byebug"
-  gem "guard", require: false
-  gem "guard-rspec", require: false
-  gem "guard-rubocop", require: false
-end
-
-group :test do
-  gem "apparition"
-  gem "capybara"
-  gem "puma"
-  gem "rack-test"
-  gem "sinatra"
-  gem "timecop"
-end
-
-group :lint do
-  gem "rubocop", require: false
-  gem "rubocop-performance", require: false
-  gem "rubocop-rake", require: false
-  gem "rubocop-rspec", require: false
-end
-
-gemspec path: "../"

data/gemfiles/sidekiq_6.3.gemfile

@@ -1,33 +0,0 @@
-# This file was generated by Appraisal
-
-source "https://rubygems.org"
-
-gem "appraisal"
-gem "rake"
-gem "rspec"
-gem "sidekiq", "~> 6.3.0"
-
-group :development do
-  gem "byebug"
-  gem "guard", require: false
-  gem "guard-rspec", require: false
-  gem "guard-rubocop", require: false
-end
-
-group :test do
-  gem "apparition"
-  gem "capybara"
-  gem "puma"
-  gem "rack-test"
-  gem "sinatra"
-  gem "timecop"
-end
-
-group :lint do
-  gem "rubocop", require: false
-  gem "rubocop-performance", require: false
-  gem "rubocop-rake", require: false
-  gem "rubocop-rspec", require: false
-end
-
-gemspec path: "../"