resque-scheduler 4.0.0 → 4.1.0

data/lib/resque/scheduler/server/views/search.erb

@@ -1,5 +1,5 @@
 <h1>Search Results</h1>
-<%= render_partial File.read(File.join(File.dirname(__FILE__), 'server/views/search_form.erb')) %>
+<%= scheduler_view :search_form, layout: false %>
 <hr>
 <% delayed = @jobs.select { |j| j['where_at'] == 'delayed' } %>
 <h1>Delayed jobs</h1>
@@ -70,4 +70,3 @@
 </table>
 
 
-

data/lib/resque/scheduler/signal_handling.rb

@@ -18,7 +18,7 @@ module Resque
             signal_queue << sig
             # break sleep in the primary scheduler thread, alowing
             # the signal queue to get processed as soon as possible.
-            @th.wakeup if @th.alive?
+            @th.wakeup if @th && @th.alive?
           end
         end
       end

data/lib/resque/scheduler/util.rb

@@ -32,9 +32,7 @@ module Resque
       end
 
       def self.classify(dashed_word)
-        dashed_word.split('-').each do|part|
-          part[0] = part[0].chr.upcase
-        end.join
+        dashed_word.split('-').map(&:capitalize).join
       end
     end
   end

data/lib/resque/scheduler/version.rb

@@ -2,6 +2,6 @@
 
 module Resque
   module Scheduler
-    VERSION = '4.0.0'
+    VERSION = '4.1.0'
   end
 end

data/resque-scheduler.gemspec

@@ -18,23 +18,25 @@ Gem::Specification.new do |spec|
   spec.license = 'MIT'
 
   spec.files = `git ls-files -z`.split("\0")
-  spec.executables = spec.files.grep(/^bin\//) { |f| File.basename(f) }
-  spec.test_files = spec.files.grep(/^test\//)
+  spec.executables = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
+  spec.test_files = spec.files.grep(%r{^test/})
   spec.require_paths = ['lib']
 
   spec.add_development_dependency 'bundler'
   spec.add_development_dependency 'json'
   spec.add_development_dependency 'kramdown'
+  spec.add_development_dependency 'minitest'
   spec.add_development_dependency 'mocha'
   spec.add_development_dependency 'pry'
   spec.add_development_dependency 'rack-test'
   spec.add_development_dependency 'rake'
   spec.add_development_dependency 'simplecov'
+  spec.add_development_dependency 'test-unit'
   spec.add_development_dependency 'yard'
 
   # We pin rubocop because new cops have a tendency to result in false-y
   # positives for new contributors, which is not a nice experience.
-  spec.add_development_dependency 'rubocop', '~> 0.28.0'
+  spec.add_development_dependency 'rubocop', '~> 0.35.1'
 
   spec.add_runtime_dependency 'mono_logger', '~> 1.0'
   spec.add_runtime_dependency 'redis', '~> 3.0'

data/test/cli_test.rb

@@ -223,4 +223,9 @@ context 'Cli' do
     Resque::Scheduler.expects(:run)
     Resque::Scheduler::Cli.run!([], {})
   end
+
+  test 'does not create keys for unspecified environment variables' do
+    cli = new_cli([], 'DYNAMIC_SCHEDULE' => 'true')
+    assert_equal({ dynamic: 'true' }, cli.send(:options))
+  end
 end

data/test/delayed_queue_test.rb

@@ -516,6 +516,283 @@ context 'DelayedQueue' do
     assert_equal(2, Resque.count_all_scheduled_jobs)
   end
 
+  test 'enqueue_delayed_selection enqueues multiple items matching ' \
+       'arguments at same timestamp' do
+    t = Time.now + 120
+    Resque.enqueue_at(t, SomeIvarJob, 'bar', 'llama')
+    Resque.enqueue_at(t, SomeIvarJob, 'foo')
+    Resque.enqueue_at(t, SomeIvarJob, 'bar', 'monkey')
+    Resque.enqueue_at(t, SomeIvarJob, 'bar', 'platypus')
+    Resque.enqueue_at(t, SomeIvarJob, 'baz')
+    Resque.enqueue_at(t, SomeIvarJob, 'bar', 'llama')
+    Resque.enqueue_at(t, SomeIvarJob, 'bar', 'llama')
+
+    assert_equal(5, Resque.enqueue_delayed_selection { |a| a.first == 'bar' })
+    assert_equal(2, Resque.count_all_scheduled_jobs)
+  end
+
+  test 'enqueue_delayed_selection enqueues single item matching arguments' do
+    t = Time.now + 120
+    Resque.enqueue_at(t, SomeIvarJob, 'foo')
+    Resque.enqueue_at(t + 1, SomeIvarJob, 'bar')
+    Resque.enqueue_at(t + 2, SomeIvarJob, 'bar')
+    Resque.enqueue_at(t + 3, SomeIvarJob, 'baz')
+
+    assert_equal(1, Resque.enqueue_delayed_selection { |a| a.first == 'foo' })
+    assert_equal(3, Resque.count_all_scheduled_jobs)
+  end
+
+  test 'enqueue_delayed_selection enqueues multiple items matching arguments' do
+    t = Time.now + 120
+    Resque.enqueue_at(t, SomeIvarJob, 'foo')
+    Resque.enqueue_at(t + 1, SomeIvarJob, 'bar')
+    Resque.enqueue_at(t + 2, SomeIvarJob, 'bar')
+    Resque.enqueue_at(t + 3, SomeIvarJob, 'baz')
+
+    assert_equal(2, Resque.enqueue_delayed_selection { |a| a.first == 'bar' })
+    assert_equal(2, Resque.count_all_scheduled_jobs)
+  end
+
+  test 'enqueue_delayed_selection enqueues multiple items matching ' \
+       'arguments as hash' do
+    t = Time.now + 120
+    Resque.enqueue_at(t, SomeIvarJob, foo: 'foo')
+    Resque.enqueue_at(t + 1, SomeIvarJob, foo: 'bar')
+    Resque.enqueue_at(t + 2, SomeIvarJob, foo: 'bar')
+    Resque.enqueue_at(t + 3, SomeIvarJob, foo: 'baz')
+
+    assert_equal(
+      2, Resque.enqueue_delayed_selection { |a| a.first['foo'] == 'bar' }
+    )
+    assert_equal(2, Resque.count_all_scheduled_jobs)
+  end
+
+  test 'enqueue_delayed_selection ignores jobs with no arguments' do
+    t = Time.now + 120
+    Resque.enqueue_at(t, SomeIvarJob)
+    Resque.enqueue_at(t + 1, SomeIvarJob)
+    Resque.enqueue_at(t + 2, SomeIvarJob)
+    Resque.enqueue_at(t + 3, SomeIvarJob)
+
+    assert_equal(0, Resque.enqueue_delayed_selection { |a| a.first == 'bar' })
+    assert_equal(4, Resque.count_all_scheduled_jobs)
+  end
+
+  test "enqueue_delayed_selection doesn't enqueue items it shouldn't" do
+    t = Time.now + 120
+    Resque.enqueue_at(t, SomeIvarJob, 'foo')
+    Resque.enqueue_at(t + 1, SomeIvarJob, 'bar')
+    Resque.enqueue_at(t + 2, SomeIvarJob, 'bar')
+    Resque.enqueue_at(t + 3, SomeIvarJob, 'baz')
+
+    assert_equal(0, Resque.enqueue_delayed_selection { |a| a.first == 'qux' })
+    assert_equal(4, Resque.count_all_scheduled_jobs)
+  end
+
+  test 'enqueue_delayed_selection ignores last_enqueued_at redis key' do
+    t = Time.now + 120
+    Resque.enqueue_at(t, SomeIvarJob)
+    Resque.last_enqueued_at(SomeIvarJob, t)
+
+    assert_equal(0, Resque.enqueue_delayed_selection { |a| a.first == 'bar' })
+    assert_equal(t.to_s, Resque.get_last_enqueued_at(SomeIvarJob))
+  end
+
+  test 'enqueue_delayed_selection enqueues item by class' do
+    t = Time.now + 120
+    Resque.enqueue_at(t, SomeIvarJob, 'foo')
+    Resque.enqueue_at(t, SomeQuickJob, 'foo')
+
+    assert_equal(1, Resque.enqueue_delayed_selection(SomeIvarJob) do |a|
+      a.first == 'foo'
+    end)
+    assert_equal(1, Resque.count_all_scheduled_jobs)
+  end
+
+  test 'enqueue_delayed_selection enqueues item by class name as a string' do
+    t = Time.now + 120
+    Resque.enqueue_at(t, SomeIvarJob, 'foo')
+    Resque.enqueue_at(t, SomeQuickJob, 'foo')
+
+    assert_equal(1, Resque.enqueue_delayed_selection('SomeIvarJob') do |a|
+      a.first == 'foo'
+    end)
+    assert_equal(1, Resque.count_all_scheduled_jobs)
+  end
+
+  test 'enqueue_delayed_selection enqueues item by class name as a symbol' do
+    t = Time.now + 120
+    Resque.enqueue_at(t, SomeIvarJob, 'foo')
+    Resque.enqueue_at(t, SomeQuickJob, 'foo')
+
+    assert_equal(1, Resque.enqueue_delayed_selection(:SomeIvarJob) do |a|
+      a.first == 'foo'
+    end)
+    assert_equal(1, Resque.count_all_scheduled_jobs)
+  end
+
+  test 'enqueue_delayed_selection enqueues items only from' \
+       'matching job class' do
+    t = Time.now + 120
+    Resque.enqueue_at(t, SomeIvarJob, 'foo')
+    Resque.enqueue_at(t, SomeQuickJob, 'foo')
+    Resque.enqueue_at(t + 1, SomeIvarJob, 'bar')
+    Resque.enqueue_at(t + 1, SomeQuickJob, 'bar')
+    Resque.enqueue_at(t + 1, SomeIvarJob, 'foo')
+    Resque.enqueue_at(t + 2, SomeQuickJob, 'foo')
+
+    assert_equal(2, Resque.enqueue_delayed_selection(SomeIvarJob) do |a|
+      a.first == 'foo'
+    end)
+    assert_equal(4, Resque.count_all_scheduled_jobs)
+  end
+
+  test 'enqueue_delayed_selection enqueues items from matching job class ' \
+       'without params' do
+    t = Time.now + 120
+    Resque.enqueue_at(t, SomeIvarJob)
+    Resque.enqueue_at(t + 1, SomeQuickJob)
+    Resque.enqueue_at(t + 2, SomeIvarJob)
+    Resque.enqueue_at(t + 3, SomeQuickJob)
+
+    assert_equal(2, Resque.enqueue_delayed_selection(SomeQuickJob) { true })
+    assert_equal(2, Resque.count_all_scheduled_jobs)
+  end
+
+  test 'find_delayed_selection finds multiple items matching ' \
+       'arguments at same timestamp' do
+    t = Time.now + 120
+    Resque.enqueue_at(t, SomeIvarJob, 'bar', 'llama')
+    Resque.enqueue_at(t, SomeIvarJob, 'foo')
+    Resque.enqueue_at(t, SomeIvarJob, 'bar', 'monkey')
+    Resque.enqueue_at(t, SomeIvarJob, 'bar', 'platypus')
+    Resque.enqueue_at(t, SomeIvarJob, 'baz')
+    Resque.enqueue_at(t, SomeIvarJob, 'bar', 'llama')
+    Resque.enqueue_at(t, SomeIvarJob, 'bar', 'llama')
+
+    assert_equal(5, (Resque.find_delayed_selection do |a|
+      a.first == 'bar'
+    end).length)
+  end
+
+  test 'find_delayed_selection finds single item matching arguments' do
+    t = Time.now + 120
+    Resque.enqueue_at(t, SomeIvarJob, 'foo')
+    Resque.enqueue_at(t + 1, SomeIvarJob, 'bar')
+    Resque.enqueue_at(t + 2, SomeIvarJob, 'bar')
+    Resque.enqueue_at(t + 3, SomeIvarJob, 'baz')
+
+    assert_equal(1, (Resque.find_delayed_selection do |a|
+      a.first == 'foo'
+    end).length)
+  end
+
+  test 'find_delayed_selection finds multiple items matching arguments' do
+    t = Time.now + 120
+    Resque.enqueue_at(t, SomeIvarJob, 'foo')
+    Resque.enqueue_at(t + 1, SomeIvarJob, 'bar')
+    Resque.enqueue_at(t + 2, SomeIvarJob, 'bar')
+    Resque.enqueue_at(t + 3, SomeIvarJob, 'baz')
+
+    assert_equal(2, (Resque.find_delayed_selection do |a|
+      a.first == 'bar'
+    end).length)
+  end
+
+  test 'find_delayed_selection finds multiple items matching ' \
+       'arguments as hash' do
+    t = Time.now + 120
+    Resque.enqueue_at(t, SomeIvarJob, foo: 'foo')
+    Resque.enqueue_at(t + 1, SomeIvarJob, foo: 'bar')
+    Resque.enqueue_at(t + 2, SomeIvarJob, foo: 'bar')
+    Resque.enqueue_at(t + 3, SomeIvarJob, foo: 'baz')
+
+    len = Resque.find_delayed_selection { |a| a.first['foo'] == 'bar' }.length
+    assert_equal(2, len)
+  end
+
+  test 'find_delayed_selection ignores jobs with no arguments' do
+    t = Time.now + 120
+    Resque.enqueue_at(t, SomeIvarJob)
+    Resque.enqueue_at(t + 1, SomeIvarJob)
+    Resque.enqueue_at(t + 2, SomeIvarJob)
+    Resque.enqueue_at(t + 3, SomeIvarJob)
+
+    assert_equal(0, (Resque.find_delayed_selection do |a|
+      a.first == 'bar'
+    end).length)
+  end
+
+  test "find_delayed_selection doesn't find items it shouldn't" do
+    t = Time.now + 120
+    Resque.enqueue_at(t, SomeIvarJob, 'foo')
+    Resque.enqueue_at(t + 1, SomeIvarJob, 'bar')
+    Resque.enqueue_at(t + 2, SomeIvarJob, 'bar')
+    Resque.enqueue_at(t + 3, SomeIvarJob, 'baz')
+
+    assert_equal(0, (Resque.find_delayed_selection do |a|
+      a.first == 'qux'
+    end).length)
+  end
+
+  test 'find_delayed_selection finds item by class' do
+    t = Time.now + 120
+    Resque.enqueue_at(t, SomeIvarJob, 'foo')
+    Resque.enqueue_at(t, SomeQuickJob, 'foo')
+
+    assert_equal(1, (Resque.find_delayed_selection(SomeIvarJob) do |a|
+      a.first == 'foo'
+    end).length)
+  end
+
+  test 'find_delayed_selection finds item by class name as a string' do
+    t = Time.now + 120
+    Resque.enqueue_at(t, SomeIvarJob, 'foo')
+    Resque.enqueue_at(t, SomeQuickJob, 'foo')
+
+    assert_equal(1, (Resque.find_delayed_selection('SomeIvarJob') do |a|
+      a.first == 'foo'
+    end).length)
+  end
+
+  test 'find_delayed_selection finds item by class name as a symbol' do
+    t = Time.now + 120
+    Resque.enqueue_at(t, SomeIvarJob, 'foo')
+    Resque.enqueue_at(t, SomeQuickJob, 'foo')
+
+    assert_equal(1, (Resque.find_delayed_selection(:SomeIvarJob) do |a|
+      a.first == 'foo'
+    end).length)
+  end
+
+  test 'find_delayed_selection finds items only from' \
+       'matching job class' do
+    t = Time.now + 120
+    Resque.enqueue_at(t, SomeIvarJob, 'foo')
+    Resque.enqueue_at(t, SomeQuickJob, 'foo')
+    Resque.enqueue_at(t + 1, SomeIvarJob, 'bar')
+    Resque.enqueue_at(t + 1, SomeQuickJob, 'bar')
+    Resque.enqueue_at(t + 1, SomeIvarJob, 'foo')
+    Resque.enqueue_at(t + 2, SomeQuickJob, 'foo')
+
+    assert_equal(2, (Resque.find_delayed_selection(SomeIvarJob) do |a|
+      a.first == 'foo'
+    end).length)
+  end
+
+  test 'find_delayed_selection finds items from matching job class ' \
+       'without params' do
+    t = Time.now + 120
+    Resque.enqueue_at(t, SomeIvarJob)
+    Resque.enqueue_at(t + 1, SomeQuickJob)
+    Resque.enqueue_at(t + 2, SomeIvarJob)
+    Resque.enqueue_at(t + 3, SomeQuickJob)
+
+    assert_equal(
+      2, (Resque.find_delayed_selection(SomeQuickJob) { true }).length
+    )
+  end
+
   test 'remove_delayed_job_from_timestamp removes instances of jobs ' \
        'at a given timestamp' do
     t = Time.now + 120

data/test/scheduler_test.rb

@@ -87,9 +87,15 @@ context 'Resque::Scheduler' do
     assert Resque::Scheduler.scheduled_jobs.include?('some_ivar_job')
 
     Resque.redis.del(:schedules)
-    Resque.redis.hset(:schedules, 'some_ivar_job2', Resque.encode(
-      'cron' => '* * * * *', 'class' => 'SomeIvarJob', 'args' => '/tmp/2'
-    ))
+    Resque.redis.hset(
+      :schedules,
+      'some_ivar_job2',
+      Resque.encode(
+        'cron' => '* * * * *',
+        'class' => 'SomeIvarJob',
+        'args' => '/tmp/2'
+      )
+    )
 
     Resque::Scheduler.reload_schedule!
 
@@ -366,9 +372,15 @@ context 'Resque::Scheduler' do
   end
 
   test 'fetch_schedule returns a schedule' do
-    Resque.redis.hset(:schedules, 'some_ivar_job2', Resque.encode(
-      'cron' => '* * * * *', 'class' => 'SomeIvarJob', 'args' => '/tmp/33'
-    ))
+    Resque.redis.hset(
+      :schedules,
+      'some_ivar_job2',
+      Resque.encode(
+        'cron' => '* * * * *',
+        'class' => 'SomeIvarJob',
+        'args' => '/tmp/33'
+      )
+    )
     assert_equal(
       { 'cron' => '* * * * *', 'class' => 'SomeIvarJob', 'args' => '/tmp/33' },
       Resque.fetch_schedule('some_ivar_job2')

data/test/test_helper.rb

@@ -2,6 +2,7 @@
 require 'simplecov'
 
 require 'test/unit'
+require 'minitest'
 require 'mocha/setup'
 require 'rack/test'
 require 'resque'
@@ -10,15 +11,6 @@ $LOAD_PATH.unshift File.dirname(File.expand_path(__FILE__)) + '/../lib'
 require 'resque-scheduler'
 require 'resque/scheduler/server'
 
-unless ENV['RESQUE_SCHEDULER_DISABLE_TEST_REDIS_SERVER']
-  # Start our own Redis when the tests start. RedisInstance will take care of
-  # starting and stopping.
-  require File.expand_path('../support/redis_instance', __FILE__)
-  RedisInstance.run!
-end
-
-at_exit { exit MiniTest::Unit.new.run(ARGV) || 0 }
-
 ##
 # test/spec/mini 3
 # original work: http://gist.github.com/25455
@@ -31,11 +23,14 @@ def context(*args, &block)
     def self.test(name, &block)
       define_method("test_#{name.gsub(/\W/, '_')}", &block) if block
     end
+
     def self.xtest(*_args)
     end
+
     def self.setup(&block)
       define_method(:setup, &block)
     end
+
     def self.teardown(&block)
       define_method(:teardown, &block)
     end
@@ -55,16 +50,16 @@ unless defined?(Rails)
 end
 
 class FakeCustomJobClass
-  def self.scheduled(_queue, _klass, *_args); end
+  def self.scheduled(_, _, *_); end
 end
 
 class FakeCustomJobClassEnqueueAt
   @queue = :test
-  def self.scheduled(_queue, _klass, *_args); end
+  def self.scheduled(_, _, *_); end
 end
 
 class SomeJob
-  def self.perform(_repo_id, _path)
+  def self.perform(_, _)
   end
 end