resque-retry 1.2.0 → 1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3424ef6139214b3f9ec367393e92e2da6ac888eb
-  data.tar.gz: 85ba61ab491cadba2783e34e3af7d05953e02f53
+  metadata.gz: 105706892be947dafeb239f354c775e3bcb8df9d
+  data.tar.gz: 43c4248749336f1dd2a56fd561fcc0f56676ab30
 SHA512:
-  metadata.gz: 6424ef718b680bfd61cc7fa47ddc1c09ae397c5a9838fbeee01fa4af5ff79001c06052f982ab517aa8f2db73d7e1f99323ca41ad4df54d328897f104ea07bfaf
-  data.tar.gz: 840b6f3402ee1bf8e708ab78d6f7f376aac96f0ef843ff5d08c9668ed1771d69b6a51a819216be8f5611013e0cfdda9f30575ec1d330ec97af304f359298963e
+  metadata.gz: a6cc62c680c943615e628f65e64e7391bd8db8b8f9257ce8080690650bd55e7a0812e8ecc62001a8a608d1f82f9daa92ef6ca36c5498d6094f01a327a3d8f126
+  data.tar.gz: baf25c455e64044e2b3849df250d1b9a594b278b83903f41703d04a6c2b0ac56d3ec9ef6aa7bcadb0a672b658bd1251f8169b9f90893ed925754b265954b856e

data/.travis.yml

@@ -3,8 +3,7 @@ language: ruby
 matrix:
   allow_failures:
     - rvm: jruby-19mode
-    - rvm: jruby-20mode
-    - rvm: rbx
+    - rvm: rbx-2
 
 rvm:
   - 1.9.3
@@ -12,5 +11,4 @@ rvm:
   - 2.1.0
   - 2.1.1
   - jruby-19mode
-  - jruby-20mode
-  - rbx
+  - rbx-2

data/HISTORY.md

@@ -1,5 +1,9 @@
 ## HEAD
 
+## 1.2.1 (2014-06-09)
+
+* Fixed Kernel.rand: "invalid argument - 0.0 (ArgumentError)" error with "ExponentialBackoff" (on "Rubinius") when `retry_delay_multiplicand_min` and `retry_delay_multiplicand_max` were the same value (@saizai)
+
 ## 1.2.0 (2014-05-19)
 
 * Fixed scenario where job does not get retried correctly when `perform` is not called as expected.

data/README.md

@@ -413,9 +413,9 @@ Contributing/Pull Requests
   * Fork the project.
   * Make your feature addition or bug fix.
   * Add tests for it.
-  * Commit.
-  * Send me a pull request. Bonus points for topic branches.
-  * If you edit the gemspec/version etc, do it in another commit please.
+  * In a seperate commit, update the HISTORY.md file please.
+  * Send us a pull request. Bonus points for topic branches.
+  * If you edit the gemspec/version etc, please do so in another commit.
 
 [god]: http://github.com/mojombo/god
 [rq]: http://github.com/defunkt/resque

data/lib/resque-retry/version.rb

@@ -1,3 +1,3 @@
 module ResqueRetry
-  VERSION = '1.2.0'
+  VERSION = '1.2.1'
 end

data/lib/resque/plugins/exponential_backoff.rb

@@ -81,8 +81,14 @@ module Resque
       # @api private
       def retry_delay
         delay = backoff_strategy[retry_attempt] || backoff_strategy.last
-        delay_multiplicand = \
-          rand(retry_delay_multiplicand_min..retry_delay_multiplicand_max)
+        # if the values are the same don't bother generating a random number, if
+        # the delta is zero, some platforms will raise an error
+        if retry_delay_multiplicand_min == retry_delay_multiplicand_max
+          delay_multiplicand = retry_delay_multiplicand_max
+        else
+          delay_multiplicand = \
+            rand(retry_delay_multiplicand_min..retry_delay_multiplicand_max)
+        end
         (delay * delay_multiplicand).to_i
       end
 

data/test/multiple_failure_test.rb

@@ -41,7 +41,7 @@ class MultipleFailureTest < MiniTest::Unit::TestCase
     perform_next_job(@worker)
 
     assert_equal 1, MockFailureBackend.errors.count, 'should have one error'
-    assert_match /uninitialized constant LimitThreeJobTemp/, MockFailureBackend.errors.first
+    assert_match /uninitialized constant.* LimitThreeJobTemp/, MockFailureBackend.errors.first
   end
 
   def test_last_failure_is_saved_in_redis_if_delay

data/test/retry_test.rb

@@ -285,4 +285,23 @@ class RetryTest < MiniTest::Unit::TestCase
     Resque.enqueue(ExpiringJob, 'expiry_test')
     perform_next_job(@worker)
   end
+
+  if Process.respond_to?(:fork) && Gem::Version.new(Resque::VERSION) >= Gem::Version.new('1.20.0')
+    def test_retry_on_dirty_exit
+      Resque.enqueue(RetryKilledJob)
+      RetryKilledJob.expects(:clean_retry_key).once
+      2.times do
+        job = @worker.reserve
+        child = fork do
+          Resque.redis.client.reconnect
+          job.perform
+        end
+        Process.waitpid(child)
+        job.fail(Resque::DirtyExit.new)
+      end
+
+      assert_equal nil, @worker.reserve
+    end
+  end
+
 end

data/test/test_jobs.rb

@@ -474,3 +474,13 @@ class FailsDuringConnectJob < RetryDefaultsJob
   @retry_limit = 3
   @retry_delay = 10
 end
+
+
+class RetryKilledJob
+  extend Resque::Plugins::Retry
+  @queue = :testing
+
+  def self.perform(*args)
+    Process.kill("KILL", Process.pid)
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: resque-retry
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.2.1
 platform: ruby
 authors:
 - Luke Antins
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-19 00:00:00.000000000 Z
+date: 2014-06-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: resque