resque-scheduler 1.0.0 → 1.0.1

data/README.markdown

@@ -1,7 +1,7 @@
 resque-scheduler
 ===============
 
-Resque-scheduler is an extension to Resque that adds support for queueing items
+Resque-scheduler is an extension to [Resque](http://github.com/defunkt/resque) that adds support for queueing items
 in the future.
 
 Requires redis >=1.1.
@@ -38,8 +38,8 @@ is most likely stored in a YAML like so:
 
 And then set the schedule wherever you configure Resque, like so:
 
-    require 'resque-scheduler'
-    ResqueScheduler.schedule = YAML.load_file(File.join(File.dirname(__FILE__), '../resque_schedule.yml'))
+    require 'resque_scheduler'
+    Resque.schedule = YAML.load_file(File.join(File.dirname(__FILE__), '../resque_schedule.yml'))
 
 Keep in mind, scheduled jobs behave like crons: if your scheduler process (more
 on that later) is not running when a particular job is supposed to be queued,
@@ -98,20 +98,24 @@ The Delayed tab:
 ![The Delayed Tab](http://img.skitch.com/20100111-ne4fcqtc5emkcuwc5qtais2kwx.jpg)
 
 
-The Scheduler process
----------------------
+Installation and the Scheduler process
+--------------------------------------
 
-The scheduler process is just a rake task which is responsible for both queueing
-items from the schedule and polling the delayed queue for items ready to be
-pushed on to the work queues.  For obvious reasons, this process never exits.
+To install:
 
-    $ rake resque-scheduler 
+    gem install resque-scheduler
 
 You'll need to add this to your rakefile:
 
     require 'resque_scheduler/tasks'
     task "resque:setup" => :environment
 
+The scheduler process is just a rake task which is responsible for both queueing
+items from the schedule and polling the delayed queue for items ready to be
+pushed on to the work queues.  For obvious reasons, this process never exits.
+
+    $ rake resque-scheduler 
+
 Supported environment variables are `VERBOSE` and `MUTE`.  If either is set to
 any nonempty value, they will take effect.  `VERBOSE` simply dumps more output
 to stdout.  `MUTE` does the opposite and silences all output. `MUTE` supercedes
@@ -130,4 +134,4 @@ work on resque-scheduler.
 Contributing
 ------------
 
-For bugs or suggestions, please just open an issue in github.
+For bugs or suggestions, please just open an issue in github.

data/lib/resque/scheduler.rb

@@ -60,18 +60,22 @@ module Resque
       # Handles queueing delayed items
       def handle_delayed_items
         item = nil
-        if timestamp = Resque.next_delayed_timestamp
-          item = nil
-          begin
-            handle_shutdown do
-              if item = Resque.next_item_for_timestamp(timestamp)
-                log "queuing #{item['class']} [delayed]"
-                klass = constantize(item['class'])
-                Resque.enqueue(klass, *item['args'])
+        begin
+          if timestamp = Resque.next_delayed_timestamp
+            item = nil
+            begin
+              handle_shutdown do
+                if item = Resque.next_item_for_timestamp(timestamp)
+                  log "queuing #{item['class']} [delayed]"
+                  klass = constantize(item['class'])
+                  Resque.enqueue(klass, *item['args'])
+                end
               end
-            end
-          end while !item.nil?
-        end
+            # continue processing until there are no more ready items in this timestamp
+            end while !item.nil?
+          end
+        # continue processing until there are no more ready timestamps
+        end while !timestamp.nil?
       end
 
       def handle_shutdown

data/lib/resque_scheduler.rb

@@ -57,12 +57,12 @@ module ResqueScheduler
     # Now, add this timestamp to the zsets.  The score and the value are
     # the same since we'll be querying by timestamp, and we don't have
     # anything else to store.
-    redis.zset_add :delayed_queue_schedule, timestamp.to_i, timestamp.to_i
+    redis.zadd :delayed_queue_schedule, timestamp.to_i, timestamp.to_i
   end
 
   # Returns an array of timestamps based on start and count
   def delayed_queue_peek(start, count)
-    (redis.zrange :delayed_queue_schedule, start, start+count).collect(&:to_i)
+    redis.zrange(:delayed_queue_schedule, start, start+count).collect(&:to_i)
   end
 
   # Returns the size of the delayed queue schedule

data/lib/resque_scheduler/version.rb

@@ -1,3 +1,3 @@
 module ResqueScheduler
-  Version = '1.0.0'
+  Version = '1.0.1'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: resque-scheduler
 version: !ruby/object:Gem::Version 
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors: 
 - Ben VandenBos
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-11 00:00:00 -08:00
+date: 2010-02-01 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency