sqeduler 0.2.0 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 952cafb156a1da8df0f3bece128b8578e4f83e97
-  data.tar.gz: 21f4293a4f7f5a5d03a316d29b6a483c6f0a9094
+  metadata.gz: 510d5754df3875e36f052b971668cf58ccdcdde1
+  data.tar.gz: dd0b216fe36b27a4df8f76dbd243e4f088b45fe8
 SHA512:
-  metadata.gz: 0dcd6a303e7b45925f053f96a9ab12ce511d41309c5df2256e54bba1d9fb48b8184db844c72b0e61b910716a34d447bb14070e7eeeff8e069e676f42c730ca7c
-  data.tar.gz: 5f97beb03984fafe2ab8e536f1e1d382f544f19908f6af8fd7ef4e42e41864ffd516a98bb8a484d611e9e4f9701253c28132ab08df5a4ac4bfef172f8e3b0e58
+  metadata.gz: 64eb353667433b507b725db2b9b92adc5dde0ec71a140ddc640a5c74a52f42dcbfa1dc63ddeba27b4c8ebd0b188711e5256cac9f89d2edd45cff0f5d635d1e7c
+  data.tar.gz: 1e7cde947da623040ee8f07218fc7b02be92b0c4bec6f54b9688068fc662b090eaadd8f6a3e8466493244aa43ed9e395f552be5443f3dee36bb13a19857c43e0

data/.rubocop.yml

@@ -1,6 +1,10 @@
 Lint/EndAlignment:
   AlignWith: variable
 
+# Setting off false-positives :(
+Lint/UnneededDisable:
+  Enabled: false
+
 Metrics/AbcSize:
   Enabled: false
 

data/.travis.yml

@@ -4,3 +4,4 @@ rvm:
   - 2.2
 services:
   - redis-server
+before_install: gem update bundler

data/CHANGES.md

@@ -1,4 +1,13 @@
-### 0.1.0 / 2015-01-11
+### 0.2.2 / 2015-11-11
 
-* Initial release:
+* Support ERB in job schedules
+* Handle exceptions more gracefully in lock acquisition
 
+### 0.2.0 / 2015-04-18
+
+* Add KillSwitch middleware
+* Cleanup
+
+### 0.1.4 / 2015-03-26
+
+* Initial release

data/Gemfile

@@ -1,8 +1,6 @@
 # encoding: utf-8
 source "https://www.rubygems.org"
 
-gem "sidekiq-scheduler", :github => "ecin/sidekiq-scheduler", :branch => "ecin/redis-lock" # https://github.com/Moove-it/sidekiq-scheduler/pull/38
-
 gemspec
 
 group :development do

data/Rakefile

@@ -1,5 +1,7 @@
 # encoding: utf-8
 
+require "bundler/gem_tasks"
+
 require "rspec/core/rake_task"
 RSpec::Core::RakeTask.new
 

data/lib/sqeduler/service.rb

@@ -73,12 +73,18 @@ module Sqeduler
           ::Sidekiq::Scheduler.rufus_scheduler_options = {
             :trigger_lock => TriggerLock.new
           }
-          ::Sidekiq.schedule = YAML.load_file(config.schedule_path)
+          ::Sidekiq.schedule = parse_schedule(config.schedule_path)
         else
           logger.warn "No schedule_path provided. Not starting Sidekiq::Scheduler."
         end
       end
 
+      def parse_schedule(path)
+        fail "Schedule file #{path} does not exist!" unless File.exist?(path)
+        file_contents = File.read(path)
+        YAML.load(ERB.new(file_contents).result)
+      end
+
       def scheduling?
         !config.schedule_path.to_s.empty?
       end

data/lib/sqeduler/trigger_lock.rb

@@ -15,6 +15,8 @@ module Sqeduler
       # - return true if already acquired
       # - refresh the lock if already acquired
       refresh || super
+    rescue
+      false
     end
   end
 end

data/lib/sqeduler/version.rb

@@ -1,4 +1,4 @@
 # encoding: utf-8
 module Sqeduler
-  VERSION = "0.2.0"
+  VERSION = "0.2.2"
 end

data/lib/sqeduler/worker/synchronization.rb

@@ -93,7 +93,7 @@ module Sqeduler
 
       # rubocop:disable Metrics/AbcSize
       def time_duration(timespan)
-        rest, secs = timespan.divmod(60)  # self is the time difference t2 - t1
+        rest, secs = timespan.divmod(60) # self is the time difference t2 - t1
         rest, mins = rest.divmod(60)
         days, hours = rest.divmod(24)
 

data/spec/fixtures/schedule.yaml

@@ -1,2 +1,2 @@
 FakeWorker:
-  every: 5s
+  every: <%=5%>s

data/spec/service_spec.rb

@@ -55,7 +55,11 @@ RSpec.describe Sqeduler::Service do
 
       context "a schedule_path is provided" do
         it "starts the scheduler" do
-          expect(Sidekiq).to receive(:"schedule=").with(YAML.load_file(schedule_filepath))
+          expect(Sidekiq).to receive(:"schedule=").with(
+            "FakeWorker" => {
+              "every" => "5s"
+            }
+          )
           subject
           expect(Sidekiq::Scheduler.rufus_scheduler_options).to have_key(:trigger_lock)
           expect(Sidekiq::Scheduler.rufus_scheduler_options[:trigger_lock]).to be_kind_of(
@@ -67,7 +71,11 @@ RSpec.describe Sqeduler::Service do
           let(:schedule_filepath) { "./spec/fixtures/schedule.yaml" }
 
           it "starts the scheduler" do
-            expect(Sidekiq).to receive(:"schedule=").with(YAML.load_file(schedule_filepath))
+            expect(Sidekiq).to receive(:"schedule=").with(
+              "FakeWorker" => {
+                "every" => "5s"
+              }
+            )
             subject
             expect(Sidekiq::Scheduler.rufus_scheduler_options).to have_key(:trigger_lock)
             expect(Sidekiq::Scheduler.rufus_scheduler_options[:trigger_lock]).to be_kind_of(

data/spec/trigger_lock_spec.rb

@@ -76,5 +76,11 @@ RSpec.describe Sqeduler::TriggerLock do
       expect(trigger_lock_2.locked?).to be(true)
       expect(trigger_lock_1.unlock).to be(false)
     end
+
+    it "should not acquire the lock if there is an error" do
+      allow(trigger_lock_1).to receive(:refresh_lock).and_raise("boom")
+      expect(trigger_lock_1.lock).to be false
+      expect(trigger_lock_1.locked?).to be false
+    end
   end
 end

data/spec/worker_spec.rb

@@ -43,14 +43,15 @@ RSpec.describe Sqeduler::Worker do
       let(:expiration) { work_time * 4 }
       let(:work_time) { 0.1 }
 
-      subject do
-        threads = []
-        threads << Thread.new { FakeWorker.new.perform(work_time) }
-        threads << Thread.new do
+      def run_synchronized_workers
+        worker1 = Thread.new do
+          FakeWorker.new.perform(work_time)
+        end
+        worker2 = Thread.new do
           sleep wait_time
           FakeWorker.new.perform(work_time)
         end
-        threads.each(&:join)
+        worker1.join && worker2.join
       end
 
       context "overlapping schedule" do
@@ -60,32 +61,32 @@ RSpec.describe Sqeduler::Worker do
           let(:timeout) { work_time / 2 }
 
           it "one worker should be blocked" do
-            subject
+            run_synchronized_workers
             verify_callback_occured(FakeWorker::JOB_LOCK_FAILURE_PATH)
           end
 
           it "only one worker should run" do
-            subject
+            run_synchronized_workers
             verify_callback_occured(FakeWorker::JOB_RUN_PATH)
           end
 
           it "one worker should succeed" do
-            subject
+            run_synchronized_workers
             verify_callback_occured(FakeWorker::JOB_SUCCESS_PATH, 2)
           end
 
           it "no worker should fail" do
-            subject
+            run_synchronized_workers
             verify_callback_skipped(FakeWorker::JOB_FAILURE_PATH)
           end
 
           it "all workers should have received before_start" do
-            subject
+            run_synchronized_workers
             verify_callback_occured(FakeWorker::JOB_BEFORE_START_PATH, 2)
           end
 
           it "a schedule collision should not have occurred" do
-            subject
+            run_synchronized_workers
             verify_callback_skipped(FakeWorker::SCHEDULE_COLLISION_PATH)
           end
         end
@@ -94,27 +95,27 @@ RSpec.describe Sqeduler::Worker do
           let(:timeout) { work_time * 4 }
 
           it "no worker should be blocked" do
-            subject
+            run_synchronized_workers
             verify_callback_skipped(FakeWorker::JOB_LOCK_FAILURE_PATH)
           end
 
           it "both workers should succeed" do
-            subject
+            run_synchronized_workers
             verify_callback_occured(FakeWorker::JOB_SUCCESS_PATH, 2)
           end
 
           it "no worker should fail" do
-            subject
+            run_synchronized_workers
             verify_callback_skipped(FakeWorker::JOB_FAILURE_PATH)
           end
 
           it "all workers should have received before_start" do
-            subject
+            run_synchronized_workers
             verify_callback_occured(FakeWorker::JOB_BEFORE_START_PATH, 2)
           end
 
           it "a schedule collision should not have occurred" do
-            subject
+            run_synchronized_workers
             verify_callback_skipped(FakeWorker::SCHEDULE_COLLISION_PATH)
           end
 
@@ -122,28 +123,28 @@ RSpec.describe Sqeduler::Worker do
             let(:expiration) { work_time / 2 }
 
             it "no worker should be blocked" do
-              subject
+              run_synchronized_workers
               verify_callback_skipped(FakeWorker::JOB_LOCK_FAILURE_PATH)
             end
 
             it "all workers should run" do
-              subject
+              run_synchronized_workers
               verify_callback_occured(FakeWorker::JOB_RUN_PATH, 2)
             end
 
             it "all workers should have received before_start" do
-              subject
+              run_synchronized_workers
               verify_callback_occured(FakeWorker::JOB_BEFORE_START_PATH, 2)
             end
 
             it "no worker should fail" do
-              subject
+              run_synchronized_workers
               verify_callback_occured(FakeWorker::JOB_SUCCESS_PATH, 2)
               verify_callback_skipped(FakeWorker::JOB_FAILURE_PATH)
             end
 
             it "a schedule collision should occur" do
-              subject
+              run_synchronized_workers
               verify_callback_occured(FakeWorker::SCHEDULE_COLLISION_PATH, 2)
             end
           end
@@ -157,28 +158,28 @@ RSpec.describe Sqeduler::Worker do
           let(:timeout) { work_time }
 
           it "no workers should be blocked" do
-            subject
+            run_synchronized_workers
             verify_callback_skipped(FakeWorker::JOB_LOCK_FAILURE_PATH)
           end
 
           it "all workers should run" do
-            subject
+            run_synchronized_workers
             verify_callback_occured(FakeWorker::JOB_RUN_PATH, 2)
           end
 
           it "no worker should fail" do
-            subject
+            run_synchronized_workers
             verify_callback_occured(FakeWorker::JOB_SUCCESS_PATH, 2)
             verify_callback_skipped(FakeWorker::JOB_FAILURE_PATH)
           end
 
           it "all workers should have received before_start" do
-            subject
+            run_synchronized_workers
             verify_callback_occured(FakeWorker::JOB_BEFORE_START_PATH, 2)
           end
 
           it "a schedule collision should not have occurred" do
-            subject
+            run_synchronized_workers
             verify_callback_skipped(FakeWorker::SCHEDULE_COLLISION_PATH)
           end
         end
@@ -187,22 +188,22 @@ RSpec.describe Sqeduler::Worker do
           let(:timeout) { work_time * 2 }
 
           it "no worker should be blocked" do
-            subject
+            run_synchronized_workers
             verify_callback_skipped(FakeWorker::JOB_LOCK_FAILURE_PATH)
           end
 
           it "both workers should succeed" do
-            subject
+            run_synchronized_workers
             verify_callback_occured(FakeWorker::JOB_SUCCESS_PATH, 2)
           end
 
           it "no worker should fail" do
-            subject
+            run_synchronized_workers
             verify_callback_skipped(FakeWorker::JOB_FAILURE_PATH)
           end
 
           it "all workers should have received before_start" do
-            subject
+            run_synchronized_workers
             verify_callback_occured(FakeWorker::JOB_BEFORE_START_PATH, 2)
           end
 
@@ -210,28 +211,28 @@ RSpec.describe Sqeduler::Worker do
             let(:expiration) { work_time / 2 }
 
             it "no worker should be blocked" do
-              subject
+              run_synchronized_workers
               verify_callback_skipped(FakeWorker::JOB_LOCK_FAILURE_PATH)
             end
 
             it "all workers should run" do
-              subject
+              run_synchronized_workers
               verify_callback_occured(FakeWorker::JOB_RUN_PATH, 2)
             end
 
             it "all workers should have received before_start" do
-              subject
+              run_synchronized_workers
               verify_callback_occured(FakeWorker::JOB_BEFORE_START_PATH, 2)
             end
 
             it "no worker should fail" do
-              subject
+              run_synchronized_workers
               verify_callback_occured(FakeWorker::JOB_SUCCESS_PATH, 2)
               verify_callback_skipped(FakeWorker::JOB_FAILURE_PATH)
             end
 
             it "a schedule collision should occur" do
-              subject
+              run_synchronized_workers
               verify_callback_occured(FakeWorker::SCHEDULE_COLLISION_PATH, 2)
             end
           end

data/sqeduler.gemspec

@@ -10,7 +10,7 @@ Gem::Specification.new do |gem|
   multiple hosts. Also provides a convenient abstract class for Sidekiq workers.
   DESC
   gem.license       = "Apache"
-  gem.authors       = '["Jared Jenkins"]'
+  gem.authors       = ["Jared Jenkins"]
   gem.email         = "jaredjenkins@squareup.com"
   gem.homepage      = "https://rubygems.org/gems/sqeduler"
 
@@ -20,13 +20,13 @@ Gem::Specification.new do |gem|
   gem.require_paths = ["lib"]
 
   gem.add_runtime_dependency "sidekiq"
-  gem.add_runtime_dependency "sidekiq-scheduler"
+  gem.add_runtime_dependency "sidekiq-scheduler", "~> 1.1"
   gem.add_runtime_dependency "activesupport"
 
-  gem.add_development_dependency "bundler", "~> 1.7"
+  gem.add_development_dependency "bundler", "~> 1.10"
   gem.add_development_dependency "pry", "~> 0"
   gem.add_development_dependency "rake", "~> 10"
-  gem.add_development_dependency "rspec", "~> 3"
+  gem.add_development_dependency "rspec", "~> 3.3"
   gem.add_development_dependency "rubocop", "~> 0.24"
   gem.add_development_dependency "timecop", "~> 0"
   gem.add_development_dependency "yard", "~> 0"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sqeduler
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.2
 platform: ruby
 authors:
-- '["Jared Jenkins"]'
+- Jared Jenkins
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-23 00:00:00.000000000 Z
+date: 2015-11-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sidekiq
@@ -28,16 +28,16 @@ dependencies:
   name: sidekiq-scheduler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.1'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
@@ -58,14 +58,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: '1.10'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: '1.10'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
@@ -100,14 +100,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3'
+        version: '3.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3'
+        version: '3.3'
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
@@ -216,7 +216,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.5.0
 signing_key: 
 specification_version: 4
 summary: Common Sidekiq infrastructure for multi-host applications.