sidecloq 0.1.2 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2200f8910f10b0ab912557cfd6a44db679702f03
-  data.tar.gz: 04001b1fb882556311c1f5616d2c2ac82146caaf
+  metadata.gz: bc79f44db3f6f94b4de477d87b170b6a8f0af0bf
+  data.tar.gz: c2cdd0e3641298003d3ae8f3b8072876b86f8316
 SHA512:
-  metadata.gz: 265280fbcf45861e28f5908c7b1e6a57b954f3e5d808add68967bec3e6a7ecb1589a24defc18dd873a198402dd4eb4396a0396fd71f92fa28fda3ca8a5afc3f6
-  data.tar.gz: ab1195c4b10619e5cb76df19ea42daf7a77ec443d2bc7164714772ce4f9d5c0da53c704b08ad284c167b4598d88b19667e2a6d7f61174f71d028e1d07f9e86fa
+  metadata.gz: cd2cf8af352b2c6c3a77dff7e00ca9d2124cd0145a242390d4c874bc7cefdd638a8cca97531a0a86042e4513aa4b9b19ec3d6225298e586ceac9f32845889f08
+  data.tar.gz: efacb0bce951f43c692e03b07536321baea03d448ed5d463a65f83aaa10b1697ba1acbfd04fd296d9c5c5017d4264ffb66991f05ddaa53af8da6f7cee9d3155d

data/.travis.yml

@@ -7,15 +7,21 @@ rvm:
   - 2.0.0
   - 2.1.8
   - 2.2.4
+  - 2.3.0
   - ruby-head
   - jruby-9.0.4.0
   - jruby-head
   - rbx-2.6
   - rbx-2.7
+env:
+  - "sidekiq=master"
+  - "sidekiq=stable"
+  - "sidekiq=3.5.3"
 matrix:
   allow_failures:
     - rvm: ruby-head
     - rvm: jruby-head
+    - env: "sidekiq=master"
 addons:
   code_climate:
     repo_token: dee2fdcb3562533038a22e862c0fc91a6f1fa38730cd2b77177655e5b9507c83

data/Gemfile

@@ -2,9 +2,19 @@ source 'https://rubygems.org'
 
 gemspec
 
-platforms :mri do
+platforms :mri, :rbx do
   gem 'pry'
   gem 'minitest-utils'
 end
 
+# https://github.com/sinatra/sinatra/blob/master/Gemfile
+sidekiq_dep =
+  case ENV['sidekiq']
+  when 'stable', nil then nil
+  when /(\d+\.)+\d+/ then "~> " + ENV['sidekiq'].sub("sidekiq-", '')
+  else {github: 'mperham/sidekiq', branch: ENV['sidekiq']}
+  end
+
+gem 'sidekiq', sidekiq_dep
+
 gem 'codeclimate-test-reporter', group: :test, require: false

data/README.md

@@ -45,6 +45,9 @@ Add this line to your application's Gemfile:
 gem 'sidecloq'
 ```
 
+Tested on MRI > 2, JRuby and Rubinius.  Basically, if you can run
+Sidekiq, you can run Sidecloq.
+
 ## Configuration
 
 ### Quickstart

data/lib/sidecloq.rb

@@ -44,8 +44,13 @@ module Sidecloq
     @runner.run
   end
 
+  def self.running?
+   !!@runner
+  end
+
   def self.shutdown
     @runner.stop(options[:timeout] || 10) if @runner
+    @runner = nil
   end
 
   def self.extract_schedule
@@ -56,6 +61,7 @@ module Sidecloq
 
     # try for a file
     options[:schedule_file] ||= 'config/sidecloq.yml'
+
     if File.exist?(options[:schedule_file])
       return Schedule.from_yaml(options[:schedule_file])
     elsif defined?(Rails)

data/lib/sidecloq/scheduler.rb

@@ -6,6 +6,7 @@ module Sidecloq
     def initialize(schedule, options = {})
       @schedule = schedule
       @options = options
+      @loaded = Concurrent::Event.new
     end
 
     # run queues jobs per their schedules, blocking forever
@@ -14,30 +15,22 @@ module Sidecloq
       sync_with_redis
       logger.info('Starting scheduler')
       load_schedule_into_rufus
-      logger.debug('Joining rufus thread')
       rufus.join
-      logger.debug('Scheduler run ended')
     end
 
     def stop(timeout = nil)
       logger.info("Stopping scheduler (timeout: #{timeout})")
-      if timeout
-        t = Concurrent::ScheduledTask.new(timeout) do
-          rufus.shutdown(:kill) if rufus.up?
-        end
-        Thread.new do
-          rufus.shutdown(:wait)
-          t.cancel
-        end
-      else
-        rufus.shutdown(:wait)
-      end
-      rufus.join
+      rufus.shutdown(:kill)
+      rufus.thread.join(timeout)
       logger.info('Stopped scheduler')
     end
 
     private unless $TESTING
 
+    def wait_for_loaded
+      @loaded.wait
+    end
+
     def rufus
       @rufus ||= Rufus::Scheduler.new
     end
@@ -51,6 +44,7 @@ module Sidecloq
       @schedule.job_specs.each do |name, spec|
         load_into_rufus(name, spec)
       end
+      @loaded.set
     end
 
     def load_into_rufus(name, spec)

data/lib/sidecloq/version.rb

@@ -1,3 +1,3 @@
 module Sidecloq
-  VERSION = '0.1.2'
+  VERSION = '0.2.0'
 end

data/sidetoq.gemspec

@@ -19,7 +19,7 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
 
-  spec.add_dependency 'sidekiq', '~> 4.0.1'
+  spec.add_dependency 'sidekiq', '>= 3.5.3', '< 5'
   spec.add_dependency 'redlock', '~> 0.1.2'
   # mimics some dev dependencies of sidekiq:
   spec.add_dependency 'concurrent-ruby'

metadata

@@ -1,29 +1,35 @@
 --- !ruby/object:Gem::Specification
 name: sidecloq
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.2.0
 platform: ruby
 authors:
 - Matt Robinson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-24 00:00:00.000000000 Z
+date: 2015-12-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sidekiq
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.5.3
+    - - "<"
       - !ruby/object:Gem::Version
-        version: 4.0.1
+        version: '5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.5.3
+    - - "<"
       - !ruby/object:Gem::Version
-        version: 4.0.1
+        version: '5'
 - !ruby/object:Gem::Dependency
   name: redlock
   requirement: !ruby/object:Gem::Requirement