resque-status 0.4.0 → 0.4.1

data/lib/resque/plugins/status.rb

@@ -28,12 +28,13 @@ 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.4.0'
+      VERSION = '0.4.1'
 
       autoload :Hash, 'resque/plugins/status/hash'
 
       # The error class raised when a job is killed
       class Killed < RuntimeError; end
+      class NotANumber < RuntimeError; end
 
       attr_reader :uuid, :options
 
@@ -76,11 +77,7 @@ module Resque
         #       job_id = ExampleJob.create(:num => 100)
         #
         def create(options = {})
-          if Resque.inline?
-            self.perform(nil, options)
-          else
-            self.enqueue(self, options)
-          end
+          self.enqueue(self, options)
         end
 
         # Adds a job of type <tt>klass<tt> to the queue with <tt>options<tt>.
@@ -124,11 +121,7 @@ module Resque
         def perform(uuid=nil, options = {})
           uuid ||= Resque::Plugins::Status::Hash.generate_uuid
           instance = new(uuid, options)
-          if Resque.inline?
-            instance.perform
-          else
-            instance.safe_perform!
-          end
+          instance.safe_perform!
           instance
         end
 
@@ -198,6 +191,9 @@ module Resque
       # This will kill the job if it has been added to the kill list with
       # <tt>Resque::Plugins::Status::Hash.kill()</tt>
       def at(num, total, *messages)
+        if total.to_f <= 0.0
+          raise(NotANumber, "Called at() with total=#{total} which is not a number")
+        end
         tick({
           'num' => num,
           'total' => total

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

@@ -94,15 +94,15 @@ module Resque
 
         # Return the <tt>num</tt> most recent status/job UUIDs in reverse chronological order.
         def self.status_ids(range_start = nil, range_end = nil)
-          unless range_end && range_start
-            # Because we want a reverse chronological order, we need to get a range starting
-            # by the higest negative number.
-            redis.zrevrange(set_key, 0, -1) || []
-          else
+          if range_end && range_start
             # Because we want a reverse chronological order, we need to get a range starting
             # by the higest negative number. The ordering is transparent from the API user's
             # perspective so we need to convert the passed params
             (redis.zrevrange(set_key, (range_start.abs), ((range_end || 1).abs)) || [])
+          else
+            # Because we want a reverse chronological order, we need to get a range starting
+            # by the higest negative number.
+            redis.zrevrange(set_key, 0, -1) || []
           end
         end
 

data/resque-status.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "resque-status"
-  s.version = "0.4.0"
+  s.version = "0.4.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Aaron Quint"]
-  s.date = "2012-10-21"
+  s.date = "2013-01-26"
   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 = [

data/test/test_helper.rb

@@ -38,12 +38,11 @@ at_exit do
   pid = `ps -e -o pid,command | grep [r]edis-test`.split(" ")[0]
   puts "Killing test redis server..."
   Process.kill("KILL", pid.to_i)
-  `rm -f #{dir}/dump.rdb`
   exit exit_code
 end
 
 puts "Starting redis for testing at localhost:9736..."
-`redis-server #{dir}/redis-test.conf`
+`rm -f #{dir}/dump.rdb && redis-server #{dir}/redis-test.conf`
 Resque.redis = 'localhost:9736/1'
 
 #### Fixtures
@@ -72,7 +71,6 @@ class ErrorJob
 end
 
 class KillableJob
-
   include Resque::Plugins::Status
 
   def perform

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: resque-status
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-21 00:00:00.000000000 Z
+date: 2013-01-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: resque
@@ -88,6 +88,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -3693274209748855583
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: