mlanett-redis-lock 0.1.1 → 0.2.0

data/.travis.yml

@@ -0,0 +1,7 @@
+language: ruby
+rvm:
+  - 1.9.3
+gemfile:
+  - Gemfile-redis2
+  - Gemfile-redis3
+before_script: "sudo apt-get install -qq redis-server"

data/Gemfile-redis2

@@ -0,0 +1,9 @@
+source 'https://rubygems.org'
+
+# Specify your gem's dependencies in redis-lock.gemspec
+gemspec
+
+gem 'redis', '~>2.0'
+gem "simplecov", require: false
+gem 'rspec'
+gem 'rake'

data/Gemfile-redis2.lock

@@ -0,0 +1,35 @@
+PATH
+  remote: .
+  specs:
+    mlanett-redis-lock (0.1.1)
+      redis
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    diff-lcs (1.1.3)
+    multi_json (1.3.6)
+    rake (0.9.2.2)
+    redis (2.2.2)
+    rspec (2.11.0)
+      rspec-core (~> 2.11.0)
+      rspec-expectations (~> 2.11.0)
+      rspec-mocks (~> 2.11.0)
+    rspec-core (2.11.1)
+    rspec-expectations (2.11.2)
+      diff-lcs (~> 1.1.3)
+    rspec-mocks (2.11.2)
+    simplecov (0.6.4)
+      multi_json (~> 1.0)
+      simplecov-html (~> 0.5.3)
+    simplecov-html (0.5.3)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  mlanett-redis-lock!
+  rake
+  redis (~> 2.0)
+  rspec
+  simplecov

data/Gemfile-redis3

@@ -0,0 +1,9 @@
+source 'https://rubygems.org'
+
+# Specify your gem's dependencies in redis-lock.gemspec
+gemspec
+
+gem 'redis', '~>3.0'
+gem 'rake'
+gem "simplecov", require: false
+gem 'rspec'

data/Gemfile-redis3.lock

@@ -0,0 +1,35 @@
+PATH
+  remote: .
+  specs:
+    mlanett-redis-lock (0.1.1)
+      redis
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    diff-lcs (1.1.3)
+    multi_json (1.3.6)
+    rake (0.9.2.2)
+    redis (3.0.1)
+    rspec (2.11.0)
+      rspec-core (~> 2.11.0)
+      rspec-expectations (~> 2.11.0)
+      rspec-mocks (~> 2.11.0)
+    rspec-core (2.11.1)
+    rspec-expectations (2.11.2)
+      diff-lcs (~> 1.1.3)
+    rspec-mocks (2.11.2)
+    simplecov (0.6.4)
+      multi_json (~> 1.0)
+      simplecov-html (~> 0.5.3)
+    simplecov-html (0.5.3)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  mlanett-redis-lock!
+  rake
+  redis (~> 3.0)
+  rspec
+  simplecov

data/README.md

@@ -1,5 +1,8 @@
 # Redis::Lock
 
+[![Build Status](https://secure.travis-ci.org/langalex/redis-lock.png?branch=master)](http://travis-ci.org/langalex/redis-lock)
+
+
 This gem implements a pessimistic lock using Redis.
 It correctly handles timeouts and vanishing lock owners (such as machine failures)
 
@@ -9,7 +12,7 @@ This uses setnx, but not the setnx algorithm described in the redis cookbook, wh
 
 Add this line to your application's Gemfile:
 
-    gem 'redis-lock'
+    gem 'mlanett-redis-lock', require: 'redis-lock'
 
 And then execute:
 
@@ -17,7 +20,7 @@ And then execute:
 
 Or install it yourself as:
 
-    $ gem install redis-lock
+    $ gem install mlanett-redis-lock
 
 ## Background
 

data/lib/redis-lock.rb

@@ -35,12 +35,12 @@ class Redis
       do_lock_with_timeout(timeout) or raise LockNotAcquired.new(key)
       if block then
         begin
-          block.call
+          result = block.call
         ensure
           release_lock
         end
       end
-      self
+      result
     end
 
     def extend_life( new_life )
@@ -85,7 +85,7 @@ class Redis
         new_xval = Time.now.to_i + life
         result   = redis.mapped_msetnx okey => oval, xkey => new_xval
 
-        if result == 1 then
+        if [1, true].include?(result) then
           log :debug, "do_lock() success"
           @xval = new_xval
           return true

data/lib/redis-lock/version.rb

@@ -1,5 +1,5 @@
 class Redis
   class Lock
-    VERSION = "0.1.1"
+    VERSION = "0.2.0"
   end
 end

data/spec/redis_lock_spec.rb

@@ -20,16 +20,22 @@ describe Redis::Lock, redis: true do
     hers.should_not be_locked
   end
 
+  it 'returns the return value of the block' do
+    hers.lock do
+      1
+    end.should eql(1)
+  end
+
   it "can prevent other use of a lock" do
     hers.lock do
-      expect { his.lock.unlock }.to raise_exception
+      expect { his.lock; his.unlock }.to raise_exception
     end
-    expect { his.lock.unlock }.to_not raise_exception
+    expect { his.lock; his.unlock }.to_not raise_exception
   end
 
   it "can lock two different items at the same time" do
     his.lock do
-      expect { his_other.lock.unlock }.to_not raise_exception
+      expect { his_other.lock; his_other.unlock }.to_not raise_exception
       his.should be_locked
     end
   end
@@ -45,7 +51,7 @@ describe Redis::Lock, redis: true do
   end
 
   it "can release a lock" do
-    hers.lock.release_lock
+    hers.lock; hers.release_lock
   end
 
   it "can use a timeout" do
@@ -70,14 +76,14 @@ describe Redis::Lock, redis: true do
     hers.life = 1
     hers.lock
     # don't unlock it, let hers time out
-    expect { his.lock(10).unlock }.to_not raise_exception
+    expect { his.lock(10); his.unlock }.to_not raise_exception
   end
 
   it "can extend the life of a lock" do
     hers.life = 1
     hers.lock
     hers.extend_life(100)
-    expect { his.lock(10).unlock }.to raise_exception
+    expect { his.lock(10); his.unlock }.to raise_exception
     hers.unlock
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mlanett-redis-lock
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-14 00:00:00.000000000Z
+date: 2013-02-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redis
-  requirement: &70189385787000 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,7 +21,12 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70189385787000
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Pessimistic locking using Redis
 email:
 - mark.lanett@gmail.com
@@ -31,7 +36,12 @@ extra_rdoc_files: []
 files:
 - .gitignore
 - .rspec
+- .travis.yml
 - Gemfile
+- Gemfile-redis2
+- Gemfile-redis2.lock
+- Gemfile-redis3
+- Gemfile-redis3.lock
 - Guardfile
 - LICENSE
 - README.md
@@ -56,15 +66,21 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -3504077138606239435
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -3504077138606239435
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.16
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Pessimistic locking using Redis