resque-retry 1.5.3 → 1.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6aa034bb302b1946fcc3900ef412f35ab3d56aa18718304b6ec91ed997020d29
-  data.tar.gz: ead7a803c822ec57b55994621f13fa8a788b17743e1f682eb72b361b0f59eadc
+  metadata.gz: 18f7b00c3922adebe816efc0357bfba5925dddc5ae85bea9d4b69e0a05e9fb46
+  data.tar.gz: dd4d14d570a628aa667445cd4f64929ecc0bcab22bc536b164bc9e9437574a59
 SHA512:
-  metadata.gz: a71f62fe40bd8cda477a7a17071e738b16425b8b97f7122dec69eb28808167ad82ac148b58d25824b0dc554377e490c4ca7aa92df652913fb9504bf1a69054ef
-  data.tar.gz: f087615ff9a87816f9bda22ac9258f70aad0d564e54afe9342796ca5f59b0cee40c8b8be6cc905617987e58682d33496465bf611d6caf8a30d38ab52c322cff5
+  metadata.gz: ffab51ba83437149d5bc39400983e436a38cd4e2d200b7562fa892f16f6facf1310a0dcf666030d8181aec5424dbcd80c146983ce25b3579f7e9a4088692dc8f
+  data.tar.gz: dcef4495dfc111270f16bb02dafa72d1fb66caebe4302dbb0359aad2dcaf72f29c887cc7e0caa22c3ef012aba5813933fb19c1c210b597bea17b6ab4ab561ff6

data/.travis.yml

@@ -7,7 +7,8 @@ matrix:
     - rvm: jruby-9.1.9.0
 
 rvm:
-  - 2.3.7
-  - 2.4.4
-  - 2.5.1
+  - 2.3.8
+  - 2.4.6
+  - 2.5.5
+  - 2.6.3
   - jruby-9.1.9.0

data/HISTORY.md

@@ -1,3 +1,8 @@
+# 1.6.0 (2019-04-21)
+
+* Clean-up / refactoring in preparation for a release (`ruby` deprecations, etc.)
+* Loosen version requirement to allow resque v2.0 and up (@peret)
+
 # 1.5.3 (2018-11-26)
 
 * Monkey patch in the `requeue_queue` method onto the `Resque::Failure` backend (this _should_ be a temporary fix)

data/README.md

@@ -1,7 +1,7 @@
 resque-retry
 ============
 
-A [Resque][resque] plugin. Requires Resque ~> 1.25 & [resque-scheduler][resque-scheduler] ~> 4.0.
+A [Resque][resque] plugin. Requires Resque ~> 1.25 or Resque ~> 2.0 & [resque-scheduler][resque-scheduler] ~> 4.0.
 
 This gem provides retry, delay and exponential backoff support for resque jobs.
 

data/lib/resque-retry/version.rb

@@ -1,3 +1,3 @@
 module ResqueRetry
-  VERSION = '1.5.3'
+  VERSION = '1.6.0'
 end

data/lib/resque/failure/multiple_with_retry_suppression.rb

@@ -89,8 +89,12 @@ module Resque
       # https://github.com/resque/resque/pull/1659
       #
       # @api public
-      def self.requeue_queue(queue)
-        classes.first.requeue_queue(queue)
+      class_eval do |klass|
+        if !klass.respond_to?(:requeue_queue)
+          def klass.requeue_queue(queue)
+            classes.first.requeue_queue(queue)
+          end
+        end
       end
 
       protected

data/lib/resque/plugins/exponential_backoff.rb

@@ -52,12 +52,16 @@ module Resque
       #
       # @api private
       def self.extended(receiver)
+        retry_delay_multiplicand_min = DEFAULT_RETRY_DELAY_MULTIPLICAND_MIN
         retry_delay_multiplicand_min = \
-          receiver.instance_variable_get("@retry_delay_multiplicand_min") || \
-            DEFAULT_RETRY_DELAY_MULTIPLICAND_MIN
+          receiver.instance_variable_get(:@retry_delay_multiplicand_min) \
+            if receiver.instance_variable_defined?(:@retry_delay_multiplicand_min)
+
+        retry_delay_multiplicand_max = DEFAULT_RETRY_DELAY_MULTIPLICAND_MAX
         retry_delay_multiplicand_max = \
-          receiver.instance_variable_get("@retry_delay_multiplicand_max") || \
-            DEFAULT_RETRY_DELAY_MULTIPLICAND_MAX
+          receiver.instance_variable_get(:@retry_delay_multiplicand_max) \
+            if receiver.instance_variable_defined?(:@retry_delay_multiplicand_max)
+
         if retry_delay_multiplicand_min > retry_delay_multiplicand_max
           raise InvalidRetryDelayMultiplicandConfigurationException.new(
             %{"@retry_delay_multiplicand_min" must be less than or equal to "@retry_delay_multiplicand_max"}

data/lib/resque/plugins/retry.rb

@@ -52,8 +52,13 @@ module Resque
       #
       # @api private
       def self.extended(receiver)
-        retry_exceptions = receiver.instance_variable_get('@retry_exceptions')
-        fatal_exceptions = receiver.instance_variable_get('@fatal_exceptions')
+        retry_exceptions = nil
+        retry_exceptions = receiver.instance_variable_get(:@retry_exceptions) \
+          if receiver.instance_variable_defined?(:@retry_exceptions)
+
+        fatal_exceptions = nil
+        fatal_exceptions = receiver.instance_variable_get(:@fatal_exceptions) \
+          if receiver.instance_variable_defined?(:@fatal_exceptions)
 
         if fatal_exceptions && retry_exceptions
           raise AmbiguousRetryStrategyException.new(%{You can't define both "@fatal_exceptions" and "@retry_exceptions"})
@@ -130,7 +135,7 @@ module Resque
       #
       # @api public
       def retry_delay(exception_class = nil)
-        if @retry_exceptions.is_a?(Hash)
+        if instance_variable_defined?(:@retry_exceptions) && @retry_exceptions.is_a?(Hash)
           delay = @retry_exceptions[exception_class] ||= begin
             relevant_definitions = @retry_exceptions.select { |ex| exception_class <= ex }
             relevant_definitions.any? ? relevant_definitions.sort.first[1] : 0
@@ -261,7 +266,7 @@ module Resque
       #
       # @api public
       def retry_exceptions
-        if @retry_exceptions.is_a?(Hash)
+        if instance_variable_defined?(:@retry_exceptions) && @retry_exceptions.is_a?(Hash)
           @retry_exceptions.keys
         else
           @retry_exceptions ||= nil
@@ -487,7 +492,8 @@ module Resque
           # This hook is called from a worker processes, not the job process
           # that failed with a DirtyExit, so @retry_attempt wasn't set yet
           @retry_attempt = Resque.redis.get(redis_retry_key(*args)).to_i
-        elsif @on_failure_retry_hook_already_called
+        elsif instance_variable_defined?(:@on_failure_retry_hook_already_called) && \
+          @on_failure_retry_hook_already_called
           log_message 'on_failure_retry_hook_already_called', args, exception
           return
         end

data/resque-retry.gemspec

@@ -29,7 +29,7 @@ Gem::Specification.new do |s|
   s.files = `git ls-files`.split($/)
   s.require_paths = %w[lib]
 
-  s.add_dependency('resque', '~> 1.25')
+  s.add_dependency('resque', '>= 1.25', '< 3.0')
   s.add_dependency('resque-scheduler', '~> 4.0')
 
   s.add_development_dependency('rake', '~> 10.3')

data/test/multiple_failure_test.rb

@@ -14,7 +14,6 @@ class MockFailureBackend < Resque::Failure::Base
 end
 
 class MultipleFailureTest < Minitest::Test
-
   def setup
     Resque.redis.flushall
     @worker = Resque::Worker.new(:testing)
@@ -27,8 +26,7 @@ class MultipleFailureTest < Minitest::Test
   end
 
   def failure_key_for(klass)
-    args = []
-    key = 'failure-' + klass.redis_retry_key(args)
+    'failure-' + klass.redis_retry_key([])
   end
 
   def test_failure_is_passed_on_when_job_class_not_found
@@ -41,7 +39,9 @@ class MultipleFailureTest < Minitest::Test
     perform_next_job(@worker)
 
     assert_equal 1, MockFailureBackend.errors.count, 'should have one error'
-    assert_match /uninitialized constant.* LimitThreeJobTemp/, MockFailureBackend.errors.first
+
+    uninitialized_constant_pattern = /uninitialized constant.* LimitThreeJobTemp/
+    assert_match uninitialized_constant_pattern, MockFailureBackend.errors.first
   end
 
   def test_last_failure_is_saved_in_redis_if_delay

data/test/resque_test.rb

@@ -1,11 +1,15 @@
 require 'test_helper'
 
-# make sure the worlds not fallen from beneith us.
 class ResqueTest < Minitest::Test
   def test_resque_version
-    major, minor, patch = Resque::Version.split('.')
-    assert_equal 1, major.to_i, 'major version does not match'
-    assert_operator minor.to_i, :>=, 8, 'minor version is too low'
+    major, minor, _ = Resque::Version.split('.')
+    assert [1, 2].include?(major.to_i), 'major version does not match'
+
+    if major.to_i == 1
+      assert_operator minor.to_i, :>=, 25, 'minor version is too low'
+    else
+      assert_operator minor.to_i, :>=, 0, 'minor version is too low'
+    end
   end
 
   def test_good_job

data/test/retry_exception_delay_test.rb

@@ -1,6 +1,6 @@
 require 'test_helper'
 
-class RetryTest < Minitest::Test
+class RetryExeptionDelayTest < Minitest::Test
   def setup
     Resque.redis.flushall
     @worker = Resque::Worker.new(:testing)

data/test/test_jobs.rb

@@ -364,8 +364,15 @@ class BaseJob < AsyncJob
 
     def inherited(subclass)
       super
-      %w(@retry_exceptions @retry_delay @retry_limit @auto_retry_limit).each do |variable|
-        value = BaseJob.instance_variable_get(variable)
+      %i[
+        @auto_retry_limit
+        @retry_delay
+        @retry_exceptions
+        @retry_limit
+      ].each do |variable|
+        value = nil
+        value = BaseJob.instance_variable_get(variable) \
+          if BaseJob.instance_variable_defined?(variable)
         value = value.dup rescue value
         subclass.instance_variable_set(variable, value)
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: resque-retry
 version: !ruby/object:Gem::Version
-  version: 1.5.3
+  version: 1.6.0
 platform: ruby
 authors:
 - Luke Antins
@@ -10,22 +10,28 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-11-26 00:00:00.000000000 Z
+date: 2019-04-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: resque
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.25'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.25'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: resque-scheduler
   requirement: !ruby/object:Gem::Requirement
@@ -217,8 +223,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: A resque plugin; provides retry, delay and exponential backoff support for