resque-status 0.3.0 → 0.3.1

data/Gemfile

@@ -1,8 +1,14 @@
 source :rubygems
 
 gem 'redisk', '>= 0.2.1'
-gem 'resque', '>= 1.3.1'
-gem 'uuid', '>= 2.0.2'
-gem 'mocha', '>= 0.9.8'
-gem 'shoulda', '>= 2.10.2'
-gem 'jeweler'
+gem 'resque', '~>1.19'
+gem 'uuid', '~>2.0.2'
+
+group :test do
+  gem 'mocha', '~>0.9.8'
+  gem 'shoulda', '~>2.10.2'
+end
+
+group :development do
+  gem 'jeweler'
+end

data/Gemfile.lock

@@ -6,35 +6,33 @@ GEM
       bundler (~> 1.0)
       git (>= 1.2.5)
       rake
-    json (1.4.6)
     macaddr (1.5.0)
       systemu (>= 2.4.0)
-    metaclass (0.0.1)
-    mocha (0.10.3)
-      metaclass (~> 0.0.1)
+    mocha (0.9.12)
+    multi_json (1.0.4)
     rack (1.4.0)
     rack-protection (1.2.0)
       rack
     rake (0.9.2.2)
     redis (2.2.2)
-    redis-namespace (1.1.0)
+    redis-namespace (1.0.3)
       redis (< 3.0.0)
     redisk (0.2.2)
       redis (>= 0.1.1)
       redis-namespace (>= 0.1.0)
-    resque (1.15.0)
-      json (~> 1.4.6)
-      redis-namespace (>= 0.10.0)
+    resque (1.19.0.1)
+      multi_json (~> 1.0)
+      redis-namespace (~> 1.0.2)
       sinatra (>= 0.9.2)
       vegas (~> 0.1.2)
-    shoulda (2.11.3)
+    shoulda (2.10.3)
     sinatra (1.3.2)
       rack (~> 1.3, >= 1.3.6)
       rack-protection (~> 1.2)
       tilt (~> 1.3, >= 1.3.3)
     systemu (2.4.2)
     tilt (1.3.3)
-    uuid (2.3.4)
+    uuid (2.0.2)
       macaddr (~> 1.0)
     vegas (0.1.8)
       rack (>= 1.0.0)
@@ -44,8 +42,8 @@ PLATFORMS
 
 DEPENDENCIES
   jeweler
-  mocha (>= 0.9.8)
+  mocha (~> 0.9.8)
   redisk (>= 0.2.1)
-  resque (>= 1.3.1)
-  shoulda (>= 2.10.2)
-  uuid (>= 2.0.2)
+  resque (~> 1.19)
+  shoulda (~> 2.10.2)
+  uuid (~> 2.0.2)

data/Rakefile

@@ -16,11 +16,6 @@ begin
     gem.homepage = "http://github.com/quirkey/resque-status"
     gem.rubyforge_project = "quirkey"
     gem.authors = ["Aaron Quint"]
-    gem.add_dependency "uuid", ">=2.0.2"
-    gem.add_dependency "resque", ">=1.3.1"
-    gem.add_dependency "redisk", ">=0.2.1"
-    gem.add_development_dependency "shoulda", ">=2.10.2"
-    gem.add_development_dependency "mocha", ">=0.9.8"
     # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
   end
   Jeweler::GemcutterTasks.new

data/lib/resque/plugins/status.rb

@@ -30,6 +30,7 @@ module Resque
     # This job would iterate num times updating the status as it goes. At the end
     # we update the status telling anyone listening to this job that its complete.
     module Status
+      VERSION = '0.3.1'
 
       # The error class raised when a job is killed
       class Killed < RuntimeError; end
@@ -119,7 +120,12 @@ module Resque
       def safe_perform!
         set_status({'status' => 'working'})
         perform
-        completed unless status && status.completed?
+        if status.failed?
+          on_failure(status.message) if respond_to?(:on_failure)
+          return
+        elsif status && !status.completed?
+          completed
+        end
         on_success if respond_to?(:on_success)
       rescue Killed
         logger.info "Job #{self} Killed at #{Time.now}"

data/lib/resque/plugins/status/hash.rb

@@ -1,7 +1,6 @@
 module Resque
   module Plugins
     module Status
-      VERSION = '0.3.0'
 
       # Resque::Plugins::Status::Hash is a Hash object that has helper methods for dealing with
       # the common status attributes. It also has a number of class methods for
@@ -103,6 +102,20 @@ module Resque
           redis.smembers(kill_key)
         end
 
+        # Kills <tt>num</tt> jobs within range starting with the most recent first.
+        # By default kills all jobs.
+        # Note that the same conditions apply as <tt>kill</tt>, i.e. only jobs that check
+        # on each iteration by calling <tt>tick</tt> or <tt>at</tt> are eligible to killed.
+        # @param [Numeric] range_start The optional starting range
+        # @param [Numeric] range_end The optional ending range
+        # @example killing the last 20 submitted jobs
+        #   Resque::Plugins::Status::Hash.killall(0, 20)
+        def self.killall(range_start = nil, range_end = nil)
+          status_ids(range_start, range_end).collect do |id|
+            kill(id)
+          end
+        end
+
         # Check whether a job with UUID is on the kill list
         def self.should_kill?(uuid)
           redis.sismember(kill_key, uuid)

data/lib/resque/status_server.rb

@@ -1,3 +1,4 @@
+require 'resque/server'
 require 'resque-status'
 
 module Resque

data/resque-status.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "resque-status"
-  s.version = "0.3.0"
+  s.version = "0.3.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Aaron Quint"]
-  s.date = "2012-01-22"
+  s.date = "2012-01-23"
   s.description = "resque-status is an extension to the resque queue system that provides simple trackable jobs. It provides a Resque::Plugins::Status::Hash class which can set/get the statuses of jobs and a Resque::Plugins::Status class that when included provides easily trackable/killable jobs."
   s.email = "aaron@quirkey.com"
   s.extra_rdoc_files = [
@@ -51,41 +51,20 @@ Gem::Specification.new do |s|
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<redisk>, [">= 0.2.1"])
-      s.add_runtime_dependency(%q<resque>, [">= 1.3.1"])
-      s.add_runtime_dependency(%q<uuid>, [">= 2.0.2"])
-      s.add_runtime_dependency(%q<mocha>, [">= 0.9.8"])
-      s.add_runtime_dependency(%q<shoulda>, [">= 2.10.2"])
-      s.add_runtime_dependency(%q<jeweler>, [">= 0"])
-      s.add_runtime_dependency(%q<uuid>, [">= 2.0.2"])
-      s.add_runtime_dependency(%q<resque>, [">= 1.3.1"])
-      s.add_runtime_dependency(%q<redisk>, [">= 0.2.1"])
-      s.add_development_dependency(%q<shoulda>, [">= 2.10.2"])
-      s.add_development_dependency(%q<mocha>, [">= 0.9.8"])
+      s.add_runtime_dependency(%q<resque>, ["~> 1.19"])
+      s.add_runtime_dependency(%q<uuid>, ["~> 2.0.2"])
+      s.add_development_dependency(%q<jeweler>, [">= 0"])
     else
       s.add_dependency(%q<redisk>, [">= 0.2.1"])
-      s.add_dependency(%q<resque>, [">= 1.3.1"])
-      s.add_dependency(%q<uuid>, [">= 2.0.2"])
-      s.add_dependency(%q<mocha>, [">= 0.9.8"])
-      s.add_dependency(%q<shoulda>, [">= 2.10.2"])
+      s.add_dependency(%q<resque>, ["~> 1.19"])
+      s.add_dependency(%q<uuid>, ["~> 2.0.2"])
       s.add_dependency(%q<jeweler>, [">= 0"])
-      s.add_dependency(%q<uuid>, [">= 2.0.2"])
-      s.add_dependency(%q<resque>, [">= 1.3.1"])
-      s.add_dependency(%q<redisk>, [">= 0.2.1"])
-      s.add_dependency(%q<shoulda>, [">= 2.10.2"])
-      s.add_dependency(%q<mocha>, [">= 0.9.8"])
     end
   else
     s.add_dependency(%q<redisk>, [">= 0.2.1"])
-    s.add_dependency(%q<resque>, [">= 1.3.1"])
-    s.add_dependency(%q<uuid>, [">= 2.0.2"])
-    s.add_dependency(%q<mocha>, [">= 0.9.8"])
-    s.add_dependency(%q<shoulda>, [">= 2.10.2"])
+    s.add_dependency(%q<resque>, ["~> 1.19"])
+    s.add_dependency(%q<uuid>, ["~> 2.0.2"])
     s.add_dependency(%q<jeweler>, [">= 0"])
-    s.add_dependency(%q<uuid>, [">= 2.0.2"])
-    s.add_dependency(%q<resque>, [">= 1.3.1"])
-    s.add_dependency(%q<redisk>, [">= 0.2.1"])
-    s.add_dependency(%q<shoulda>, [">= 2.10.2"])
-    s.add_dependency(%q<mocha>, [">= 0.9.8"])
   end
 end
 

data/test/test_helper.rb

@@ -89,3 +89,11 @@ end
 class BasicJob
   include Resque::Plugins::Status
 end
+
+class FailureJob
+  include Resque::Plugins::Status
+
+  def perform
+    failed("I'm such a failure")
+  end
+end

data/test/test_resque_plugins_status.rb

@@ -93,6 +93,32 @@ class TestResquePluginsStatus < Test::Unit::TestCase
       before_should "call perform on the inherited class" do
         WorkingJob.any_instance.expects(:perform).once
       end
+    end
+
+    context "manually failing a job" do
+      setup do
+        @uuid      = FailureJob.create(:num => 100)
+        @payload   = Resque.pop(:statused)
+        @performed = FailureJob.perform(*@payload['args'])
+      end
+
+      should "load load a new instance of the klass" do
+        assert @performed.is_a?(FailureJob)
+      end
+
+      should "set the uuid" do
+        assert_equal @uuid, @performed.uuid
+      end
+
+      should "set the status" do
+        assert @performed.status.is_a?(Resque::Plugins::Status::Hash)
+        assert_equal 'FailureJob({"num"=>100})', @performed.status.name
+      end
+
+      should "be failed" do
+        assert_match(/failure/, @performed.status.message)
+        assert @performed.status.failed?
+      end
 
     end
 
@@ -126,10 +152,10 @@ class TestResquePluginsStatus < Test::Unit::TestCase
         @uuid1    = KillableJob.create(:num => 100)
         @uuid2    = KillableJob.create(:num => 100)
 
-        Resque::Status.killall
+        Resque::Plugins::Status::Hash.killall
 
-        assert_contains Resque::Status.kill_ids, @uuid1
-        assert_contains Resque::Status.kill_ids, @uuid2
+        assert_contains Resque::Plugins::Status::Hash.kill_ids, @uuid1
+        assert_contains Resque::Plugins::Status::Hash.kill_ids, @uuid2
 
         @payload1   = Resque.pop(:statused)
         @payload2   = Resque.pop(:statused)
@@ -137,8 +163,8 @@ class TestResquePluginsStatus < Test::Unit::TestCase
         @performed = KillableJob.perform(*@payload1['args'])
         @performed = KillableJob.perform(*@payload2['args'])
 
-        @status1 = Resque::Status.get(@uuid1)
-        @status2 = Resque::Status.get(@uuid2)
+        @status1 = Resque::Plugins::Status::Hash.get(@uuid1)
+        @status2 = Resque::Plugins::Status::Hash.get(@uuid2)
       end
 
       should "set the status to killed" do
@@ -157,8 +183,8 @@ class TestResquePluginsStatus < Test::Unit::TestCase
       end
 
       should "not persist the kill key" do
-        assert_does_not_contain Resque::Status.kill_ids, @uuid1
-        assert_does_not_contain Resque::Status.kill_ids, @uuid2
+        assert_does_not_contain Resque::Plugins::Status::Hash.kill_ids, @uuid1
+        assert_does_not_contain Resque::Plugins::Status::Hash.kill_ids, @uuid2
       end
 
     end
@@ -168,10 +194,10 @@ class TestResquePluginsStatus < Test::Unit::TestCase
         @uuid1    = KillableJob.create(:num => 100)
         @uuid2    = KillableJob.create(:num => 100)
 
-        Resque::Status.killall(0,0) # only @uuid2 should be killed
+        Resque::Plugins::Status::Hash.killall(0,0) # only @uuid2 should be killed
 
-        assert_does_not_contain Resque::Status.kill_ids, @uuid1
-        assert_contains Resque::Status.kill_ids, @uuid2
+        assert_does_not_contain Resque::Plugins::Status::Hash.kill_ids, @uuid1
+        assert_contains Resque::Plugins::Status::Hash.kill_ids, @uuid2
 
         @payload1   = Resque.pop(:statused)
         @payload2   = Resque.pop(:statused)
@@ -179,8 +205,8 @@ class TestResquePluginsStatus < Test::Unit::TestCase
         @performed = KillableJob.perform(*@payload1['args'])
         @performed = KillableJob.perform(*@payload2['args'])
 
-        @status1 = Resque::Status.get(@uuid1)
-        @status2 = Resque::Status.get(@uuid2)
+        @status1 = Resque::Plugins::Status::Hash.get(@uuid1)
+        @status2 = Resque::Plugins::Status::Hash.get(@uuid2)
       end
 
       should "set the status to killed" do
@@ -199,8 +225,8 @@ class TestResquePluginsStatus < Test::Unit::TestCase
       end
 
       should "not persist the kill key" do
-        assert_does_not_contain Resque::Status.kill_ids, @uuid1
-        assert_does_not_contain Resque::Status.kill_ids, @uuid2
+        assert_does_not_contain Resque::Plugins::Status::Hash.kill_ids, @uuid1
+        assert_does_not_contain Resque::Plugins::Status::Hash.kill_ids, @uuid2
       end
 
     end
@@ -268,7 +294,6 @@ class TestResquePluginsStatus < Test::Unit::TestCase
         should "set status as failed" do
           assert_equal 'failed', @job.status.status
         end
-
       end
 
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: resque-status
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-22 00:00:00.000000000Z
+date: 2012-01-23 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redisk
-  requirement: &70167507502960 !ruby/object:Gem::Requirement
+  requirement: &70111193431380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,117 +21,40 @@ dependencies:
         version: 0.2.1
   type: :runtime
   prerelease: false
-  version_requirements: *70167507502960
+  version_requirements: *70111193431380
 - !ruby/object:Gem::Dependency
   name: resque
-  requirement: &70167507502380 !ruby/object:Gem::Requirement
+  requirement: &70111193430860 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 1.3.1
+        version: '1.19'
   type: :runtime
   prerelease: false
-  version_requirements: *70167507502380
+  version_requirements: *70111193430860
 - !ruby/object:Gem::Dependency
   name: uuid
-  requirement: &70167507501840 !ruby/object:Gem::Requirement
+  requirement: &70111193430060 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
         version: 2.0.2
   type: :runtime
   prerelease: false
-  version_requirements: *70167507501840
-- !ruby/object:Gem::Dependency
-  name: mocha
-  requirement: &70167507501300 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 0.9.8
-  type: :runtime
-  prerelease: false
-  version_requirements: *70167507501300
-- !ruby/object:Gem::Dependency
-  name: shoulda
-  requirement: &70167507500760 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 2.10.2
-  type: :runtime
-  prerelease: false
-  version_requirements: *70167507500760
+  version_requirements: *70111193430060
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &70167507500200 !ruby/object:Gem::Requirement
+  requirement: &70111193429380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: *70167507500200
-- !ruby/object:Gem::Dependency
-  name: uuid
-  requirement: &70167507499640 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 2.0.2
-  type: :runtime
-  prerelease: false
-  version_requirements: *70167507499640
-- !ruby/object:Gem::Dependency
-  name: resque
-  requirement: &70167507499060 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 1.3.1
-  type: :runtime
-  prerelease: false
-  version_requirements: *70167507499060
-- !ruby/object:Gem::Dependency
-  name: redisk
-  requirement: &70167507496920 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 0.2.1
-  type: :runtime
-  prerelease: false
-  version_requirements: *70167507496920
-- !ruby/object:Gem::Dependency
-  name: shoulda
-  requirement: &70167507496200 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 2.10.2
-  type: :development
-  prerelease: false
-  version_requirements: *70167507496200
-- !ruby/object:Gem::Dependency
-  name: mocha
-  requirement: &70167507495300 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 0.9.8
   type: :development
   prerelease: false
-  version_requirements: *70167507495300
+  version_requirements: *70111193429380
 description: resque-status is an extension to the resque queue system that provides
   simple trackable jobs. It provides a Resque::Plugins::Status::Hash class which can
   set/get the statuses of jobs and a Resque::Plugins::Status class that when included