refilling_queue 0.0.3 → 0.0.4

data/Appraisals

@@ -0,0 +1,5 @@
+["2", "3"].each do |version|
+  appraise "redis#{version}" do
+    gem "redis", "~>#{version}.0"
+  end
+end

data/Gemfile

@@ -1,6 +1,8 @@
 source :rubygems
 gemspec
 
+gem 'appraisal'
+gem 'bump'
 gem 'rake'
 gem 'rspec', '~>2'
-gem 'fakeredis'
+gem 'redis'

data/Gemfile.lock

@@ -1,14 +1,16 @@
 PATH
   remote: .
   specs:
-    refilling_queue (0.0.3)
+    refilling_queue (0.0.4)
 
 GEM
   remote: http://rubygems.org/
   specs:
+    appraisal (0.5.1)
+      bundler
+      rake
+    bump (0.3.5)
     diff-lcs (1.1.3)
-    fakeredis (0.4.0)
-      redis (~> 3.0.0)
     rake (0.9.2)
     redis (3.0.1)
     rspec (2.6.0)
@@ -24,7 +26,9 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  fakeredis
+  appraisal
+  bump
   rake
+  redis
   refilling_queue!
   rspec (~> 2)

data/Rakefile

@@ -1,22 +1,11 @@
 require 'bundler/gem_tasks'
+require 'appraisal'
+require 'bump/tasks'
 
-task :default do
+task :spec do
   sh "rspec spec/"
 end
 
-# extracted from https://github.com/grosser/project_template
-rule /^version:bump:.*/ do |t|
-  sh "git status | grep 'nothing to commit'" # ensure we are not dirty
-  index = ['major', 'minor','patch'].index(t.name.split(':').last)
-  file = 'lib/refilling_queue/version.rb'
-
-  version_file = File.read(file)
-  old_version, *version_parts = version_file.match(/(\d+)\.(\d+)\.(\d+)/).to_a
-  version_parts[index] = version_parts[index].to_i + 1
-  version_parts[2] = 0 if index < 2 # remove patch for minor
-  version_parts[1] = 0 if index < 1 # remove minor for major
-  new_version = version_parts * '.'
-  File.open(file,'w'){|f| f.write(version_file.sub(old_version, new_version)) }
-
-  sh "bundle && git add #{file} Gemfile.lock && git commit -m 'bump version to #{new_version}'"
+task :default do
+  sh "bundle exec rake appraisal:install && bundle exec rake appraisal spec"
 end

data/gemfiles/redis2.gemfile

@@ -0,0 +1,11 @@
+# This file was generated by Appraisal
+
+source :rubygems
+
+gem "appraisal"
+gem "bump"
+gem "rake"
+gem "rspec", "~>2"
+gem "redis", "~>2.0"
+
+gemspec :path=>"../"

data/gemfiles/redis2.gemfile.lock

@@ -0,0 +1,34 @@
+PATH
+  remote: /Users/mgrosser/code/tools/refilling_queue
+  specs:
+    refilling_queue (0.0.3)
+
+GEM
+  remote: http://rubygems.org/
+  specs:
+    appraisal (0.5.1)
+      bundler
+      rake
+    bump (0.3.5)
+    diff-lcs (1.1.3)
+    rake (10.0.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.3)
+      diff-lcs (~> 1.1.3)
+    rspec-mocks (2.11.3)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  appraisal
+  bump
+  rake
+  redis (~> 2.0)
+  refilling_queue!
+  rspec (~> 2)

data/gemfiles/redis3.gemfile

@@ -0,0 +1,11 @@
+# This file was generated by Appraisal
+
+source :rubygems
+
+gem "appraisal"
+gem "bump"
+gem "rake"
+gem "rspec", "~>2"
+gem "redis", "~>3.0"
+
+gemspec :path=>"../"

data/gemfiles/redis3.gemfile.lock

@@ -0,0 +1,34 @@
+PATH
+  remote: /Users/mgrosser/code/tools/refilling_queue
+  specs:
+    refilling_queue (0.0.3)
+
+GEM
+  remote: http://rubygems.org/
+  specs:
+    appraisal (0.5.1)
+      bundler
+      rake
+    bump (0.3.5)
+    diff-lcs (1.1.3)
+    rake (10.0.2)
+    redis (3.0.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.3)
+      diff-lcs (~> 1.1.3)
+    rspec-mocks (2.11.3)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  appraisal
+  bump
+  rake
+  redis (~> 3.0)
+  refilling_queue!
+  rspec (~> 2)

data/lib/refilling_queue/version.rb

@@ -1,3 +1,3 @@
 class RefillingQueue
-  VERSION = '0.0.3'
+  VERSION = '0.0.4'
 end

data/lib/refilling_queue.rb

@@ -53,7 +53,7 @@ class RefillingQueue
       @client.setnx lock, "1"
       @client.expire lock, @options[:lock_timeout]
     end
-    raise RefillingQueue::Locked unless acquired
+    raise RefillingQueue::Locked unless [true, 1].include?(acquired)
 
     begin
       yield

data/spec/refilling_queue_spec.rb

@@ -1,15 +1,19 @@
 require 'spec_helper'
-require 'fakeredis'
 
 describe RefillingQueue do
   def kill_all_threads
     Thread.list.each {|thread| thread.exit unless thread == Thread.current }
   end
 
-  let(:client){ FakeRedis::Redis.new }
+  let(:client){ Redis.new }
 
   before do
     kill_all_threads
+    client.flushdb
+  end
+
+  after :all do
+    `rm -f dump.rdb`
   end
 
   it "has a VERSION" do
@@ -27,9 +31,9 @@ describe RefillingQueue do
   context "#pop" do
     it "removes an element" do
       queue = RefillingQueue.new(client, "x"){ [1,2,3,4] }
-      queue.pop.should == 1
-      queue.pop.should == 2
-      queue.pop.should == 3
+      queue.pop.should == "1"
+      queue.pop.should == "2"
+      queue.pop.should == "3"
     end
 
     it "only tries to refill once" do
@@ -41,23 +45,23 @@ describe RefillingQueue do
     it "refills itself if queue gets empty" do
       content = [1]
       queue = RefillingQueue.new(client, "x"){ content }
-      queue.pop.should == 1
+      queue.pop.should == "1"
       content.replace [4,5]
-      queue.pop.should == 4
-      queue.pop.should == 5
-      queue.pop.should == 4
+      queue.pop.should == "4"
+      queue.pop.should == "5"
+      queue.pop.should == "4"
     end
 
     it "refills itself when it expires" do
       content = [1,2,3]
-      queue = RefillingQueue.new(client, "x", :refresh_every => 0.1){ content }
+      queue = RefillingQueue.new(client, "x", :refresh_every => 1){ content }
 
-      queue.pop.should == 1
+      queue.pop.should == "1"
       content.replace [4,5]
-      queue.pop.should == 2
-      sleep 0.5
+      queue.pop.should == "2"
+      sleep 2
 
-      queue.pop.should == 4
+      queue.pop.should == "4"
     end
   end
 
@@ -67,23 +71,22 @@ describe RefillingQueue do
 
       # lock-blocker
       Thread.new do
-        RefillingQueue.new(client, "x"){ sleep 0.2; called << 1; [] }.pop
+        RefillingQueue.new(client, "x"){ called << 1; sleep 0.3; called << 2; [] }.pop
       end
       sleep 0.1
 
       # blocked
       locked = false
-      Thread.new do
-        queue = RefillingQueue.new(client, "x"){ sleep 0.2; called << 1; [] }
-        begin
-          queue.pop
-        rescue RefillingQueue::Locked
-          locked = true
-        end
+      queue = RefillingQueue.new(client, "x"){ called << 3; [] }
+      begin
+        queue.pop
+        fail
+      rescue RefillingQueue::Locked
+        locked = true
       end
       sleep 0.3
 
-      called.should == [1]
+      called.should == [1, 2]
       locked.should == true
     end
 
@@ -99,9 +102,9 @@ describe RefillingQueue do
       RefillingQueue.new(client, "x", :lock_timeout => 1){ called << 1; [1] }.pop
       Thread.new do
         # lock-blocker
-        RefillingQueue.new(client, "x", :lock_timeout => 1){ sleep 2; called << 2; [1] }.pop
+        RefillingQueue.new(client, "x", :lock_timeout => 1){ sleep 3; called << 2; [1] }.pop
       end
-      sleep 1.5
+      sleep 2
       RefillingQueue.new(client, "x", :lock_timeout => 1){ called << 3; [1] }.pop
       called.should == [1,3]
     end

data/spec/spec_helper.rb

@@ -1,4 +1,3 @@
-require "fakeredis"
-
 $LOAD_PATH.unshift 'lib'
 require 'refilling_queue'
+require 'redis'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: refilling_queue
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-13 00:00:00.000000000 Z
+date: 2012-11-20 00:00:00.000000000 Z
 dependencies: []
 description: 
 email: michael@grosser.it
@@ -18,10 +18,15 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .travis.yml
+- Appraisals
 - Gemfile
 - Gemfile.lock
 - Rakefile
 - Readme.md
+- gemfiles/redis2.gemfile
+- gemfiles/redis2.gemfile.lock
+- gemfiles/redis3.gemfile
+- gemfiles/redis3.gemfile.lock
 - lib/refilling_queue.rb
 - lib/refilling_queue/version.rb
 - refilling_queue.gemspec
@@ -42,7 +47,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2533570961055463155
+      hash: 949949052394646117
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -51,7 +56,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2533570961055463155
+      hash: 949949052394646117
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24