resque-scheduler 2.0.1 → 2.1.0

data/script/migrate_to_timestamps_set.rb

@@ -0,0 +1,14 @@
+require 'redis'
+require 'resque'
+
+if ARGV.size != 1
+  puts "migrate_to_timestamps_set.rb <redis-host:redis-port>"
+  exit
+end
+
+Resque.redis = ARGV[0]
+redis = Resque.redis
+Array(redis.keys("delayed:*")).each do |key|
+  jobs = redis.lrange(key, 0, -1)
+  jobs.each {|job| redis.sadd("timestamps:#{job}", key)}
+end

data/test/delayed_queue_test.rb

@@ -8,20 +8,21 @@ context "DelayedQueue" do
   end
 
   test "enqueue_at adds correct list and zset" do
-    timestamp = Time.now - 1 # 1 second ago (in the past, should come out right away)
+    timestamp = Time.now + 1
+    encoded_job =  Resque.encode({:class => SomeIvarJob.to_s, :args => ["path"], :queue => Resque.queue_from_class(SomeIvarJob)})
 
     assert_equal(0, Resque.redis.llen("delayed:#{timestamp.to_i}").to_i, "delayed queue should be empty to start")
+    assert_equal(0, Resque.redis.scard("timestamps:#{encoded_job}"), "job timestamps set should be empty to start")
 
     Resque.enqueue_at(timestamp, SomeIvarJob, "path")
 
     # Confirm the correct keys were added
     assert_equal(1, Resque.redis.llen("delayed:#{timestamp.to_i}").to_i, "delayed queue should have one entry now")
+    assert_equal(1, Resque.redis.scard("timestamps:#{encoded_job}"), "job timestamps should have one entry now")
     assert_equal(1, Resque.redis.zcard(:delayed_queue_schedule), "The delayed_queue_schedule should have 1 entry now")
 
-    read_timestamp = Resque.next_delayed_timestamp
+    read_timestamp = timestamp.to_i
 
-    # Confirm the timestamp came out correctly
-    assert_equal(timestamp.to_i, read_timestamp, "The timestamp we pull out of redis should match the one we put in")
     item = Resque.next_item_for_timestamp(read_timestamp)
 
     # Confirm the item came out correctly
@@ -31,23 +32,25 @@ context "DelayedQueue" do
     # And now confirm the keys are gone
     assert(!Resque.redis.exists("delayed:#{timestamp.to_i}"))
     assert_equal(0, Resque.redis.zcard(:delayed_queue_schedule), "delayed queue should be empty")
+    assert_equal(0, Resque.redis.scard("timestamps:#{encoded_job}"), "job timestamps set should be empty")
   end
 
   test "enqueue_at with queue adds correct list and zset and queue" do
-    timestamp = Time.now - 1 # 1 second ago (in the past, should come out right away)
+    timestamp = Time.now + 1
+    encoded_job =  Resque.encode({:class => SomeIvarJob.to_s, :args => ["path"], :queue => 'critical'})
 
     assert_equal(0, Resque.redis.llen("delayed:#{timestamp.to_i}").to_i, "delayed queue should be empty to start")
+    assert_equal(0, Resque.redis.scard("timestamps:#{encoded_job}"), "job timestamps set should be empty to start")
 
     Resque.enqueue_at_with_queue('critical', timestamp, SomeIvarJob, "path")
 
     # Confirm the correct keys were added
     assert_equal(1, Resque.redis.llen("delayed:#{timestamp.to_i}").to_i, "delayed queue should have one entry now")
+    assert_equal(1, Resque.redis.scard("timestamps:#{encoded_job}"), "job timestamps should have one entry now")
     assert_equal(1, Resque.redis.zcard(:delayed_queue_schedule), "The delayed_queue_schedule should have 1 entry now")
 
-    read_timestamp = Resque.next_delayed_timestamp
+    read_timestamp = timestamp.to_i
 
-    # Confirm the timestamp came out correctly
-    assert_equal(timestamp.to_i, read_timestamp, "The timestamp we pull out of redis should match the one we put in")
     item = Resque.next_item_for_timestamp(read_timestamp)
 
     # Confirm the item came out correctly
@@ -58,17 +61,21 @@ context "DelayedQueue" do
     # And now confirm the keys are gone
     assert(!Resque.redis.exists("delayed:#{timestamp.to_i}"))
     assert_equal(0, Resque.redis.zcard(:delayed_queue_schedule), "delayed queue should be empty")
+    assert_equal(0, Resque.redis.scard("timestamps:#{encoded_job}"), "job timestamps set should be empty")
   end
 
   test "a job in the future doesn't come out" do
     timestamp = Time.now + 600 # 10 minutes from now (in the future, shouldn't come out)
+    encoded_job =  Resque.encode({:class => SomeIvarJob.to_s, :args => ["path"], :queue => Resque.queue_from_class(SomeIvarJob)})
 
     assert_equal(0, Resque.redis.llen("delayed:#{timestamp.to_i}").to_i, "delayed queue should be empty to start")
+    assert_equal(0, Resque.redis.scard("timestamps:#{encoded_job}"), "job timestamps set should be empty to start")
 
     Resque.enqueue_at(timestamp, SomeIvarJob, "path")
 
     # Confirm the correct keys were added
     assert_equal(1, Resque.redis.llen("delayed:#{timestamp.to_i}").to_i, "delayed queue should have one entry now")
+    assert_equal(1, Resque.redis.scard("timestamps:#{encoded_job}"), "job timestamps should have one entry now")
     assert_equal(1, Resque.redis.zcard(:delayed_queue_schedule), "The delayed_queue_schedule should have 1 entry now")
 
     read_timestamp = Resque.next_delayed_timestamp
@@ -88,19 +95,21 @@ context "DelayedQueue" do
 
   test "enqueue_at and enqueue_in are equivelent" do
     timestamp = Time.now + 60
+    encoded_job =  Resque.encode({:class => SomeIvarJob.to_s, :args => ["path"], :queue => Resque.queue_from_class(SomeIvarJob)})
 
     Resque.enqueue_at(timestamp, SomeIvarJob, "path")
     Resque.enqueue_in(timestamp - Time.now, SomeIvarJob, "path")
 
     assert_equal(1, Resque.redis.zcard(:delayed_queue_schedule), "should have one timestamp in the delayed queue")
     assert_equal(2, Resque.redis.llen("delayed:#{timestamp.to_i}"), "should have 2 items in the timestamp queue")
+    assert_equal(1, Resque.redis.scard("timestamps:#{encoded_job}"), "job timestamps should have one entry now")
   end
 
   test "empty delayed_queue_peek returns empty array" do
     assert_equal([], Resque.delayed_queue_peek(0,20))
   end
 
-  test "delqyed_queue_peek returns stuff" do
+  test "delayed_queue_peek returns stuff" do
     t = Time.now
     expected_timestamps = (1..5).to_a.map do |i|
       (t + 60 + i).to_i
@@ -166,12 +175,11 @@ context "DelayedQueue" do
 
   test "handle_delayed_item with items" do
     t = Time.now - 60 # in the past
-    Resque.enqueue_at(t, SomeIvarJob)
-    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::Scheduler.handle_delayed_items
+    Resque::Job.expects(:create).twice.with(:ivar, SomeIvarJob)
+    Resque.enqueue_at(t, SomeIvarJob)
+    Resque.enqueue_at(t, SomeIvarJob)
   end
 
   test "handle_delayed_items with items in the future" do
@@ -186,9 +194,8 @@ context "DelayedQueue" do
 
   test "calls klass#scheduled when enqueuing jobs if it exists" do
     t = Time.now - 60
+    FakeCustomJobClassEnqueueAt.expects(:scheduled).once.with(:test, FakeCustomJobClassEnqueueAt.to_s, {:foo => "bar"})
     Resque.enqueue_at(t, FakeCustomJobClassEnqueueAt, :foo => "bar")
-    FakeCustomJobClassEnqueueAt.expects(:scheduled).once.with('test', FakeCustomJobClassEnqueueAt.to_s, {"foo" => "bar"})
-    Resque::Scheduler.handle_delayed_items
   end
 
   test "when Resque.inline = true, calls klass#scheduled when enqueuing jobs if it exists" do
@@ -218,6 +225,24 @@ context "DelayedQueue" do
     assert_equal(0, Resque.delayed_timestamp_peek(t, 0, 3).length)
   end
 
+  test "enqueue_delayed creates jobs and empties the delayed queue" do
+    t = Time.now + 60
+
+    Resque.enqueue_at(t, SomeIvarJob, "foo")
+    Resque.enqueue_at(t, SomeIvarJob, "bar")
+    Resque.enqueue_at(t, SomeIvarJob, "bar")
+
+    # 3 SomeIvarJob jobs should be created in the "ivar" queue
+    Resque::Job.expects(:create).never.with(:ivar, SomeIvarJob, "foo")
+    Resque::Job.expects(:create).twice.with(:ivar, SomeIvarJob, "bar")
+
+    # 2 SomeIvarJob jobs should be enqueued
+    assert_equal(2, Resque.enqueue_delayed(SomeIvarJob, "bar"))
+
+    # delayed queue for timestamp should have one remaining
+    assert_equal(1, Resque.delayed_timestamp_peek(t, 0, 3).length)
+  end
+
   test "handle_delayed_items works with out specifying queue (upgrade case)" do
     t = Time.now - 60
     Resque.delayed_push(t, :class => 'SomeIvarJob')
@@ -237,13 +262,23 @@ context "DelayedQueue" do
 
     Resque.reset_delayed_queue
     assert_equal(0, Resque.delayed_queue_schedule_size)
+    assert_equal(0, Resque.redis.keys("timestamps:*").size)
   end
 
   test "remove_delayed removes job and returns the count" do
     t = Time.now + 120
+    encoded_job =  Resque.encode({:class => SomeIvarJob.to_s, :args => [], :queue => Resque.queue_from_class(SomeIvarJob)})
     Resque.enqueue_at(t, SomeIvarJob)
 
     assert_equal(1, Resque.remove_delayed(SomeIvarJob))
+    assert_equal(0, Resque.redis.scard("timestamps:#{encoded_job}"))
+  end
+
+  test "scheduled_at returns an array containing job schedule time" do
+    t = Time.now + 120
+    Resque.enqueue_at(t, SomeIvarJob)
+
+    assert_equal([t.to_i], Resque.scheduled_at(SomeIvarJob))
   end
 
   test "remove_delayed doesn't remove things it shouldn't" do

data/test/resque-web_test.rb

@@ -10,10 +10,10 @@ context "on GET to /schedule" do
 end
 
 context "on GET to /schedule with scheduled jobs" do
-  setup do 
+  setup do
     ENV['rails_env'] = 'production'
-    Resque.schedule = {:some_ivar_job => {'cron' => "* * * * *", 'class' => 'SomeIvarJob', 'args' => "/tmp", 'rails_env' => 'production'},
-                       :some_other_job => {'queue' => 'high', 'class' => 'SomeOtherJob', 'args' => {:b => 'blah'}}}
+    Resque.schedule = {'some_ivar_job' => {'cron' => "* * * * *", 'class' => 'SomeIvarJob', 'args' => "/tmp", 'rails_env' => 'production'},
+                       'some_other_job' => {'every' => ['5m'], 'queue' => 'high', 'class' => 'SomeOtherJob', 'args' => {'b' => 'blah'}}}
     Resque::Scheduler.load_schedule!
     get "/schedule"
   end

data/test/scheduler_args_test.rb

@@ -77,7 +77,7 @@ context "scheduling jobs with arguments" do
   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: 
+      args:
     YAML
     SomeIvarJob.expects(:perform).once.with()
     Resque.reserve('ivar').perform

data/test/scheduler_setup_test.rb

@@ -0,0 +1,59 @@
+require File.dirname(__FILE__) + '/test_helper'
+
+context "Resque::Scheduler" do
+
+  setup do
+    Resque::Scheduler.dynamic = false
+    Resque.redis.flushall
+    Resque::Scheduler.clear_schedule!
+  end
+
+  test 'set custom logger' do
+    custom_logger = Logger.new('/dev/null')
+    Resque::Scheduler.logger = custom_logger
+    assert_equal(custom_logger, Resque::Scheduler.logger)
+  end
+
+  context 'logger default settings' do
+    setup do
+      nullify_logger
+    end
+
+    test 'uses STDOUT' do
+      assert_equal(Resque::Scheduler.logger.instance_variable_get(:@logdev).dev, STDOUT)
+    end
+    test 'not verbose' do
+      assert Resque::Scheduler.logger.level > Logger::DEBUG
+    end
+    test 'not muted' do
+      assert Resque::Scheduler.logger.level < Logger::FATAL
+    end
+
+    teardown do
+      nullify_logger
+    end
+  end
+
+  context 'logger custom settings' do
+    setup do
+      nullify_logger
+    end
+
+    test 'uses logfile' do
+      Resque::Scheduler.logfile = '/dev/null'
+      assert_equal(Resque::Scheduler.logger.instance_variable_get(:@logdev).filename, '/dev/null')
+    end
+    test 'set verbosity' do
+      Resque::Scheduler.verbose = true
+      assert Resque::Scheduler.logger.level == Logger::DEBUG
+    end
+    test 'mute logger' do
+      Resque::Scheduler.mute = true
+      assert Resque::Scheduler.logger.level == Logger::FATAL
+    end
+
+    teardown do
+      nullify_logger
+    end
+  end
+end

data/test/scheduler_test.rb

@@ -191,6 +191,17 @@ context "Resque::Scheduler" do
     assert_equal({'cron' => "* * * * *", 'class' => 'SomeIvarJob', 'args' => "/tmp/75"},
       Resque.decode(Resque.redis.hget(:schedules, "my_ivar_job")))
   end
+  
+  test "schedule= removes schedules not present in the given schedule argument" do
+    Resque::Scheduler.dynamic = true
+
+    Resque.schedule = {"old_job" => {'cron' => "* * * * *", 'class' => 'OldJob'}}
+    assert_equal({"old_job" => {'cron' => "* * * * *", 'class' => 'OldJob'}}, Resque.schedule)
+
+    Resque.schedule = {"new_job" => {'cron' => "* * * * *", 'class' => 'NewJob'}}
+    Resque.reload_schedule!
+    assert_equal({"new_job" => {'cron' => "* * * * *", 'class' => 'NewJob'}}, Resque.schedule)
+  end
 
   test "schedule= uses job name as 'class' argument if it's missing" do
     Resque::Scheduler.dynamic = true

data/test/test_helper.rb

@@ -6,7 +6,7 @@ dir = File.dirname(File.expand_path(__FILE__))
 
 require 'rubygems'
 require 'test/unit'
-require 'mocha'
+require 'mocha/setup'
 require 'resque'
 $LOAD_PATH.unshift File.dirname(File.expand_path(__FILE__)) + '/../lib'
 require 'resque_scheduler'
@@ -57,7 +57,7 @@ def context(*args, &block)
     def self.teardown(&block) define_method(:teardown, &block) end
   end
   (class << klass; self end).send(:define_method, :name) { name.gsub(/\W/,'_') }
-  klass.class_eval &block
+  klass.class_eval(&block)
 end
 
 class FakeCustomJobClass
@@ -83,3 +83,10 @@ class SomeRealClass
     :some_real_queue
   end
 end
+
+def nullify_logger
+  Resque::Scheduler.mute    = nil
+  Resque::Scheduler.verbose = nil
+  Resque::Scheduler.logfile = nil
+  Resque::Scheduler.logger  = nil
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: resque-scheduler
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,16 +9,64 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-21 00:00:00.000000000 Z
+date: 2013-09-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.3'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.3'
+- !ruby/object:Gem::Dependency
+  name: mocha
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rack-test
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -26,7 +74,23 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rubocop
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: redis
   requirement: !ruby/object:Gem::Requirement
@@ -51,6 +115,9 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 1.20.0
+    - - <
+      - !ruby/object:Gem::Version
+        version: '1.25'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -59,6 +126,9 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 1.20.0
+    - - <
+      - !ruby/object:Gem::Version
+        version: '1.25'
 - !ruby/object:Gem::Dependency
   name: rufus-scheduler
   requirement: !ruby/object:Gem::Requirement
@@ -85,10 +155,14 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- .rubocop.yml
+- .travis.yml
+- AUTHORS.md
+- CONTRIBUTING.md
 - Gemfile
 - HISTORY.md
 - LICENSE
-- README.markdown
+- README.md
 - Rakefile
 - lib/resque/scheduler.rb
 - lib/resque/scheduler/lock.rb
@@ -97,6 +171,7 @@ files:
 - lib/resque/scheduler/lock/resilient.rb
 - lib/resque/scheduler_locking.rb
 - lib/resque_scheduler.rb
+- lib/resque_scheduler/logger_builder.rb
 - lib/resque_scheduler/plugin.rb
 - lib/resque_scheduler/server.rb
 - lib/resque_scheduler/server/views/delayed.erb
@@ -105,6 +180,7 @@ files:
 - lib/resque_scheduler/tasks.rb
 - lib/resque_scheduler/version.rb
 - resque-scheduler.gemspec
+- script/migrate_to_timestamps_set.rb
 - tasks/resque_scheduler.rake
 - test/delayed_queue_test.rb
 - test/redis-test.conf
@@ -112,31 +188,48 @@ files:
 - test/scheduler_args_test.rb
 - test/scheduler_hooks_test.rb
 - test/scheduler_locking_test.rb
+- test/scheduler_setup_test.rb
 - test/scheduler_test.rb
 - test/support/redis_instance.rb
 - test/test_helper.rb
-homepage: http://github.com/bvandenbos/resque-scheduler
+homepage: http://github.com/resque/resque-scheduler
 licenses: []
 post_install_message: 
 rdoc_options: []
 require_paths:
-- lib
+- - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 2224918234097590124
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
-      version: 1.3.6
+      version: '0'
+      segments:
+      - 0
+      hash: 2224918234097590124
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Light weight job scheduling on top of Resque
-test_files: []
+test_files:
+- test/delayed_queue_test.rb
+- test/redis-test.conf
+- test/resque-web_test.rb
+- test/scheduler_args_test.rb
+- test/scheduler_hooks_test.rb
+- test/scheduler_locking_test.rb
+- test/scheduler_setup_test.rb
+- test/scheduler_test.rb
+- test/support/redis_instance.rb
+- test/test_helper.rb