sidecloq 0.3.1 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dbb14d2cb9a6f7f0bffae45cd3ec7f00c8a2ad13
-  data.tar.gz: c44a7e5b308559bfb3c5d2bf10c108de1e9ff090
+  metadata.gz: b41bfb4239c49401c7770406179fa1f540b7c02f
+  data.tar.gz: fe0442e1e48ab22235e87730805bf66857187def
 SHA512:
-  metadata.gz: f613f8c63b1d6e3bd87682e740a1e56fdf2796be6b5488967cda62fbd5f9ce417382ca42ee3ae7ac3b3a3975636b13a03c518d80eee59c47e20ac245565cb2ea
-  data.tar.gz: 69f054480ede7d3318804bbff1d9b0b59c46b40210fa2cac10aea2691fb8d4912027537f48599c0803b4015f75b716830adbea0af39878efc4d77d4e2b0a9f0e
+  metadata.gz: 23ac57a675494dcbd4c165e2be9926fde24705b6f0186cf5e8c72f8bb4f12f107bd1d8bab6f03e8e6346dfab67a486057ce57a0c648edf0339ea6d539c758025
+  data.tar.gz: ef479271fb90cebc3019de4ca86a1a3007689b2cdaba584c08a3bb25ab45a6d3d554fa101c6c24b136342def3d037dd54f4a4676ae1cfeea22bdc1586a9d3470

data/README.md

@@ -71,9 +71,17 @@ the above configuration block).
 ```yaml
 my_scheduled_job: # a unique name for this schedule
   class: Jobs::DoWork # the job class
+  args: [100]       # (optional) set of arguments
   cron: "* * * * *" # cron formatted schedule
   queue: "queue_name" # Sidekiq queue for job
 
+my_scheduled_job_with_args:
+  class: Jobs::WorkerWithArgs
+  args:
+    batch_size: 100
+  cron: "1 1 * * *"
+  queue: "queue_name"
+
 my_other_scheduled_job:
   class: Jobs::AnotherClassName
   cron: "1 1 * * *"

data/lib/sidecloq/locker.rb

@@ -13,6 +13,7 @@ module Sidecloq
       @check_interval = options[:check_interval] || 15
       @lock_manager = Redlock::Client.new([@redis])
       @obtained_lock = Concurrent::Event.new
+      @lock = nil
     end
 
     # blocks until lock is obtained, then yields
@@ -51,7 +52,11 @@ module Sidecloq
 
     def try_to_get_or_refresh_lock
       # redlock is in ms, not seconds
-      @lock = @lock_manager.lock(@key, @ttl * 1000, extend: @lock)
+      if @lock
+        @lock = @lock_manager.lock(@key, @ttl * 1000, extend: @lock)
+      else
+        @lock = @lock_manager.lock(@key, @ttl * 1000)
+      end
       @obtained_lock.set if @lock
       logger.debug("Leader lock #{'not ' unless @lock}held")
       @lock

data/lib/sidecloq/version.rb

@@ -1,3 +1,3 @@
 module Sidecloq
-  VERSION = '0.3.1'
+  VERSION = '0.3.2'
 end

data/sidecloq.gemspec

@@ -20,13 +20,13 @@ Gem::Specification.new do |spec|
   spec.require_paths = ['lib']
 
   spec.add_dependency 'sidekiq', '>= 3.5.3', '< 5'
-  spec.add_dependency 'redlock', '~> 0.1.2'
+  spec.add_dependency 'redlock', '~> 0.2.0'
   # mimics some dev dependencies of sidekiq:
   spec.add_dependency 'concurrent-ruby'
   spec.add_dependency 'rufus-scheduler', '~> 3.1', '>= 3.1.10'
 
-  spec.add_development_dependency 'rake', '~> 10.0'
+  spec.add_development_dependency 'rake', '>= 10.0'
   spec.add_development_dependency 'minitest'
-  spec.add_development_dependency 'redis-namespace', '~> 1.5', '>= 1.5.2'
+  spec.add_development_dependency 'redis-namespace', '~> 1.5', '>= 1.5.3'
   spec.add_development_dependency 'activejob'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sidecloq
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
 platform: ruby
 authors:
 - Matt Robinson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-06 00:00:00.000000000 Z
+date: 2017-03-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sidekiq
@@ -36,14 +36,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.2
+        version: 0.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.2
+        version: 0.2.0
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby
   requirement: !ruby/object:Gem::Requirement
@@ -82,14 +82,14 @@ dependencies:
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '10.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '10.0'
 - !ruby/object:Gem::Dependency
@@ -115,7 +115,7 @@ dependencies:
         version: '1.5'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.5.2
+        version: 1.5.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -125,7 +125,7 @@ dependencies:
         version: '1.5'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.5.2
+        version: 1.5.3
 - !ruby/object:Gem::Dependency
   name: activejob
   requirement: !ruby/object:Gem::Requirement