sidekiq-limit_fetch 4.1.0 → 4.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f4e35bb2ed507c01ab307ba39254c5d82ba6837d60a771c33e765f3a92ede831
-  data.tar.gz: 3883ea7ccd095c1f9f0f3ae3900d642500e14f146a74b37a9cffd48440e4e6ec
+  metadata.gz: 3dc3b9d874068db0c7968d4c566c69bbd7bf5e9f0ac5544bfc9e86d68accc268
+  data.tar.gz: 22391f58b07505932a24b618f5c2de5b82af533d210b764396b896867e497fe2
 SHA512:
-  metadata.gz: b1ae9ec40f0f303c352579478a75c7d85cf1fb77fa5f48f73bd2d44b35dd1d6e9daf1f88251108990408a1efc6077f3b250a571ff3d2806de9a72a2766d033b3
-  data.tar.gz: 9ace46d937a68560dc050fee75ebd4ce663f17bce4ea1be25825d568816282b8ce6059133786e8463fe48d3349baffb4c7a93e04613568367e9114672d23f314
+  metadata.gz: 98d0c2c185fe2fddc2ab80d4db40b6dff4e427693e4d8e4923b8b89db36a94927203aa261ed48df2a68877ffd850931252f741ce689c5755f5bed1ca7131e12e
+  data.tar.gz: f410a1484dcd488f18435111b1e5b497b5c1dc05ee7b6dd7813f8835396ef22a12dade7adab16263c7f6d2cf5f1591e7fabc05d390a59f901ef6de5c9a3d1d12

data/.github/workflows/ci.yml

@@ -14,8 +14,8 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ruby: ["2.6", "2.7", "3.0", "3.1", jruby-9.3]
-        appraisal: ['5.0', '5.1', '5.2', '6.0', '6.1', '6.2', '6.3', '6.4']
+        ruby: ["2.7", "3.0", "3.1"]
+        appraisal: ['6.0', '6.1', '6.2', '6.3', '6.4', '6.5', 'master']
     services:
       redis:
         image: redis

data/Appraisals

@@ -1,15 +1,3 @@
-appraise 'sidekiq-5.0' do
-  gem 'sidekiq', '~> 5.0.0'
-end
-
-appraise 'sidekiq-5.1' do
-  gem 'sidekiq', '~> 5.1.0'
-end
-
-appraise 'sidekiq-5.2' do
-  gem 'sidekiq', '~> 5.2.0'
-end
-
 appraise 'sidekiq-6.0' do
   gem 'sidekiq', '~> 6.0.0'
 end
@@ -30,6 +18,10 @@ appraise 'sidekiq-6.4' do
   gem 'sidekiq', '~> 6.4.0'
 end
 
+appraise 'sidekiq-6.5' do
+  gem 'sidekiq', '~> 6.5.0'
+end
+
 appraise 'sidekiq-master' do
   gem 'sidekiq', github: 'mperham/sidekiq'
 end

data/CHANGELOG.md

@@ -1,13 +1,19 @@
 # Changelog
 
-All notable changes to this project will be documented in this file.
+## [4.3.1] - 2022-08-23
 
-The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
-and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
+- #137 - Fix deprecation of passing timeout as positional argument to brpop from [@cgunther](https://github.com/cgunther)
 
-## [4.1.0] - 2022-03-29
+## [4.3.0] - 2022-08-16
+
+- #135 - Some extra fixes for Sidekiq 6.5 (fixes #128, #130, #131) from [@BobbyMcWho](https://github.com/BobbyMcWho)
+
+## [4.2.0] - 2022-06-09
 
-### Changed
+- #127 - Fix for Sidekiq 6.5 internal change vias PR #128 from [@evgeniradev][https://github.com/evgeniradev]
+- testing changes: stop supporting Sidekiq < 6, add tests for Sidekiq 6.5, stop testing on ruby 2.6 EOL
+
+## [4.1.0] - 2022-03-29
 
 - #101 - Fix stuck queues bug on Redis restart from [@907th](https://github.com/907th).
 
@@ -15,8 +21,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 This project was taken over by [@deanpcmad](https://github.com/deanpcmad)
 
-### Changed
-
 - #120 - Migrate CI to GitHub Actions from [@petergoldstein](https://github.com/petergoldstein).
 - #124 - Fixed redis v4.6.0 pipelines deprecation warning from [@iurev](https://github.com/iurev).
-- #83  - Processing dynamic queues from [@alexey-yanchenko](https://github.com/alexey-yanchenko).
+- #83  - Processing dynamic queues from [@alexey-yanchenko](https://github.com/alexey-yanchenko).

data/gemfiles/sidekiq_6.0.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ..
   specs:
-    sidekiq-limit_fetch (3.4.0)
+    sidekiq-limit_fetch (4.3.1)
       redis (>= 4.6.0)
       sidekiq (>= 4)
 
@@ -14,7 +14,7 @@ GEM
       thor (>= 0.14.0)
     connection_pool (2.2.5)
     diff-lcs (1.5.0)
-    rack (2.2.3)
+    rack (2.2.3.1)
     rack-protection (2.2.0)
       rack
     rake (13.0.6)
@@ -30,7 +30,7 @@ GEM
     rspec-expectations (3.11.0)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.11.0)
-    rspec-mocks (3.11.0)
+    rspec-mocks (3.11.1)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.11.0)
     rspec-support (3.11.0)
@@ -53,4 +53,4 @@ DEPENDENCIES
   sidekiq-limit_fetch!
 
 BUNDLED WITH
-   2.3.6
+   2.3.5

data/gemfiles/sidekiq_6.1.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ..
   specs:
-    sidekiq-limit_fetch (3.4.0)
+    sidekiq-limit_fetch (4.3.1)
       redis (>= 4.6.0)
       sidekiq (>= 4)
 
@@ -14,7 +14,7 @@ GEM
       thor (>= 0.14.0)
     connection_pool (2.2.5)
     diff-lcs (1.5.0)
-    rack (2.2.3)
+    rack (2.2.3.1)
     rake (13.0.6)
     redis (4.6.0)
     redis-namespace (1.8.2)
@@ -28,7 +28,7 @@ GEM
     rspec-expectations (3.11.0)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.11.0)
-    rspec-mocks (3.11.0)
+    rspec-mocks (3.11.1)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.11.0)
     rspec-support (3.11.0)
@@ -50,4 +50,4 @@ DEPENDENCIES
   sidekiq-limit_fetch!
 
 BUNDLED WITH
-   2.3.6
+   2.3.5

data/gemfiles/sidekiq_6.2.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ..
   specs:
-    sidekiq-limit_fetch (3.4.0)
+    sidekiq-limit_fetch (4.3.1)
       redis (>= 4.6.0)
       sidekiq (>= 4)
 
@@ -14,7 +14,7 @@ GEM
       thor (>= 0.14.0)
     connection_pool (2.2.5)
     diff-lcs (1.5.0)
-    rack (2.2.3)
+    rack (2.2.3.1)
     rake (13.0.6)
     redis (4.6.0)
     redis-namespace (1.8.2)
@@ -28,11 +28,11 @@ GEM
     rspec-expectations (3.11.0)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.11.0)
-    rspec-mocks (3.11.0)
+    rspec-mocks (3.11.1)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.11.0)
     rspec-support (3.11.0)
-    sidekiq (6.2.1)
+    sidekiq (6.2.2)
       connection_pool (>= 2.2.2)
       rack (~> 2.0)
       redis (>= 4.2.0)
@@ -50,4 +50,4 @@ DEPENDENCIES
   sidekiq-limit_fetch!
 
 BUNDLED WITH
-   2.3.6
+   2.3.5

data/gemfiles/sidekiq_6.3.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ..
   specs:
-    sidekiq-limit_fetch (3.4.0)
+    sidekiq-limit_fetch (4.3.1)
       redis (>= 4.6.0)
       sidekiq (>= 4)
 
@@ -14,7 +14,7 @@ GEM
       thor (>= 0.14.0)
     connection_pool (2.2.5)
     diff-lcs (1.5.0)
-    rack (2.2.3)
+    rack (2.2.3.1)
     rake (13.0.6)
     redis (4.6.0)
     redis-namespace (1.8.2)
@@ -28,7 +28,7 @@ GEM
     rspec-expectations (3.11.0)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.11.0)
-    rspec-mocks (3.11.0)
+    rspec-mocks (3.11.1)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.11.0)
     rspec-support (3.11.0)
@@ -50,4 +50,4 @@ DEPENDENCIES
   sidekiq-limit_fetch!
 
 BUNDLED WITH
-   2.3.6
+   2.3.5

data/gemfiles/sidekiq_6.4.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ..
   specs:
-    sidekiq-limit_fetch (3.4.0)
+    sidekiq-limit_fetch (4.3.1)
       redis (>= 4.6.0)
       sidekiq (>= 4)
 
@@ -14,7 +14,7 @@ GEM
       thor (>= 0.14.0)
     connection_pool (2.2.5)
     diff-lcs (1.5.0)
-    rack (2.2.3)
+    rack (2.2.3.1)
     rake (13.0.6)
     redis (4.6.0)
     redis-namespace (1.8.2)
@@ -28,11 +28,11 @@ GEM
     rspec-expectations (3.11.0)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.11.0)
-    rspec-mocks (3.11.0)
+    rspec-mocks (3.11.1)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.11.0)
     rspec-support (3.11.0)
-    sidekiq (6.4.1)
+    sidekiq (6.4.2)
       connection_pool (>= 2.2.2)
       rack (~> 2.0)
       redis (>= 4.2.0)
@@ -50,4 +50,4 @@ DEPENDENCIES
   sidekiq-limit_fetch!
 
 BUNDLED WITH
-   2.3.6
+   2.3.5

data/gemfiles/{sidekiq_5.0.gemfile → sidekiq_6.5.gemfile}

@@ -2,6 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "sidekiq", "~> 5.0.0"
+gem "sidekiq", "~> 6.5.0"
 
 gemspec path: "../"

data/gemfiles/{sidekiq_5.2.gemfile.lock → sidekiq_6.5.gemfile.lock}

@@ -1,7 +1,7 @@
 PATH
   remote: ..
   specs:
-    sidekiq-limit_fetch (3.4.0)
+    sidekiq-limit_fetch (4.3.1)
       redis (>= 4.6.0)
       sidekiq (>= 4)
 
@@ -14,9 +14,7 @@ GEM
       thor (>= 0.14.0)
     connection_pool (2.2.5)
     diff-lcs (1.5.0)
-    rack (2.0.9)
-    rack-protection (2.2.0)
-      rack
+    rack (2.2.3.1)
     rake (13.0.6)
     redis (4.6.0)
     redis-namespace (1.8.2)
@@ -30,15 +28,14 @@ GEM
     rspec-expectations (3.11.0)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.11.0)
-    rspec-mocks (3.11.0)
+    rspec-mocks (3.11.1)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.11.0)
     rspec-support (3.11.0)
-    sidekiq (5.2.8)
-      connection_pool (~> 2.2, >= 2.2.2)
-      rack (< 2.1.0)
-      rack-protection (>= 1.5.0)
-      redis (>= 3.3.5, < 5)
+    sidekiq (6.5.0)
+      connection_pool (>= 2.2.2)
+      rack (~> 2.0)
+      redis (>= 4.2.0)
     thor (1.2.1)
 
 PLATFORMS
@@ -49,8 +46,8 @@ DEPENDENCIES
   rake
   redis-namespace (~> 1.5, >= 1.5.2)
   rspec
-  sidekiq (~> 5.2.0)
+  sidekiq (~> 6.5.0)
   sidekiq-limit_fetch!
 
 BUNDLED WITH
-   2.3.6
+   2.3.5

data/gemfiles/sidekiq_master.gemfile.lock

@@ -1,8 +1,8 @@
 GIT
   remote: https://github.com/mperham/sidekiq.git
-  revision: cf7b067c89ae3b1303e35d29408099cf40991f6d
+  revision: 277ea1888f25917e9dde8d00bdb866f86a55691f
   specs:
-    sidekiq (6.4.2)
+    sidekiq (6.5.0)
       connection_pool (>= 2.2.2)
       rack (~> 2.0)
       redis (>= 4.2.0)
@@ -10,7 +10,7 @@ GIT
 PATH
   remote: ..
   specs:
-    sidekiq-limit_fetch (3.4.0)
+    sidekiq-limit_fetch (4.3.1)
       redis (>= 4.6.0)
       sidekiq (>= 4)
 
@@ -23,7 +23,7 @@ GEM
       thor (>= 0.14.0)
     connection_pool (2.2.5)
     diff-lcs (1.5.0)
-    rack (2.2.3)
+    rack (2.2.3.1)
     rake (13.0.6)
     redis (4.6.0)
     redis-namespace (1.8.2)
@@ -37,7 +37,7 @@ GEM
     rspec-expectations (3.11.0)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.11.0)
-    rspec-mocks (3.11.0)
+    rspec-mocks (3.11.1)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.11.0)
     rspec-support (3.11.0)
@@ -55,4 +55,4 @@ DEPENDENCIES
   sidekiq-limit_fetch!
 
 BUNDLED WITH
-   2.3.6
+   2.3.5

data/lib/sidekiq/extensions/manager.rb

@@ -6,7 +6,8 @@ class Sidekiq::Manager
     end
 
     def start
-      Sidekiq::LimitFetch::Queues.start options
+      # In sidekiq 6.5.0 the variable @options has been renamed to @config
+      Sidekiq::LimitFetch::Queues.start @options || @config
       Sidekiq::LimitFetch::Global::Monitor.start!
       super
     end

data/lib/sidekiq/limit_fetch/unit_of_work.rb

@@ -1,7 +1,11 @@
 module Sidekiq
   class LimitFetch::UnitOfWork < BasicFetch::UnitOfWork
     def initialize(queue, job)
-      super
+      if post_6_5?
+        super(queue, job, Sidekiq)
+      else
+        super
+      end
       redis_retryable { Queue[queue_name].increase_busy }
     end
 
@@ -17,6 +21,10 @@ module Sidekiq
 
     private
 
+    def post_6_5?
+      Gem::Version.new(Sidekiq::VERSION) >= Gem::Version.new('6.5.0')
+    end
+
     def redis_retryable(&block)
       Sidekiq::LimitFetch.redis_retryable(&block)
     end

data/lib/sidekiq/limit_fetch.rb

@@ -28,13 +28,18 @@ module Sidekiq::LimitFetch
     UnitOfWork.new(queue, job) if job
   end
 
+  def config
+    # Post 6.5, Sidekiq.options is deprecated and replaced with passing Sidekiq directly
+    post_6_5? ? Sidekiq : Sidekiq.options
+  end
+
   # Backwards compatibility for sidekiq v6.1.0
   # @see https://github.com/mperham/sidekiq/pull/4602
   def bulk_requeue(*args)
     if Sidekiq::BasicFetch.respond_to?(:bulk_requeue) # < 6.1.0
       Sidekiq::BasicFetch.bulk_requeue(*args)
     else # 6.1.0+
-      Sidekiq::BasicFetch.new(Sidekiq.options).bulk_requeue(*args)
+      Sidekiq::BasicFetch.new(config).bulk_requeue(*args)
     end
   end
 
@@ -56,12 +61,16 @@ module Sidekiq::LimitFetch
 
   private
 
+  def post_6_5?
+    @post_6_5 ||= Gem::Version.new(Sidekiq::VERSION) >= Gem::Version.new('6.5.0')
+  end
+
   def redis_brpop(queues)
     if queues.empty?
       sleep TIMEOUT  # there are no queues to handle, so lets sleep
       []             # and return nothing
     else
-      redis_retryable { Sidekiq.redis { |it| it.brpop *queues, TIMEOUT } }
+      redis_retryable { Sidekiq.redis { |it| it.brpop *queues, timeout: TIMEOUT } }
     end
   end
 end

data/sidekiq-limit_fetch.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |gem|
   gem.name          = 'sidekiq-limit_fetch'
-  gem.version       = '4.1.0'
+  gem.version       = '4.3.1'
   gem.license       = 'MIT'
   gem.authors       = ['Dean Perry', 'brainopia']
   gem.email         = 'dean@deanpcmad.com'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sidekiq-limit_fetch
 version: !ruby/object:Gem::Version
-  version: 4.1.0
+  version: 4.3.1
 platform: ruby
 authors:
 - Dean Perry
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-03-29 00:00:00.000000000 Z
+date: 2022-08-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sidekiq
@@ -130,12 +130,6 @@ files:
 - demo/config/boot.rb
 - demo/config/environment.rb
 - demo/config/environments/development.rb
-- gemfiles/sidekiq_5.0.gemfile
-- gemfiles/sidekiq_5.0.gemfile.lock
-- gemfiles/sidekiq_5.1.gemfile
-- gemfiles/sidekiq_5.1.gemfile.lock
-- gemfiles/sidekiq_5.2.gemfile
-- gemfiles/sidekiq_5.2.gemfile.lock
 - gemfiles/sidekiq_6.0.gemfile
 - gemfiles/sidekiq_6.0.gemfile.lock
 - gemfiles/sidekiq_6.1.gemfile
@@ -146,6 +140,8 @@ files:
 - gemfiles/sidekiq_6.3.gemfile.lock
 - gemfiles/sidekiq_6.4.gemfile
 - gemfiles/sidekiq_6.4.gemfile.lock
+- gemfiles/sidekiq_6.5.gemfile
+- gemfiles/sidekiq_6.5.gemfile.lock
 - gemfiles/sidekiq_master.gemfile
 - gemfiles/sidekiq_master.gemfile.lock
 - lib/sidekiq-limit_fetch.rb
@@ -187,7 +183,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.22
+rubygems_version: 3.3.7
 signing_key: 
 specification_version: 4
 summary: Sidekiq strategy to support queue limits

data/gemfiles/sidekiq_5.0.gemfile.lock

@@ -1,57 +0,0 @@
-PATH
-  remote: ..
-  specs:
-    sidekiq-limit_fetch (3.4.0)
-      redis (>= 4.6.0)
-      sidekiq (>= 4)
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    appraisal (2.4.1)
-      bundler
-      rake
-      thor (>= 0.14.0)
-    concurrent-ruby (1.1.10)
-    connection_pool (2.2.5)
-    diff-lcs (1.5.0)
-    rack (2.2.3)
-    rack-protection (2.2.0)
-      rack
-    rake (13.0.6)
-    redis (4.6.0)
-    redis-namespace (1.8.2)
-      redis (>= 3.0.4)
-    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.11.0)
-    rspec-mocks (3.11.0)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.11.0)
-    rspec-support (3.11.0)
-    sidekiq (5.0.5)
-      concurrent-ruby (~> 1.0)
-      connection_pool (~> 2.2, >= 2.2.0)
-      rack-protection (>= 1.5.0)
-      redis (>= 3.3.4, < 5)
-    thor (1.2.1)
-
-PLATFORMS
-  x86_64-linux
-
-DEPENDENCIES
-  appraisal
-  rake
-  redis-namespace (~> 1.5, >= 1.5.2)
-  rspec
-  sidekiq (~> 5.0.0)
-  sidekiq-limit_fetch!
-
-BUNDLED WITH
-   2.3.6

data/gemfiles/sidekiq_5.1.gemfile

@@ -1,7 +0,0 @@
-# This file was generated by Appraisal
-
-source "https://rubygems.org"
-
-gem "sidekiq", "~> 5.1.0"
-
-gemspec path: "../"

data/gemfiles/sidekiq_5.1.gemfile.lock

@@ -1,57 +0,0 @@
-PATH
-  remote: ..
-  specs:
-    sidekiq-limit_fetch (3.4.0)
-      redis (>= 4.6.0)
-      sidekiq (>= 4)
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    appraisal (2.4.1)
-      bundler
-      rake
-      thor (>= 0.14.0)
-    concurrent-ruby (1.1.10)
-    connection_pool (2.2.5)
-    diff-lcs (1.5.0)
-    rack (2.2.3)
-    rack-protection (2.2.0)
-      rack
-    rake (13.0.6)
-    redis (4.6.0)
-    redis-namespace (1.8.2)
-      redis (>= 3.0.4)
-    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.11.0)
-    rspec-mocks (3.11.0)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.11.0)
-    rspec-support (3.11.0)
-    sidekiq (5.1.3)
-      concurrent-ruby (~> 1.0)
-      connection_pool (~> 2.2, >= 2.2.0)
-      rack-protection (>= 1.5.0)
-      redis (>= 3.3.5, < 5)
-    thor (1.2.1)
-
-PLATFORMS
-  x86_64-linux
-
-DEPENDENCIES
-  appraisal
-  rake
-  redis-namespace (~> 1.5, >= 1.5.2)
-  rspec
-  sidekiq (~> 5.1.0)
-  sidekiq-limit_fetch!
-
-BUNDLED WITH
-   2.3.6

data/gemfiles/sidekiq_5.2.gemfile

@@ -1,7 +0,0 @@
-# This file was generated by Appraisal
-
-source "https://rubygems.org"
-
-gem "sidekiq", "~> 5.2.0"
-
-gemspec path: "../"