redis-lock 0.1.1 → 0.1.2

data/lib/redis-lock/version.rb

@@ -1,5 +1,5 @@
 module Redis
   module Lock
-    VERSION = "0.1.1"
+    VERSION = "0.1.2"
   end
 end

data/lib/redis/lock.rb

@@ -46,12 +46,12 @@ class Redis
         end
       
         raise RedisLockException.new("Unable to acquire lock for #{key}.")
-      rescue => e
+      rescue Exception => e
         if e.message == "Unable to acquire lock for #{key}."
+          attempt_counter += 1
           if attempt_counter == max_attempts
             raise
           else
-            attempt_counter += 1
             sleep 1
             retry
           end

data/spec/redis_spec.rb

@@ -1,6 +1,7 @@
 require 'spec_helper'
 require 'redis-lock'
 require 'logger'
+require 'date' 
 
 describe 'redis' do
   
@@ -56,5 +57,13 @@ describe 'redis' do
     @redis.lock_for_update('test_key', 9000) { @redis.set('test_key', 'awesome') }
     @redis.get('lock:test_key').should be_nil
   end
+
+  it "should keep trying to lock a key" do
+    time = DateTime.now
+    @redis.lock('test_key', 9000)
+    lambda { @redis.lock('test_key', 9000, 10) }.should raise_exception("Unable to acquire lock for test_key.")
+    # Should have spent 9 seconds trying to lock
+    DateTime.now.should >= time + Rational(9, 86400)
+  end
   
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: redis-lock
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-23 00:00:00.000000000 Z
+date: 2013-10-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redis