brianjlandau-resque-scheduler 1.10.4 → 1.10.5

data/README.markdown

@@ -140,7 +140,7 @@ environment variable, the job won't be loaded.
 
 ### Dynamic Schedules
 
-If needed you can also have schedules that are dynamically defined and updated inside of your application. This can be completed by loading the schedule initially wherever you configure Resque and setting `Resque::Scheduler.dynamic` to `true`. Then subsequently updating the "`schedule`" key in redis (namespaced to the Resque namespace) with a JSON encoded version of the schedule hash will cause the schedule to be updated.
+If needed you can also have schedules that are dynamically defined and updated inside of your application. This can be completed by loading the schedule initially wherever you configure Resque and setting `Resque::Scheduler.dynamic` to `true`. Then subsequently updating the "`schedules`" key in redis, namespaced to the Resque namespace. The "`schedules`" key is expected to be a redis hash data type, where the key is the name of the schedule and the value is a JSON encoded hash of the schedule configuration.
 
 When the scheduler loops it will look for differences between the existing schedule and the current schedule in redis. If there are differences it will make the necessary changes to the running schedule.
 

data/brianjlandau-resque-scheduler.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{brianjlandau-resque-scheduler}
-  s.version = "1.10.4"
+  s.version = "1.10.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Ben VandenBos", "Brian Landau"]

data/lib/resque_scheduler.rb

@@ -40,7 +40,7 @@ module ResqueScheduler
   end
   
   def get_schedule
-    redis.hgetall(:schedule).tap do |h|
+    redis.hgetall(:schedules).tap do |h|
       h.each do |name, config|
         h[name] = decode(config)
       end

data/lib/resque_scheduler/server.rb

@@ -19,7 +19,7 @@ module ResqueScheduler
         end
 
         get "/schedule" do
-          Resque.reload_schedule! if Resque.respond_to?(:reload_schedule!)
+          Resque.reload_schedule! if Resque::Scheduler.dynamic
           # Is there a better way to specify alternate template locations with sinatra?
           erb File.read(File.join(File.dirname(__FILE__), 'server/views/scheduler.erb'))
         end

data/lib/resque_scheduler/version.rb

@@ -1,3 +1,3 @@
 module ResqueScheduler
-  Version = '1.10.4'
+  Version = '1.10.5'
 end

data/test/scheduler_test.rb

@@ -7,7 +7,7 @@ class Resque::SchedulerTest < Test::Unit::TestCase
   end
 
   def setup
-    Resque.redis.del(:schedule)
+    Resque.redis.del(:schedules)
     Resque::Scheduler.mute = true
     Resque::Scheduler.clear_schedule!
     Resque::Scheduler.send(:class_variable_set, :@@scheduled_jobs, {})
@@ -78,7 +78,7 @@ class Resque::SchedulerTest < Test::Unit::TestCase
   
   def test_can_reload_schedule
     Resque.schedule = {"some_ivar_job" => {'cron' => "* * * * *", 'class' => 'SomeIvarJob', 'args' => "/tmp"}}
-    Resque.redis.hset(:schedule, "some_ivar_job", Resque.encode(
+    Resque.redis.hset(:schedules, "some_ivar_job", Resque.encode(
       {'cron' => "* * * * *", 'class' => 'SomeIvarJob', 'args' => "/tmp"}
     ))
   
@@ -87,8 +87,8 @@ class Resque::SchedulerTest < Test::Unit::TestCase
     assert_equal(1, Resque::Scheduler.rufus_scheduler.all_jobs.size)
     assert Resque::Scheduler.scheduled_jobs.include?("some_ivar_job")
     
-    Resque.redis.del(:schedule)
-    Resque.redis.hset(:schedule, "some_ivar_job2", Resque.encode(
+    Resque.redis.del(:schedules)
+    Resque.redis.hset(:schedules, "some_ivar_job2", Resque.encode(
       {'cron' => "* * * * *", 'class' => 'SomeIvarJob', 'args' => "/tmp/2"}
     ))
     
@@ -133,13 +133,13 @@ class Resque::SchedulerTest < Test::Unit::TestCase
     
     Resque::Scheduler.load_schedule!
     
-    Resque.redis.hset(:schedule, "some_ivar_job", Resque.encode(
+    Resque.redis.hset(:schedules, "some_ivar_job", Resque.encode(
       {'cron' => "* * * * *", 'class' => 'SomeIvarJob', 'args' => "/tmp/2"}
     ))
-    Resque.redis.hset(:schedule, "new_ivar_job", Resque.encode(
+    Resque.redis.hset(:schedules, "new_ivar_job", Resque.encode(
       {'cron' => "* * * * *", 'class' => 'SomeJob', 'args' => "/tmp/3"}
     ))
-    Resque.redis.hset(:schedule, "stay_put_job", Resque.encode(
+    Resque.redis.hset(:schedules, "stay_put_job", Resque.encode(
       {'cron' => "* * * * *", 'class' => 'SomeJob', 'args' => "/tmp"}
     ))
     
@@ -167,13 +167,13 @@ class Resque::SchedulerTest < Test::Unit::TestCase
     Resque::Scheduler.rufus_scheduler.expects(:unschedule).with(Resque::Scheduler.scheduled_jobs["some_ivar_job"].job_id)
     Resque::Scheduler.rufus_scheduler.expects(:unschedule).with(Resque::Scheduler.scheduled_jobs["another_ivar_job"].job_id)
     
-    Resque.redis.hset(:schedule, "some_ivar_job", Resque.encode(
+    Resque.redis.hset(:schedules, "some_ivar_job", Resque.encode(
       {'cron' => "* * * * *", 'class' => 'SomeIvarJob', 'args' => "/tmp/2"}
     ))
-    Resque.redis.hset(:schedule, "new_ivar_job", Resque.encode(
+    Resque.redis.hset(:schedules, "new_ivar_job", Resque.encode(
       {'cron' => "* * * * *", 'class' => 'SomeJob', 'args' => "/tmp/3"}
     ))
-    Resque.redis.hset(:schedule, "stay_put_job", Resque.encode(
+    Resque.redis.hset(:schedules, "stay_put_job", Resque.encode(
       {'cron' => "* * * * *", 'class' => 'SomeJob', 'args' => "/tmp"}
     ))
     

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: brianjlandau-resque-scheduler
 version: !ruby/object:Gem::Version 
-  hash: 55
+  hash: 53
   prerelease: false
   segments: 
   - 1
   - 10
-  - 4
-  version: 1.10.4
+  - 5
+  version: 1.10.5
 platform: ruby
 authors: 
 - Ben VandenBos