resque-retry 1.7.6 → 1.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bcd42f2b0761226dd2cfa5f9c9d4ff336cda1be0f6acf972ae15cd553f88fa0b
-  data.tar.gz: d65b4261a3ff1068f9880739ea1f4647c10be957511840203331f714cb8281dc
+  metadata.gz: e59965fb9d40a6d3f680291e5cbdec8edf04946ad50749175e984062a52e9d1c
+  data.tar.gz: c7962de9928657b3b4b2745efbb5e403a512f44a1b0cd5db5701aee87302dffa
 SHA512:
-  metadata.gz: 78c8fccf7a670f1fc0246d7e8862941eae3fb2bda8ea4d11fb1bea2a5890ed1867f50ff9389a752f3383bf5383783b32e3f63c5ef623909a28aaeba62f4576a2
-  data.tar.gz: 8e3e0ed80d154282e6dddd85b8b7b95b22949d580ad6c0c7a0fc9c3a16475dca861320f919db0f2ddf6b8dca78e8bdd846a48b86db6a5761848d6d4fcb7012a4
+  metadata.gz: 41c214710cdfb36737e8ed9cc598f625df4020e29a056f235fd8aa636cec7f2e220f63afbfa29090b944444cee0f938b66d676b23496671b65f7f1051f08b8e4
+  data.tar.gz: c78705b7a1a87c9b92c8eb6c9b72070dfb51f52dcab7b3cdc55e2a0a89940f34a1ef98255f11986a43011c6a56abeeee0d2f96493b41ee921ad90dab178ce76b

data/.github/workflows/ci.yml

@@ -10,7 +10,7 @@ jobs:
           - 6379:6379
     strategy:
       matrix:
-        ruby-version: [2.7, 2.6]
+        ruby-version: ['3.1', '3.0', '2.7']
 
     steps:
       - uses: actions/checkout@v2

data/HISTORY.md

@@ -1,3 +1,14 @@
+# 1.8.0 (2023-04-15)
+
+* Address `retry_key_exists?` issue that was originally reported /
+  partially addressed here:
+  https://github.com/lantins/resque-retry/pull/173
+* Fix test-failures due to API / interface changes for dependencies
+* Remove `ruby@2.6` from the test[ing] matrix as it has been EOL for
+  quite some time at this point (as of this PR `ruby@2.7` is also EOL,
+  but I left this in for the time being)
+* Add `ruby@3.1` to the test[ing] matrix
+
 # 1.7.6 (2021-08-06)
 
 * Fix Redis 4.3 breaking saving job failures with multiple failure backend

data/lib/resque/failure/multiple_with_retry_suppression.rb

@@ -149,11 +149,7 @@ module Resque
       private
 
       def redis_key_exists?(key)
-        if Resque.redis.respond_to?(:exists?)
-          Resque.redis.exists?(key)
-        else
-          ![false, 0].include?(Resque.redis.exists(key) || false)
-        end
+        ![false, 0].include?(Resque.redis.exists(key) || false)
       end
     end
   end

data/lib/resque-retry/version.rb

@@ -1,3 +1,3 @@
 module ResqueRetry
-  VERSION = '1.7.6'
+  VERSION = '1.8.0'
 end

data/resque-retry.gemspec

@@ -29,13 +29,13 @@ Gem::Specification.new do |s|
   s.require_paths = %w[lib]
 
   s.add_dependency('resque', '>= 1.25', '< 3.0')
-  s.add_dependency('resque-scheduler', '~> 4.0')
+  s.add_dependency('resque-scheduler', '>= 4.0', '<6.0')
 
   s.add_development_dependency('rake', '~> 10.3')
   s.add_development_dependency('minitest', '~> 5.5')
   s.add_development_dependency('rack-test', '~> 0.6')
   s.add_development_dependency('yard', '~> 0.8')
-  s.add_development_dependency('json', '~> 1.8')
+  s.add_development_dependency('json', '~> 2.0')
   s.add_development_dependency('simplecov', '~> 0.9')
   s.add_development_dependency('mocha', '~> 1.1')
 end

data/test/multiple_failure_test.rb

@@ -91,7 +91,7 @@ class MultipleFailureTest < Minitest::Test
 
     Resque.enqueue(LimitThreeJobDelay1Hour)
     perform_next_job(@worker)
-    assert !Resque.redis.exists(key), 'key should have been removed.'
+    assert [false, 0].include?(Resque.redis.exists(key) || false), 'key should have been removed.'
   end
 
   def test_last_failure_has_double_delay_redis_expiry_if_delay
@@ -109,7 +109,7 @@ class MultipleFailureTest < Minitest::Test
 
     # I don't like this, but...
     key = failure_key_for(LimitThreeJob)
-    assert !Resque.redis.exists(key)
+    assert [false, 0].include?(Resque.redis.exists(key) || false), 'key should have not been added.'
   end
 
   def test_errors_are_suppressed_up_to_retry_limit
@@ -158,7 +158,10 @@ class MultipleFailureTest < Minitest::Test
   end
 
   def test_redis_exists_returns_integer
+    return if !Redis.respond_to?(:exists_returns_integer)
+
     Resque.enqueue(RetryDefaultsJob)
+
     original = Redis.exists_returns_integer
     Redis.exists_returns_integer = true
 

data/test/resque_test.rb

@@ -2,7 +2,7 @@ require 'test_helper'
 
 class ResqueTest < Minitest::Test
   def test_resque_version
-    major, minor, _ = Resque::Version.split('.')
+    major, minor, _ = resque_version.split('.')
     assert [1, 2].include?(major.to_i), 'major version does not match'
 
     if major.to_i == 1
@@ -19,4 +19,14 @@ class ResqueTest < Minitest::Test
     assert_equal 1, Resque.info[:processed], 'processed job'
     assert_equal 0, Resque.delayed_queue_schedule_size
   end
+
+  private
+
+  def resque_version
+    begin
+      Resque::VERSION
+    rescue NameError
+      Resque::Version
+    end
+  end
 end

data/test/retry_test.rb

@@ -316,7 +316,7 @@ class RetryTest < Minitest::Test
       2.times do
         job = @worker.reserve
         child = fork do
-          Resque.redis.client.reconnect
+          Resque.redis.reconnect rescue Resque.redis.client.reconnect
           job.perform
         end
         Process.waitpid(child)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: resque-retry
 version: !ruby/object:Gem::Version
-  version: 1.7.6
+  version: 1.8.0
 platform: ruby
 authors:
 - Luke Antins
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-08-06 00:00:00.000000000 Z
+date: 2023-04-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: resque
@@ -36,16 +36,22 @@ dependencies:
   name: resque-scheduler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '4.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '6.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '4.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '6.0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -108,14 +114,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.8'
+        version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.8'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -223,7 +229,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: A resque plugin; provides retry, delay and exponential backoff support for