resque-scheduler 3.0.0 → 3.1.0

checksums.yaml

@@ -1,7 +1,15 @@
 ---
-SHA1:
-  metadata.gz: 315b0ea47908358f5cd357a315f9bcf958402ccb
-  data.tar.gz: 8bcbe775f3fc7f68d47a7d0cf79f75b2f27ac0b3
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    YzhjNDEyNjkyZWQ5MGY0YWUxNWNmN2JiMTAzODdhOGUyZTAyZTA1YQ==
+  data.tar.gz: !binary |-
+    NTQzOWY4MDliZjUxZDhlMTZjYTc4OWM0NWVjMTA5MTVmZmJkYzQ1ZA==
 SHA512:
-  metadata.gz: 40b428d2bfdbd36eb3ba623812a3d06db24a674531db24069c9dd19e24af478c49eafe615238d333ae9181ecf2ca3e76a0a8f9b20f2181431a4ff147733d80f4
-  data.tar.gz: ce2e9aee9671c7a4ffbf016934d169ee36d575543142fccea9318244c8a84c20108878ed5010ace31d67aa706bc6f4793aabc5952bf521aeecf0f33728ac18f4
+  metadata.gz: !binary |-
+    ZDE1ZTBlZjlkOWM1MDEwMjc3Y2I2MWExNTNiNjFlMDUyNjY1YzZlMmYxYWQ0
+    MjdkMjQ3OTA0N2FhYjk4NWI5NTdkZmM2ODYwNTMzNGM4OTExNDdkMjA5ZjI1
+    MWI2Y2ExOWZkM2EyZjkxNTVlNTViODExNDYwZjk4OTAyMWM5YWI=
+  data.tar.gz: !binary |-
+    YzE3OTNjODE1YWI5NWQwNmNjZDJlMDM0Yjg2ZTAwZGRkMzA2NzY3NTc4ZjI4
+    NGQ4Y2Q4ZDM1NWUxNDViYjk3YmI1M2E5ZDMwYjAzMTk4MWYwZjMzNGVmNmE5
+    YTAyYWI4NGI1Zjc1M2U1MzgxZTk4NWNiODYzZDQyODFkM2M2MWM=

data/.rubocop.yml

@@ -7,28 +7,10 @@ AllCops:
   - resque-scheduler.gemspec
   - bin/resque-scheduler
 
-# Offence count: 1
-CaseEquality:
-  Enabled: false
-
-# Offence count: 2
-# Configuration parameters: CountComments.
-ClassLength:
-  Max: 130
-
-# Offence count: 3
-CyclomaticComplexity:
-  Max: 21
-
-# Offence count: 29
 Documentation:
   Enabled: false
 
-# Offence count: 17
-# Configuration parameters: CountComments.
-MethodLength:
-  Max: 145
-
-# Offence count: 1
-RescueException:
+Style/DoubleNegation:
+  Enabled: false
+Metrics/PerceivedComplexity:
   Enabled: false

data/.rubocop_todo.yml

@@ -1,29 +1,57 @@
 # This configuration was generated by `rubocop --auto-gen-config`
-# on 2014-05-24 08:24:15 -0400 using RuboCop version 0.22.0.
+# on 2014-12-21 12:37:35 -0500 using RuboCop version 0.28.0.
 # The point is for the user to remove these configuration records
 # one by one as the offenses are removed from the code base.
 # Note that changes in the inspected code, or installation of new
 # versions of RuboCop, may require this file to be generated again.
 
-# Offense count: 12
-DoubleNegation:
+# Offense count: 2
+# Configuration parameters: AllowSafeAssignment.
+Lint/AssignmentInCondition:
   Enabled: false
 
+# Offense count: 16
+Metrics/AbcSize:
+  Max: 42
+
+# Offense count: 2
+# Configuration parameters: CountComments.
+Metrics/ClassLength:
+  Max: 105
+
+# Offense count: 4
+Metrics/CyclomaticComplexity:
+  Max: 12
+
+# Offense count: 18
+# Configuration parameters: CountComments.
+Metrics/MethodLength:
+  Max: 34
+
 # Offense count: 1
-EachWithObject:
+Style/CaseEquality:
+  Enabled: false
+
+# Offense count: 1
+Style/EachWithObject:
   Enabled: false
 
 # Offense count: 3
 # Configuration parameters: Exclude.
-FileName:
+Style/FileName:
   Enabled: false
 
-# Offense count: 7
+# Offense count: 6
 # Configuration parameters: MinBodyLength.
-GuardClause:
+Style/GuardClause:
+  Enabled: false
+
+# Offense count: 6
+# Configuration parameters: MaxLineLength.
+Style/IfUnlessModifier:
   Enabled: false
 
 # Offense count: 1
-# Configuration parameters: EnforcedStyle, SupportedStyles.
-Next:
+# Configuration parameters: EnforcedStyle, MinBodyLength, SupportedStyles.
+Style/Next:
   Enabled: false

data/.travis.yml

@@ -1,23 +1,31 @@
 language: ruby
+sudo: false
 rvm:
-- '1.9.3'
-- '2.1'
-- 'jruby-19mode'
-- 'rbx'
+- 1.9.3
+- 2.1.5
+- jruby-19mode
+- rbx
 env:
   global:
   - RESQUE_SCHEDULER_DISABLE_TEST_REDIS_SERVER=1
   - JRUBY_OPTS='-Xcext.enabled=true'
 matrix:
   allow_failures:
-  - rvm: 'jruby-19mode'
-  - rvm: 'rbx'
+  - rvm: jruby-19mode
+  - rvm: rbx
 services:
 - redis-server
 notifications:
   email:
     recipients:
     - daniel.buch+resque-scheduler@gmail.com
+    on_success: change
+    on_failure: change
+  irc:
+    channels:
+    - 'chat.freenode.net#resque'
+    on_success: change
+    on_failure: change
 deploy:
   provider: rubygems
   api_key:
@@ -26,4 +34,5 @@ deploy:
   on:
     tags: true
     repo: resque/resque-scheduler
-    rvm: '2.1'
+    rvm: 2.1.5
+    all_branches: true

data/HISTORY.md

@@ -1,5 +1,14 @@
 # Resque Scheduler History / ChangeLog / Release Notes
 
+## 3.1.0 (2014-12-21)
+* Note in README.md about production redis deployment configuration
+* Bugfix to only override configuration options if provided
+* Avoid use of redis `KEYS` command in `Resque.remove_delayed_selection`
+* Better PID file cleanup
+* Added option to filter by job class in `Resque.remove_delayed_selection`
+* Bugfix to only release master lock if it belongs to us
+* Tell-don't-ask with `Resque.schedule` to enable atomic clear & set
+
 ## 3.0.0 (2014-05-27)
 * The grand re-namespacing of
 `resque_scheduler/(.*)` => `resque/scheduler/\1`

data/README.md

@@ -44,7 +44,7 @@ To install:
 
     gem install resque-scheduler
 
-If you use a Gemfile, you may want to specify the `:require` explicitly:
+If you use a Gemfile:
 
 ```ruby
 gem 'resque-scheduler'
@@ -151,7 +151,7 @@ default `'text'`)
 of `MonoLogger::DEBUG`, default `false`)
 
 
-### Resque Pool integration 
+### Resque Pool integration
 
 For normal work with the
 [resque-pool](https://github.com/nevans/resque-pool) gem, add the
@@ -599,6 +599,14 @@ provisioners:
 vagrant up
 ```
 
+### Deployment Notes
+
+It is recommended that a production deployment of resque_scheduler be hosted on
+a dedicated Redis database.  While making and managing scheduled tasks,
+resque_scheudler currently scans the entire Redis keyspace, which may cause latency
+and stability issues if resque_scheduler is hosted on a Redis instance storing a large
+number of keys (such as those written by a different system hosted on the same Redis instance).
+
 ### Contributing
 
 See [CONTRIBUTING.md](CONTRIBUTING.md)

data/Rakefile

@@ -7,7 +7,7 @@ require 'yard'
 task default: [:rubocop, :test] unless RUBY_PLATFORM =~ /java/
 task default: [:test] if RUBY_PLATFORM =~ /java/
 
-Rubocop::RakeTask.new
+RuboCop::RakeTask.new
 
 Rake::TestTask.new do |t|
   t.libs << 'test'

data/lib/resque/scheduler.rb

@@ -206,7 +206,7 @@ module Resque
 
       def handle_errors
         yield
-      rescue Exception => e
+      rescue => e
         log_error "#{e.class.name}: #{e.message}"
       end
 
@@ -336,7 +336,7 @@ module Resque
           rescue Interrupt
             if @shutdown
               Resque.clean_schedules
-              release_master_lock!
+              release_master_lock
             end
             break
           end

data/lib/resque/scheduler/delaying_extensions.rb

@@ -105,12 +105,7 @@ module Resque
       # Returns the next delayed queue timestamp
       # (don't call directly)
       def next_delayed_timestamp(at_time = nil)
-        items = redis.zrangebyscore(
-          :delayed_queue_schedule, '-inf', (at_time || Time.now).to_i,
-          limit: [0, 1]
-        )
-        timestamp = items.nil? ? nil : Array(items).first
-        timestamp.to_i unless timestamp.nil?
+        search_first_delayed_timestamp_in_range(nil, at_time || Time.now)
       end
 
       # Returns the next item to be processed for a given timestamp, nil if
@@ -145,17 +140,7 @@ module Resque
       # Given an encoded item, remove it from the delayed_queue
       def remove_delayed(klass, *args)
         search = encode(job_to_hash(klass, args))
-        timestamps = redis.smembers("timestamps:#{search}")
-
-        replies = redis.pipelined do
-          timestamps.each do |key|
-            redis.lrem(key, 0, search)
-            redis.srem("timestamps:#{search}", key)
-          end
-        end
-
-        return 0 if replies.nil? || replies.empty?
-        replies.each_slice(2).map(&:first).inject(:+)
+        remove_delayed_job(search)
       end
 
       # Given an encoded item, enqueue it now
@@ -170,21 +155,22 @@ module Resque
       #
       # This allows for removal of delayed jobs that have arguments matching
       # certain criteria
-      def remove_delayed_selection
+      def remove_delayed_selection(klass = nil)
         fail ArgumentError, 'Please supply a block' unless block_given?
 
         destroyed = 0
-        # There is no way to search Redis list entries for a partial match,
-        # so we query for all delayed job tasks and do our matching after
-        # decoding the payload data
-        jobs = Resque.redis.keys('delayed:*')
-        jobs.each do |job|
+        start = nil
+        while start = search_first_delayed_timestamp_in_range(start, nil)
+          job = "delayed:#{start}"
+          start += 1
           index = Resque.redis.llen(job) - 1
           while index >= 0
             payload = Resque.redis.lindex(job, index)
             decoded_payload = decode(payload)
-            if yield(decoded_payload['args'])
-              removed = redis.lrem job, 0, payload
+            job_class = decoded_payload['class']
+            relevant_class = (klass.nil? || klass.to_s == job_class)
+            if relevant_class && yield(decoded_payload['args'])
+              removed = remove_delayed_job(payload)
               destroyed += removed
               index -= removed
             else
@@ -192,6 +178,7 @@ module Resque
             end
           end
         end
+
         destroyed
       end
 
@@ -254,6 +241,20 @@ module Resque
         { class: klass.to_s, args: args, queue: queue }
       end
 
+      def remove_delayed_job(encoded_job)
+        timestamps = redis.smembers("timestamps:#{encoded_job}")
+
+        replies = redis.pipelined do
+          timestamps.each do |key|
+            redis.lrem(key, 0, encoded_job)
+            redis.srem("timestamps:#{encoded_job}", key)
+          end
+        end
+
+        return 0 if replies.nil? || replies.empty?
+        replies.each_slice(2).map(&:first).inject(:+)
+      end
+
       def clean_up_timestamp(key, timestamp)
         # If the list is empty, remove it.
 
@@ -270,6 +271,18 @@ module Resque
         end
       end
 
+      def search_first_delayed_timestamp_in_range(start_at, stop_at)
+        start_at = start_at.nil? ? '-inf' : start_at.to_i
+        stop_at = stop_at.nil? ? '+inf' : stop_at.to_i
+
+        items = redis.zrangebyscore(
+          :delayed_queue_schedule, start_at, stop_at,
+          limit: [0, 1]
+        )
+        timestamp = items.nil? ? nil : Array(items).first
+        timestamp.to_i unless timestamp.nil?
+      end
+
       def plugin
         Resque::Scheduler::Plugin
       end

data/lib/resque/scheduler/env.rb

@@ -1,10 +1,13 @@
 # vim:fileencoding=utf-8
 
+require 'English' # $PROCESS_ID
+
 module Resque
   module Scheduler
     class Env
       def initialize(options)
         @options = options
+        @pidfile_path = nil
       end
 
       def setup
@@ -16,46 +19,79 @@ module Resque
         setup_scheduler_configuration
       end
 
+      def cleanup
+        cleanup_pid_file
+      end
+
       private
 
-      attr_reader :options
+      attr_reader :options, :pidfile_path
 
       def setup_backgrounding
+        return unless options[:background]
+
         # Need to set this here for conditional Process.daemon redirect of
         # stderr/stdout to /dev/null
         Resque::Scheduler.quiet = !!options[:quiet]
 
-        if options[:background]
-          unless Process.respond_to?('daemon')
-            abort 'background option is set, which requires ruby >= 1.9'
-          end
-
-          Process.daemon(true, !Resque::Scheduler.quiet)
-          Resque.redis.client.reconnect
+        unless Process.respond_to?('daemon')
+          abort 'background option is set, which requires ruby >= 1.9'
         end
+
+        Process.daemon(true, !Resque::Scheduler.quiet)
+        Resque.redis.client.reconnect
       end
 
       def setup_pid_file
-        File.open(options[:pidfile], 'w') do |f|
+        return unless options[:pidfile]
+
+        @pidfile_path = File.expand_path(options[:pidfile])
+
+        File.open(pidfile_path, 'w') do |f|
           f.puts $PROCESS_ID
-        end if options[:pidfile]
+        end
+
+        at_exit { cleanup_pid_file }
       end
 
       def setup_scheduler_configuration
         Resque::Scheduler.configure do |c|
-          # These settings are somewhat redundant given the defaults present
-          # in the attr reader methods.  They are left here for clarity and
-          # to serve as an example of how to use `.configure`.
-
-          c.app_name = options[:app_name]
-          c.dynamic = !!options[:dynamic]
-          c.env = options[:env]
-          c.logfile = options[:logfile]
-          c.logformat = options[:logformat]
-          c.poll_sleep_amount = Float(options[:poll_sleep_amount] || '5')
-          c.verbose = !!options[:verbose]
+          if options.key?(:app_name)
+            c.app_name = options[:app_name]
+          end
+
+          if options.key?(:dynamic)
+            c.dynamic = !!options[:dynamic]
+          end
+
+          if options.key(:env)
+            c.env = options[:env]
+          end
+
+          if options.key?(:logfile)
+            c.logfile = options[:logfile]
+          end
+
+          if options.key?(:logformat)
+            c.logformat = options[:logformat]
+          end
+
+          if psleep = options[:poll_sleep_amount] && !psleep.nil?
+            c.poll_sleep_amount = Float(psleep)
+          end
+
+          if options.key?(:verbose)
+            c.verbose = !!options[:verbose]
+          end
         end
       end
+
+      def cleanup_pid_file
+        return unless pidfile_path
+
+        File.delete(pidfile_path) if File.exist?(pidfile_path)
+        @pidfile_path = nil
+      end
     end
   end
 end

data/lib/resque/scheduler/lock/base.rb

@@ -33,6 +33,11 @@ module Resque
           Resque.redis.del(key) == 1
         end
 
+        # Releases the lock iff we own it
+        def release
+          locked? && release!
+        end
+
         private
 
         # Extends the lock by `timeout` seconds.

data/lib/resque/scheduler/locking.rb

@@ -67,9 +67,17 @@ module Resque
       end
 
       def release_master_lock!
+        warn "#{self}\#release_master_lock! is deprecated because it does " \
+             "not respect lock ownership. Use #{self}\#release_master_lock " \
+             "instead (at #{caller.first}"
+
         master_lock.release!
       end
 
+      def release_master_lock
+        master_lock.release
+      end
+
       private
 
       def build_master_lock

data/lib/resque/scheduler/scheduling_extensions.rb

@@ -44,15 +44,33 @@ module Resque
       # param, otherwise params is passed in as the only parameter to
       # perform.
       def schedule=(schedule_hash)
-        # clean the schedules as it exists in redis
-        clean_schedules
+        # This operation tries to be as atomic as possible.
+        # It needs to read the existing schedules outside the transaction.
+        # Unlikely, but this could still cause a race condition.
+        #
+        # A more robust solution would be to SCRIPT it, but that would change
+        # the required version of Redis.
 
-        schedule_hash = prepare_schedule(schedule_hash)
+        # select schedules to remove
+        if redis.exists(:schedules)
+          clean_keys = non_persistent_schedules
+        else
+          clean_keys = []
+        end
 
-        # store all schedules in redis, so we can retrieve them back
-        # everywhere.
-        schedule_hash.each do |name, job_spec|
-          set_schedule(name, job_spec)
+        # Start the transaction. If this is not atomic and more than one
+        # process is calling `schedule=` the clean_schedules might overlap a
+        # set_schedule and cause the schedules to become corrupt.
+        redis.multi do
+          clean_schedules(clean_keys)
+
+          schedule_hash = prepare_schedule(schedule_hash)
+
+          # store all schedules in redis, so we can retrieve them back
+          # everywhere.
+          schedule_hash.each do |name, job_spec|
+            set_schedule(name, job_spec)
+          end
         end
 
         # ensure only return the successfully saved data!
@@ -82,16 +100,18 @@ module Resque
       end
 
       # clean the schedules as it exists in redis, useful for first setup?
-      def clean_schedules
-        if redis.exists(:schedules)
-          redis.hkeys(:schedules).each do |key|
-            remove_schedule(key) unless schedule_persisted?(key)
-          end
+      def clean_schedules(keys = non_persistent_schedules)
+        keys.each do |key|
+          remove_schedule(key)
         end
         @schedule = nil
         true
       end
 
+      def non_persistent_schedules
+        redis.hkeys(:schedules).select { |k| !schedule_persisted?(k) }
+      end
+
       # Create or update a schedule with the provided name and configuration.
       #
       # Note: values for class and custom_job_class need to be strings,
@@ -102,14 +122,11 @@ module Resque
       #                                     :queue => 'high',
       #                                     :args => '/tmp/poop'})
       def set_schedule(name, config)
-        existing_config = fetch_schedule(name)
         persist = config.delete(:persist) || config.delete('persist')
-        unless existing_config && existing_config == config
-          redis.pipelined do
-            redis.hset(:schedules, name, encode(config))
-            redis.sadd(:schedules_changed, name)
-            redis.sadd(:persisted_schedules, name) if persist
-          end
+        redis.pipelined do
+          redis.hset(:schedules, name, encode(config))
+          redis.sadd(:schedules_changed, name)
+          redis.sadd(:persisted_schedules, name) if persist
         end
         config
       end
@@ -125,11 +142,9 @@ module Resque
 
       # remove a given schedule by name
       def remove_schedule(name)
-        redis.pipelined do
-          redis.hdel(:schedules, name)
-          redis.srem(:persisted_schedules, name)
-          redis.sadd(:schedules_changed, name)
-        end
+        redis.hdel(:schedules, name)
+        redis.srem(:persisted_schedules, name)
+        redis.sadd(:schedules_changed, name)
       end
 
       private

data/lib/resque/scheduler/server.rb

@@ -142,7 +142,7 @@ module Resque
           dels = delayed_jobs_for_worker(worker)
           results += dels.select do |j|
             j['class'].downcase.include?(worker) &&
-              j.merge!('where_at' => 'delayed')
+            j.merge!('where_at' => 'delayed')
           end
 
           Resque.queues.each do |queue|
@@ -150,7 +150,7 @@ module Resque
             queued = [queued] unless queued.is_a?(Array)
             results += queued.select do |j|
               j['class'].downcase.include?(worker) &&
-                j.merge!('queue' => queue, 'where_at' => 'queued')
+              j.merge!('queue' => queue, 'where_at' => 'queued')
             end
           end
 
@@ -210,7 +210,7 @@ module Resque
             working = [*Resque.working]
             work = working.select do |w|
               w.job && w.job['payload'] &&
-                w.job['payload']['class'].downcase.include?(worker)
+              w.job['payload']['class'].downcase.include?(worker)
             end
             work.each do |w|
               results += [

data/lib/resque/scheduler/tasks.rb

@@ -1,6 +1,5 @@
 # vim:fileencoding=utf-8
 
-require 'English'
 require 'resque/tasks'
 require 'resque-scheduler'
 

data/lib/resque/scheduler/version.rb

@@ -2,6 +2,6 @@
 
 module Resque
   module Scheduler
-    VERSION = '3.0.0'
+    VERSION = '3.1.0'
   end
 end

data/resque-scheduler.gemspec

@@ -10,27 +10,32 @@ Gem::Specification.new do |spec|
   spec.email = ['bvandenbos@gmail.com']
   spec.homepage = 'http://github.com/resque/resque-scheduler'
   spec.summary = 'Light weight job scheduling on top of Resque'
-  spec.description = %q(Light weight job scheduling on top of Resque.
+  spec.description = <<-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.)
+    Also supports queueing jobs on a fixed, cron-like schedule.
+  DESCRIPTION
   spec.license = 'MIT'
 
-  spec.files = `git ls-files`.split("\n")
+  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.require_paths = ['lib']
 
-  spec.add_development_dependency 'bundler', '~> 1.5'
+  spec.add_development_dependency 'bundler'
   spec.add_development_dependency 'json'
   spec.add_development_dependency 'kramdown'
   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 'rubocop'
   spec.add_development_dependency 'simplecov'
   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_runtime_dependency 'mono_logger', '~> 1.0'
   spec.add_runtime_dependency 'redis', '~> 3.0'
   spec.add_runtime_dependency 'resque', '~> 1.25'

data/test/cli_test.rb

@@ -153,8 +153,8 @@ context 'Cli' do
   end
 
   test 'initializes logfile from the env' do
-    cli = new_cli([], 'LOGFILE' => 'derp.log')
-    assert_equal('derp.log', cli.send(:options)[:logfile])
+    cli = new_cli([], 'LOGFILE' => 'example.log')
+    assert_equal('example.log', cli.send(:options)[:logfile])
   end
 
   test 'defaults to nil logfile' do

data/test/delayed_queue_test.rb

@@ -447,6 +447,75 @@ context 'DelayedQueue' do
     assert_equal(4, Resque.count_all_scheduled_jobs)
   end
 
+  test 'remove_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.remove_delayed_selection { |a| a.first == 'bar' })
+    assert_equal(t.to_s, Resque.get_last_enqueued_at(SomeIvarJob))
+  end
+
+  test 'remove_delayed_selection removes item by class' do
+    t = Time.now + 120
+    Resque.enqueue_at(t, SomeIvarJob, 'foo')
+    Resque.enqueue_at(t, SomeQuickJob, 'foo')
+
+    assert_equal(1, Resque.remove_delayed_selection(SomeIvarJob) do |a|
+      a.first == 'foo'
+    end)
+    assert_equal(1, Resque.count_all_scheduled_jobs)
+  end
+
+  test 'remove_delayed_selection removes 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.remove_delayed_selection('SomeIvarJob') do |a|
+      a.first == 'foo'
+    end)
+    assert_equal(1, Resque.count_all_scheduled_jobs)
+  end
+
+  test 'remove_delayed_selection removes 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.remove_delayed_selection(:SomeIvarJob) do |a|
+      a.first == 'foo'
+    end)
+    assert_equal(1, Resque.count_all_scheduled_jobs)
+  end
+
+  test 'remove_delayed_selection removes 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.remove_delayed_selection(SomeIvarJob) do |a|
+      a.first == 'foo'
+    end)
+    assert_equal(4, Resque.count_all_scheduled_jobs)
+  end
+
+  test 'remove_delayed_selection removes 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.remove_delayed_selection(SomeQuickJob) { true })
+    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

data/test/env_test.rb

@@ -31,11 +31,17 @@ context 'Env' do
     env.setup
   end
 
-  test 'writes pid to pidfile when given' do
-    mock_pidfile = mock('pidfile')
-    mock_pidfile.expects(:puts)
-    File.expects(:open).with('derp.pid', 'w').yields(mock_pidfile)
-    env = new_env(pidfile: 'derp.pid')
+  test 'keep set config if no option given' do
+    Resque::Scheduler.configure { |c| c.dynamic = true }
+    env = new_env
     env.setup
+    assert_equal(true, Resque::Scheduler.dynamic)
+  end
+
+  test 'override config if option given' do
+    Resque::Scheduler.configure { |c| c.dynamic = true }
+    env = new_env(dynamic: false)
+    env.setup
+    assert_equal(false, Resque::Scheduler.dynamic)
   end
 end

data/test/multi_process_test.rb

@@ -0,0 +1,37 @@
+# vim:fileencoding=utf-8
+require_relative 'test_helper'
+
+context 'Multi Process' do
+  test 'setting schedule= from many process does not corrupt the schedules' do
+    schedules = {}
+    counts  = []
+    threads = []
+
+    # This number may need to be increased if this test is not failing
+    processes = 20
+
+    schedule_count = 200
+
+    schedule_count.times do |n|
+      schedules["job #{n}"] = { cron: '0 1 0 0 0' }
+    end
+
+    processes.times do |n|
+      threads << Thread.new do
+        sleep n * 0.1
+        Resque.schedule = schedules
+        counts << Resque.schedule.size
+      end
+    end
+
+    # doing this outside the threads increases the odds of failure
+    Resque.schedule = schedules
+    counts << Resque.schedule.size
+
+    threads.each(&:join)
+
+    counts.each_with_index do |c, i|
+      assert_equal schedule_count, c, "schedule count is incorrect (c: #{i})"
+    end
+  end
+end

data/test/resque-web_test.rb

@@ -174,17 +174,17 @@ context 'POST /schedule/requeue' do
     assert last_response.ok?, last_response.errors
     assert last_response.body.include?('This job requires parameters')
     assert last_response.body.include?(
-      %Q(<input type="hidden" name="job_name" value="#{job_name}">)
+      %(<input type="hidden" name="job_name" value="#{job_name}">)
     )
 
     Resque.schedule[job_name]['parameters'].each do |_param_name, param_config|
       assert last_response.body.include?(
         '<span style="border-bottom:1px dotted;" ' <<
-        %Q[title="#{param_config['description']}">(?)</span>]
+        %[title="#{param_config['description']}">(?)</span>]
       )
       assert last_response.body.include?(
         '<input type="text" name="log_level" ' <<
-        %Q(value="#{param_config['default']}">)
+        %(value="#{param_config['default']}">)
       )
     end
   end
@@ -225,13 +225,13 @@ context 'on POST to /delayed/search' do
   end
 
   test 'should find matching scheduled job' do
-    post '/delayed/search' , 'search' => 'ivar'
+    post '/delayed/search', 'search' => 'ivar'
     assert last_response.status == 200
     assert last_response.body.include?('SomeIvarJob')
   end
 
   test 'should find matching queued job' do
-    post '/delayed/search' , 'search' => 'quick'
+    post '/delayed/search', 'search' => 'quick'
     assert last_response.status == 200
     assert last_response.body.include?('SomeQuickJob')
   end

data/test/scheduler_locking_test.rb

@@ -113,6 +113,12 @@ context 'Resque::Scheduler::Locking' do
   end
 
   test 'release_master_lock should delegate to master_lock' do
+    @subject.master_lock.expects(:release)
+    @subject.release_master_lock
+  end
+
+  test 'release_master_lock! should delegate to master_lock' do
+    @subject.expects(:warn)
     @subject.master_lock.expects(:release!)
     @subject.release_master_lock!
   end

data/test/scheduler_task_test.rb

@@ -22,7 +22,7 @@ context 'Resque::Scheduler' do
   end
 
   test 'sending TERM to scheduler breaks out of poll_sleep' do
-    Resque::Scheduler.expects(:release_master_lock!)
+    Resque::Scheduler.expects(:release_master_lock)
 
     @pid = Process.pid
     Thread.new do
@@ -34,7 +34,7 @@ context 'Resque::Scheduler' do
       Resque::Scheduler.run
     end
 
-    Resque::Scheduler.unstub(:release_master_lock!)
-    Resque::Scheduler.release_master_lock!
+    Resque::Scheduler.unstub(:release_master_lock)
+    Resque::Scheduler.release_master_lock
   end
 end

data/test/scheduler_test.rb

@@ -418,8 +418,8 @@ context 'Resque::Scheduler' do
   end
 
   test 'procline contains env when present' do
-    Resque::Scheduler.env = 'derp'
-    assert Resque::Scheduler.send(:build_procline, 'cage') =~ /\[derp\]: cage/
+    Resque::Scheduler.env = 'xyz'
+    assert Resque::Scheduler.send(:build_procline, 'cage') =~ /\[xyz\]: cage/
   end
 
   test 'procline omits env when absent' do

data/test/support/redis_instance.rb

@@ -25,7 +25,7 @@ class RedisInstance
     end
 
     def stop!
-      $stdout.puts "Sending TERM to Redis (#{pid})..."
+      $stdout.puts "Sending TERM to Redis (#{pid})..." if $stdout.tty?
       Process.kill('TERM', pid)
 
       @port = nil

metadata

@@ -1,215 +1,214 @@
 --- !ruby/object:Gem::Specification
 name: resque-scheduler
 version: !ruby/object:Gem::Version
-  version: 3.0.0
+  version: 3.1.0
 platform: ruby
 authors:
 - Ben VandenBos
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-27 00:00:00.000000000 Z
+date: 2014-12-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: '1.5'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: '1.5'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: kramdown
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: mocha
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rack-test
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rubocop
+  name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: simplecov
+  name: yard
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: yard
+  name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.28.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.28.0
 - !ruby/object:Gem::Dependency
   name: mono_logger
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.0'
 - !ruby/object:Gem::Dependency
   name: redis
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '3.0'
 - !ruby/object:Gem::Dependency
   name: resque
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.25'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.25'
 - !ruby/object:Gem::Dependency
   name: rufus-scheduler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '2.0'
-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.
+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.\n"
 email:
 - bvandenbos@gmail.com
 executables:
@@ -217,15 +216,15 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
-- ".rubocop.yml"
-- ".rubocop_todo.yml"
-- ".simplecov"
-- ".travis.yml"
-- ".vagrant-provision-as-vagrant.sh"
-- ".vagrant-provision.sh"
-- ".vagrant-skel/bash_profile"
-- ".vagrant-skel/bashrc"
+- .gitignore
+- .rubocop.yml
+- .rubocop_todo.yml
+- .simplecov
+- .travis.yml
+- .vagrant-provision-as-vagrant.sh
+- .vagrant-provision.sh
+- .vagrant-skel/bash_profile
+- .vagrant-skel/bashrc
 - AUTHORS.md
 - CONTRIBUTING.md
 - Gemfile
@@ -279,6 +278,7 @@ files:
 - test/cli_test.rb
 - test/delayed_queue_test.rb
 - test/env_test.rb
+- test/multi_process_test.rb
 - test/resque-web_test.rb
 - test/scheduler_args_test.rb
 - test/scheduler_hooks_test.rb
@@ -299,17 +299,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Light weight job scheduling on top of Resque
@@ -317,6 +317,7 @@ test_files:
 - test/cli_test.rb
 - test/delayed_queue_test.rb
 - test/env_test.rb
+- test/multi_process_test.rb
 - test/resque-web_test.rb
 - test/scheduler_args_test.rb
 - test/scheduler_hooks_test.rb
@@ -327,4 +328,3 @@ test_files:
 - test/support/redis_instance.rb
 - test/test_helper.rb
 - test/util_test.rb
-has_rdoc: