uncharted-scheduler 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 22af2912d477aba70cd7b7dd1a8e1990aeb970ea
-  data.tar.gz: ddefcdf0e45a4c188e79190866f53410d4d8bf7e
+  metadata.gz: 2dd1f6a6377d75a590d7f3be87c19ff73d9211e6
+  data.tar.gz: 0aa6c2371c54cdd12ec83c6f5baefbe00921148c
 SHA512:
-  metadata.gz: be6249a8da2ed34ab24191e7c7a944d98ae3a8d48062b5bd9f80b7d7f9673ba374f7349f4f8fcf7f91b85c760f3dffb9b1bebe49a412e32937441baa0160996a
-  data.tar.gz: 83f00303e70044a5aaa4cb2cbff765df54ca362888115731492c84f0f582aa868de2f30539047c0716df48b8d531ce637ce560265a5fbbcfeb199dff43cc078f
+  metadata.gz: 2f5716b5c401687361fffb0f5be63844d29735773738fdb1c159e7813b119a9b471576c05a88f4bf7704bec4ddb36562facbfe1016ef8dbc125f9dd495c6a602
+  data.tar.gz: 425793a4501c963036c80570fa351caa1fdf1d3c7ae04d4fb94ef3c55e842ae107e35f77a4cf2035080b167c45d22a1d08a3bc005fa78fab9b48f18221e864d3

data/.travis.yml

@@ -1,4 +1,8 @@
 language: ruby
 rvm:
   - 2.1.5
+
+services:
+  - redis-server
+
 before_install: gem install bundler -v 1.10.5

data/README.md

@@ -10,8 +10,7 @@ Uncharted Scheduler allows for scheduling of recurring jobs with [Sidekiq](https
 Add this line to your application's Gemfile:
 
 ```ruby
-gem 'uncharted-scheduler',
-    git: 'https://github.com/unchartedcode/scheduler'
+gem 'uncharted-scheduler'
 ```
 
 And then execute:

data/lib/distributed_mutex.rb

@@ -1,52 +1,27 @@
+require 'redlock'
+require 'byebug'
+
 # Cross-process locking using Redis.
 class DistributedMutex
-
-  def self.synchronize(key, redis=nil, &blk)
-    self.new(key, redis).synchronize(&blk)
+  def self.synchronize(key, redis=nil, timeout=60, &blk)
+    self.new(key, redis, timeout).synchronize(&blk)
   end
 
-  def initialize(key, redis=nil)
+  def initialize(key, redis=nil, timeout=60)
     @key = key
     @redis = redis || $redis
+    @lock_manager = Redlock::Client.new([@redis])
+    @timeout = timeout
     @mutex = Mutex.new
   end
 
   # NOTE wrapped in mutex to maintain its semantics
   def synchronize
     @mutex.lock
-    while !try_to_get_lock
-      sleep 0.001
+    @lock_manager.lock(@key, @timeout) do |lock_info|
+      yield lock_info
     end
-
-    yield
-
   ensure
-    @redis.del @key
     @mutex.unlock
   end
-
-  private
-
-  def try_to_get_lock
-    got_lock = false
-    if @redis.setnx @key, Time.now.to_i + 60
-      @redis.expire @key, 60
-      got_lock = true
-    else
-      begin
-        @redis.watch @key
-        time = @redis.get @key
-        if time && time.to_i < Time.now.to_i
-          got_lock = @redis.multi do
-            @redis.set @key, Time.now.to_i + 60
-          end
-        end
-      ensure
-        @redis.unwatch
-      end
-    end
-
-    got_lock
-  end
-
 end

data/lib/scheduler/version.rb

@@ -1,3 +1,3 @@
 module Scheduler
-  VERSION = "0.1.2"
+  VERSION = "0.1.3"
 end

data/scheduler.gemspec

@@ -23,11 +23,11 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "rspec"
   spec.add_development_dependency "sqlite3"
-  spec.add_development_dependency "mock_redis"
   spec.add_development_dependency "byebug"
   spec.add_development_dependency "coveralls"
 
-  spec.add_dependency "rails"
+  spec.add_dependency "rails", "< 5.0"
   spec.add_dependency "redis"
   spec.add_dependency "sidekiq"
+  spec.add_dependency "redlock", "0.1.8"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: uncharted-scheduler
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Sam Saffron
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-05-10 00:00:00.000000000 Z
+date: 2016-12-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -68,7 +68,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: mock_redis
+  name: byebug
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -82,7 +82,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: byebug
+  name: coveralls
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -96,21 +96,21 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: coveralls
+  name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
+        version: '5.0'
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '5.0'
 - !ruby/object:Gem::Dependency
-  name: rails
+  name: redis
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -124,7 +124,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: redis
+  name: sidekiq
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -138,19 +138,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: sidekiq
+  name: redlock
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.1.8
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.1.8
 description: Allows you to define recurring workers for Sidekiq without requiring
   a dedicated job server
 email:
@@ -202,7 +202,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.3
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: Performance friendly recurring jobs for Sidekiq