resque-retry 1.3.2 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3e009bab760d817a59eb5969981a4449b84b3b8a
-  data.tar.gz: 293ad2734c8083e095456b278c7fcf3f5aa724ca
+  metadata.gz: d4c061060637465cbab7c2348d2facefa1816493
+  data.tar.gz: 3b76a1d34c68eeb3fae868900b75ca02192bc851
 SHA512:
-  metadata.gz: a8bb21258513a5f42cb19a228bb46e57d25b57022aefaabca41c81d6c63fc483d44028960b8ec09c2cae0ac8575b6e1041e078c2532b67757117ac419397a190
-  data.tar.gz: 4f6ab5ead5467abfa397977c3b5b32c8ce3879b02a60045ac490d6683123fbc1561d4f611753df71d2b1f4874fbae440efd42b8eff2a2b9c547d5b150787277c
+  metadata.gz: 63bcdd107167973953477e6e591c8ce86d2a2957b41bb93cbe161153f5f2e6fd69e417718ba46d497f755fcde882373f2f992538c48b7aa11b7a449ba2aec867
+  data.tar.gz: 4d34d77f1fe0b4ae1728495865f79f20b05ef7896ddf30d23d70cdef2d03caf57ff995617e2e6aff3b854a34865933a05913a638e2fb0e285f75685bb334771a

data/HISTORY.md

@@ -1,5 +1,9 @@
 ## HEAD
 
+## 1.4.0 (2015-01-07)
+
+* Dependency on `resque-scheduler` bumped to ~> 4.0
+
 ## 1.3.2 (2014-10-09)
 
 * Fixed: Ensure `#constantize` is called on `Job` instance.

data/README.md

@@ -1,10 +1,9 @@
 resque-retry
 ============
 
-A [Resque][rq] plugin. Requires Resque ~> 1.25 & [resque-scheduler][rqs] ~> 3.0.
+A [Resque][rq] plugin. Requires Resque ~> 1.25 & [resque-scheduler][rqs] ~> 4.0.
 
-resque-retry provides retry, delay and exponential backoff support for
-resque jobs.
+This gem provides retry, delay and exponential backoff support for resque jobs.
 
   * Redis backed retry count/limit.
   * Retry on all or specific exceptions.
@@ -107,16 +106,64 @@ also checkout the resque-web additions!
 The new Retry tab displays delayed jobs with retry information; the number of
 attempts and the exception details from the last failure.
 
-Make sure you include this in your `config.ru` or similar file:
+
+### Configuring and running the Resque-Web Interface
+
+#### Using a Rack configuration: 
+
+One alternative is to use a rack configuration file. To use this, make 
+sure you include this in your `config.ru` or similar file:
+
 ```ruby
 require 'resque-retry'
 require 'resque-retry/server'
 
-# require your jobs & application code.
+# Make sure to require your workers & application code below this line:
+# require '[path]/[to]/[jobs]/your_worker' 
 
+# Run the server
 run Resque::Server.new
 ```
 
+As an example, you could run this server with the following command:
+```
+rackup -p 9292 config.ru
+```
+
+When using bundler, you can also run the server like this:
+```
+bundle exec rackup -p 9292 config.ru 
+```
+
+
+#### Using the 'resque-web' command with a configuration file:
+
+Another alternative is to use resque's built-in 'resque-web' command with
+the additional resque-retry tabs. In order to do this, you must first create
+a configuration file. For the sake of this example we'll create the configuration
+file in a 'config' directory, and name it 'resque_web_config.rb'. In practice 
+you could rename this configuration file to anything you'd like and place in your
+project in any directory of your choosing. The contents of the configuration file
+would look like this:
+
+```ruby
+# [app_dir]/config/resque_web_config.rb
+require 'resque-retry'
+require 'resque-retry/server'
+
+# Make sure to require your workers & application code below this line:
+# require '[path]/[to]/[jobs]/your_worker' 
+
+```
+
+Once you have the configuration file ready, you can pass the configuration file
+to the resque-web command as a parameter, like so:
+
+```
+resque-web [app_dir]/config/resque_web_config.rb
+```
+
+
 Retry Options & Logic
 ---------------------
 
@@ -437,7 +484,6 @@ Contributing/Pull Requests
   * 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
-[rqs]: http://github.com/bvandenbos/resque-scheduler
-[bundler]: http://gembundler.com/
-
+[rq]: http://github.com/resque/resque
+[rqs]: http://github.com/resque/resque-scheduler
+[bundler]: http://bundler.io

data/lib/resque-retry/version.rb

@@ -1,3 +1,3 @@
 module ResqueRetry
-  VERSION = '1.3.2'
+  VERSION = '1.4.0'
 end

data/resque-retry.gemspec

@@ -30,13 +30,13 @@ Gem::Specification.new do |s|
   s.require_paths = %w[lib]
 
   s.add_dependency('resque', '~> 1.25')
-  s.add_dependency('resque-scheduler', '~> 3.0')
+  s.add_dependency('resque-scheduler', '~> 4.0')
 
-  s.add_development_dependency('rake', '~> 10.1')
-  s.add_development_dependency('minitest', '~> 4.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('simplecov', '~> 0.7')
-  s.add_development_dependency('mocha', '~> 1.0')
+  s.add_development_dependency('simplecov', '~> 0.9')
+  s.add_development_dependency('mocha', '~> 1.1')
 end

data/test/exponential_backoff_test.rb

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

data/test/multiple_failure_test.rb

@@ -13,7 +13,7 @@ class MockFailureBackend < Resque::Failure::Base
   self.errors = []
 end
 
-class MultipleFailureTest < MiniTest::Unit::TestCase
+class MultipleFailureTest < Minitest::Test
 
   def setup
     Resque.redis.flushall

data/test/redis-test.conf

@@ -13,8 +13,7 @@ port 9736
 
 # If you want you can bind a single interface, if the bind option is not
 # specified all the interfaces will listen for connections.
-#
-# bind 127.0.0.1
+bind 127.0.0.1
 
 # Close the connection after a client is idle for N seconds (0 to disable)
 timeout 300

data/test/resque_test.rb

@@ -1,7 +1,7 @@
 require 'test_helper'
 
 # make sure the worlds not fallen from beneith us.
-class ResqueTest < MiniTest::Unit::TestCase
+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'
@@ -15,4 +15,4 @@ class ResqueTest < MiniTest::Unit::TestCase
     assert_equal 1, Resque.info[:processed], 'processed job'
     assert_equal 0, Resque.delayed_queue_schedule_size
   end
-end
+end

data/test/retry_criteria_test.rb

@@ -1,6 +1,6 @@
 require 'test_helper'
 
-class RetryCriteriaTest < MiniTest::Unit::TestCase
+class RetryCriteriaTest < Minitest::Test
   def setup
     Resque.redis.flushall
     @worker = Resque::Worker.new(:testing)
@@ -72,4 +72,4 @@ class RetryCriteriaTest < MiniTest::Unit::TestCase
     assert_equal 2, Resque.info[:failed], 'failed jobs'
     assert_equal 3, Resque.info[:processed], 'processed job'
   end
-end
+end

data/test/retry_exception_delay_test.rb

@@ -1,6 +1,6 @@
 require 'test_helper'
 
-class RetryTest < MiniTest::Unit::TestCase
+class RetryTest < Minitest::Test
   def setup
     Resque.redis.flushall
     @worker = Resque::Worker.new(:testing)
@@ -43,5 +43,4 @@ class RetryTest < MiniTest::Unit::TestCase
     assert_in_delta (start_time + 10), delayed[1], 1.00, '2nd retry delay timestamp'
     assert_in_delta (start_time + 15), delayed[2], 1.00, '3rd retry delay timestamp'
   end
-
 end

data/test/retry_inheriting_checks_test.rb

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

data/test/retry_test.rb

@@ -2,7 +2,7 @@ require 'test_helper'
 require 'resque/failure/redis'
 require 'digest/sha1'
 
-class RetryTest < MiniTest::Unit::TestCase
+class RetryTest < Minitest::Test
   def setup
     Resque.redis.flushall
     @worker = Resque::Worker.new(:testing)

data/test/server_helpers_test.rb

@@ -1,10 +1,8 @@
 require 'test_helper'
-
 require 'resque'
 require 'resque-retry/server'
 
-class ServerHelpersTest < MiniTest::Unit::TestCase
-
+class ServerHelpersTest < Minitest::Test
   def setup
     Resque.redis.flushall
     @worker = Resque::Worker.new(:testing)
@@ -21,5 +19,4 @@ class ServerHelpersTest < MiniTest::Unit::TestCase
     job = Resque.delayed_timestamp_peek(timestamp, 0, 1).first
     assert_equal '0', @helpers.retry_attempts_for_job(job), 'should have 0 retry attempt'
   end
-
 end

data/test/server_test.rb

@@ -1,10 +1,10 @@
 require 'test_helper'
-
 require 'resque-retry/server'
-ENV['RACK_ENV'] = 'test'
+
+ENV['RACK_ENV'] = ENV['RAILS_ENV']
 
 # Testing the Resque web interface additions.
-class ServerTest < MiniTest::Unit::TestCase
+class ServerTest < MiniTest::Test
   include Rack::Test::Methods
 
   def setup
@@ -41,5 +41,4 @@ class ServerTest < MiniTest::Unit::TestCase
     get '/retry'
     assert last_response.body.include?('<b>1</b> timestamps'), 'should have 1 retry jobs'
   end
-
-end
+end

data/test/test_helper.rb

@@ -4,7 +4,7 @@ $TESTING = true
 
 require 'rubygems'
 require 'timeout'
-require 'minitest/unit'
+require 'minitest/autorun'
 require 'minitest/pride'
 require 'rack/test'
 require 'mocha/setup'
@@ -32,21 +32,16 @@ if !system('which redis-cli')
   abort ''
 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)
-  `redis-cli -p 9736 shutdown nosave`
-end
+# This code is run after all the tests have finished running to ensure that the
+# Redis server is shutdowa
+Minitest.after_run { `redis-cli -p 9736 shutdown nosave` }
 
 puts "Starting redis for testing at localhost:9736..."
 `redis-server #{dir}/redis-test.conf`
 Resque.redis = '127.0.0.1:9736'
 
 # Test helpers
-class MiniTest::Unit::TestCase
+class Minitest::Test
   def perform_next_job(worker, &block)
     return unless job = worker.reserve
     worker.perform(job, &block)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: resque-retry
 version: !ruby/object:Gem::Version
-  version: 1.3.2
+  version: 1.4.0
 platform: ruby
 authors:
 - Luke Antins
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-09 00:00:00.000000000 Z
+date: 2015-01-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: resque
@@ -32,42 +32,42 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.1'
+        version: '10.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.1'
+        version: '10.3'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '5.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '5.5'
 - !ruby/object:Gem::Dependency
   name: rack-test
   requirement: !ruby/object:Gem::Requirement
@@ -116,28 +116,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.7'
+        version: '0.9'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.7'
+        version: '0.9'
 - !ruby/object:Gem::Dependency
   name: mocha
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.1'
 description: |2
     resque-retry provides retry, delay and exponential backoff support for
     resque jobs.
@@ -213,7 +213,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.1
+rubygems_version: 2.4.2
 signing_key: 
 specification_version: 4
 summary: A resque plugin; provides retry, delay and exponential backoff support for