resque-scheduler 1.9.7 → 1.9.8

data/.gitignore

@@ -1,2 +1,3 @@
+.bundle/
 pkg
 nbproject

data/Gemfile

@@ -0,0 +1,2 @@
+source :rubygems
+gemspec

data/Gemfile.lock

@@ -0,0 +1,52 @@
+PATH
+  remote: .
+  specs:
+    resque-scheduler (1.9.7)
+      redis (>= 2.0.1)
+      resque (>= 1.8.0)
+      rufus-scheduler
+
+GEM
+  remote: http://rubygems.org/
+  specs:
+    git (1.2.5)
+    jeweler (1.5.1)
+      bundler (~> 1.0.0)
+      git (>= 1.2.5)
+      rake
+    json (1.4.6)
+    mocha (0.9.9)
+      rake
+    rack (1.2.1)
+    rack-test (0.5.6)
+      rack (>= 1.0)
+    rake (0.8.7)
+    redis (2.1.1)
+    redis-namespace (0.8.0)
+      redis (< 3.0.0)
+    resque (1.10.0)
+      json (~> 1.4.6)
+      redis-namespace (~> 0.8.0)
+      sinatra (>= 0.9.2)
+      vegas (~> 0.1.2)
+    rufus-scheduler (2.0.7)
+      tzinfo
+    sinatra (1.1.0)
+      rack (~> 1.1)
+      tilt (~> 1.1)
+    tilt (1.1)
+    tzinfo (0.3.23)
+    vegas (0.1.8)
+      rack (>= 1.0.0)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  jeweler
+  mocha
+  rack-test
+  redis (>= 2.0.1)
+  resque (>= 1.8.0)
+  resque-scheduler!
+  rufus-scheduler

data/HISTORY.md

@@ -1,3 +1,13 @@
+## 2.0.0 (???)
+
+* Dynamic schedule support (brianjlandau, davidyang)
+* Now depends on redis >=1.3
+
+## 1.9.8 (???)
+
+* Validates delayed jobs prior to insertion into the delayed queue (bogdan)
+* Rescue exceptions that occur during queuing and log them (dgrijalva)
+
 ## 1.9.7 (2010-11-09)
 
 * Support for rufus-scheduler "every" syntax (fallwith)

data/README.markdown

@@ -147,7 +147,7 @@ and make it support scheduled job.
 Let's pretend we have a JobWithStatus class called FakeLeaderboard
 
 		class FakeLeaderboard < Resque::JobWithStatus
-			def perfom
+			def perform
 				# do something and keep track of the status
 			end
 		end

data/Rakefile

@@ -1,4 +1,5 @@
-load File.expand_path('tasks/resque_scheduler.rake')
+require 'bundler'
+Bundler::GemHelper.install_tasks
 
 $LOAD_PATH.unshift 'lib'
 
@@ -10,47 +11,3 @@ task :test do
     require File.expand_path(f)
   end
 end
-
-
-desc "Build a gem"
-task :gem => [ :test, :gemspec, :build ]
-
-begin
-  begin
-    require 'jeweler'
-  rescue LoadError
-    puts "Jeweler not available. Install it with: "
-    puts "gem install jeweler"
-  end
-
-  require 'resque_scheduler/version'
-
-  Jeweler::Tasks.new do |gemspec|
-    gemspec.name = "resque-scheduler"
-    gemspec.summary = "Light weight job scheduling on top of Resque"
-    gemspec.description = %{Light weight job scheduling on top of Resque.
-  Adds methods enqueue_at/enqueue_in to schedule jobs in the future.
-  Also supports queueing jobs on a fixed, cron-like schedule.}
-    gemspec.email = "bvandenbos@gmail.com"
-    gemspec.homepage = "http://github.com/bvandenbos/resque-scheduler"
-    gemspec.authors = ["Ben VandenBos"]
-    gemspec.version = ResqueScheduler::Version
-
-    gemspec.add_dependency "redis", ">= 2.0.1"
-    gemspec.add_dependency "resque", ">= 1.8.0"
-    gemspec.add_dependency "rufus-scheduler"
-    gemspec.add_development_dependency "jeweler"
-    gemspec.add_development_dependency "mocha"
-    gemspec.add_development_dependency "rack-test"
-  end
-end
-
-
-desc "Push a new version to Gemcutter"
-task :publish => [ :test, :gemspec, :build ] do
-  system "git tag v#{ResqueScheduler::Version}"
-  system "git push origin v#{ResqueScheduler::Version}"
-  system "git push origin master"
-  system "gem push pkg/resque-scheduler-#{ResqueScheduler::Version}.gem"
-  system "git clean -fd"
-end

data/lib/resque/scheduler.rb

@@ -103,14 +103,18 @@ module Resque
         begin
           handle_shutdown do
             if item = Resque.next_item_for_timestamp(timestamp)
-              log "queuing #{item['class']} [delayed]"
-              queue = item['queue'] || Resque.queue_from_class(constantize(item['class']))
-              # Support custom job classes like job with status
-              if (job_klass = item['custom_job_class']) && (job_klass != 'Resque::Job')
-                # custom job classes not supporting the same API calls must implement the #schedule method
-                constantize(job_klass).scheduled(queue, item['class'], *item['args'])
-              else
-                Resque::Job.create(queue, item['class'], *item['args'])
+              begin
+                log "queuing #{item['class']} [delayed]"
+                queue = item['queue'] || Resque.queue_from_class(constantize(item['class']))
+                # Support custom job classes like job with status
+                if (job_klass = item['custom_job_class']) && (job_klass != 'Resque::Job')
+                  # custom job classes not supporting the same API calls must implement the #schedule method
+                  constantize(job_klass).scheduled(queue, item['class'], *item['args'])
+                else
+                  Resque::Job.create(queue, item['class'], *item['args'])
+                end
+              rescue
+                log! "Failed to enqueue #{klass_name}:\n #{$!}"
               end
             end
           end
@@ -128,7 +132,7 @@ module Resque
       def enqueue_from_config(config)
         args = config['args'] || config[:args]
         klass_name = config['class'] || config[:class]
-        params = args.nil? ? [] : Array(args)
+        params = args.is_a?(Hash) ? [args] : Array(args)
         queue = config['queue'] || config[:queue] || Resque.queue_from_class(constantize(klass_name))
         # Support custom job classes like job with status
         if (job_klass = config['custom_job_class']) && (job_klass != 'Resque::Job')
@@ -137,6 +141,8 @@ module Resque
         else
           Resque::Job.create(queue, klass_name, *params)
         end        
+      rescue
+        log! "Failed to enqueue #{klass_name}:\n #{$!}"
       end
 
       def rufus_scheduler

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

@@ -29,7 +29,9 @@
       <td style="white-space:nowrap"><%= (config['cron'].nil? && !config['every'].nil?) ?
                                          h('every: ' + config['every']) : 
                                          h('cron: ' + config['cron']) %></td>
-      <td><%= h config['class'] %></td>
+      <td><%= (config['class'].nil? && !config['custom_job_class'].nil?) ?
+              h(config['custom_job_class']) :
+              h(config['class']) %></td>
       <td><%= h config['queue'] || queue_from_class_name(config['class']) %></td>
       <td><%= h config['args'].inspect %></td>
     </tr>

data/lib/resque_scheduler/version.rb

@@ -1,3 +1,3 @@
 module ResqueScheduler
-  Version = '1.9.7'
+  Version = '1.9.8'
 end

data/lib/resque_scheduler.rb

@@ -41,6 +41,7 @@ module ResqueScheduler
   # for queueing.  Until timestamp is in the past, the job will
   # sit in the schedule list.
   def enqueue_at(timestamp, klass, *args)
+    validate_job!(klass)
     delayed_push(timestamp, job_to_hash(klass, args))
   end
 
@@ -150,6 +151,16 @@ module ResqueScheduler
       end
     end
 
+    def validate_job!(klass)
+      if klass.to_s.empty?
+        raise Resque::NoClassError.new("Jobs must be given a class.")
+      end
+
+      unless queue_from_class(klass)
+        raise Resque::NoQueueError.new("Jobs must be placed onto a queue.")
+      end
+    end
+
 end
 
 Resque.extend ResqueScheduler

data/resque-scheduler.gemspec

@@ -1,83 +1,29 @@
-# Generated by jeweler
-# DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
 # -*- encoding: utf-8 -*-
+require File.expand_path("../lib/resque_scheduler/version", __FILE__)
 
 Gem::Specification.new do |s|
-  s.name = %q{resque-scheduler}
-  s.version = "1.9.7"
-
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Ben VandenBos"]
-  s.date = %q{2010-11-10}
+  s.name        = "resque-scheduler"
+  s.version     = ResqueScheduler::Version
+  s.platform    = Gem::Platform::RUBY
+  s.authors     = ['Ben VandenBos']
+  s.email       = ['bvandenbos@gmail.com']
+  s.homepage    = "http://github.com/bvandenbos/resque-scheduler"
+  s.summary     = "Light weight job scheduling on top of Resque"
   s.description = %q{Light weight job scheduling on top of Resque.
-  Adds methods enqueue_at/enqueue_in to schedule jobs in the future.
-  Also supports queueing jobs on a fixed, cron-like schedule.}
-  s.email = %q{bvandenbos@gmail.com}
-  s.extra_rdoc_files = [
-    "LICENSE",
-     "README.markdown"
-  ]
-  s.files = [
-    ".gitignore",
-     "HISTORY.md",
-     "LICENSE",
-     "README.markdown",
-     "Rakefile",
-     "lib/resque/scheduler.rb",
-     "lib/resque_scheduler.rb",
-     "lib/resque_scheduler/server.rb",
-     "lib/resque_scheduler/server/views/delayed.erb",
-     "lib/resque_scheduler/server/views/delayed_timestamp.erb",
-     "lib/resque_scheduler/server/views/scheduler.erb",
-     "lib/resque_scheduler/tasks.rb",
-     "lib/resque_scheduler/version.rb",
-     "resque-scheduler.gemspec",
-     "tasks/resque_scheduler.rake",
-     "test/delayed_queue_test.rb",
-     "test/redis-test.conf",
-     "test/resque-web_test.rb",
-     "test/scheduler_test.rb",
-     "test/test_helper.rb"
-  ]
-  s.homepage = %q{http://github.com/bvandenbos/resque-scheduler}
-  s.rdoc_options = ["--charset=UTF-8"]
-  s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.7}
-  s.summary = %q{Light weight job scheduling on top of Resque}
-  s.test_files = [
-    "test/delayed_queue_test.rb",
-     "test/resque-web_test.rb",
-     "test/scheduler_test.rb",
-     "test/test_helper.rb"
-  ]
-
-  if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
-    s.specification_version = 3
+    Adds methods enqueue_at/enqueue_in to schedule jobs in the future.
+    Also supports queueing jobs on a fixed, cron-like schedule.}
+  
+  s.required_rubygems_version = ">= 1.3.6"
+  s.add_development_dependency "bundler", ">= 1.0.0"
 
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<redis>, [">= 2.0.1"])
-      s.add_runtime_dependency(%q<resque>, [">= 1.8.0"])
-      s.add_runtime_dependency(%q<rufus-scheduler>, [">= 0"])
-      s.add_development_dependency(%q<jeweler>, [">= 0"])
-      s.add_development_dependency(%q<mocha>, [">= 0"])
-      s.add_development_dependency(%q<rack-test>, [">= 0"])
-    else
-      s.add_dependency(%q<redis>, [">= 2.0.1"])
-      s.add_dependency(%q<resque>, [">= 1.8.0"])
-      s.add_dependency(%q<rufus-scheduler>, [">= 0"])
-      s.add_dependency(%q<jeweler>, [">= 0"])
-      s.add_dependency(%q<mocha>, [">= 0"])
-      s.add_dependency(%q<rack-test>, [">= 0"])
-    end
-  else
-    s.add_dependency(%q<redis>, [">= 2.0.1"])
-    s.add_dependency(%q<resque>, [">= 1.8.0"])
-    s.add_dependency(%q<rufus-scheduler>, [">= 0"])
-    s.add_dependency(%q<jeweler>, [">= 0"])
-    s.add_dependency(%q<mocha>, [">= 0"])
-    s.add_dependency(%q<rack-test>, [">= 0"])
-  end
+  s.files        = `git ls-files`.split("\n")
+  s.executables  = `git ls-files`.split("\n").map{|f| f =~ /^bin\/(.*)/ ? $1 : nil}.compact
+  s.require_path = 'lib'
+  
+  s.add_runtime_dependency(%q<redis>, [">= 2.0.1"])
+  s.add_runtime_dependency(%q<resque>, [">= 1.8.0"])
+  s.add_runtime_dependency(%q<rufus-scheduler>, [">= 0"])
+  s.add_development_dependency(%q<mocha>, [">= 0"])
+  s.add_development_dependency(%q<rack-test>, [">= 0"])
+  
 end
-

data/test/delayed_queue_test.rb

@@ -217,4 +217,13 @@ class Resque::DelayedQueueTest < Test::Unit::TestCase
     assert_equal(2, Resque.remove_delayed(SomeIvarJob, "bar"))
     assert_equal(2, Resque.count_all_scheduled_jobs)
   end
+
+  def test_invalid_job_class
+    assert_raise Resque::NoClassError do
+      Resque.enqueue_in(10, nil)
+    end
+    assert_raise Resque::NoQueueError do
+      Resque.enqueue_in(10, String) # string serves as invalid Job class
+    end
+  end
 end

data/test/scheduler_args_test.rb

@@ -0,0 +1,83 @@
+require File.dirname(__FILE__) + '/test_helper'
+
+context "scheduling jobs with arguments" do
+  setup { Resque::Scheduler.clear_schedule! }
+
+  test "calls the worker without arguments when 'args' is missing from the config" do
+    Resque::Scheduler.enqueue_from_config(YAML.load(<<-YAML))
+      class: SomeIvarJob
+    YAML
+    SomeIvarJob.expects(:perform).once.with()
+    Resque.reserve('ivar').perform
+  end
+
+  test "calls the worker without arguments when 'args' is blank in the config" do
+    Resque::Scheduler.enqueue_from_config(YAML.load(<<-YAML))
+      class: SomeIvarJob
+      args: 
+    YAML
+    SomeIvarJob.expects(:perform).once.with()
+    Resque.reserve('ivar').perform
+  end
+
+  test "calls the worker with a string when the config lists a string" do
+    Resque::Scheduler.enqueue_from_config(YAML.load(<<-YAML))
+      class: SomeIvarJob
+      args: string
+    YAML
+    SomeIvarJob.expects(:perform).once.with('string')
+    Resque.reserve('ivar').perform
+  end
+
+  test "calls the worker with a Fixnum when the config lists an integer" do
+    Resque::Scheduler.enqueue_from_config(YAML.load(<<-YAML))
+      class: SomeIvarJob
+      args: 1
+    YAML
+    SomeIvarJob.expects(:perform).once.with(1)
+    Resque.reserve('ivar').perform
+  end
+
+  test "calls the worker with multiple arguments when the config lists an array" do
+    Resque::Scheduler.enqueue_from_config(YAML.load(<<-YAML))
+      class: SomeIvarJob
+      args:
+        - 1
+        - 2
+    YAML
+    SomeIvarJob.expects(:perform).once.with(1, 2)
+    Resque.reserve('ivar').perform
+  end
+
+  test "calls the worker with an array when the config lists a nested array" do
+    Resque::Scheduler.enqueue_from_config(YAML.load(<<-YAML))
+      class: SomeIvarJob
+      args:
+        - - 1
+          - 2
+    YAML
+    SomeIvarJob.expects(:perform).once.with([1, 2])
+    Resque.reserve('ivar').perform
+  end
+
+  test "calls the worker with a hash when the config lists a hash" do
+    Resque::Scheduler.enqueue_from_config(YAML.load(<<-YAML))
+      class: SomeIvarJob
+      args:
+        key: value
+    YAML
+    SomeIvarJob.expects(:perform).once.with('key' => 'value')
+    Resque.reserve('ivar').perform
+  end
+
+  test "calls the worker with a nested hash when the config lists a nested hash" do
+    Resque::Scheduler.enqueue_from_config(YAML.load(<<-YAML))
+      class: SomeIvarJob
+      args:
+        first_key:
+          second_key: value
+    YAML
+    SomeIvarJob.expects(:perform).once.with('first_key' => {'second_key' => 'value'})
+    Resque.reserve('ivar').perform
+  end
+end

data/test/scheduler_test.rb

@@ -20,6 +20,11 @@ class Resque::SchedulerTest < Test::Unit::TestCase
     Resque::Scheduler.enqueue_from_config('every' => '1m', 'class' => 'JamesJob', 'args' => '/tmp', 'queue' => 'james_queue')
   end
 
+  def test_enqueue_from_config_doesnt_crash_on_exception_when_enqueueing
+    Resque::Job.stubs(:create).raises(Resque::NoQueueError, 'test exception').with(:ivar, 'SomeIvarJob', '/tmp')
+    Resque::Scheduler.enqueue_from_config('cron' => "* * * * *", 'class' => 'SomeIvarJob', 'args' => "/tmp")
+  end
+
   def test_enqueue_from_config_puts_stuff_in_the_resque_queue
     Resque::Job.stubs(:create).once.returns(true).with(:ivar, 'SomeIvarJob', '/tmp')
     Resque::Scheduler.enqueue_from_config('cron' => "* * * * *", 'class' => 'SomeIvarJob', 'args' => "/tmp")

metadata

@@ -1,13 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: resque-scheduler
 version: !ruby/object:Gem::Version 
-  hash: 61
   prerelease: false
   segments: 
   - 1
   - 9
-  - 7
-  version: 1.9.7
+  - 8
+  version: 1.9.8
 platform: ruby
 authors: 
 - Ben VandenBos
@@ -15,68 +14,66 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-10 00:00:00 -08:00
+date: 2011-01-14 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: redis
+  name: bundler
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 13
         segments: 
-        - 2
-        - 0
         - 1
-        version: 2.0.1
-  type: :runtime
+        - 0
+        - 0
+        version: 1.0.0
+  type: :development
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: resque
+  name: redis
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 55
         segments: 
-        - 1
-        - 8
+        - 2
         - 0
-        version: 1.8.0
+        - 1
+        version: 2.0.1
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  name: rufus-scheduler
+  name: resque
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
+        - 1
+        - 8
         - 0
-        version: "0"
+        version: 1.8.0
   type: :runtime
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  name: jeweler
+  name: rufus-scheduler
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 0
         version: "0"
-  type: :development
+  type: :runtime
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
   name: mocha
@@ -86,7 +83,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 0
         version: "0"
@@ -100,7 +96,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 0
         version: "0"
@@ -108,18 +103,20 @@ dependencies:
   version_requirements: *id006
 description: |-
   Light weight job scheduling on top of Resque.
-    Adds methods enqueue_at/enqueue_in to schedule jobs in the future.
-    Also supports queueing jobs on a fixed, cron-like schedule.
-email: bvandenbos@gmail.com
+      Adds methods enqueue_at/enqueue_in to schedule jobs in the future.
+      Also supports queueing jobs on a fixed, cron-like schedule.
+email: 
+- bvandenbos@gmail.com
 executables: []
 
 extensions: []
 
-extra_rdoc_files: 
-- LICENSE
-- README.markdown
+extra_rdoc_files: []
+
 files: 
 - .gitignore
+- Gemfile
+- Gemfile.lock
 - HISTORY.md
 - LICENSE
 - README.markdown
@@ -137,6 +134,7 @@ files:
 - test/delayed_queue_test.rb
 - test/redis-test.conf
 - test/resque-web_test.rb
+- test/scheduler_args_test.rb
 - test/scheduler_test.rb
 - test/test_helper.rb
 has_rdoc: true
@@ -144,8 +142,8 @@ homepage: http://github.com/bvandenbos/resque-scheduler
 licenses: []
 
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
+rdoc_options: []
+
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -153,7 +151,6 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
@@ -162,10 +159,11 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
-      - 0
-      version: "0"
+      - 1
+      - 3
+      - 6
+      version: 1.3.6
 requirements: []
 
 rubyforge_project: 
@@ -173,8 +171,5 @@ rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Light weight job scheduling on top of Resque
-test_files: 
-- test/delayed_queue_test.rb
-- test/resque-web_test.rb
-- test/scheduler_test.rb
-- test/test_helper.rb
+test_files: []
+