redis-store 1.0.0.beta4 → 1.0.0.beta5

data/spec/redis/store/version_spec.rb

@@ -2,6 +2,6 @@ require 'spec_helper'
 
 describe Redis::Store::VERSION do
   it "should describe Redis::Store version" do
-    Redis::Store::VERSION::STRING.should == "1.0.0.beta4"
+    Redis::Store::VERSION::STRING.should == "1.0.0.beta5"
   end
 end

data/spec/redis/store_spec.rb

@@ -0,0 +1,13 @@
+require 'spec_helper'
+
+describe "Redis::Store" do
+  before :each do
+    @store = Redis::Store.new
+  end
+
+  it "should force reconnection" do
+    client = @store.instance_variable_get(:@client)
+    client.should_receive(:reconnect)
+    @store.reconnect
+  end
+end

data/tasks/redis.tasks.rb

@@ -40,23 +40,23 @@ class RedisRunner
   end
 
   def self.stop
-    system %(echo "SHUTDOWN" | nc localhost #{port})
+    system %(redis-cli -p #{port} SHUTDOWN)
   end
 end
 
-class SingleRedisRunner < RedisRunner
+class MainRedisRunner < RedisRunner
   def self.redisconfdir
-    File.expand_path(File.dirname(__FILE__) + "/../spec/config/single.conf")
+    File.expand_path(File.dirname(__FILE__) + "/../spec/config/redis.conf")
   end
 end
 
-class MasterRedisRunner < RedisRunner
+class NodeOneRedisRunner < RedisRunner
   def self.redisconfdir
-    File.expand_path(File.dirname(__FILE__) + "/../spec/config/master.conf")
+    File.expand_path(File.dirname(__FILE__) + "/../spec/config/node-one.conf")
   end
 
   def self.dtach_socket
-    "/tmp/redis_master.dtach"
+    "/tmp/redis-node-one.dtach"
   end
 
   def self.port
@@ -64,13 +64,13 @@ class MasterRedisRunner < RedisRunner
   end
 end
 
-class SlaveRedisRunner < RedisRunner
+class NodeTwoRedisRunner < RedisRunner
   def self.redisconfdir
-    File.expand_path(File.dirname(__FILE__) + "/../spec/config/slave.conf")
+    File.expand_path(File.dirname(__FILE__) + "/../spec/config/node-two.conf")
   end
 
   def self.dtach_socket
-    "/tmp/redis_slave.dtach"
+    "/tmp/redis-node-two.dtach"
   end
 
   def self.port
@@ -78,9 +78,9 @@ class SlaveRedisRunner < RedisRunner
   end
 end
 
-class RedisClusterRunner
+class RedisReplicationRunner
   def self.runners
-    [ SingleRedisRunner, MasterRedisRunner, SlaveRedisRunner ]
+    [ MainRedisRunner, NodeOneRedisRunner, NodeTwoRedisRunner ]
   end
 
   def self.start_detached
@@ -154,6 +154,7 @@ namespace :redis do
 
     commit = case ENV['VERSION']
       when "1.2.6" then "570e43c8285a4e5e3f31"
+      when "2.2.2" then "048c0f0f37a67f3f33bd"
     end
 
     arguments = commit.nil? ? "pull origin master" : "reset --hard #{commit}"
@@ -167,16 +168,23 @@ namespace :redis do
     RedisRunner.stop
   end
 
-  namespace :cluster do
-    desc "Starts the redis_cluster"
+  namespace :replication do
+    desc "Starts redis replication servers"
     task :start do
-      result = RedisClusterRunner.start_detached
+      result = RedisReplicationRunner.start_detached
       raise("Could not start redis-server, aborting.") unless result
     end
 
-    desc "Stops the redis_cluster"
+    desc "Stops redis replication servers"
     task :stop do
-      RedisClusterRunner.stop
+      RedisReplicationRunner.stop
+    end
+
+    desc "Open an IRb session with the master/slave replication"
+    task :console do
+      RedisReplicationRunner.start_detached
+      system "bundle exec irb -I lib -I extra -r redis-store.rb"
+      RedisReplicationRunner.stop
     end
   end  
 end
@@ -210,11 +218,11 @@ namespace :dtach do
   end
 end
 
-def invoke_with_redis_cluster(task_name)
+def invoke_with_redis_replication(task_name)
   begin
-    Rake::Task["redis:cluster:start"].invoke
+    Rake::Task["redis:replication:start"].invoke
     Rake::Task[task_name].invoke
   ensure
-    Rake::Task["redis:cluster:stop"].invoke
+    Rake::Task["redis:replication:stop"].invoke
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: redis-store
 version: !ruby/object:Gem::Version 
-  hash: -1848230056
+  hash: -1848230055
   prerelease: true
   segments: 
   - 1
   - 0
   - 0
-  - beta4
-  version: 1.0.0.beta4
+  - beta5
+  version: 1.0.0.beta5
 platform: ruby
 authors: 
 - Luca Guidi
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-15 00:00:00 +01:00
+date: 2011-04-02 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -25,14 +25,14 @@ dependencies:
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        hash: 15
+        hash: 7
         segments: 
         - 2
+        - 2
         - 0
-        - 0
-        version: 2.0.0
+        version: 2.2.0
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -64,7 +64,7 @@ dependencies:
   type: :development
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  name: rack
+  name: rack-cache
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
@@ -77,24 +77,10 @@ dependencies:
         version: "0"
   type: :development
   version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: rack-cache
-  prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  type: :development
-  version_requirements: *id005
 - !ruby/object:Gem::Dependency 
   name: merb
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
@@ -106,11 +92,11 @@ dependencies:
         - 0
         version: 1.1.0
   type: :development
-  version_requirements: *id006
+  version_requirements: *id005
 - !ruby/object:Gem::Dependency 
   name: rspec
   prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
@@ -122,11 +108,11 @@ dependencies:
         - 0
         version: 1.3.0
   type: :development
-  version_requirements: *id007
+  version_requirements: *id006
 - !ruby/object:Gem::Dependency 
   name: i18n
   prerelease: false
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -136,11 +122,11 @@ dependencies:
         - 0
         version: "0"
   type: :development
-  version_requirements: *id008
+  version_requirements: *id007
 - !ruby/object:Gem::Dependency 
   name: ruby-debug
   prerelease: false
-  requirement: &id009 !ruby/object:Gem::Requirement 
+  requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -150,11 +136,11 @@ dependencies:
         - 0
         version: "0"
   type: :development
-  version_requirements: *id009
+  version_requirements: *id008
 - !ruby/object:Gem::Dependency 
   name: redis
   prerelease: false
-  requirement: &id010 !ruby/object:Gem::Requirement 
+  requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -166,7 +152,7 @@ dependencies:
         - 0
         version: 2.0.0
   type: :runtime
-  version_requirements: *id010
+  version_requirements: *id009
 description: Namespaced Rack::Session, Rack::Cache, I18n and cache Redis stores for Ruby web frameworks.
 email: guidi.luca@gmail.com
 executables: []
@@ -206,9 +192,9 @@ files:
 - spec/active_support/cache/redis_store_spec.rb
 - spec/cache/merb/redis_store_spec.rb
 - spec/cache/sinatra/redis_store_spec.rb
-- spec/config/master.conf
-- spec/config/single.conf
-- spec/config/slave.conf
+- spec/config/node-one.conf
+- spec/config/node-two.conf
+- spec/config/redis.conf
 - spec/i18n/backend/redis_spec.rb
 - spec/rack/cache/entitystore/pony.jpg
 - spec/rack/cache/entitystore/redis_spec.rb
@@ -220,6 +206,7 @@ files:
 - spec/redis/store/marshalling_spec.rb
 - spec/redis/store/namespace_spec.rb
 - spec/redis/store/version_spec.rb
+- spec/redis/store_spec.rb
 - spec/spec_helper.rb
 - tasks/redis.tasks.rb
 has_rdoc: true
@@ -273,4 +260,5 @@ test_files:
 - spec/redis/store/marshalling_spec.rb
 - spec/redis/store/namespace_spec.rb
 - spec/redis/store/version_spec.rb
+- spec/redis/store_spec.rb
 - spec/spec_helper.rb