resque-retry 1.0.0.a → 1.0.0

data/HISTORY.md

@@ -1,6 +1,6 @@
-## HEAD - will become v1.0.0
+## 1.0.0 (2012-09-07)
 
-**INCLUDES NON-BACKWARDS COMPATIBLE CHANGES**
+** !!! WARNING !!! INCLUDES NON-BACKWARDS COMPATIBLE CHANGES **
 
 * Fixed issues related to infinate job retries and v1.20.0 of resque.
 * Minimum gem dependency versions changed: resque >= 1.10.0, resque-scheduler >= 1.9.9
@@ -8,6 +8,7 @@
 * Web interface will work without needing to `require` your job code. (n.b. less details avaialble via web).
 * IMPORTANT: `#identifier` method has been namedspaced to `#retry_identifier`.
 * Bugfix: `Remove` button on retry web interface was not working.
+* Feature: Allow `tagging` exceptions with a module instead of an exception class. (@tils - Tilmann Singer)
 
 ## 0.2.2 (2011-12-08)
 

data/README.md

@@ -21,7 +21,7 @@ To install:
 
     $ gem install resque-retry
 
-If your using [Bundler][bundler] to manage your dependencies, you should add `gem
+If you're using [Bundler][bundler] to manage your dependencies, you should add `gem
 'resque-retry'` to your projects `Gemfile`.
 
 Add this to your `Rakefile`:
@@ -63,7 +63,7 @@ For more explanation and examples, please see the remaining documentation.
 Failure Backend & Resque Web Additions
 --------------------------------------
 
-Lets say your using the Redis failure backend of resque (the default).
+Lets say you're using the Redis failure backend of resque (the default).
 Every time a job fails, the failure queue is populated with the job and
 exception details.
 
@@ -95,7 +95,7 @@ the Redis failed queue, like a normal failure *(without retry)* would.
 
 ### Resque Web Additions
 
-If your using the `MultipleWithRetrySuppression` failure backend, you should
+If you're using the `MultipleWithRetrySuppression` failure backend, you should
 also checkout the resque-web additions!
 
 The new Retry tab displays delayed jobs with retry information; the number of

data/Rakefile

@@ -10,16 +10,17 @@ task :default => :test
 ##
 # Test task.
 Rake::TestTask.new(:test) do |task|
+  task.libs << 'test'
   task.test_files = FileList['test/*_test.rb']
   task.verbose = true
 end
 
 ##
 # docs task.
-YARD::Rake::YardocTask.new :yardoc do |t|
-    t.files   = ['lib/**/*.rb']
-    t.options = ['--output-dir', "doc/",
-                 '--files', 'LICENSE',
-                 '--readme', 'README.md',
-                 '--title', 'resque-retry documentation']
+YARD::Rake::YardocTask.new :yardoc do |task|
+  task.files   = ['lib/**/*.rb']
+  task.options = ['--output-dir', 'doc/',
+                  '--files', 'LICENSE HISTORY.md',
+                  '--readme', 'README.md',
+                  '--title', 'resque-retry documentation']
 end

data/bin/test-rubies.sh

@@ -0,0 +1,18 @@
+#!/usr/bin/env bash
+
+# Perform some loose sanity checking that were in the correct directory first.
+if [ ! -f "Gemfile" ] || [ ! -f "resque-retry.gemspec" ]; then
+	echo "  ERROR: You may only run this script from the ROOT directory of the gem.  Aborting."
+	exit 1
+fi
+
+# exit if anything fails.
+set -e
+# echo the commands we execute
+set -o verbose
+# ruby versions to test.
+TEST_RUBIES="ruby-1.8.7-p358,ruby-1.9.2-p320,ruby-1.9.3-p0,jruby-1.6.7.2,rbx-2.0.testing"
+# install dependencies.
+rvm $TEST_RUBIES do bundle
+# run unit tests
+rvm $TEST_RUBIES do bundle exec rake

data/lib/resque/failure/multiple_with_retry_suppression.rb

@@ -3,7 +3,7 @@ require 'resque/failure/multiple'
 module Resque
   module Failure
 
-    # A multiple failure backend, with retry suppression.
+    # A multiple failure backend, with retry suppression
     #
     # For example: if you had a job that could retry 5 times, your failure 
     # backends are not notified unless the _final_ retry attempt also fails.
@@ -19,11 +19,13 @@ module Resque
     class MultipleWithRetrySuppression < Multiple
       include Resque::Helpers
 
-      # Called when the job fails.
+      # Called when the job fails
       #
       # If the job will retry, suppress the failure from the other backends.
       # Store the lastest failure information in redis, used by the web
       # interface.
+      #
+      # @api private
       def save
         if !(retryable? && retrying?)
           cleanup_retry_failure_log!
@@ -43,12 +45,16 @@ module Resque
         end
       end
 
-      # Expose this for the hook's use.
+      # Expose this for the hook's use
+      #
+      # @api public
       def self.failure_key(retry_key)
         'failure-' + retry_key
       end
 
       protected
+
+      # Return the class/module of the failed job.
       def klass
         constantize(payload['class'])
       end

data/lib/resque/plugins/exponential_backoff.rb

@@ -37,24 +37,30 @@ module Resque
     module ExponentialBackoff
       include Resque::Plugins::Retry
 
-      # Defaults to the number of delays in the backoff strategy.
+      # Defaults to the number of delays in the backoff strategy
       #
       # @return [Number] maximum number of retries
+      #
+      # @api private
       def retry_limit
         @retry_limit ||= backoff_strategy.length
       end
 
-      # Selects the delay from the backoff strategy.
+      # Selects the delay from the backoff strategy
       #
       # @return [Number] seconds to delay until the next retry.
+      #
+      # @api private
       def retry_delay
         backoff_strategy[retry_attempt] || backoff_strategy.last
       end
 
       # @abstract
-      # The backoff strategy is used to vary the delay between retry attempts.
+      # The backoff strategy is used to vary the delay between retry attempts
       # 
       # @return [Array] array of delays. index = retry attempt
+      #
+      # @api public
       def backoff_strategy
         @backoff_strategy ||= [0, 60, 600, 3600, 10_800, 21_600]
       end

data/lib/resque/plugins/retry.rb

@@ -35,6 +35,8 @@ module Resque
     module Retry
 
       # Copy retry criteria checks on inheritance.
+      #
+      # @api private
       def inherited(subclass)
         super(subclass)
         subclass.instance_variable_set("@retry_criteria_checks", retry_criteria_checks.dup)
@@ -45,10 +47,12 @@ module Resque
       #           are many/long or may not cleanly convert to strings.
       #
       # Builds a retry identifier using the job arguments. This identifier
-      # is used as part of the redis key.
+      # is used as part of the redis key
       #
       # @param [Array] args job arguments
       # @return [String] job identifier
+      #
+      # @api public
       def retry_identifier(*args)
         args_string = args.join('-')
         args_string.empty? ? nil : args_string
@@ -58,34 +62,42 @@ module Resque
       # attempts.
       #
       # @return [String] redis key
+      #
+      # @api public
       def redis_retry_key(*args)
         ['resque-retry', name, retry_identifier(*args)].compact.join(":").gsub(/\s/, '')
       end
 
-      # Maximum number of retrys we can attempt to successfully perform the job.
+      # Maximum number of retrys we can attempt to successfully perform the job
       #
       # A retry limit of 0 will *never* retry.
       # A retry limit of -1 or below will retry forever.
       #
       # @return [Fixnum]
+      #
+      # @api public
       def retry_limit
         @retry_limit ||= 1
       end
 
-      # Number of retry attempts used to try and perform the job.
+      # Number of retry attempts used to try and perform the job
       #
       # The real value is kept in Redis, it is accessed and incremented using
       # a before_perform hook.
       #
       # @return [Fixnum] number of attempts
+      #
+      # @api public
       def retry_attempt
         @retry_attempt ||= 0
       end
 
       # @abstract
-      # Number of seconds to delay until the job is retried.
-      # 
+      # Number of seconds to delay until the job is retried
+      #
       # @return [Number] number of seconds to delay
+      #
+      # @api public
       def retry_delay(exception_class = nil)
         if @retry_exceptions.is_a?(Hash)
           delay = @retry_exceptions[exception_class] || 0
@@ -100,37 +112,62 @@ module Resque
       # Number of seconds to sleep after job is requeued
       # 
       # @return [Number] number of seconds to sleep
+      #
+      # @api public
       def sleep_after_requeue
         @sleep_after_requeue ||= 0
       end
 
+      # @abstract
+      # Specify another resque job (module or class) to delegate retry duties
+      # to upon failure
+      #
+      # @return [Object, nil] class or module if delegate on failure, otherwise nil
+      #
+      # @api public
       def retry_job_delegate
         @retry_job_delegate ||= nil
       end
 
       # @abstract
       # Modify the arguments used to retry the job. Use this to do something
-      # other than try the exact same job again.
+      # other than try the exact same job again
       #
       # @return [Array] new job arguments
+      #
+      # @api public
       def args_for_retry(*args)
         args
       end
 
-      # Convenience method to test whether you may retry on a given exception.
+      # Convenience method to test whether you may retry on a given
+      # exception
+      #
+      # @param [Exception] an instance of Exception. Deprecated: can
+      # also be a Class
       #
       # @return [Boolean]
+      #
+      # @api public
       def retry_exception?(exception)
         return true if retry_exceptions.nil?
-        !! retry_exceptions.any? { |ex| ex >= exception }
+        !! retry_exceptions.any? do |ex|
+          if exception.is_a?(Class)
+            ex >= exception
+          else
+            ex === exception
+          end
+        end
       end
 
       # @abstract
-      # Controls what exceptions may be retried.
+      # Controls what exceptions may be retried
       #
       # Default: `nil` - this will retry all exceptions.
-      # 
+      #
       # @return [Array, nil]
+      #
+      # @api public
       def retry_exceptions
         if @retry_exceptions.is_a?(Hash)
           @retry_exceptions.keys
@@ -139,17 +176,19 @@ module Resque
         end
       end
 
-      # Test if the retry criteria is valid.
+      # Test if the retry criteria is valid
       #
       # @param [Exception] exception
       # @param [Array] args job arguments
       # @return [Boolean]
+      #
+      # @api public
       def retry_criteria_valid?(exception, *args)
         # if the retry limit was reached, dont bother checking anything else.
         return false if retry_limit_reached?
 
         # We always want to retry if the exception matches.
-        should_retry = retry_exception?(exception.class)
+        should_retry = retry_exception?(exception)
 
         # call user retry criteria check blocks.
         retry_criteria_checks.each do |criteria_check|
@@ -159,17 +198,20 @@ module Resque
         should_retry
       end
 
-      # Retry criteria checks.
+      # Retry criteria checks
       #
       # @return [Array]
+      #
+      # @api public
       def retry_criteria_checks
         @retry_criteria_checks ||= []
-        @retry_criteria_checks
       end
 
-      # Test if the retry limit has been reached.
+      # Test if the retry limit has been reached
       #
       # @return [Boolean]
+      #
+      # @api public
       def retry_limit_reached?
         if retry_limit == 0
           true
@@ -181,7 +223,7 @@ module Resque
       end
 
       # Register a retry criteria check callback to be run before retrying
-      # the job again.
+      # the job again
       #
       # If any callback returns `true`, the job will be retried.
       #
@@ -200,11 +242,15 @@ module Resque
       # @yieldparam exception [Exception] the exception that was raised
       # @yieldparam args [Array] job arguments
       # @yieldreturn [Boolean] false == dont retry, true = can retry
+      #
+      # @api public
       def retry_criteria_check(&block)
         retry_criteria_checks << block
       end
 
-      # Retries the job.
+      # Retries the job
+      #
+      # @api private
       def try_again(exception, *args)
         # some plugins define retry_delay and have it take no arguments, so rather than break those,
         # we'll just check here to see whether it takes the additional exception class argument or not
@@ -225,9 +271,11 @@ module Resque
         sleep(sleep_after_requeue) if sleep_after_requeue > 0
       end
 
-      # Resque before_perform hook.
+      # Resque before_perform hook
       #
       # Increments and sets the `@retry_attempt` count.
+      #
+      # @api private
       def before_perform_retry(*args)
         @on_failure_retry_hook_already_called = false
 
@@ -237,21 +285,25 @@ module Resque
         @retry_attempt = Resque.redis.incr(retry_key) # increment by 1.
       end
 
-      # Resque after_perform hook.
+      # Resque after_perform hook
       #
       # Deletes retry attempt count from Redis.
+      #
+      # @api private
       def after_perform_retry(*args)
         clean_retry_key(*args)
       end
 
-      # Resque on_failure hook.
+      # Resque on_failure hook
       #
       # Checks if our retry criteria is valid, if it is we try again.
       # Otherwise the retry attempt count is deleted from Redis.
       #
-      # NOTE: This hook will only allow execution once per job perform attempt.
+      # @note This hook will only allow execution once per job perform attempt.
       #       This was added because Resque v1.20.0 calls the hook twice.
       #       IMO; this isn't something resque-retry should have to worry about!
+      #
+      # @api private
       def on_failure_retry(exception, *args)
         return if @on_failure_retry_hook_already_called
 
@@ -264,6 +316,11 @@ module Resque
         @on_failure_retry_hook_already_called = true
       end
 
+      # Used to perform retry criteria check blocks under the job instance's context
+      #
+      # @return [Object] return value of the criteria check
+      #
+      # @api private
       def instance_exec(*args, &block)
         mname = "__instance_exec_#{Thread.current.object_id.abs}"
         class << self; self end.class_eval{ define_method(mname, &block) }
@@ -275,6 +332,9 @@ module Resque
         ret
       end
 
+      # Clean up retry state from redis once done
+      #
+      # @api private
       def clean_retry_key(*args)
         Resque.redis.del(redis_retry_key(*args))
       end

data/lib/resque-retry/server.rb

@@ -1,51 +1,16 @@
 require 'cgi'
+require 'resque/server'
+require 'resque_scheduler/server'
 
 # Extend Resque::Server to add tabs.
 module ResqueRetry
   module Server
 
+    # Adds `resque-retry` web interface elements to `resque-web`
+    #
+    # @api private
     def self.included(base)
       base.class_eval {
-        helpers do
-          # builds a retry key for the specified job.
-          def retry_key_for_job(job)
-            begin
-              klass = Resque.constantize(job['class'])
-              if klass.respond_to?(:redis_retry_key)
-                klass.redis_retry_key(job['args'])
-              else
-                nil
-              end
-            rescue NameError
-              nil
-            end
-          end
-
-          # gets the number of retry attempts for a job.
-          def retry_attempts_for_job(job)
-            Resque.redis.get(retry_key_for_job(job))
-          end
-
-          # gets the failure details hash for a job.
-          def retry_failure_details(retry_key)
-            Resque.decode(Resque.redis.get("failure_#{retry_key}"))
-          end
-
-          # reads a 'local' template file.
-          def local_template(path)
-            # Is there a better way to specify alternate template locations with sinatra?
-            File.read(File.join(File.dirname(__FILE__), "server/views/#{path}"))
-          end
-
-          # cancels job retry
-          def cancel_retry(job)
-            klass = Resque.constantize(job['class'])
-            retry_key = retry_key_for_job(job)
-            Resque.remove_delayed(klass, *job['args'])
-            Resque.redis.del("failure_#{retry_key}")
-            Resque.redis.del(retry_key)
-          end
-        end
 
         get '/retry' do
           erb local_template('retry.erb')
@@ -70,10 +35,53 @@ module ResqueRetry
       }
     end
 
+    # Helper methods used by retry tab.
+    module Helpers
+      # builds a retry key for the specified job.
+      def retry_key_for_job(job)
+        begin
+          klass = Resque.constantize(job['class'])
+          if klass.respond_to?(:redis_retry_key)
+            klass.redis_retry_key(job['args'])
+          else
+            nil
+          end
+        rescue NameError
+          nil
+        end
+      end
+
+      # gets the number of retry attempts for a job.
+      def retry_attempts_for_job(job)
+        Resque.redis.get(retry_key_for_job(job))
+      end
+
+      # gets the failure details hash for a job.
+      def retry_failure_details(retry_key)
+        Resque.decode(Resque.redis.get("failure-#{retry_key}"))
+      end
+
+      # reads a 'local' template file.
+      def local_template(path)
+        # Is there a better way to specify alternate template locations with sinatra?
+        File.read(File.join(File.dirname(__FILE__), "server/views/#{path}"))
+      end
+
+      # cancels job retry
+      def cancel_retry(job)
+        klass = Resque.constantize(job['class'])
+        retry_key = retry_key_for_job(job)
+        Resque.remove_delayed(klass, *job['args'])
+        Resque.redis.del("failure-#{retry_key}")
+        Resque.redis.del(retry_key)
+      end
+    end
+
   end
 end
 
 Resque::Server.tabs << 'Retry'
 Resque::Server.class_eval do
   include ResqueRetry::Server
+  helpers ResqueRetry::Server::Helpers
 end

data/test/exponential_backoff_test.rb

@@ -1,4 +1,4 @@
-require File.expand_path(File.dirname(__FILE__) + '/test_helper')
+require 'test_helper'
 
 class ExponentialBackoffTest < MiniTest::Unit::TestCase
   def setup

data/test/multiple_failure_test.rb

@@ -1,4 +1,17 @@
-require File.expand_path(File.dirname(__FILE__) + '/test_helper')
+require 'test_helper'
+
+# Mock failure backend for testing MultipleWithRetrySuppression
+class MockFailureBackend < Resque::Failure::Base
+  class << self
+    attr_accessor :errors
+  end
+
+  def save
+    self.class.errors << exception.to_s
+  end
+
+  self.errors = []
+end
 
 class MultipleFailureTest < MiniTest::Unit::TestCase
 
@@ -19,7 +32,7 @@ class MultipleFailureTest < MiniTest::Unit::TestCase
   end
 
   def test_failure_is_passed_on_when_job_class_not_found
-    skip 'commit 7113b0df to `resque` gem means the failure backend is never called'
+    skip 'commit 7113b0df to `resque` gem means the failure backend is never called. effects resque v1.20.0'
     new_job_class = Class.new(LimitThreeJob).tap { |klass| klass.send(:instance_variable_set, :@queue, LimitThreeJob.instance_variable_get(:@queue)) }
     Object.send(:const_set, 'LimitThreeJobTemp', new_job_class)
     Resque.enqueue(LimitThreeJobTemp)

data/test/redis-test.conf

@@ -1,4 +1,4 @@
-# Redis configuration file example
+# Redis configuration file
 
 # By default Redis does not run as a daemon. Use 'yes' if you need it.
 # Note that Redis will write a pid file in /var/run/redis.pid when daemonized.
@@ -6,7 +6,7 @@ daemonize yes
 
 # When run as a daemon, Redis write a pid file in /var/run/redis.pid by default.
 # You can specify a custom pid file location here.
-pidfile ./test/redis-test.pid
+#pidfile ./test/redis-test.pid
 
 # Accept connections on the specified port, default is 6379
 port 9736
@@ -30,16 +30,16 @@ timeout 300
 #   after 900 sec (15 min) if at least 1 key changed
 #   after 300 sec (5 min) if at least 10 keys changed
 #   after 60 sec if at least 10000 keys changed
-save 900 1
-save 300 10
-save 60 10000
+#save 900 1
+#save 300 10
+#save 60 10000
 
 # The filename where to dump the DB
-dbfilename dump.rdb
+#dbfilename dump.rdb
 
 # For default save/load DB in/from the working directory
 # Note that you must specify a directory not a file name.
-dir ./test/
+#dir ./test/
 
 # Set server verbosity to 'debug'
 # it can be one of:

data/test/resque_test.rb

@@ -1,4 +1,4 @@
-require File.expand_path(File.dirname(__FILE__) + '/test_helper')
+require 'test_helper'
 
 # make sure the worlds not fallen from beneith us.
 class ResqueTest < MiniTest::Unit::TestCase

data/test/retry_criteria_test.rb

@@ -1,4 +1,4 @@
-require File.expand_path(File.dirname(__FILE__) + '/test_helper')
+require 'test_helper'
 
 class RetryCriteriaTest < MiniTest::Unit::TestCase
   def setup

data/test/retry_exception_delay_test.rb

@@ -1,4 +1,4 @@
-require File.expand_path(File.dirname(__FILE__) + '/test_helper')
+require 'test_helper'
 
 class RetryTest < MiniTest::Unit::TestCase
   def setup

data/test/retry_inheriting_checks_test.rb

@@ -1,4 +1,4 @@
-require File.expand_path(File.dirname(__FILE__) + '/test_helper')
+require 'test_helper'
 
 class RetryInheritingChecksTest < MiniTest::Unit::TestCase
   def setup

data/test/retry_test.rb

@@ -1,4 +1,4 @@
-require File.expand_path(File.dirname(__FILE__) + '/test_helper')
+require 'test_helper'
 
 class RetryTest < MiniTest::Unit::TestCase
   def setup
@@ -108,13 +108,17 @@ class RetryTest < MiniTest::Unit::TestCase
     assert_equal 0, Resque.info[:pending], 'pending jobs'
   end
 
-  def test_can_determine_if_exception_may_be_retried
+  def test_can_determine_if_exception_may_be_retried_with_defaults
     assert_equal true, RetryDefaultsJob.retry_exception?(StandardError), 'StandardError may retry'
     assert_equal true, RetryDefaultsJob.retry_exception?(CustomException), 'CustomException may retry'
     assert_equal true, RetryDefaultsJob.retry_exception?(HierarchyCustomException), 'HierarchyCustomException may retry'
+  end
 
+  def test_can_determine_if_exception_may_be_retried_with_custom_retry_exceptions
+    assert_equal false, RetryCustomExceptionsJob.retry_exception?(StandardError), 'StandardError may not retry'
     assert_equal true, RetryCustomExceptionsJob.retry_exception?(CustomException), 'CustomException may retry'
     assert_equal true, RetryCustomExceptionsJob.retry_exception?(HierarchyCustomException), 'HierarchyCustomException may retry'
+    assert_equal true, RetryCustomExceptionsJob.retry_exception?(RuntimeError.new.extend(CustomExceptionModule)), 'Extended with CustomExceptionModule may retry'
     assert_equal false, RetryCustomExceptionsJob.retry_exception?(AnotherCustomException), 'AnotherCustomException may not retry'
   end
 
@@ -130,6 +134,17 @@ class RetryTest < MiniTest::Unit::TestCase
     assert_equal 2, Resque.info[:pending], 'pending jobs'
   end
 
+  def test_retry_if_failed_and_exception_may_retry_because_of_included_module
+    Resque.enqueue(RetryCustomExceptionsJob, 'tagged CustomException')
+    4.times do
+      perform_next_job(@worker)
+    end
+
+    assert_equal 4, Resque.info[:failed], 'failed jobs'
+    assert_equal 4, Resque.info[:processed], 'processed job'
+    assert_equal 1, Resque.info[:pending], 'pending jobs'
+  end
+
   def test_do_not_retry_if_failed_and_exception_does_not_allow_retry
     Resque.enqueue(RetryCustomExceptionsJob, AnotherCustomException)
     Resque.enqueue(RetryCustomExceptionsJob, RuntimeError)

data/test/server_test.rb

@@ -1,4 +1,4 @@
-require File.expand_path(File.dirname(__FILE__) + '/test_helper')
+require 'test_helper'
 
 require 'resque-retry/server'
 ENV['RACK_ENV'] = 'test'

data/test/test_helper.rb

@@ -3,12 +3,14 @@ $LOAD_PATH.unshift dir + '/../lib'
 $TESTING = true
 
 require 'rubygems'
+require 'timeout'
 require 'minitest/unit'
 require 'minitest/pride'
 require 'rack/test'
 require 'mocha'
 
-if RUBY_ENGINE == 'ruby' && RUBY_VERSION >= '1.9'
+# Run code coverage in MRI 1.9 only.
+if RUBY_VERSION >= '1.9' && RUBY_ENGINE == 'ruby'
   require 'simplecov'
   SimpleCov.start do
     add_filter '/test/'
@@ -18,45 +20,31 @@ end
 require 'resque-retry'
 require dir + '/test_jobs'
 
-# make sure we can run redis
-if !system("which redis-server")
-  puts '', "** can't find `redis-server` in your path"
-  puts "** try running `sudo rake install`"
+# make sure we can run redis-server
+if !system('which redis-server')
+  puts '', "** `redis-server` was not found in your PATH"
   abort ''
 end
 
+# make sure we can shutdown the server using cli.
+if !system('which redis-cli')
+  puts '', "** `redis-cli` was not found in your PATH"
+  abort ''
+end
 
-# start our own redis when the tests start,
-# kill it when they end
+# This code is run `at_exit` to setup everything before running the tests.
+# Redis server is started before this code block runs.
 at_exit do
   next if $!
 
   exit_code = MiniTest::Unit.new.run(ARGV)
-
-  pid = `ps -e -o pid,command | grep [r]edis-test`.split(" ")[0]
-  puts "Killing test redis server..."
-  `rm -f #{dir}/dump.rdb`
-  `kill -9 #{pid}`
-  exit exit_code
+  `redis-cli -p 9736 shutdown nosave`
 end
 
 puts "Starting redis for testing at localhost:9736..."
 `redis-server #{dir}/redis-test.conf`
 Resque.redis = '127.0.0.1:9736'
 
-# Mock failure backend for testing MultipleWithRetrySuppression
-class MockFailureBackend < Resque::Failure::Base
-  class << self
-    attr_accessor :errors
-  end
-
-  def save
-    self.class.errors << exception.to_s
-  end
-
-  self.errors = []
-end
-
 # Test helpers
 class MiniTest::Unit::TestCase
   def perform_next_job(worker, &block)

data/test/test_jobs.rb

@@ -1,4 +1,5 @@
 CustomException = Class.new(StandardError)
+CustomExceptionModule = Module.new
 HierarchyCustomException = Class.new(CustomException)
 AnotherCustomException = Class.new(StandardError)
 
@@ -155,12 +156,13 @@ class RetryCustomExceptionsJob < RetryDefaultsJob
   @queue = :testing
 
   @retry_limit = 5
-  @retry_exceptions = [CustomException, HierarchyCustomException]
+  @retry_exceptions = [CustomException, CustomExceptionModule, HierarchyCustomException]
 
   def self.perform(exception)
     case exception
     when 'CustomException' then raise CustomException
     when 'HierarchyCustomException' then raise HierarchyCustomException
+    when 'tagged CustomException' then raise AnotherCustomException.new.extend(CustomExceptionModule)
     when 'AnotherCustomException' then raise AnotherCustomException
     else raise StandardError
     end

metadata

@@ -1,8 +1,8 @@
 --- !ruby/object:Gem::Specification
 name: resque-retry
 version: !ruby/object:Gem::Version
-  version: 1.0.0.a
-  prerelease: 6
+  version: 1.0.0
+  prerelease: 
 platform: ruby
 authors:
 - Luke Antins
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-11 00:00:00.000000000Z
+date: 2012-09-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: resque
-  requirement: &2158569780 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,15 @@ dependencies:
         version: 1.10.0
   type: :runtime
   prerelease: false
-  version_requirements: *2158569780
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.10.0
 - !ruby/object:Gem::Dependency
   name: resque-scheduler
-  requirement: &2158568800 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,10 +38,15 @@ dependencies:
         version: 1.9.9
   type: :runtime
   prerelease: false
-  version_requirements: *2158568800
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.9.9
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &2158568180 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,10 +54,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2158568180
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: minitest
-  requirement: &2158567580 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -55,10 +70,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2158567580
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rack-test
-  requirement: &2158567120 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -66,10 +86,31 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2158567120
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &2158566580 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rdiscount
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -77,10 +118,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2158566580
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &2158566080 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -88,10 +134,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2158566080
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &2158565300 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -99,10 +150,15 @@ dependencies:
         version: 0.3.0
   type: :development
   prerelease: false
-  version_requirements: *2158565300
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.3.0
 - !ruby/object:Gem::Dependency
   name: mocha
-  requirement: &2158564740 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -110,7 +166,12 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2158564740
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: ! "  resque-retry provides retry, delay and exponential backoff support
   for\n  resque jobs.\n\n  Features:\n\n  * Redis backed retry count/limit.\n  * Retry
   on all or specific exceptions.\n  * Exponential backoff (varying the delay between
@@ -125,6 +186,7 @@ files:
 - Rakefile
 - README.md
 - HISTORY.md
+- bin/test-rubies.sh
 - test/exponential_backoff_test.rb
 - test/multiple_failure_test.rb
 - test/redis-test.conf
@@ -158,12 +220,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>'
+  - - ! '>='
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: A resque plugin; provides retry, delay and exponential backoff support for