resque-scheduler 2.5.5 → 3.0.0

data/test/support/redis_instance.rb

@@ -1,3 +1,4 @@
+# vim:fileencoding=utf-8
 require 'socket'
 require 'timeout'
 require 'fileutils'
@@ -7,9 +8,10 @@ class RedisInstance
     @running = false
     @port = nil
     @pid = nil
+    @waiting = false
 
     def run_if_needed!
-      run! unless running?
+      run! unless @running
     end
 
     def run!
@@ -17,18 +19,7 @@ class RedisInstance
       ensure_pid_directory
       reassign_redis_clients
       start_redis_server
-
-      if $?.success?
-        wait_for_pid
-        puts "Booted isolated Redis on port #{port} with PID #{pid}."
-
-        wait_for_redis_boot
-
-        # Ensure we tear down Redis on Ctrl+C / test failure.
-        at_exit { stop! }
-      else
-        fail "Failed to start Redis on port #{port}."
-      end
+      post_boot_waiting_and_such
 
       @running = true
     end
@@ -42,26 +33,34 @@ class RedisInstance
       @pid = nil
     end
 
-    def running?
-      @running
-    end
-
     private
 
+    def post_boot_waiting_and_such
+      wait_for_pid
+      puts "Booted isolated Redis on #{port} with PID #{pid}."
+
+      wait_for_redis_boot
+
+      # Ensure we tear down Redis on Ctrl+C / test failure.
+      at_exit { stop! }
+    end
+
     def ensure_redis_server_present!
-      if !system('redis-server -v')
+      unless system('redis-server -v')
         fail "** can't find `redis-server` in your path"
       end
     end
 
     def wait_for_redis_boot
-      Timeout::timeout(10) do
-        begin
-          while Resque.redis.ping != 'PONG'
+      Timeout.timeout(10) do
+        loop do
+          begin
+            break if Resque.redis.ping == 'PONG'
+          rescue Redis::CannotConnectError
+            @waiting = true
           end
-        rescue
-          # silence all errors
         end
+        @waiting = false
       end
     end
 
@@ -70,11 +69,13 @@ class RedisInstance
     end
 
     def reassign_redis_clients
-      Resque.redis = Redis.new(:hostname => '127.0.0.1', :port => port, :thread_safe => true)
+      Resque.redis = Redis.new(
+        hostname: '127.0.0.1', port: port, thread_safe: true
+      )
     end
 
     def start_redis_server
-      IO.popen("redis-server -", "w+") do |server|
+      IO.popen('redis-server -', 'w+') do |server|
         server.write(config)
         server.close_write
       end
@@ -85,9 +86,8 @@ class RedisInstance
     end
 
     def wait_for_pid
-      Timeout::timeout(10) do
-        while !File.exist?(pid_file)
-        end
+      Timeout.timeout(10) do
+        loop { break if File.exist?(pid_file) }
       end
     end
 
@@ -96,7 +96,7 @@ class RedisInstance
     end
 
     def pid_file
-      "/tmp/redis-scheduler-test.pid"
+      '/tmp/redis-scheduler-test.pid'
     end
 
     def config
@@ -109,7 +109,7 @@ class RedisInstance
 
     # Returns a random port in the upper (10000-65535) range.
     def random_port
-      ports = (10000..65535).to_a
+      ports = (10_000..65_535).to_a
 
       loop do
         port = ports[rand(ports.size)]
@@ -117,8 +117,8 @@ class RedisInstance
       end
     end
 
-    def port_available?(ip, port, seconds=1)
-      Timeout::timeout(seconds) do
+    def port_available?(ip, port, seconds = 1)
+      Timeout.timeout(seconds) do
         begin
           TCPSocket.new(ip, port).close
           false
@@ -131,4 +131,3 @@ class RedisInstance
     end
   end
 end
-

data/test/test_helper.rb

@@ -1,20 +1,14 @@
-# Pretty much copied this file from the resque test_helper since we want
-# to do all the same stuff
-
-dir = File.dirname(File.expand_path(__FILE__))
-
-require 'rubygems'
-require 'bundler/setup'
-
-require 'simplecov' unless RUBY_VERSION < '1.9'
+# vim:fileencoding=utf-8
+require 'simplecov'
 
 require 'test/unit'
 require 'mocha/setup'
+require 'rack/test'
 require 'resque'
 
 $LOAD_PATH.unshift File.dirname(File.expand_path(__FILE__)) + '/../lib'
-require 'resque_scheduler'
-require 'resque_scheduler/server'
+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
@@ -23,35 +17,32 @@ unless ENV['RESQUE_SCHEDULER_DISABLE_TEST_REDIS_SERVER']
   RedisInstance.run!
 end
 
-at_exit do
-  next if $!
-
-  if defined?(MiniTest)
-    exit_code = MiniTest::Unit.new.run(ARGV)
-  else
-    exit_code = Test::Unit::AutoRunner.run
-  end
-
-  exit(exit_code || 0)
-end
+at_exit { exit MiniTest::Unit.new.run(ARGV) || 0 }
 
 ##
 # test/spec/mini 3
-# http://gist.github.com/25455
-# chris@ozmm.org
+# original work: http://gist.github.com/25455
+# forked and modified: https://gist.github.com/meatballhat/8906709
 #
 def context(*args, &block)
   return super unless (name = args.first) && block
   require 'test/unit'
-  klass = Class.new(defined?(ActiveSupport::TestCase) ? ActiveSupport::TestCase : Test::Unit::TestCase) do
+  klass = Class.new(Test::Unit::TestCase) do
     def self.test(name, &block)
-      define_method("test_#{name.gsub(/\W/,'_')}", &block) if 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
-    def self.xtest(*args) end
-    def self.setup(&block) define_method(:setup, &block) end
-    def self.teardown(&block) define_method(:teardown, &block) end
   end
-  (class << klass; self end).send(:define_method, :name) { name.gsub(/\W/,'_') }
+  (class << klass; self end).send(:define_method, :name) do
+    name.gsub(/\W/, '_')
+  end
   klass.class_eval(&block)
 end
 
@@ -64,16 +55,16 @@ unless defined?(Rails)
 end
 
 class FakeCustomJobClass
-  def self.scheduled(queue, klass, *args); end
+  def self.scheduled(_queue, _klass, *_args); end
 end
 
 class FakeCustomJobClassEnqueueAt
   @queue = :test
-  def self.scheduled(queue, klass, *args); end
+  def self.scheduled(_queue, _klass, *_args); end
 end
 
 class SomeJob
-  def self.perform(repo_id, path)
+  def self.perform(_repo_id, _path)
   end
 end
 
@@ -87,6 +78,12 @@ class SomeFancyJob < SomeJob
   end
 end
 
+class SomeSharedEnvJob < SomeJob
+  def self.queue
+    :shared_job
+  end
+end
+
 class SomeQuickJob < SomeJob
   @queue = :quick
 end
@@ -110,7 +107,7 @@ JobWithoutParams = Class.new(JobWithParams)
   DYNAMIC_SCHEDULE
   LOGFILE
   LOGFORMAT
-  MUTE
+  QUIET
   RAILS_ENV
   RESQUE_SCHEDULER_INTERVAL
   VERBOSE
@@ -120,10 +117,10 @@ end
 
 def nullify_logger
   Resque::Scheduler.configure do |c|
-    c.mute    = nil
+    c.quiet = nil
     c.verbose = nil
     c.logfile = nil
-    c.logger  = nil
+    c.send(:logger=, nil)
   end
 
   ENV['LOGFILE'] = nil

data/test/util_test.rb

@@ -0,0 +1,11 @@
+# vim:fileencoding=utf-8
+
+context 'Util' do
+  def util
+    Resque::Scheduler::Util
+  end
+
+  test 'constantizing' do
+    assert util.constantize('Resque::Scheduler') == Resque::Scheduler
+  end
+end

metadata

@@ -1,169 +1,211 @@
 --- !ruby/object:Gem::Specification
 name: resque-scheduler
 version: !ruby/object:Gem::Version
-  version: 2.5.5
+  version: 3.0.0
 platform: ruby
 authors:
 - Ben VandenBos
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-27 00:00:00.000000000 Z
+date: 2014-05-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '1.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '1.5'
+- !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
   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
   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
+  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: 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.4
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.0.4
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: resque
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.25.1
+        version: '1.25'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.25.1
+        version: '1.25'
 - !ruby/object:Gem::Dependency
   name: rufus-scheduler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.24
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.24
+        version: '2.0'
 description: |-
   Light weight job scheduling on top of Resque.
       Adds methods enqueue_at/enqueue_in to schedule jobs in the future.
@@ -175,10 +217,15 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rubocop.yml
-- .simplecov
-- .travis.yml
+- ".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
@@ -187,6 +234,7 @@ files:
 - README.md
 - ROADMAP.md
 - Rakefile
+- Vagrantfile
 - bin/resque-scheduler
 - examples/Rakefile
 - examples/config/initializers/resque-web.rb
@@ -200,32 +248,37 @@ files:
 - examples/run-resque-web
 - lib/resque-scheduler.rb
 - lib/resque/scheduler.rb
+- lib/resque/scheduler/cli.rb
+- lib/resque/scheduler/configuration.rb
+- lib/resque/scheduler/delaying_extensions.rb
+- lib/resque/scheduler/env.rb
+- lib/resque/scheduler/extension.rb
 - lib/resque/scheduler/lock.rb
 - lib/resque/scheduler/lock/base.rb
 - lib/resque/scheduler/lock/basic.rb
 - lib/resque/scheduler/lock/resilient.rb
-- lib/resque/scheduler_locking.rb
-- lib/resque_scheduler.rb
-- lib/resque_scheduler/cli.rb
-- lib/resque_scheduler/logger_builder.rb
-- lib/resque_scheduler/plugin.rb
-- lib/resque_scheduler/server.rb
-- lib/resque_scheduler/server/views/delayed.erb
-- lib/resque_scheduler/server/views/delayed_schedules.erb
-- lib/resque_scheduler/server/views/delayed_timestamp.erb
-- lib/resque_scheduler/server/views/requeue-params.erb
-- lib/resque_scheduler/server/views/scheduler.erb
-- lib/resque_scheduler/server/views/search.erb
-- lib/resque_scheduler/server/views/search_form.erb
-- lib/resque_scheduler/tasks.rb
-- lib/resque_scheduler/util.rb
-- lib/resque_scheduler/version.rb
+- lib/resque/scheduler/locking.rb
+- lib/resque/scheduler/logger_builder.rb
+- lib/resque/scheduler/plugin.rb
+- lib/resque/scheduler/scheduling_extensions.rb
+- lib/resque/scheduler/server.rb
+- lib/resque/scheduler/server/views/delayed.erb
+- lib/resque/scheduler/server/views/delayed_schedules.erb
+- lib/resque/scheduler/server/views/delayed_timestamp.erb
+- lib/resque/scheduler/server/views/requeue-params.erb
+- lib/resque/scheduler/server/views/scheduler.erb
+- lib/resque/scheduler/server/views/search.erb
+- lib/resque/scheduler/server/views/search_form.erb
+- lib/resque/scheduler/signal_handling.rb
+- lib/resque/scheduler/tasks.rb
+- lib/resque/scheduler/util.rb
+- lib/resque/scheduler/version.rb
 - resque-scheduler.gemspec
 - script/migrate_to_timestamps_set.rb
 - tasks/resque_scheduler.rake
 - test/cli_test.rb
 - test/delayed_queue_test.rb
-- test/redis-test.conf
+- test/env_test.rb
 - test/resque-web_test.rb
 - test/scheduler_args_test.rb
 - test/scheduler_hooks_test.rb
@@ -235,6 +288,7 @@ files:
 - test/scheduler_test.rb
 - test/support/redis_instance.rb
 - test/test_helper.rb
+- test/util_test.rb
 homepage: http://github.com/resque/resque-scheduler
 licenses:
 - MIT
@@ -245,24 +299,24 @@ 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.0.14
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Light weight job scheduling on top of Resque
 test_files:
 - test/cli_test.rb
 - test/delayed_queue_test.rb
-- test/redis-test.conf
+- test/env_test.rb
 - test/resque-web_test.rb
 - test/scheduler_args_test.rb
 - test/scheduler_hooks_test.rb
@@ -272,3 +326,5 @@ test_files:
 - test/scheduler_test.rb
 - test/support/redis_instance.rb
 - test/test_helper.rb
+- test/util_test.rb
+has_rdoc: