mlanett-redis-lock 0.0.1 → 0.1.0

data/README.md

@@ -30,14 +30,14 @@ rather than acquiring the lock with a very long lifetime which will result in lo
 
 A lock needs an owner. Redis::Lock defaults to using an owner id of HOSTNAME:PID.
 
-A lock may need more than one attempt to acquire it. Redis::Lock offers a timeout; this defaults to 1 second.
+A lock may need more than one attempt to acquire it. Redis::Lock offers a timeout; this defaults to 10 seconds.
 It uses exponential backoff with sleeps so it's fairly safe to use longer timeouts.
 
 ## Usage
 
 This gem adds lock() and unlock() to Redis instances.
 lock() takes a block and is safer than using lock() and unlock() separately.
-lock() takes a key and lifetime and optionally a timeout (otherwise defaulting to 1 second).
+lock() takes a key and lifetime and optionally a timeout (otherwise defaulting to 10 second).
 
 redis.lock("test") { do_something }
 

data/lib/redis-lock.rb

@@ -31,7 +31,7 @@ class Redis
       @life   = options[:life] || 60
     end
 
-    def lock( timeout = 1, &block )
+    def lock( timeout = 10, &block )
       do_lock_with_timeout(timeout) or raise LockNotAcquired.new(key)
       if block then
         begin
@@ -214,8 +214,10 @@ class Redis
 
   # Convenience methods
 
-  def lock( key, timeout = 1, options = {}, &block )
-    Lock.new( self, key, options ).lock( timeout, &block )
+  # @option timeout defaults to 10 seconds
+  def lock( key, options = {}, &block )
+    acquire = options.delete(:acquire) || 10
+    Lock.new( self, key, options ).lock( acquire, &block )
   end
 
   def unlock( key )

data/lib/redis-lock/version.rb

@@ -1,5 +1,5 @@
 class Redis
   class Lock
-    VERSION = "0.0.1"
+    VERSION = "0.1.0"
   end
 end

data/spec/helper.rb

@@ -1,7 +1,7 @@
 # -*- encoding: utf-8 -*-
 
 require "bundler/setup"       # set up gem paths
-require "ruby-debug"          # because sometimes you need it
+#require "ruby-debug"          # because sometimes you need it
 
 require "simplecov"           # code coverage
 SimpleCov.start               # must be loaded before our own code

data/test/stress.rb

@@ -23,18 +23,6 @@ OptionParser.new do |opts|
   opts.on( "-h", "--help", "Display this usage summary" ) { puts opts; exit }
 end.parse!
 
-class Thing
-  attr :id
-  attr :activity
-  def initialize( id, activity )
-    @id       = id
-    @activity = activity
-  end
-  def process
-    Kernel.sleep( rand activity )
-  end
-end # Thing
-
 class Runner
 
   attr :options
@@ -48,7 +36,7 @@ class Runner
   end
 
   def test( key, time )
-    redis.lock( key, time, life: time*2 ) do
+    redis.lock( key, acquire: time, life: time*2 ) do
       val1 = rand(65536)
       redis.set( "#{key}:widget", val1 )
       Kernel.sleep( time )
@@ -99,6 +87,8 @@ end
 
 # main
 
+puts "[#{Process.pid}] Starting with #{options.inspect}"
+
 redis = ::Redis.connect(TEST_REDIS)
 redis.flushall          # clean before run
 redis.client.disconnect # don't keep when forking

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mlanett-redis-lock
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-04 00:00:00.000000000Z
+date: 2012-02-07 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redis
-  requirement: &70233994826820 !ruby/object:Gem::Requirement
+  requirement: &70349318263680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,7 +21,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70233994826820
+  version_requirements: *70349318263680
 description: Pessimistic locking using Redis
 email:
 - mark.lanett@gmail.com