resque-scheduler 2.2.0 → 2.3.0

checksums.yaml

@@ -0,0 +1,15 @@
+---
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    YTM5YzMwMmUzNzYyNWJkMmY0MTJiOTc0MTIxMTA4MTBlNWY1ZWVmMw==
+  data.tar.gz: !binary |-
+    Zjc3ZTlmZWE5MDBjNGExYjkzZWEwZTk5NDMwYTI4NjIzNGJjM2Q5Ng==
+!binary "U0hBNTEy":
+  metadata.gz: !binary |-
+    M2I1NDI0M2VmZGRkNTAyZTNjODJjNTI4YjRiN2QyYmIxMTk1ZDk5MjIzY2Jl
+    ZjJlMjE3MzM2MzFmMTA2ZWY3ZjdhMzY5NmQ3NWY0ODA5ZDE3ZDk4OWUzZmRh
+    MDhiZjUxZTJlZDdjZjdhYmU0NjRmMmE0NDg1YmE5ZjQ4MDA1YjE=
+  data.tar.gz: !binary |-
+    ZTFlN2RhYTljYzRjOTAyMzY2NzA2YTRiMzNiNWQwMDFmOGE3OThlZTUyZTVl
+    ODFkNDk3MDBiMmZhZmEyOTAwZDNkODgwNDQxMTEwNDRjM2QwNzk3OGI2OTYx
+    ZWU3NGIyMTA1Y2E2NWYwMWM1YjI2ZTkzOTdhNzhiYTJjYThlODU=

data/.rubocop.yml

@@ -2,18 +2,21 @@
 # The point is for the user to remove these configuration records
 # one by one as the offences are removed from the code base.
 
-AccessControl:
-  Enabled: false
-
 AlignParameters:
   Enabled: false
 
 AssignmentInCondition:
   Enabled: false
 
+BracesAroundHashParameters:
+  Enabled: false
+
 CaseEquality:
   Enabled: false
 
+ClassLength:
+  Enabled: false
+
 ClassVars:
   Enabled: false
 
@@ -26,12 +29,18 @@ ColonMethodCall:
 CommentAnnotation:
   Enabled: false
 
+CyclomaticComplexity:
+  Enabled: false
+
 Documentation:
   Enabled: false
 
 EmptyLines:
   Enabled: false
 
+EmptyLinesAroundBody:
+  Enabled: false
+
 Encoding:
   Enabled: false
 

data/.travis.yml

@@ -1,4 +1,3 @@
----
 language: ruby
 rvm:
 - ree
@@ -8,3 +7,11 @@ script: bundle exec rake rubocop test
 notifications:
   email:
     recipients: daniel.buch+resque-scheduler@gmail.com
+deploy:
+  provider: rubygems
+  api_key:
+    secure: dM97lL/jTu14mEHD2Ih/vQfZ8cWJWb+DQ8UKZjkD2JfYtvwEAlkPG9RrrDkSHb5qkYxG2VAhjyx/0MZJ0TsVL6wrLMC9gcJb3yomw2Sch2Noj68tEndiSUHnxrB9gKzbhHbjLQXDqYf4Hco9/PHHQp4piFPJhLzNZRehIuTJPcA=
+  gem: resque-scheduler
+  on:
+    tags: true
+    repo: resque/resque-scheduler

data/AUTHORS.md

@@ -51,6 +51,7 @@ Resque Scheduler authors
 - Spring MC
 - Tim Liner
 - Tony Lewis
+- Vincent Zhu
 - V Sreekanth
 - andreas
 - bbauer

data/Gemfile

@@ -2,4 +2,4 @@ source 'https://rubygems.org'
 
 gemspec
 
-gem 'yajl-ruby', '~> 0.8.2', :platforms => :mri, :group => :test
+gem 'yajl-ruby', '>= 1.1.0', :platforms => :mri, :group => :test

data/HISTORY.md

@@ -1,3 +1,13 @@
+## 2.3.0 (2013-11-07)
+
+* Fix re-introduced `ThreadError` on Ruby 2
+* **BREAKING CHANGE**: Added `RESQUE_SCHEDULER_INTERVAL` in place of `INTERVAL`
+* Use `Float()` instead of `Integer()` to calculate poll sleep amount
+* Upgraded dependence of Resque to support 1.25
+* Add rufus scheduler `every` notice to README
+* Use `Resque.validate` instead of custom `.validate_job!`
+* Specify MIT license in gemspec
+
 ## 2.2.0 (2013-10-13)
 
 * Locking rufus-scheduler dependency to `~> 2.0`

data/README.md

@@ -14,8 +14,8 @@ 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                |
+| ~> 2.0                   | >= 3.0.0              |
+| >= 0.0.1                 | ~> 1.3                |
 
 
 Job scheduling is supported in two different way: Recurring (scheduled) and
@@ -207,6 +207,11 @@ clear_leaderboards_moderator:
   description: "This job will check Daemon every 30 seconds after 120 seconds after start"
 ```
 
+IMPORTANT: Rufus `every` syntax will calculate jobs scheduling time starting from the moment of deploy,
+resulting in resetting schedule time on every deploy, so it's probably a good idea to use it only for
+frequent jobs (like every 10-30 minutes), otherwise - when you use something like `every 20h` and deploy once-twice per day -
+it will schedule the job for 20 hours from deploy, resulting in a job to never be run.
+
 NOTE: Six parameter cron's are also supported (as they supported by
 rufus-scheduler which powers the resque-scheduler process).  This allows you
 to schedule jobs per second (ie: `"30 * * * * *"` would fire a job every 30
@@ -411,10 +416,15 @@ Resque::Scheduler.logfile = nil # that means, all messages go to STDOUT
 
 ### Polling frequency
 
-You can pass an INTERVAL option which is a integer representing the polling frequency.
-The default is 5 seconds, but for a semi-active app you may want to use a smaller (integer) value.
+You can pass a `RESQUE_SCHEDULER_INTERVAL` option which is an integer or float
+representing the polling frequency. The default is 5 seconds, but for a
+semi-active app you may want to use a smaller value.
+
+    $ RESQUE_SCHEDULER_INTERVAL=1 rake resque:scheduler
 
-    $ INTERVAL=1 rake resque:scheduler
+**NOTE** This value was previously `INTERVAL` but was renamed to
+`RESQUE_SCHEDULER_INTERVAL` to avoid clashing with the interval Resque
+uses for its jobs.
 
 ### Plagiarism alert
 

data/Rakefile

@@ -25,7 +25,7 @@ end
 desc 'Run rubocop'
 task :rubocop do
   unless RUBY_VERSION < '1.9'
-    sh('rubocop --config .rubocop.yml --format simple') { |r, _| r || abort }
+    sh('rubocop --format simple') { |ok, _| ok || abort }
   end
 end
 

data/lib/resque/scheduler.rb

@@ -220,7 +220,7 @@ module Resque
         args = job_config['args'] || job_config[:args]
 
         klass_name = job_config['class'] || job_config[:class]
-        klass = Resque.constantize(klass_name) rescue klass_name
+        klass = ResqueScheduler::Util.constantize(klass_name) rescue klass_name
 
         params = args.is_a?(Hash) ? [args] : Array(args)
         queue = job_config['queue'] || job_config[:queue] || Resque.queue_from_class(klass)
@@ -230,7 +230,7 @@ module Resque
           # job class can not be constantized (via a requeue call from the web perhaps), fall
           # back to enqueing normally via Resque::Job.create.
           begin
-            Resque.constantize(job_klass).scheduled(queue, klass_name, *params)
+            ResqueScheduler::Util.constantize(job_klass).scheduled(queue, klass_name, *params)
           rescue NameError
             # Note that the custom job class (job_config['custom_job_class']) is the one enqueued
             Resque::Job.create(queue, job_klass, *params)
@@ -313,8 +313,11 @@ module Resque
         @shutdown = true
 
         if @sleeping
-          Resque.clean_schedules
-          Thread.new { release_master_lock! }
+          thread = Thread.new do
+            Resque.clean_schedules
+            release_master_lock!
+          end
+          thread.join
           exit
         end
       end

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

@@ -14,7 +14,7 @@ module Resque
 
         # Attempts to acquire the lock. Returns true if successfully acquired.
         def acquire!
-          raise NotImplementedError
+          fail NotImplementedError
         end
 
         def value
@@ -23,7 +23,7 @@ module Resque
 
         # Returns true if you currently hold the lock.
         def locked?
-          raise NotImplementedError
+          fail NotImplementedError
         end
 
         # Releases the lock.
@@ -31,7 +31,7 @@ module Resque
           Resque.redis.del(key) == 1
         end
 
-      private
+        private
 
         # Extends the lock by `timeout` seconds.
         def extend_lock!

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

@@ -20,7 +20,7 @@ module Resque
           ).to_i == 1
         end
 
-      private
+        private
 
         def locked_sha(refresh = false)
           @locked_sha = nil if refresh

data/lib/resque/scheduler_locking.rb

@@ -1,4 +1,3 @@
-
 # ### Locking the scheduler process
 #
 # There are two places in resque-scheduler that need to be synchonized
@@ -69,7 +68,7 @@ module Resque
       master_lock.release!
     end
 
-  private
+    private
 
     def build_master_lock
       if supports_lua?

data/lib/resque_scheduler.rb

@@ -1,11 +1,11 @@
 require 'rubygems'
 require 'resque'
 require 'resque_scheduler/version'
+require 'resque_scheduler/util'
 require 'resque/scheduler'
 require 'resque_scheduler/plugin'
 
 module ResqueScheduler
-
   #
   # Accepts a new schedule configuration of the form:
   #
@@ -132,7 +132,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)
+    validate(klass)
     enqueue_at_with_queue(queue_from_class(klass), timestamp, klass, *args)
   end
 
@@ -330,16 +330,6 @@ 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
-
     def prepare_schedule(schedule_hash)
       prepared_hash = {}
       schedule_hash.each do |name, job_spec|
@@ -349,7 +339,6 @@ module ResqueScheduler
       end
       prepared_hash
     end
-
 end
 
 Resque.extend ResqueScheduler

data/lib/resque_scheduler/server.rb

@@ -1,6 +1,5 @@
 require 'resque_scheduler'
 require 'resque/server'
-
 # Extend Resque::Server to add tabs
 module ResqueScheduler
 
@@ -16,7 +15,7 @@ module ResqueScheduler
           end
 
           def queue_from_class_name(class_name)
-            Resque.queue_from_class(Resque.constantize(class_name))
+            Resque.queue_from_class(ResqueScheduler::Util.constantize(class_name))
           end
         end
 
@@ -50,7 +49,7 @@ module ResqueScheduler
           config_args = config_args.merge(submitted_args)
 
           # Insert the args hash into config and queue the resque job
-          config = config.merge({'args' => config_args})
+          config = config.merge('args' => config_args)
           Resque::Scheduler.enqueue_from_config(config)
           redirect u("/overview")
         end

data/lib/resque_scheduler/tasks.rb

@@ -25,7 +25,7 @@ namespace :resque do
     Resque::Scheduler.dynamic           = true if ENV['DYNAMIC_SCHEDULE']
     Resque::Scheduler.verbose           = true if ENV['VERBOSE']
     Resque::Scheduler.logfile           = ENV['LOGFILE'] if ENV['LOGFILE']
-    Resque::Scheduler.poll_sleep_amount = Integer(ENV['INTERVAL']) if ENV['INTERVAL']
+    Resque::Scheduler.poll_sleep_amount = Float(ENV['RESQUE_SCHEDULER_INTERVAL']) if ENV['RESQUE_SCHEDULER_INTERVAL']
     Resque::Scheduler.run
   end
 

data/lib/resque_scheduler/util.rb

@@ -0,0 +1,34 @@
+module ResqueScheduler
+  class Util
+    # In order to upgrade to resque(1.25) which has deprecated following methods ,
+    # we just added these usefull helpers back to use in Resque Scheduler.
+    # refer to: https://github.com/resque/resque-scheduler/pull/273
+    
+    def self.constantize(camel_cased_word)
+      camel_cased_word = camel_cased_word.to_s
+
+      if camel_cased_word.include?('-')
+        camel_cased_word = classify(camel_cased_word)
+      end
+
+      names = camel_cased_word.split('::')
+      names.shift if names.empty? || names.first.empty?
+
+      constant = Object
+      names.each do |name|
+        args = Module.method(:const_get).arity != 1 ? [false] : []
+
+        if constant.const_defined?(name, *args)
+          constant = constant.const_get(name)
+        else
+          constant = constant.const_missing(name)
+        end
+      end
+      constant
+    end
+
+    def self.classify(dashed_word)
+      dashed_word.split('-').each { |part| part[0] = part[0].chr.upcase }.join
+    end
+  end
+end

data/lib/resque_scheduler/version.rb

@@ -1,3 +1,3 @@
 module ResqueScheduler
-  VERSION = '2.2.0'
+  VERSION = '2.3.0'
 end

data/resque-scheduler.gemspec

@@ -13,6 +13,7 @@ Gem::Specification.new do |spec|
   spec.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.}
+  spec.license = 'MIT'
 
   spec.files        = `git ls-files`.split("\n")
   spec.executables  = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
@@ -27,6 +28,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'rubocop' unless RUBY_VERSION < '1.9'
 
   spec.add_runtime_dependency 'redis', '>= 3.0.0'
-  spec.add_runtime_dependency 'resque', ['>= 1.20.0', '< 1.25']
+  spec.add_runtime_dependency 'resque', '~> 1.25'
   spec.add_runtime_dependency 'rufus-scheduler', '~> 2.0'
 end

data/test/delayed_queue_test.rb

@@ -9,7 +9,7 @@ context "DelayedQueue" do
 
   test "enqueue_at adds correct list and zset" do
     timestamp = Time.now + 1
-    encoded_job =  Resque.encode({:class => SomeIvarJob.to_s, :args => ["path"], :queue => Resque.queue_from_class(SomeIvarJob)})
+    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")
@@ -37,7 +37,7 @@ context "DelayedQueue" do
 
   test "enqueue_at with queue adds correct list and zset and queue" do
     timestamp = Time.now + 1
-    encoded_job =  Resque.encode({:class => SomeIvarJob.to_s, :args => ["path"], :queue => 'critical'})
+    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")
@@ -66,7 +66,7 @@ context "DelayedQueue" do
 
   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)})
+    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")
@@ -95,7 +95,7 @@ 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)})
+    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")
@@ -267,7 +267,7 @@ context "DelayedQueue" do
 
   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)})
+    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))
@@ -358,9 +358,6 @@ context "DelayedQueue" do
   end
 
   test "invalid job class" do
-    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

data/test/resque-web_test.rb

@@ -12,8 +12,22 @@ end
 context "on GET to /schedule with scheduled jobs" do
   setup do
     ENV['rails_env'] = 'production'
-    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.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
@@ -34,14 +48,18 @@ end
 def resque_schedule
   {
     'job_without_params' => {
-      'cron' => "* * * * *",
+      'cron' => '* * * * *',
       'class' => 'JobWithoutParams',
-      'args' => {"host" => 'localhost'},
+      'args' => {
+        'host' => 'localhost'
+      },
       'rails_env' => 'production'},
     'job_with_params' => {
-      'cron' => "* * * * *",
+      'cron' => '* * * * *',
       'class' => 'JobWithParams',
-      'args' => {"host" => 'localhost'},
+      'args' => {
+        'host' => 'localhost'
+      },
       'parameters' => {
         'log_level' => {
           'description' => 'The level of logging',
@@ -99,8 +117,8 @@ context "POST /schedule/requeue_with_params" do
     log_level = 'error'
 
     job_config = Resque.schedule[job_name]
-    args = job_config['args'].merge({'log_level' => log_level})
-    job_config = job_config.merge({'args' => args})
+    args = job_config['args'].merge('log_level' => log_level)
+    job_config = job_config.merge('args' => args)
 
     Resque::Scheduler.stubs(:enqueue_from_config).once.with(job_config)
 

data/test/scheduler_test.rb

@@ -60,7 +60,7 @@ context "Resque::Scheduler" do
 
     Resque.redis.del(:schedules)
     Resque.redis.hset(:schedules, "some_ivar_job2", Resque.encode(
-      {'cron' => "* * * * *", 'class' => 'SomeIvarJob', 'args' => "/tmp/2"}
+      'cron' => "* * * * *", 'class' => 'SomeIvarJob', 'args' => "/tmp/2"
     ))
 
     Resque::Scheduler.reload_schedule!
@@ -232,7 +232,7 @@ context "Resque::Scheduler" do
 
   test "get_schedule returns a schedule" do
     Resque.redis.hset(:schedules, "some_ivar_job2", Resque.encode(
-      {'cron' => "* * * * *", 'class' => 'SomeIvarJob', 'args' => "/tmp/33"}
+      'cron' => "* * * * *", 'class' => 'SomeIvarJob', 'args' => "/tmp/33"
     ))
     assert_equal({'cron' => "* * * * *", 'class' => 'SomeIvarJob', 'args' => "/tmp/33"},
       Resque.get_schedule("some_ivar_job2"))
@@ -240,7 +240,7 @@ context "Resque::Scheduler" do
 
   test "remove_schedule removes a schedule" do
     Resque.redis.hset(:schedules, "some_ivar_job3", Resque.encode(
-      {'cron' => "* * * * *", 'class' => 'SomeIvarJob', 'args' => "/tmp/44"}
+      'cron' => "* * * * *", 'class' => 'SomeIvarJob', 'args' => "/tmp/44"
     ))
     Resque.remove_schedule("some_ivar_job3")
     assert_equal nil, Resque.redis.hget(:schedules, "some_ivar_job3")

data/test/support/redis_instance.rb

@@ -28,7 +28,7 @@ class RedisInstance
           RedisInstance.stop!
         end
       else
-        raise "Failed to start Redis on port #{port}."
+        fail "Failed to start Redis on port #{port}."
       end
 
       @running = true
@@ -47,7 +47,7 @@ class RedisInstance
       @running
     end
 
-  private
+    private
 
     def wait_for_redis_boot
       Timeout::timeout(10) do

data/test/test_helper.rb

@@ -84,6 +84,14 @@ class SomeRealClass
   end
 end
 
+class JobWithParams
+  def self.perform(*args)
+    @args = args
+  end
+end
+
+JobWithoutParams = Class.new(JobWithParams)
+
 def nullify_logger
   Resque::Scheduler.mute    = nil
   Resque::Scheduler.verbose = nil

metadata

@@ -1,20 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: resque-scheduler
 version: !ruby/object:Gem::Version
-  version: 2.2.0
-  prerelease: 
+  version: 2.3.0
 platform: ruby
 authors:
 - Ben VandenBos
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-03 00:00:00.000000000 Z
+date: 2013-11-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -22,7 +20,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -30,7 +27,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: mocha
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -38,7 +34,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -46,7 +41,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rack-test
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -54,7 +48,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -62,7 +55,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -70,7 +62,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -78,7 +69,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -86,7 +76,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -94,7 +83,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: redis
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -102,7 +90,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -110,29 +97,20 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: resque
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
-      - !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
-    none: false
     requirements:
-    - - ! '>='
-      - !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
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -140,7 +118,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -179,6 +156,7 @@ files:
 - lib/resque_scheduler/server/views/requeue-params.erb
 - lib/resque_scheduler/server/views/scheduler.erb
 - lib/resque_scheduler/tasks.rb
+- lib/resque_scheduler/util.rb
 - lib/resque_scheduler/version.rb
 - resque-scheduler.gemspec
 - script/migrate_to_timestamps_set.rb
@@ -194,28 +172,28 @@ files:
 - test/support/redis_instance.rb
 - test/test_helper.rb
 homepage: http://github.com/resque/resque-scheduler
-licenses: []
+licenses:
+- MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Light weight job scheduling on top of Resque
 test_files:
 - test/delayed_queue_test.rb