sqeduler 0.3.6 → 0.3.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 999b1300f9f730cc4648c14082aa596a2e16195a
-  data.tar.gz: 4922c321fa003eb1657664182fd7320c9d2092a2
+  metadata.gz: dd29046cb516b9fafdbd2ec01a41adb53478cf82
+  data.tar.gz: 739c3c00428e9805ef77f87596a16bd4efe6fdf8
 SHA512:
-  metadata.gz: 1123efb89e5e45441d4c63690d2c1536ff250e9e5722fafce6c9f27cf2741013d0556707608c5f3c6f0cdaab57fc79a2e58e04138b647f722fadbf03603c3c18
-  data.tar.gz: d0205b540bbed7c43215fba5b956d8beef3c86d8eecf995da154dd44de1f89b372ac090528fac46b951cffd1fa353e0b7c2d281a43afb1b1ac795b6f12f481e6
+  metadata.gz: da595ba77cd4088ea1b437ff37cd5ab4dc033e28b476e88f3555fa5a421ff8217fbab5b518be48fb71e610c32d1fb67120d6172da838ed099852289b3c4249d2
+  data.tar.gz: 1bcdb26ae008247dc0dca1d079a723c3a031bf7c7e0ffc26d59f56f323b2ec85af51cdda2ae16a9347781cafeee54ab1cc742c872cd9c9ebf1545c447aa0f0b5

data/.rubocop.yml

@@ -16,7 +16,7 @@ Metrics/LineLength:
   Max: 120
 
 Metrics/MethodLength:
-  Max: 20
+  Max: 25
 
 Style/HashSyntax:
   EnforcedStyle: hash_rockets

data/.travis.yml

@@ -1,7 +1,11 @@
 language: ruby
 rvm:
-  - 2.1
-  - 2.2
+  - 2.2.5
+  - 2.3.1
 services:
   - redis-server
-before_install: gem update bundler
+before_install:
+  - gem update --system
+  - gem --version
+  - gem update bundler
+  - bundle --version

data/CHANGES.md

@@ -1,3 +1,7 @@
+### 0.3.7 / 2016-09-21
+
+* Fixed a bug introduced by sidekiq-scheduler 2.0.9 that resulted in the schedule being empty
+
 ### 0.3.6 / 2016-06-16
 
 * Symbolize keys in redis config hash

data/lib/sqeduler/service.rb

@@ -14,7 +14,6 @@ module Sqeduler
         raise "No config provided" unless config
         config_sidekiq_server
         config_sidekiq_client
-        config_scheduler
       end
 
       def verify_redis_pool(redis_pool)
@@ -33,10 +32,22 @@ module Sqeduler
         ::Sidekiq.configure_server do |config|
           setup_sidekiq_redis(config)
           if Service.scheduling?
+            logger.info "Initializing Sidekiq::Scheduler with schedule #{::Sqeduler::Service.config.schedule_path}"
+
+            config.on(:startup) do
+              ::Sidekiq::Scheduler.rufus_scheduler_options = {
+                :trigger_lock => TriggerLock.new
+              }
+              ::Sidekiq.schedule = ::Sqeduler::Service.parse_schedule(::Sqeduler::Service.config.schedule_path)
+              ::Sidekiq::Scheduler.reload_schedule!
+            end
+
             config.on(:shutdown) do
               # Make sure any scheduling locks are released on shutdown.
-              Sidekiq::Scheduler.rufus_scheduler.stop
+              ::Sidekiq::Scheduler.rufus_scheduler.stop
             end
+          else
+            logger.warn "No schedule_path provided. Not starting Sidekiq::Scheduler."
           end
 
           # the server can also enqueue jobs
@@ -68,18 +79,6 @@ module Sqeduler
         config.redis = Service.config.redis_hash
       end
 
-      def config_scheduler
-        if scheduling?
-          logger.info "Initializing Sidekiq::Scheduler with schedule #{config.schedule_path}"
-          ::Sidekiq::Scheduler.rufus_scheduler_options = {
-            :trigger_lock => TriggerLock.new
-          }
-          ::Sidekiq.schedule = parse_schedule(config.schedule_path)
-        else
-          logger.warn "No schedule_path provided. Not starting Sidekiq::Scheduler."
-        end
-      end
-
       def parse_schedule(path)
         raise "Schedule file #{path} does not exist!" unless File.exist?(path)
         file_contents = File.read(path)

data/lib/sqeduler/version.rb

@@ -1,4 +1,4 @@
 # encoding: utf-8
 module Sqeduler
-  VERSION = "0.3.6".freeze
+  VERSION = "0.3.7".freeze
 end

data/spec/integration_spec.rb

@@ -27,6 +27,6 @@ RSpec.describe "Sidekiq integration" do
     end
     Process.kill("INT", pid)
     Process.wait(pid, 0)
-    expect(File).to exist(FakeWorker::JOB_RUN_PATH)
+    expect(File.exist?(FakeWorker::JOB_RUN_PATH)).to be_truthy
   end
 end

data/spec/service_spec.rb

@@ -17,7 +17,7 @@ RSpec.describe Sqeduler::Service do
 
     context "no config provided" do
       it "should raise" do
-        expect { subject }.to raise_error
+        expect { subject }.to raise_error(RuntimeError, "No config provided")
       end
     end
 
@@ -38,12 +38,12 @@ RSpec.describe Sqeduler::Service do
         )
       end
 
-      it "starts the server" do
+      it "configures the server" do
         expect(Sidekiq).to receive(:configure_server)
         subject
       end
 
-      it "starts the client" do
+      it "configures the client" do
         expect(Sidekiq).to receive(:configure_client)
         subject
       end
@@ -58,47 +58,6 @@ RSpec.describe Sqeduler::Service do
         expect(client_receiver).to receive(:call)
         subject
       end
-
-      context "a schedule_path is provided" do
-        it "starts the scheduler" do
-          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(
-            Sqeduler::TriggerLock
-          )
-        end
-
-        context "a schedule_path is a string" do
-          let(:schedule_filepath) { "./spec/fixtures/schedule.yaml" }
-
-          it "starts the scheduler" do
-            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(
-              Sqeduler::TriggerLock
-            )
-          end
-        end
-      end
-
-      context "a schedule_path is not provided" do
-        let(:schedule_filepath) { nil }
-
-        it "does not start the scheduler" do
-          expect(Sidekiq).to_not receive(:"schedule=")
-          subject
-        end
-      end
     end
   end
 
@@ -134,7 +93,7 @@ RSpec.describe Sqeduler::Service do
         allow_any_instance_of(Redis).to receive(:info).and_return(
           "redis_version" => "2.6.11"
         )
-        expect { subject }.to raise_error
+        expect { subject }.to raise_error(RuntimeError, "Must be using redis >= 2.6.12")
       end
     end
 
@@ -168,7 +127,7 @@ RSpec.describe Sqeduler::Service do
       end
 
       it "should raise" do
-        expect { described_class.redis_pool }.to raise_error
+        expect { described_class.redis_pool }.to raise_error(RuntimeError, "Must be using redis >= 2.6.12")
       end
     end
 
@@ -226,7 +185,7 @@ RSpec.describe Sqeduler::Service do
       let(:logger) { nil }
 
       it "should raise ArgumentError" do
-        expect { subject }.to raise_error(ArgumentError)
+        expect { subject }.to raise_error(ArgumentError, /^No logger provided/)
       end
 
       context "in a Rails app" do

data/spec/spec_helper.rb

@@ -12,7 +12,7 @@ RSpec.configure do |config|
   config.before(:each) do
     TEST_REDIS.flushdb
     Sqeduler::Service.config = nil
-    REDIS_CONFIG = { :host => "localhost", :db => 1 }.clone
+    stub_const("REDIS_CONFIG", :host => "localhost", :db => 1)
   end
   config.disable_monkey_patching!
 end

data/spec/worker_spec.rb

@@ -4,12 +4,12 @@ require "./spec/fixtures/fake_worker"
 
 RSpec.describe Sqeduler::Worker do
   def verify_callback_occured(file_path, times = 1)
-    expect(File).to exist(file_path)
+    expect(File.exist?(file_path)).to be_truthy
     expect(File.read(file_path).length).to eq(times)
   end
 
   def verify_callback_skipped(file_path)
-    expect(File).to_not exist(file_path)
+    expect(File.exist?(file_path)).to be_falsey
   end
 
   def maybe_cleanup_file(file_path)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sqeduler
 version: !ruby/object:Gem::Version
-  version: 0.3.6
+  version: 0.3.7
 platform: ruby
 authors:
 - Jared Jenkins
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-16 00:00:00.000000000 Z
+date: 2016-09-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sidekiq
@@ -234,7 +234,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Common Sidekiq infrastructure for multi-host applications.
@@ -254,4 +254,3 @@ test_files:
 - spec/worker/kill_switch_spec.rb
 - spec/worker/synchronization_spec.rb
 - spec/worker_spec.rb
-has_rdoc: