resque-scheduler 2.0.0.h → 2.0.0

data/.gitignore

@@ -3,3 +3,4 @@ doc/
 pkg
 nbproject
 Gemfile.lock
+.rvmrc

data/HISTORY.md

@@ -1,8 +1,14 @@
-## 2.0.0.h (2012-03-19)
+## 2.0.0
+
+* Add support for Resque.inline configuration (carlosantoniodasilva)
+* Fixing possible job loss race condition around deleting delayed queues
+  and enqueuing a job 0 seconds in the future.
+
+### 2.0.0.h (2012-03-19)
 
 * Adding plugin support with hooks (andreas)
 
-## 2.0.0.f (2011-11-03)
+### 2.0.0.f (2011-11-03)
 
 * TODO: address race condition with delayed jobs (using redis transactions)
 * Support ENV['BACKGROUND'] flag for daemonizing (bernerdschaefer)
@@ -10,7 +16,7 @@
 * Added remove_delayed_job_from_timestamp to remove delayed jobs from
   a given timestamp.
 
-## 2.0.0.e (2011-09-16)
+### 2.0.0.e (2011-09-16)
 
 * Adding enqueue_at_with_queue/enqueue_in_with_queue support (niralisse)
 * Adding `Resque::Scheduler.poll_sleep_amount` to allow for configuring
@@ -18,19 +24,19 @@
 * Add a "Clear Delayed Jobs" button to the Delayed Jobs page (john-griffin)
 * Fixed pagination issue on the Delayed tab
 
-## 2.0.0.d (2011-04-04)
+### 2.0.0.d (2011-04-04)
 
 * porting bug fixes from v1.9-stable
 
-## 2.0.0.c
+### 2.0.0.c
 
 * Rake task drop a pid file (sreeix)
 
-## 2.0.0.b
+### 2.0.0.b
 
 * Bug fixes
 
-## 2.0.0.a
+### 2.0.0.a
 
 * Dynamic schedule support (brianjlandau, davidyang)
 * Now depends on redis >=1.3
@@ -108,7 +114,7 @@
 
 ## 1.0.4 (2010-02-26)
 
-* Added support for specifying the queue to put the job onto. This allows for 
+* 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.
 

data/README.markdown

@@ -6,7 +6,13 @@ resque-scheduler
 Resque-scheduler is an extension to [Resque](http://github.com/defunkt/resque)
 that adds support for queueing items in the future.
 
-Requires redis >=1.3.
+This table explains the version requirements for redis
+
+| resque-scheduler version | required redis version|
+|:-------------------------|----------------------:|
+| >= 2.0.0                 | >= 2.2.0              |
+| >= 0.0.1                 | >= 1.3                |
+
 
 Job scheduling is supported in two different way: Recurring (scheduled) and
 Delayed.
@@ -21,7 +27,7 @@ The syntax is pretty explanatory:
 
 ### Documentation
 
-This README covers what most people need to know.  If you're looking for 
+This README covers what most people need to know.  If you're looking for
 details on individual methods, you might want to try the [rdoc](http://rdoc.info/github/bvandenbos/resque-scheduler/master/frames).
 
 ### Installation
@@ -30,9 +36,13 @@ To install:
 
     gem install resque-scheduler
 
+If you use a Gemfile, you may want to specify the `:require` explicitly:
+
+    gem 'resque-scheduler', :require => 'resque_scheduler'
+
 Adding the resque:scheduler rake task:
 
-    require 'resque_scheduler/tasks'    
+    require 'resque_scheduler/tasks'
 
 There are three things `resque-scheduler` needs to know about in order to do
 it's jobs: the schedule, where redis lives, and which queues to use.  The
@@ -45,35 +55,35 @@ to know.
 
     # Resque tasks
     require 'resque/tasks'
-    require 'resque_scheduler/tasks'    
-  
+    require 'resque_scheduler/tasks'
+
     namespace :resque do
       task :setup do
         require 'resque'
         require 'resque_scheduler'
-        require 'resque/scheduler'      
-      
+        require 'resque/scheduler'
+
         # you probably already have this somewhere
         Resque.redis = 'localhost:6379'
 
         # If you want to be able to dynamically change the schedule,
         # uncomment this line.  A dynamic schedule can be updated via the
         # Resque::Scheduler.set_schedule (and remove_schedule) methods.
-        # When dynamic is set to true, the scheduler process looks for 
+        # When dynamic is set to true, the scheduler process looks for
         # schedule changes and applies them on the fly.
         # Note: This feature is only available in >=2.0.0.
         #Resque::Scheduler.dynamic = true
-        
+
         # The schedule doesn't need to be stored in a YAML, it just needs to
         # be a hash.  YAML is usually the easiest.
         Resque.schedule = YAML.load_file('your_resque_schedule.yml')
-        
+
         # If your schedule already has +queue+ set for each job, you don't
         # need to require your jobs.  This can be an advantage since it's
         # less code that resque-scheduler needs to know about. But in a small
         # project, it's usually easier to just include you job classes here.
         # So, someting like this:
-        require 'jobs'        
+        require 'jobs'
       end
     end
 
@@ -82,7 +92,7 @@ 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
@@ -118,7 +128,7 @@ time is in the past, the job moves from the delayed queue to the actual resque
 work queue and will be completed as workers as free to process it.
 
 Also supported is `Resque.enqueue_at` which takes a timestamp to queue the
-job, and `Resque.enqueue_at_with_queue` which takes both a timestamp and a 
+job, and `Resque.enqueue_at_with_queue` which takes both a timestamp and a
 queue name.
 
 The delayed queue is stored in redis and is persisted in the same way the
@@ -163,7 +173,7 @@ is most likely stored in a YAML like so:
       # If you want to have a different job name and class name, provide the 'class' option
       class: QueueDocuments
       queue: high
-      args: 
+      args:
       description: "This job queues all content for indexing in solr"
 
     clear_leaderboards_contributors:
@@ -174,7 +184,7 @@ is most likely stored in a YAML like so:
       description: "This job resets the weekly leaderboard for contributions"
 
 The queue value is optional, but if left unspecified resque-scheduler will
-attempt to get the queue from the job class, which means it needs to be 
+attempt to get the queue from the job class, which means it needs to be
 defined.  If you're getting "uninitialized constant" errors, you probably
 need to either set the queue in the schedule or require your jobs in your
 "resque:setup" rake task.
@@ -253,7 +263,7 @@ And then a schedule:
       cron: "30 6 * * 1"
       queue: scoring
       custom_job_class: FakeLeaderboard
-      args: 
+      args:
       rails_env: demo
       description: "This job will auto-create leaderboards for our online demo and the status will update as the worker makes progress"
 
@@ -286,10 +296,12 @@ The Delayed tab:
 
 ![The Delayed Tab](http://img.skitch.com/20100111-ne4fcqtc5emkcuwc5qtais2kwx.jpg)
 
+#### How do I get the schedule tabs to show up???
+
 To get these to show up you need to pass a file to `resque-web` to tell it to
-include the `resque-scheduler` plugin.  Unless you're running redis on
-localhost, you probably already have this file.  It probably looks something
-like this:
+include the `resque-scheduler` plugin and the resque-schedule server extension
+to the resque-web sinatra app.  Unless you're running redis on localhost, you
+probably already have this file.  It probably looks something like this:
 
     require 'resque' # include resque so we can configure it
     Resque.redis = "redis_server:6379" # tell Resque where redis lives
@@ -298,8 +310,14 @@ Now, you want to add the following:
 
     # This will make the tabs show up.
     require 'resque_scheduler'
+    require 'resque_scheduler/server'
+
+That should make the scheduler tabs show up in `resque-web`.
 
-As of resque-scheduler 2.0, it's no longer necessary to have the resque-web
+
+#### Changes as of 2.0.0
+
+As of resque-scheduler 2.0.0, it's no longer necessary to have the resque-web
 process aware of the schedule because it reads it from redis.  But prior to
 2.0, you'll want to make sure you load the schedule in this file as well.
 Something like this:
@@ -310,7 +328,6 @@ Now make sure you're passing that file to resque-web like so:
 
     resque-web ~/yourapp/config/resque_config.rb
 
-That should make the scheduler tabs show up in `resque-web`.
 
 ### Running in the background
 

data/lib/resque/scheduler.rb

@@ -17,7 +17,7 @@ module Resque
 
       # If set, will try to update the schulde in the loop
       attr_accessor :dynamic
-      
+
       # Amount of time in seconds to sleep between polls of the delayed
       # queue.  Defaults to 5
       attr_writer :poll_sleep_amount
@@ -26,7 +26,7 @@ module Resque
       def scheduled_jobs
         @@scheduled_jobs
       end
-      
+
       def poll_sleep_amount
         @poll_sleep_amount ||= 5 # seconds
       end
@@ -75,7 +75,7 @@ module Resque
         end
       end
 
-      def print_schedule 
+      def print_schedule
         if rufus_scheduler
           log! "Scheduling Info\tLast Run"
           scheduler_jobs = rufus_scheduler.all_jobs
@@ -89,7 +89,7 @@ module Resque
       # rufus scheduler instance
       def load_schedule!
         procline "Loading Schedule"
-         
+
         # Need to load the schedule from redis for the first time if dynamic
         Resque.reload_schedule! if dynamic
 
@@ -103,7 +103,7 @@ module Resque
         Resque.redis.del(:schedules_changed)
         procline "Schedules Loaded"
       end
-      
+
       # modify interval type value to value with options if options available
       def optionizate_interval_value(value)
         args = value
@@ -155,7 +155,6 @@ module Resque
       # Handles queueing delayed items
       # at_time - Time to start scheduling items (default: now).
       def handle_delayed_items(at_time=nil)
-        item = nil
         if timestamp = Resque.next_delayed_timestamp(at_time)
           procline "Processing Delayed Items"
           while !timestamp.nil?
@@ -184,7 +183,7 @@ module Resque
         yield
         exit if @shutdown
       end
-      
+
       def handle_errors
         begin
           yield
@@ -219,7 +218,7 @@ module Resque
           # one app that schedules for another
           if Class === klass
             ResqueScheduler::Plugin.run_before_delayed_enqueue_hooks(klass, *params)
-            Resque.enqueue(klass, *params)
+            Resque.enqueue_to(queue, klass, *params)
           else
             # This will not run the before_hooks in rescue, but will at least
             # queue the job.

data/lib/resque_scheduler.rb

@@ -1,9 +1,7 @@
 require 'rubygems'
 require 'resque'
-require 'resque/server'
 require 'resque_scheduler/version'
 require 'resque/scheduler'
-require 'resque_scheduler/server'
 require 'resque_scheduler/plugin'
 
 module ResqueScheduler
@@ -59,12 +57,12 @@ module ResqueScheduler
   def schedule
     @schedule ||= {}
   end
-  
+
   # reloads the schedule from redis
   def reload_schedule!
     @schedule = get_schedules
   end
-  
+
   # gets the schedule as it exists in redis
   def get_schedules
     if redis.exists(:schedules)
@@ -77,12 +75,12 @@ module ResqueScheduler
       nil
     end
   end
-  
+
   # Create or update a schedule with the provided name and configuration.
   #
   # Note: values for class and custom_job_class need to be strings,
   # not constants.
-  #  
+  #
   #    Resque.set_schedule('some_job', {:class => 'SomeJob',
   #                                     :every => '15mins',
   #                                     :queue => 'high',
@@ -95,12 +93,12 @@ module ResqueScheduler
     end
     config
   end
-  
+
   # retrive the schedule configuration for the given name
   def get_schedule(name)
     decode(redis.hget(:schedules, name))
   end
-  
+
   # remove a given schedule by name
   def remove_schedule(name)
     redis.hdel(:schedules, name)
@@ -113,17 +111,23 @@ module ResqueScheduler
   # sit in the schedule list.
   def enqueue_at(timestamp, klass, *args)
     validate_job!(klass)
-    enqueue_at_with_queue( queue_from_class(klass), timestamp, klass, *args)
+    enqueue_at_with_queue(queue_from_class(klass), timestamp, klass, *args)
   end
 
   # Identical to +enqueue_at+, except you can also specify
-  # a queue in which the job will be placed after the 
-  # timestamp has passed.
+  # a queue in which the job will be placed after the
+  # timestamp has passed. It respects Resque.inline option, by
+  # creating the job right away instead of adding to the queue.
   def enqueue_at_with_queue(queue, timestamp, klass, *args)
     return false unless Plugin.run_before_schedule_hooks(klass, *args)
-    
-    delayed_push(timestamp, job_to_hash_with_queue(queue, klass, args))
-    
+
+    if Resque.inline?
+      # Just create the job and let resque perform it right away with inline.
+      Resque::Job.create(queue, klass, *args)
+    else
+      delayed_push(timestamp, job_to_hash_with_queue(queue, klass, args))
+    end
+
     Plugin.run_after_schedule_hooks(klass, *args)
   end
 
@@ -134,7 +138,7 @@ module ResqueScheduler
   end
 
   # Identical to +enqueue_in+, except you can also specify
-  # a queue in which the job will be placed after the 
+  # a queue in which the job will be placed after the
   # number of seconds has passed.
   def enqueue_in_with_queue(queue, number_of_seconds_from_now, klass, *args)
     enqueue_at_with_queue(queue, Time.now + number_of_seconds_from_now, klass, *args)
@@ -156,7 +160,7 @@ module ResqueScheduler
 
   # Returns an array of timestamps based on start and count
   def delayed_queue_peek(start, count)
-    Array(redis.zrange(:delayed_queue_schedule, start, start+count)).collect{|x| x.to_i}
+    Array(redis.zrange(:delayed_queue_schedule, start, start+count-1)).collect{|x| x.to_i}
   end
 
   # Returns the size of the delayed queue schedule
@@ -210,7 +214,7 @@ module ResqueScheduler
   end
 
   # Given an encoded item, remove it from the delayed_queue
-  # 
+  #
   # This method is potentially very expensive since it needs to scan
   # through the delayed queue for every timestamp.
   def remove_delayed(klass, *args)
@@ -221,7 +225,7 @@ module ResqueScheduler
     end
     destroyed
   end
-  
+
   # Given a timestamp and job (klass + args) it removes all instances and
   # returns the count of jobs removed.
   #
@@ -238,28 +242,32 @@ module ResqueScheduler
     total_jobs = 0
     Array(redis.zrange(:delayed_queue_schedule, 0, -1)).each do |timestamp|
       total_jobs += redis.llen("delayed:#{timestamp}").to_i
-    end 
+    end
     total_jobs
-  end 
+  end
 
   private
-  
+
     def job_to_hash(klass, args)
       {:class => klass.to_s, :args => args, :queue => queue_from_class(klass)}
     end
-    
+
     def job_to_hash_with_queue(queue, klass, args)
       {:class => klass.to_s, :args => args, :queue => queue}
     end
 
     def clean_up_timestamp(key, timestamp)
       # If the list is empty, remove it.
+      redis.watch key
       if 0 == redis.llen(key).to_i
-        redis.del key
-        redis.zrem :delayed_queue_schedule, timestamp.to_i
+        redis.multi do
+          redis.del key
+          redis.zrem :delayed_queue_schedule, timestamp.to_i
+        end
+      else
+        redis.unwatch
       end
     end
-
     def validate_job!(klass)
       if klass.to_s.empty?
         raise Resque::NoClassError.new("Jobs must be given a class.")
@@ -283,6 +291,3 @@ module ResqueScheduler
 end
 
 Resque.extend ResqueScheduler
-Resque::Server.class_eval do
-  include ResqueScheduler::Server
-end

data/lib/resque_scheduler/plugin.rb

@@ -14,7 +14,7 @@ module ResqueScheduler
     end
 
     def method_missing(method_name, *args, &block)
-      if method_name =~ /^run_(.*)_hooks$/
+      if method_name.to_s =~ /^run_(.*)_hooks$/
         job = args.shift
         run_hooks job, $1, *args
       else

data/lib/resque_scheduler/server.rb

@@ -1,7 +1,9 @@
+require 'resque_scheduler'
+require 'resque/server'
 
 # Extend Resque::Server to add tabs
 module ResqueScheduler
-  
+
   module Server
 
     def self.included(base)
@@ -29,7 +31,7 @@ module ResqueScheduler
           Resque::Scheduler.enqueue_from_config(config)
           redirect u("/overview")
         end
-        
+
         get "/delayed" do
           # Is there a better way to specify alternate template locations with sinatra?
           erb File.read(File.join(File.dirname(__FILE__), 'server/views/delayed.erb'))
@@ -39,13 +41,13 @@ module ResqueScheduler
           # Is there a better way to specify alternate template locations with sinatra?
           erb File.read(File.join(File.dirname(__FILE__), 'server/views/delayed_timestamp.erb'))
         end
-        
+
         post "/delayed/queue_now" do
           timestamp = params['timestamp']
           Resque::Scheduler.enqueue_delayed_items_for_timestamp(timestamp.to_i) if timestamp.to_i > 0
           redirect u("/overview")
         end
-        
+
         post "/delayed/clear" do
           Resque.reset_delayed_queue
           redirect u('delayed')
@@ -59,5 +61,9 @@ module ResqueScheduler
     Resque::Server.tabs << 'Delayed'
 
   end
-  
+
+end
+
+Resque::Server.class_eval do
+  include ResqueScheduler::Server
 end

data/lib/resque_scheduler/version.rb

@@ -1,3 +1,3 @@
 module ResqueScheduler
-  VERSION = '2.0.0.h'
+  VERSION = '2.0.0'
 end

data/resque-scheduler.gemspec

@@ -22,6 +22,6 @@ Gem::Specification.new do |s|
   s.require_path = 'lib'
 
   s.add_runtime_dependency(%q<redis>, [">= 2.0.1"])
-  s.add_runtime_dependency(%q<resque>, [">= 1.19.0"])
+  s.add_runtime_dependency(%q<resque>, [">= 1.20.0"])
   s.add_runtime_dependency(%q<rufus-scheduler>, [">= 0"])
 end

data/test/delayed_queue_test.rb

@@ -110,9 +110,9 @@ context "DelayedQueue" do
       Resque.delayed_push(timestamp, {:class => SomeIvarJob, :args => 'blah1'})
     end
 
-    timestamps = Resque.delayed_queue_peek(2,3)
+    timestamps = Resque.delayed_queue_peek(1,2)
 
-    assert_equal(expected_timestamps[2,3], timestamps)
+    assert_equal(expected_timestamps[1,2], timestamps)
   end
 
   test "delayed_queue_schedule_size returns correct size" do
@@ -123,26 +123,26 @@ context "DelayedQueue" do
 
   test "delayed_timestamp_size returns 0 when nothing is queue" do
     t = Time.now + 60
-    assert_equal(0, Resque.delayed_timestamp_size(t))    
+    assert_equal(0, Resque.delayed_timestamp_size(t))
   end
-  
+
   test "delayed_timestamp_size returns 1 when one thing is queued" do
     t = Time.now + 60
     Resque.enqueue_at(t, SomeIvarJob)
-    assert_equal(1, Resque.delayed_timestamp_size(t))    
+    assert_equal(1, Resque.delayed_timestamp_size(t))
   end
 
   test "delayed_timestamp_peek returns empty array when nothings in it" do
     t = Time.now + 60
     assert_equal([], Resque.delayed_timestamp_peek(t, 0, 1), "make sure it's an empty array, not nil")
   end
-  
+
   test "delayed_timestamp_peek returns an array containing one job when one thing is queued" do
     t = Time.now + 60
     Resque.enqueue_at(t, SomeIvarJob)
     assert_equal [{'args' => [], 'class' => 'SomeIvarJob', 'queue' => 'ivar'}], Resque.delayed_timestamp_peek(t, 0, 1)
   end
-  
+
   test "delayed_timestamp_peek returns an array of multiple jobs when more than one job is queued" do
     t = Time.now + 60
     Resque.enqueue_at(t, SomeIvarJob)
@@ -150,7 +150,7 @@ context "DelayedQueue" do
     job = {'args' => [], 'class' => 'SomeIvarJob', 'queue' => 'ivar'}
     assert_equal([job, job], Resque.delayed_timestamp_peek(t, 0, 2))
   end
-  
+
   test "delayed_timestamp_peek only returns an array of one job if only asked for 1" do
     t = Time.now + 60
     Resque.enqueue_at(t, SomeIvarJob)
@@ -170,7 +170,7 @@ context "DelayedQueue" do
     Resque.enqueue_at(t, SomeIvarJob)
 
     # 2 SomeIvarJob jobs should be created in the "ivar" queue
-    Resque::Job.expects(:create).twice.with(:ivar, SomeIvarJob, nil)
+    Resque::Job.expects(:create).twice.with('ivar', SomeIvarJob, nil)
     Resque::Scheduler.handle_delayed_items
   end
 
@@ -180,7 +180,7 @@ context "DelayedQueue" do
     Resque.enqueue_at(t, SomeIvarJob)
 
     # 2 SomeIvarJob jobs should be created in the "ivar" queue
-    Resque::Job.expects(:create).twice.with(:ivar, SomeIvarJob, nil)
+    Resque::Job.expects(:create).twice.with('ivar', SomeIvarJob, nil)
     Resque::Scheduler.handle_delayed_items(t)
   end
 
@@ -191,7 +191,7 @@ context "DelayedQueue" do
     Resque.enqueue_at(t, SomeIvarJob)
 
     # 2 SomeIvarJob jobs should be created in the "ivar" queue
-    Resque::Job.expects(:create).twice.with(:ivar, SomeIvarJob, nil)
+    Resque::Job.expects(:create).twice.with('ivar', SomeIvarJob, nil)
 
     Resque::Scheduler.enqueue_delayed_items_for_timestamp(t)
 
@@ -258,14 +258,14 @@ context "DelayedQueue" do
     assert_equal(2, Resque.remove_delayed(SomeIvarJob, "bar"))
     assert_equal(2, Resque.count_all_scheduled_jobs)
   end
-  
+
   test "remove_delayed_job_from_timestamp removes instances of jobs at a given timestamp" do
     t = Time.now + 120
     Resque.enqueue_at(t, SomeIvarJob, "foo")
     assert_equal 1, Resque.remove_delayed_job_from_timestamp(t, SomeIvarJob, "foo")
     assert_equal 0, Resque.delayed_timestamp_size(t)
   end
-  
+
   test "remove_delayed_job_from_timestamp doesn't remove items from other timestamps" do
     t1 = Time.now + 120
     t2 = t1 + 1
@@ -275,29 +275,29 @@ context "DelayedQueue" do
     assert_equal 1, Resque.delayed_timestamp_size(t1)
     assert_equal 0, Resque.delayed_timestamp_size(t2)
   end
-  
+
   test "remove_delayed_job_from_timestamp removes nothing if there are no matches" do
     t = Time.now + 120
     assert_equal 0, Resque.remove_delayed_job_from_timestamp(t, SomeIvarJob, "foo")
   end
-  
+
   test "remove_delayed_job_from_timestamp only removes items that match args" do
     t = Time.now + 120
     Resque.enqueue_at(t, SomeIvarJob, "foo")
     Resque.enqueue_at(t, SomeIvarJob, "bar")
     assert_equal 1, Resque.remove_delayed_job_from_timestamp(t, SomeIvarJob, "foo")
-    assert_equal 1, Resque.delayed_timestamp_size(t)    
+    assert_equal 1, Resque.delayed_timestamp_size(t)
   end
-  
+
   test "remove_delayed_job_from_timestamp returns the number of items removed" do
     t = Time.now + 120
     Resque.enqueue_at(t, SomeIvarJob, "foo")
     assert_equal 1, Resque.remove_delayed_job_from_timestamp(t, SomeIvarJob, "foo")
   end
-  
+
   test "remove_delayed_job_from_timestamp should cleanup the delayed timestamp list if not jobs are left" do
     t = Time.now + 120
-    Resque.enqueue_at(t, SomeIvarJob, "foo")    
+    Resque.enqueue_at(t, SomeIvarJob, "foo")
     assert_equal 1, Resque.remove_delayed_job_from_timestamp(t, SomeIvarJob, "foo")
     assert !Resque.redis.exists("delayed:#{t.to_i}")
     assert Resque.delayed_queue_peek(0, 100).empty?
@@ -311,4 +311,19 @@ context "DelayedQueue" do
       Resque.enqueue_in(10, String) # string serves as invalid Job class
     end
   end
+
+  test "inlining jobs with Resque.inline config" do
+    begin
+      Resque.inline = true
+      Resque::Job.expects(:create).once.with(:ivar, SomeIvarJob, "foo", "bar")
+
+      timestamp = Time.now + 120
+      Resque.enqueue_at(timestamp, SomeIvarJob, "foo", "bar")
+
+      assert_equal 0, Resque.count_all_scheduled_jobs
+      assert !Resque.redis.exists("delayed:#{timestamp.to_i}")
+    ensure
+      Resque.inline = false
+    end
+  end
 end

data/test/scheduler_test.rb

@@ -32,6 +32,14 @@ context "Resque::Scheduler" do
     Resque::Scheduler.enqueue_from_config(config)
   end
 
+  test "enqueue_from_config respects queue params" do
+    config = {'cron' => "* * * * *", 'class' => 'SomeIvarJob', 'queue' => 'high'}
+
+    Resque.expects(:enqueue_to).with('high', SomeIvarJob)
+
+    Resque::Scheduler.enqueue_from_config(config)
+  end
+
   test "config makes it into the rufus_scheduler" do
     assert_equal(0, Resque::Scheduler.rufus_scheduler.all_jobs.size)
 

data/test/test_helper.rb

@@ -8,9 +8,9 @@ require 'rubygems'
 require 'test/unit'
 require 'mocha'
 require 'resque'
-require File.join(dir, '../lib/resque_scheduler')
 $LOAD_PATH.unshift File.dirname(File.expand_path(__FILE__)) + '/../lib'
-
+require 'resque_scheduler'
+require 'resque_scheduler/server'
 
 #
 # make sure we can run redis

metadata

@@ -1,19 +1,19 @@
 --- !ruby/object:Gem::Specification
 name: resque-scheduler
 version: !ruby/object:Gem::Version
-  version: 2.0.0.h
-  prerelease: 6
+  version: 2.0.0
+  prerelease: 
 platform: ruby
 authors:
 - Ben VandenBos
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-19 00:00:00.000000000Z
+date: 2012-05-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &2169473600 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,15 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *2169473600
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: redis
-  requirement: &2169465640 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,21 +37,31 @@ dependencies:
         version: 2.0.1
   type: :runtime
   prerelease: false
-  version_requirements: *2169465640
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 2.0.1
 - !ruby/object:Gem::Dependency
   name: resque
-  requirement: &2169464480 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.19.0
+        version: 1.20.0
   type: :runtime
   prerelease: false
-  version_requirements: *2169464480
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.20.0
 - !ruby/object:Gem::Dependency
   name: rufus-scheduler
-  requirement: &2169462660 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,7 +69,12 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2169462660
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: ! "Light weight job scheduling on top of Resque.\n    Adds methods enqueue_at/enqueue_in
   to schedule jobs in the future.\n    Also supports queueing jobs on a fixed, cron-like
   schedule."
@@ -100,9 +120,6 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -2739279222393439195
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -111,7 +128,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.6
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.17
+rubygems_version: 1.8.21
 signing_key: 
 specification_version: 3
 summary: Light weight job scheduling on top of Resque