redis-semaphore 0.2.1 → 0.2.2

checksums.yaml

@@ -0,0 +1,15 @@
+---
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    OWYwZTRjNTdiNmMzYzM5MzIwNjQzNzViYTBiOWEyNTY5MmQ1MDRkYQ==
+  data.tar.gz: !binary |-
+    MjhkM2JiMDE2ZDQ5YmYzNmY3NmE0ZjViOTcxYjVjMDgxM2RmMjY3NQ==
+SHA512:
+  metadata.gz: !binary |-
+    NjZlNWQzMzJiYmY4ZTM2NDdmNGNmZTY5OGM0MmU3NzQxYzkyY2UzMmQ0Y2Rj
+    YjUzOGZhY2Q2ODA3ZGM5YzY0NTlhNTA4OGE3ZDlkODU1NDlmZGVkMWM5Mjg1
+    MDgxZDE3NjNhNTllOGU3MTYxNTU0YjQyNWM2MjJmNDQ3MmQxYTY=
+  data.tar.gz: !binary |-
+    MDQ4YTljMDAzNjRiZTI1YjI4ZjRlZDI4YmNjNzNjYjdlM2RlZWY1ZWRhOTQ2
+    ZTUyMzIyNzhlYTJmMTU0NjQ0NjYyMGU4OGYwMzk2MDkxNmVlNWIyMTBlYmZj
+    NjVjZGQ0NGI2ZmJlYTU0OWEzY2NkNWNlMDRjMGNhZTQ2MzJkYzk=

data/README.md

@@ -189,6 +189,10 @@ Testing
 Changelog
 ---------
 
+###0.2.2 June 16, 2014
+- Fixed bug in `all_tokens` (thanks presskey!).
+- Fixed bug in error message (thanks Dmitriy!).
+
 ###0.2.1 August 6, 2013
 - Remove dependency on Redis 2.6+ using fallback for TIME command (thanks dubdromic!).
 - Add ```:use_local_time``` option
@@ -237,3 +241,5 @@ Thanks to these awesome peeps for their contributions:
 - [Ruurd Pels](https://github.com/ruurd)
 - [Prathan Thananart](https://github.com/scomma)
 - [dubdromic](https://github.com/dubdromic)
+- [Dmitriy Kiriyenko](https://github.com/dmitriy-kiriyenko)
+- [presskey](https://github.com/presskey)

data/lib/redis/semaphore.rb

@@ -28,7 +28,7 @@ class Redis
       if token.nil?
         create!
       elsif token != API_VERSION
-        raise "Semaphore exists but running as wrong version (version #{version} vs #{API_VERSION})."
+        raise "Semaphore exists but running as wrong version (version #{token} vs #{API_VERSION})."
       else
         true
       end
@@ -100,7 +100,7 @@ class Redis
     def all_tokens
       @redis.multi do
         @redis.lrange(available_key, 0, -1)
-        @redis.lrange(grabbed_key, 0, -1)
+        @redis.hkeys(grabbed_key)
       end.flatten
     end
 

data/spec/semaphore_spec.rb

@@ -171,4 +171,17 @@ describe "redis" do
       semaphore.send(:current_time).should == Time.now
     end
   end
+
+  describe "all_tokens" do
+    let(:semaphore) { Redis::Semaphore.new(:my_semaphore, :redis => @redis, :stale_client_timeout => 5) }
+
+    it "includes tokens from available and grabbed keys" do
+      semaphore.exists_or_create!
+      available_keys = semaphore.all_tokens
+      semaphore.lock(1)
+      grabbed_keys = semaphore.all_tokens
+
+      available_keys.should == grabbed_keys
+    end
+  end
 end

metadata

@@ -1,20 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: redis-semaphore
 version: !ruby/object:Gem::Version
-  version: 0.2.1
-  prerelease: 
+  version: 0.2.2
 platform: ruby
 authors:
 - David Verhasselt
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-06 00:00:00.000000000 Z
+date: 2014-06-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redis
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -22,7 +20,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -44,26 +41,26 @@ files:
 - spec/spec_helper.rb
 homepage: http://github.com/dv/redis-semaphore
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.1.10
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Implements a distributed semaphore or mutex using Redis.
 test_files: []
+has_rdoc: