resque-scheduler 1.0.3 → 1.0.4

data/HISTORY.md

@@ -1,3 +1,9 @@
+## 1.0.4 (2010-02-26)
+
+* Added support for specifying the queue to put the job onto. This allows for 
+  you to have one job that can go onto multiple queues and be able to schedule
+  jobs without having to load the job classes.
+
 ## 1.0.3 (2010-02-11)
 
 * Added support for scheduled jobs with empty crons. This is helpful to have

data/README.markdown

@@ -1,8 +1,8 @@
 resque-scheduler
 ===============
 
-Resque-scheduler is an extension to [Resque](http://github.com/defunkt/resque) that adds support for queueing items
-in the future.
+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.
 
@@ -22,7 +22,7 @@ is most likely stored in a YAML like so:
       cron: "0 0 * * *"
       class: QueueDocuments
       args: 
-      description: "This job queues all content for indexing in solr
+      description: "This job queues all content for indexing in solr"
 
     clear_leaderboards_contributors:
       cron: "30 6 * * 1"
@@ -30,9 +30,14 @@ is most likely stored in a YAML like so:
       args: contributors
       description: "This job resets the weekly leaderboard for contributions"
 
+A queue option can also be specified. When job will go onto the specified queue
+if it is available (Even if @queue is specified in the job class). When the
+queue is given it is not necessary for the scheduler to load the class.
+
     clear_leaderboards_moderator:
       cron: "30 6 * * 1"
       class: ClearLeaderboards
+	  queue: scoring
       args: moderators
       description: "This job resets the weekly leaderboard for moderators"
 
@@ -47,8 +52,8 @@ it will NOT be ran later when the scheduler process is started back up.  In that
 sense, you can sort of think of the scheduler process as crond.  Delayed jobs,
 however, are different.
 
-A big shout out to [rufus-scheduler](http://github.com/jmettraux/rufus-scheduler) for handling the heavy lifting of the
-actual scheduling engine.
+A big shout out to [rufus-scheduler](http://github.com/jmettraux/rufus-scheduler)
+for handling the heavy lifting of the actual scheduling engine.
 
 ### Delayed jobs
 
@@ -114,7 +119,7 @@ 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 
+    $ 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

data/Rakefile

@@ -36,7 +36,7 @@ begin
     gemspec.authors = ["Ben VandenBos"]
     gemspec.version = ResqueScheduler::Version
 
-    gemspec.add_dependency "resque", ">= 1.3.0"
+    gemspec.add_dependency "resque", ">= 1.5.0"
     gemspec.add_dependency "rufus-scheduler"
     gemspec.add_development_dependency "jeweler"
     gemspec.add_development_dependency "mocha"

data/lib/resque/scheduler.rb

@@ -56,7 +56,7 @@ module Resque
               enqueue_from_config(config)
             end
           else
-            log! "not cron found for #{config['class']} (#{name}) - skipping"
+            log! "no cron found for #{config['class']} (#{name}) - skipping"
           end
         end
       end
@@ -93,7 +93,8 @@ module Resque
         args = config['args'] || config[:args]
         klass_name = config['class'] || config[:class]
         params = args.nil? ? [] : Array(args)
-        Resque.enqueue(constantize(klass_name), *params)
+        queue = config['queue'] || config[:queue] || Resque.queue_from_class(constantize(klass_name))
+        Resque::Job.create(queue, klass_name, *params)
       end
 
       def rufus_scheduler

data/lib/resque_scheduler/server.rb

@@ -12,6 +12,10 @@ module ResqueScheduler
           def format_time(t)
             t.strftime("%Y-%m-%d %H:%M:%S")
           end
+
+          def queue_from_class_name(class_name)
+            Resque.queue_from_class(Resque.constantize(class_name))
+          end
         end
 
         get "/schedule" do

data/lib/resque_scheduler/server/views/scheduler.erb

@@ -12,6 +12,7 @@
     <th>Description</th>
     <th>Cron</th>
     <th>Class</th>
+    <th>Queue</th>
     <th>Arguments</th>
   </tr>
   <% Resque.schedule.each do |name, config| %>
@@ -26,6 +27,7 @@
       <td><%= h config['description'] %></td>
       <td style="white-space:nowrap"><%= h config['cron'] %></td>
       <td><%= h config['class'] %></td>
+      <td><%= h config['queue'] || queue_from_class_name(config['class']) %></td>
       <td><%= h config['args'].inspect %></td>
     </tr>
   <% end %>

data/lib/resque_scheduler/version.rb

@@ -1,3 +1,3 @@
 module ResqueScheduler
-  Version = '1.0.3'
+  Version = '1.0.4'
 end

data/test/scheduler_test.rb

@@ -6,8 +6,13 @@ class Resque::SchedulerTest < Test::Unit::TestCase
     Resque::Scheduler.clear_schedule!
   end
 
+  def test_enqueue_from_config_puts_stuff_in_the_resque_queue_without_class_loaded
+    Resque::Job.stubs(:create).once.returns(true).with('joes_queue', 'BigJoesJob', '/tmp')
+    Resque::Scheduler.enqueue_from_config('cron' => "* * * * *", 'class' => 'BigJoesJob', 'args' => "/tmp", 'queue' => 'joes_queue')
+  end
+  
   def test_enqueue_from_config_puts_stuff_in_the_resque_queue
-    Resque.stubs(:enqueue).once.returns(true).with(SomeIvarJob, '/tmp')
+    Resque::Job.stubs(:create).once.returns(true).with(:ivar, 'SomeIvarJob', '/tmp')
     Resque::Scheduler.enqueue_from_config('cron' => "* * * * *", 'class' => 'SomeIvarJob', 'args' => "/tmp")
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: resque-scheduler
 version: !ruby/object:Gem::Version 
-  version: 1.0.3
+  version: 1.0.4
 platform: ruby
 authors: 
 - Ben VandenBos
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-11 00:00:00 -08:00
+date: 2010-03-01 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -20,7 +20,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.3.0
+        version: 1.5.0
     version: 
 - !ruby/object:Gem::Dependency 
   name: rufus-scheduler