sidekiq-lock 0.6.0 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 94c0d6993d3e6f8c2acd6a63e2e78464ac974369138f6c20eeb91525d0b5ea13
-  data.tar.gz: 75437ca38c53bc825d0e6e77b8dc2ef64c5c42bb8802746f5fbacf1f91c9e4f5
+  metadata.gz: b9c3099623c0436cfe8cbd6eb0d3f56168ac0fda088b7167a0211ca4cba6e530
+  data.tar.gz: b5105d14dd29c9374b43a46cba4cfd6c576f086808051949bf4729c9163be05e
 SHA512:
-  metadata.gz: 463adf7d4dbf5d468a1c795105a716d94fd6f77141e7c7f3d77a84076e4e222cc2b6fb57f64d5286bca6fc8b9491c4de891190fb3d255f1766acd879253220d0
-  data.tar.gz: c215cce1d79e99aaa28a04a5238aac165a8e5d36271a372b39067a80040109e5f64117114fdbfae227c5cb406f86cd46e554cfa6820978573abd1f08b04ada6d
+  metadata.gz: 18898eaacf8fd60adeee2dce1e53e96bf517878856541220cbb472338dd7e4f531463917fb059b0767bb411834fe42f23aac535cb078f814de76de4bda8c3bfc
+  data.tar.gz: 07ee42bde63d54ef88ad56625167f781b259943967507fefe4769735377f12fd12dbf28985b3c0a4cf5d4a950a3162367bdcc78ce17f5ff346003c22ff38ecab

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+## 0.7.0 (Feb 7, 2024)
+
+- support for Sidekiq 7.2 (thanks for the issue report [9mm](https://github.com/9mm))
+- dropped support for Sidekiq 5 and older [as it reached EOL](https://github.com/sidekiq/sidekiq/wiki/Commercial-Support#version-policy)
+- removed `redis` as gem dependency (relying on sidekiq version you're using to choose the right one)
+
 ## 0.6.0 (May 27, 2023)
 
 - support for Sidekiq 7 (thanks to [@stympy](https://github.com/stympy))

data/LICENSE.txt

@@ -1,4 +1,4 @@
-Copyright (c) 2013 Rafal Wojsznis
+Copyright (c) 2024 Rafal Wojsznis
 
 MIT License
 

data/README.md

@@ -18,7 +18,7 @@ time - it provides a `lock` method that you can use in whatever way you want.
 
 This gem requires at least:
 - redis 2.6.12
-- redis-rb 3.0.5 (support for extended SET method)
+- sidekiq 6
 
 Add this line to your application's Gemfile:
 

data/lib/sidekiq/lock/redis_lock.rb

@@ -23,7 +23,11 @@ module Sidekiq
       # this also requires redis-rb >= 3.0.5
       def acquire!
         @acquired ||= Sidekiq.redis do |r|
-          r.set(name, value, nx: true, px: timeout)
+          if Sidekiq::VERSION >= '7.2'
+            r.set(name, value, 'nx', 'px', timeout)
+          else
+            r.set(name, value, nx: true, px: timeout)
+          end
         end
       end
 

data/lib/sidekiq/lock/version.rb

@@ -1,5 +1,5 @@
 module Sidekiq
   module Lock
-    VERSION = '0.6.0'
+    VERSION = '0.7.0'
   end
 end

data/test/lib/lock_test.rb

@@ -7,23 +7,24 @@ module Sidekiq
       skip 'Sidekiq 7+ does not print out middleware information' if Sidekiq::VERSION >= '7'
 
       cmd = 'sidekiq -r ./test/test_workers.rb -v'
-      buffer = ''
+      buffer_out = ''
 
       # very not fancy (https://78.media.tumblr.com/tumblr_lzkpw7DAl21qhy6c9o2_400.gif)
       # solution, but should do the job
       Open3.popen3(cmd) do |stdin, stdout, stderr, thread|
         begin
-          Timeout.timeout(5) do
+          Timeout.timeout(3) do
             until stdout.eof? do
-              buffer << stdout.read_nonblock(16)
+              buffer_out << stdout.read_nonblock(16)
             end
           end
+
         rescue Timeout::Error
           Process.kill('KILL', thread.pid)
         end
       end
 
-      assert_match(/\s?Middleware:.*Sidekiq::Lock::Middleware/i, buffer)
+      assert_match(/\s?Middleware:.*Sidekiq::Lock::Middleware/i, buffer_out)
     end
   end
 end

data/test/lib/middleware_test.rb

@@ -15,9 +15,8 @@ module Sidekiq
         reset_lock_variable!
       end
 
-      let(:handler) { Sidekiq::Lock::Middleware.new }
-
       it 'sets lock variable with provided static lock options' do
+        handler = Sidekiq::Lock::Middleware.new
         handler.call(LockWorker.new, { 'class' => LockWorker, 'args' => [] }, 'default') do
           true
         end
@@ -26,6 +25,7 @@ module Sidekiq
       end
 
       it 'sets lock variable with provided dynamic options' do
+        handler = Sidekiq::Lock::Middleware.new
         handler.call(DynamicLockWorker.new, { 'class' => DynamicLockWorker, 'args' => [1234, 1000] }, 'default') do
           true
         end
@@ -35,6 +35,7 @@ module Sidekiq
       end
 
       it 'sets nothing for workers without lock options' do
+        handler = Sidekiq::Lock::Middleware.new
         handler.call(RegularWorker.new, { 'class' => RegularWorker, 'args' => [] }, 'default') do
           true
         end

data/test/lib/worker_test.rb

@@ -3,8 +3,6 @@ require 'test_helper'
 module Sidekiq
   module Lock
     describe Worker do
-      # after {  }
-
       class CustomContainer
         def initialize
           @lock = nil
@@ -19,47 +17,38 @@ module Sidekiq
         end
       end
 
-      # it 'sets lock method that points to thread variable' do
-      #   set_lock_variable! "test"
-      #   assert_equal "test", LockWorker.new.lock
-      # end
-
       it 'allows method name configuration' do
-        begin
-          Sidekiq.lock_method = :custom_lock_name
+        Sidekiq.lock_method = :custom_lock_name
 
-          class WorkerWithCustomLockName
-            include Sidekiq::Worker
-            include Sidekiq::Lock::Worker
-          end
+        class WorkerWithCustomLockName
+          include Sidekiq::Worker
+          include Sidekiq::Lock::Worker
+        end
 
-          set_lock_variable! "custom_name"
+        set_lock_variable! "custom_name"
 
-          assert_equal "custom_name", WorkerWithCustomLockName.new.custom_lock_name
+        assert_equal "custom_name", WorkerWithCustomLockName.new.custom_lock_name
 
-          reset_lock_variable!
-        ensure
+        reset_lock_variable!
+      ensure
 
-          Sidekiq.lock_method = Sidekiq::Lock::METHOD_NAME
-        end
+        Sidekiq.lock_method = Sidekiq::Lock::METHOD_NAME
       end
 
       it 'allows container configuration' do
-        begin
-          container = CustomContainer.new
-          Sidekiq.lock_container = container
+        container = CustomContainer.new
+        Sidekiq.lock_container = container
 
-          class WorkerWithCustomContainer
-            include Sidekiq::Worker
-            include Sidekiq::Lock::Worker
-          end
+        class WorkerWithCustomContainer
+          include Sidekiq::Worker
+          include Sidekiq::Lock::Worker
+        end
 
-          container.store "lock-variable"
+        container.store "lock-variable"
 
-          assert_equal "lock-variable", WorkerWithCustomContainer.new.lock
-        ensure
-          Sidekiq.lock_container = Sidekiq::Lock::Container.new
-        end
+        assert_equal "lock-variable", WorkerWithCustomContainer.new.lock
+      ensure
+        Sidekiq.lock_container = Sidekiq::Lock::Container.new
       end
     end
   end

data/test/test_helper.rb

@@ -1,7 +1,5 @@
 require 'minitest/autorun'
-require 'minitest/pride'
-require 'mocha/setup'
-
+require 'mocha/minitest'
 require 'sidekiq'
 require 'test_workers'
 

data/test/test_workers.rb

@@ -1,3 +1,4 @@
+$LOAD_PATH.unshift(File.expand_path('../lib', __dir__))
 require 'sidekiq-lock'
 
 class LockWorker

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sidekiq-lock
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.7.0
 platform: ruby
 authors:
 - Rafal Wojsznis
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-05-27 00:00:00.000000000 Z
+date: 2024-02-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sidekiq
@@ -16,98 +16,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.14.0
+        version: '6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.14.0
-- !ruby/object:Gem::Dependency
-  name: redis
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 3.0.5
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 3.0.5
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: mocha
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.14.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.14.0
-- !ruby/object:Gem::Dependency
-  name: minitest
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: appraisal
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
+        version: '6'
 description: Simple redis-based lock mechanism for your sidekiq workers
 email:
 - rafal.wojsznis@gmail.com
@@ -154,7 +70,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.7
+rubygems_version: 3.4.10
 signing_key:
 specification_version: 4
 summary: Simple redis-based lock mechanism for your sidekiq workers