sqeduler 0.3.5 → 0.3.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f538f7aff473b6d02317f52b26462ec8a9432be0
-  data.tar.gz: 6a130c0ff71ccd03426845fe98b58b47df6b8812
+  metadata.gz: 999b1300f9f730cc4648c14082aa596a2e16195a
+  data.tar.gz: 4922c321fa003eb1657664182fd7320c9d2092a2
 SHA512:
-  metadata.gz: 3b23839d88381b74537db921e6ceb9128c14cd21053adbb1d56f06096fd7b0155274f1070dd66cefc459b71b5d95181c499f31eafbd783641bd081ecb55eab28
-  data.tar.gz: a5e48c55681c012e7eabc00d2aa4c7624d5e7a01076506aec9bb26ebe6cec439d7440ae9b1d65fb4f62bb7e9691df669d7062adac99b99fd988f5fcbecca001d
+  metadata.gz: 1123efb89e5e45441d4c63690d2c1536ff250e9e5722fafce6c9f27cf2741013d0556707608c5f3c6f0cdaab57fc79a2e58e04138b647f722fadbf03603c3c18
+  data.tar.gz: d0205b540bbed7c43215fba5b956d8beef3c86d8eecf995da154dd44de1f89b372ac090528fac46b951cffd1fa353e0b7c2d281a43afb1b1ac795b6f12f481e6

data/CHANGES.md

@@ -1,3 +1,8 @@
+### 0.3.6 / 2016-06-16
+
+* Symbolize keys in redis config hash
+* Add method to list disabled workers
+
 ### 0.3.5 / 2016-05-03
 
 * Move sidekiq-scheduler from 1.x to 2.x

data/README.md

@@ -72,6 +72,8 @@ To use `Sqeduler::Worker` modules:
 * You **DO NOT need** to use this gem for starting Sidekiq or Sidekiq::Scheduler (i.e: `Sqeduler::Service.start`)
 * You **DO need** to provide at `config.redis_hash`, and `config.logger` if you don't want to log to `Rails.logger`.
   * This gem creates a separate `ConnectionPool` so that it can create locks for synchronization and store state for disabling/enabling workers.
+* You **DO need** to `include`/`prepend` these modules in the actual working class
+  * They will not work if done in a parent class because of the way `prepend` works in conjunction with inheritance.
 
 The modules:
 

data/lib/sqeduler/service.rb

@@ -102,7 +102,8 @@ module Sqeduler
         redis_pool = if config.redis_pool
           config.redis_pool
         else
-          redis = { :namespace => "sqeduler" }.merge(config.redis_hash)
+          # Redis requires config hash to have symbols as keys.
+          redis = { :namespace => "sqeduler" }.merge(symbolize_keys(config.redis_hash))
           ::Sidekiq::RedisConnection.create(redis)
         end
         verify_redis_pool(redis_pool)
@@ -114,6 +115,12 @@ module Sqeduler
         return Rails.logger if defined?(Rails)
         raise ArgumentError, "No logger provided and Rails.logger cannot be inferred"
       end
+
+      private
+
+      def symbolize_keys(hash)
+        hash.map { |k, v| [k.to_sym, v] }.to_h
+      end
     end
   end
 end

data/lib/sqeduler/version.rb

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

data/lib/sqeduler/worker/kill_switch.rb

@@ -12,6 +12,12 @@ module Sqeduler
         base.extend(ClassMethods)
       end
 
+      def self.disabled
+        Service.redis_pool.with do |redis|
+          redis.hgetall(SIDEKIQ_DISABLED_WORKERS)
+        end
+      end
+
       # rubocop:disable Style/Documentation
       module ClassMethods
         def enable

data/spec/service_spec.rb

@@ -171,6 +171,40 @@ RSpec.describe Sqeduler::Service do
         expect { described_class.redis_pool }.to raise_error
       end
     end
+
+    context "when provided redis_hash has strings as keys" do
+      let(:expected_redis_config) do
+        REDIS_CONFIG.merge(:namespace => "sqeduler")
+      end
+
+      before do
+        described_class.config = Sqeduler::Config.new.tap do |config|
+          config.redis_hash = REDIS_CONFIG.map { |k, v| [k.to_s, v] }.to_h
+          config.logger = logger
+        end
+      end
+
+      it "converts keys to symbols to create redis" do
+        expect(::Sidekiq::RedisConnection).to receive(:create).with(expected_redis_config).and_call_original
+        subject
+      end
+    end
+
+    context "with namespace provided in redis_hash" do
+      let(:redis_hash) { REDIS_CONFIG.merge(:namespace => "foo") }
+
+      before do
+        described_class.config = Sqeduler::Config.new.tap do |config|
+          config.redis_hash = redis_hash
+          config.logger = logger
+        end
+      end
+
+      it "uses the provided namespace" do
+        expect(::Sidekiq::RedisConnection).to receive(:create).with(redis_hash).and_call_original
+        subject
+      end
+    end
   end
 
   describe ".logger" do

data/spec/worker/kill_switch_spec.rb

@@ -0,0 +1,21 @@
+require "spec_helper"
+require "./spec/fixtures/fake_worker"
+
+RSpec.describe Sqeduler::Worker::KillSwitch do
+  describe ".disabled" do
+    before do
+      Sqeduler::Service.config = Sqeduler::Config.new(
+        :redis_hash => REDIS_CONFIG,
+        :logger     => Logger.new(STDOUT).tap { |l| l.level = Logger::DEBUG }
+      )
+    end
+    after { FakeWorker.enable }
+
+    it "lists the disabled workers" do
+      expect(Sqeduler::Worker::KillSwitch.disabled).to eq({})
+      time = Time.now
+      Timecop.freeze(time) { FakeWorker.disable }
+      expect(Sqeduler::Worker::KillSwitch.disabled).to eq("FakeWorker" => time.to_s)
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sqeduler
 version: !ruby/object:Gem::Version
-  version: 0.3.5
+  version: 0.3.6
 platform: ruby
 authors:
 - Jared Jenkins
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-03 00:00:00.000000000 Z
+date: 2016-06-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sidekiq
@@ -210,6 +210,7 @@ files:
 - spec/spec_helper.rb
 - spec/sqeduler_spec.rb
 - spec/trigger_lock_spec.rb
+- spec/worker/kill_switch_spec.rb
 - spec/worker/synchronization_spec.rb
 - spec/worker_spec.rb
 - sqeduler.gemspec
@@ -233,7 +234,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: Common Sidekiq infrastructure for multi-host applications.
@@ -250,6 +251,7 @@ test_files:
 - spec/spec_helper.rb
 - spec/sqeduler_spec.rb
 - spec/trigger_lock_spec.rb
+- spec/worker/kill_switch_spec.rb
 - spec/worker/synchronization_spec.rb
 - spec/worker_spec.rb
 has_rdoc: