sidekiq-scheduler 2.0.0 → 2.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 037b6a4d410e4524dbf981cc073d9c30c5e31009
-  data.tar.gz: 345305609e9b89c755d636c6c9124090be88c777
+  metadata.gz: 743371bafeb924ead436bf1af7be4a04d1643c34
+  data.tar.gz: 51dd55ce2e46e04c9a7f5ff682f7efb7edb1215d
 SHA512:
-  metadata.gz: f4581a66f03bd8c574565f3ea432fc5a179a1a3e28fd3d93c0822f320b36369415c2cb84945599772631b9b4c4828f3f4f8b011144c7ecf516cb4546020066b1
-  data.tar.gz: 582260da864b28b3f9cf0484012e1356dad92253732f1c404cf2b3fb2971563ed8bc87b9d728848e5e6f80a3fa18e50c8e1a67c87d75cb627f4864f050ca46a0
+  metadata.gz: 3a6c82f077edeeee2700ad78fcf0890e5ebfe7f67f649aca84c98de5b0eaa2310bf24438f0d8e4e1f3dc1aaba1b735db5d063a5e61945eab5a4ebef8d59aa15e
+  data.tar.gz: 1928654824078d46092657a1e6f3b8033066e889119438afc7c2e48ba7b5c0611dd113c868fa9225274f67f1b26c88125f1531bbbcf603a811464127c66ea176

data/README.md

@@ -34,7 +34,7 @@ Scheduled jobs are like cron jobs, recurring on a regular basis.
 
 Add this to your Gemfile:
 ```ruby
-gem 'sidekiq-scheduler', '~> 1.2'
+gem 'sidekiq-scheduler', '~> 2.0'
 ```
 
 If you are using rails you are set
@@ -57,7 +57,7 @@ Available options are:
 
     :schedule: <the schedule to be run>
     :dynamic: <if true the schedule can be modified in runtime>
-    :enabled: <disables scheduler if true [true by default]>
+    :enabled: <enables scheduler if true [true by default]>
 
 ## Manage tasks from Unicorn/Rails server
 
@@ -72,16 +72,20 @@ puts "defined?(Rails::Server) is #{defined?(Rails::Server).inspect}"
 puts "defined?(Unicorn) is #{defined?(Unicorn).inspect}"
 
 if Rails.env == 'production' && (defined?(Rails::Server) || defined?(Unicorn))
-  Sidekiq.schedule = YAML
-    .load_file(File.expand_path('../../../config/scheduler.yml', __FILE__))
-  Sidekiq::Scheduler.reload_schedule!
+  Sidekiq.configure_server do |config|
+
+    config.on(:startup) do
+      Sidekiq.schedule = YAML
+        .load_file(File.expand_path('../../../config/scheduler.yml', __FILE__))
+      Sidekiq::Scheduler.reload_schedule!
+    end
+  end
 else
   Sidekiq::Scheduler.enabled = false
   puts "Sidekiq::Scheduler.enabled is #{Sidekiq::Scheduler.enabled.inspect}"
 end
 ```
 
-
 ## Scheduled Jobs (Recurring Jobs)
 
 Scheduled (or recurring) jobs are logically no different than a standard cron
@@ -138,7 +142,12 @@ you could create a Rails initializer called "config/initializer/scheduler.rb" wh
 
 ```ruby
 require 'sidekiq/scheduler'
-Sidekiq.schedule = YAML.load_file(File.expand_path("../../../config/scheduler.yml",__FILE__))
+
+Sidekiq.configure_server do |config|
+  config.on(:startup) do
+    Sidekiq.schedule =    YAML.load_file(File.expand_path("../../../config/scheduler.yml",__FILE__))
+  end
+end
 ```
 
 If you were running a non Rails project you should add code to load the workers classes before loading the schedule.
@@ -146,7 +155,13 @@ If you were running a non Rails project you should add code to load the workers
 ```ruby
 require 'sidekiq/scheduler'
 Dir[File.expand_path('../lib/workers/*.rb',__FILE__)].each do |file| load file; end
-Sidekiq.schedule = YAML.load_file(File.expand_path("../../../config/scheduler.yml",__FILE__))
+
+Sidekiq.configure_server do |config|
+
+  config.on(:startup) do
+    Sidekiq.schedule = YAML.load_file(File.expand_path("../../../config/scheduler.yml",__FILE__))
+  end
+end
 ```
 
 You can also put your schedule information inside sidekiq.yml and load it with:
@@ -236,11 +251,6 @@ This work is a partial port of [resque-scheduler](https://github.com/bvandenbos/
 Modified to work with the Sidekiq queueing library by Morton Jonuschat.
 Scheduling of recurring jobs has been added to v0.4.0, thanks to [Adrian Gomez](https://github.com/adrian-gomez).
 
-## Maintainers
-
-* [Morton Jonuschat](https://github.com/yabawock)
-* [Adrian Gomez](https://github.com/adrian-gomez)
-
 ## License
 
 MIT License

data/lib/sidekiq-scheduler/schedule.rb

@@ -37,11 +37,16 @@ module SidekiqScheduler
     # param, otherwise params is passed in as the only parameter to perform.
     def schedule=(schedule_hash)
       schedule_hash = prepare_schedule(schedule_hash)
+      to_remove = (get_all_schedules || {}).keys - schedule_hash.keys
 
       schedule_hash.each do |name, job_spec|
         set_schedule(name, job_spec)
       end
 
+      to_remove.each do |name|
+        remove_schedule(name)
+      end
+
       @schedule = schedule_hash
     end
 

data/lib/sidekiq-scheduler/version.rb

@@ -1,5 +1,5 @@
 module SidekiqScheduler
 
-  VERSION = '2.0.0'
+  VERSION = '2.0.1'
 
 end

data/test/schedule_test.rb

@@ -76,5 +76,22 @@ class ScheduleTest < Minitest::Test
       assert_equal nil, job_from_redis_without_decoding(job_id)
       assert Sidekiq.redis{ |r| r.sismember(:schedules_changed, job_id) }
     end
+
+    describe 'schedule update' do
+      let(:new_job_id)       { 'my_ivar_job_2' }
+      let(:new_job_class_id) { 'SomeIvarJob2' }
+
+      before do
+        Sidekiq::Scheduler.dynamic = true
+        Sidekiq.schedule = {job_id => cron_hash}
+      end
+
+      it 'schedule= adds new jobs to schedule and remove old ones' do
+        Sidekiq.schedule = {new_job_id => cron_hash}
+
+        assert_equal(cron_hash, job_from_redis(new_job_id))
+        assert_equal(nil, job_from_redis_without_decoding(job_id))
+      end
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sidekiq-scheduler
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.0.1
 platform: ruby
 authors:
 - Morton Jonuschat
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-26 00:00:00.000000000 Z
+date: 2015-12-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sidekiq
@@ -67,6 +67,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1'
+- !ruby/object:Gem::Dependency
+  name: tilt
+  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'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement