redis-store 1.0.0.rc1 → 1.0.0.1

data/.travis.yml

@@ -0,0 +1,7 @@
+bundler_args: "--without development"
+script: "bundle exec rake"
+rvm:
+  - 1.8.7
+  - 1.9.2
+  - jruby
+  - rbx

data/CHANGELOG

@@ -1,3 +1,18 @@
+*1.0.0.1 (September 6, 2011)*
+
+  * Bump version v1.0.0.1
+
+*1.0.0 (September 1, 2011)*
+
+  * Bump version v1.0.0
+  * Avoid encoding issues when sending strings to Redis. [Damian Janowski]
+  * Fixed a bug that caused all the users to share the same session (with a session_id of 0 or 1) [Mathieu Ravaux]
+  * ActiveSupport cache stores reply to read_multi with a hash, not an array. [Matt Griffin]
+  * Rack::Session && Rack::Cache store can be created with options [aligo]
+  * add destroy_session [aligo]
+  * compatible with rails 3.1. rely on Rack::Session::Redis stores API. [aligo]
+  * Fixed Marshalling semantic
+
 *1.0.0 [rc1] (June 5, 2011)*
 
   * Bump version v1.0.0.rc1

data/Gemfile

@@ -1,5 +1,5 @@
 source :gemcutter
-gem "redis", "~> 2.2.0"
+gem "redis", "~> 2.2.1"
 
 group :development do
   gem "jeweler"

data/MIT-LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2009 - 2010 Luca Guidi
+Copyright (c) 2009 - 2011 Luca Guidi
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.md

@@ -42,13 +42,13 @@ Made up of the following:
     password: secret
 
 If you want to specify the `namespace` option, you have to pass the `db` param too.
-#### __Important__: for now (rc1) `namespace` is only supported for single, non-distributed stores.
+#### __Important__: `namespace` is only supported for single, non-distributed stores.
 
 ### Set by Hash
 
     { :host => 192.168.1.100, :port => 23682, :db => 13, :namespace => "theplaylist", :password => "secret" }
 
-#### __Important__: for now (rc1) `namespace` is only supported for single, non-distributed stores.
+#### __Important__: `namespace` is only supported for single, non-distributed stores.
 
 ## Cache store
 
@@ -72,7 +72,7 @@ Provides a cache store for your Ruby web framework of choice.
 
     # Gemfile
     gem 'redis'
-    gem 'redis-store', '1.0.0.rc1'
+    gem 'redis-store', '1.0.0.1'
 
     # config/environments/production.rb
     config.cache_store = :redis_store, { ... optional configuration ... }
@@ -81,7 +81,7 @@ For advanced configurations scenarios please visit [the wiki](https://github.com
 
 ### Merb
 
-    dependency "redis-store", "1.0.0.rc1"
+    dependency "redis-store", "1.0.0.1"
     dependency("merb-cache", merb_gems_version) do
       Merb::Cache.setup do
         register(:redis, Merb::Cache::RedisStore, :servers => ["127.0.0.1:6379"])
@@ -162,7 +162,7 @@ Provides a Redis store for Rack::Session. See [http://rack.rubyforge.org/doc/Rac
     # Gemfile
     gem 'rails', '3.0.3'
     gem 'redis'
-    gem 'redis-store', '1.0.0.rc1'
+    gem 'redis-store', '1.0.0.1'
 
     # config/initializers/session_store.rb
     MyApp::Application.config.session_store :redis_session_store
@@ -171,7 +171,7 @@ For advanced configurations scenarios please visit [the wiki](https://github.com
 
 ### Merb
 
-    dependency "redis-store", "1.0.0.rc1"
+    dependency "redis-store", "1.0.0.1"
     Merb::Config.use do |c|
       c[:session_store] = "redis"
     end
@@ -236,4 +236,4 @@ If you are on **Snow Leopard** you have to run `env ARCHFLAGS="-arch x86_64" bun
 
 ## Copyright
 
-(c) 2009 - 2010 Luca Guidi - [http://lucaguidi.com](http://lucaguidi.com), released under the MIT license
+(c) 2009 - 2011 Luca Guidi - [http://lucaguidi.com](http://lucaguidi.com), released under the MIT license

data/VERSION

@@ -1 +1 @@
-1.0.0.rc1
+1.0.0.1

data/lib/action_controller/session/redis_session_store.rb

@@ -43,7 +43,7 @@ module RedisStore
             [sid, session]
           end
 
-          def set_session(env, sid, session_data)
+          def set_session(env, sid, session_data, opts=nil)
             options = env['rack.session.options']
             @pool.set(sid, session_data, options)
             return(::Redis::Store.rails3? ? sid : true)
@@ -54,6 +54,7 @@ module RedisStore
           def destroy(env)
             if sid = current_session_id(env)
               @pool.del(sid)
+              sid
             end
           rescue Errno::ECONNREFUSED
             false
@@ -62,8 +63,13 @@ module RedisStore
     end
   end
 end
-
-if ::Redis::Store.rails3?
+if ::Redis::Store.rails31?
+  require 'action_dispatch/middleware/session/abstract_store'
+  class ActionDispatch::Session::RedisSessionStore < Rack::Session::Redis
+    include ActionDispatch::Session::Compatibility
+    include ActionDispatch::Session::StaleSessionCheck
+  end
+elsif ::Redis::Store.rails3?
   class ActionDispatch::Session::RedisSessionStore < ActionDispatch::Session::AbstractStore
     include RedisStore::Rack::Session::Rails
   end
@@ -72,3 +78,4 @@ else
     include RedisStore::Rack::Session::Rails
   end
 end
+

data/lib/active_support/cache/redis_store.rb

@@ -170,7 +170,14 @@ module ActiveSupport
       #   cache.read_multi "rabbit", "white-rabbit"
       #   cache.read_multi "rabbit", "white-rabbit", :raw => true
       def read_multi(*names)
-        @data.mget *names
+        values = @data.mget(*names)
+        
+        # Remove the options hash before mapping keys to values
+        names.extract_options!
+        
+        result = Hash[names.zip(values)]
+        result.reject!{ |k,v| v.nil? }
+        result
       end
 
       # Increment a key in the store.

data/lib/rack/cache/redis_metastore.rb

@@ -14,7 +14,8 @@ module Rack
 
       class Redis < RedisBase
         def initialize(server, options = {})
-          @cache = ::Redis::Factory.create server
+          options[:redis_server] ||= server
+          @cache = ::Redis::Factory.create options
         end
 
         def read(key)

data/lib/rack/session/redis.rb

@@ -7,7 +7,8 @@ module Rack
       def initialize(app, options = {})
         super
         @mutex = Mutex.new
-        @pool = ::Redis::Factory.create options[:redis_server] || @default_options[:redis_server]
+        options[:redis_server] ||= @default_options[:redis_server]
+        @pool = ::Redis::Factory.create options
       end
 
       def generate_sid
@@ -58,6 +59,11 @@ module Rack
         @mutex.unlock if env['rack.multithread']
       end
 
+      def destroy_session(env, session_id, options)
+        options = { :renew => true }.update(options) unless options[:drop]
+        set_session(env, session_id, 0, options)
+      end
+
       private
         def merge_sessions(sid, old, new, cur=nil)
           cur ||= {}
@@ -79,3 +85,4 @@ module Rack
     end
   end
 end
+

data/lib/redis/store.rb

@@ -12,6 +12,10 @@ class Redis
       defined?(::Rails) && ::Rails::VERSION::MAJOR == 3
     end
 
+    def self.rails31? #:nodoc:
+      defined?(::Rails) && ::Rails::VERSION::MAJOR == 3 && ::Rails::VERSION::MINOR == 1
+    end
+
     def reconnect
       @client.reconnect
     end
@@ -32,3 +36,4 @@ class Redis
       end
   end
 end
+

data/lib/redis/store/marshalling.rb

@@ -2,11 +2,11 @@ class Redis
   class Store < self
     module Marshalling
       def set(key, value, options = nil)
-        _marshal(value, options) { |value| super key, value, options }
+        _marshal(value, options) { |value| super encode(key), encode(value), options }
       end
 
       def setnx(key, value, options = nil)
-        _marshal(value, options) { |value| super key, value, options }
+        _marshal(value, options) { |value| super encode(key), encode(value), options }
       end
 
       def get(key, options = nil)
@@ -22,7 +22,7 @@ class Redis
 
       private
         def _marshal(val, options)
-          yield marshal?(options) ? val : Marshal.dump(val)
+          yield marshal?(options) ? Marshal.dump(val) : val
         end
 
         def _unmarshal(val, options)
@@ -30,11 +30,21 @@ class Redis
         end
 
         def marshal?(options)
-          options && options[:raw]
+          !(options && options[:raw])
         end
 
         def unmarshal?(result, options)
-          result && result.size > 0 && !marshal?(options)
+          result && result.size > 0 && marshal?(options)
+        end
+
+        if defined?(Encoding)
+          def encode(string)
+            string.to_s.force_encoding(Encoding::BINARY)
+          end
+        else
+          def encode(string)
+            string
+          end
         end
     end
   end

data/lib/redis/store/version.rb

@@ -4,7 +4,7 @@ class Redis
       MAJOR = 1
       MINOR = 0
       TINY  = 0
-      BUILD = "rc1"
+      BUILD = 1
 
       STRING = [MAJOR, MINOR, TINY, BUILD].join('.')
     end

data/redis-store.gemspec

@@ -5,20 +5,20 @@
 
 Gem::Specification.new do |s|
   s.name = %q{redis-store}
-  s.version = "1.0.0.rc1"
+  s.version = "1.0.0.1"
 
-  s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
+  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = [%q{Luca Guidi}]
-  s.date = %q{2011-06-05}
+  s.date = %q{2011-09-06}
   s.description = %q{Namespaced Rack::Session, Rack::Cache, I18n and cache Redis stores for Ruby web frameworks.}
   s.email = %q{guidi.luca@gmail.com}
   s.extra_rdoc_files = [
     "README.md"
   ]
   s.files = [
+    ".travis.yml",
     "CHANGELOG",
     "Gemfile",
-    "Gemfile.lock",
     "MIT-LICENSE",
     "README.md",
     "Rakefile",
@@ -66,32 +66,14 @@ Gem::Specification.new do |s|
   ]
   s.homepage = %q{http://github.com/jodosha/redis-store}
   s.require_paths = [%q{lib}]
-  s.rubygems_version = %q{1.8.5}
+  s.rubygems_version = %q{1.8.6}
   s.summary = %q{Namespaced Rack::Session, Rack::Cache, I18n and cache Redis stores for Ruby web frameworks.}
-  s.test_files = [
-    "spec/action_controller/session/redis_session_store_spec.rb",
-    "spec/active_support/cache/redis_store_spec.rb",
-    "spec/cache/merb/redis_store_spec.rb",
-    "spec/cache/sinatra/redis_store_spec.rb",
-    "spec/i18n/backend/redis_spec.rb",
-    "spec/rack/cache/entitystore/redis_spec.rb",
-    "spec/rack/cache/metastore/redis_spec.rb",
-    "spec/rack/session/redis_spec.rb",
-    "spec/redis/distributed_store_spec.rb",
-    "spec/redis/factory_spec.rb",
-    "spec/redis/store/interface_spec.rb",
-    "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"
-  ]
 
   if s.respond_to? :specification_version then
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<redis>, ["~> 2.2.0"])
+      s.add_runtime_dependency(%q<redis>, ["~> 2.2.1"])
       s.add_development_dependency(%q<jeweler>, [">= 0"])
       s.add_development_dependency(%q<git>, [">= 0"])
       s.add_development_dependency(%q<rack-cache>, [">= 0"])
@@ -100,7 +82,7 @@ Gem::Specification.new do |s|
       s.add_development_dependency(%q<i18n>, [">= 0"])
       s.add_development_dependency(%q<ruby-debug>, [">= 0"])
     else
-      s.add_dependency(%q<redis>, ["~> 2.2.0"])
+      s.add_dependency(%q<redis>, ["~> 2.2.1"])
       s.add_dependency(%q<jeweler>, [">= 0"])
       s.add_dependency(%q<git>, [">= 0"])
       s.add_dependency(%q<rack-cache>, [">= 0"])
@@ -110,7 +92,7 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<ruby-debug>, [">= 0"])
     end
   else
-    s.add_dependency(%q<redis>, ["~> 2.2.0"])
+    s.add_dependency(%q<redis>, ["~> 2.2.1"])
     s.add_dependency(%q<jeweler>, [">= 0"])
     s.add_dependency(%q<git>, [">= 0"])
     s.add_dependency(%q<rack-cache>, [">= 0"])

data/spec/action_controller/session/redis_session_store_spec.rb

@@ -104,12 +104,12 @@ describe RAILS_SESSION_STORE_CLASS do
     end
 
     it "should read the data" do
-      @client.should_receive(:call).with(:get, "#{@namespace}:#{@sid}")
+      @client.should_receive(:call).with([:get, "#{@namespace}:#{@sid}"])
       @store.send :get_session, @env, @sid
     end
 
     it "should write the data" do
-      @client.should_receive(:call).with(:set, "#{@namespace}:#{@sid}", Marshal.dump(@white_rabbit))
+      @client.should_receive(:call).with([:set, "#{@namespace}:#{@sid}", Marshal.dump(@white_rabbit)])
       @store.send :set_session, @env, @sid, @white_rabbit
     end
   end

data/spec/active_support/cache/redis_store_spec.rb

@@ -149,6 +149,22 @@ module ActiveSupport
         end
       end
 
+      it "should increment a raw key" do
+        with_store_management do |store|
+          store.write("raw-counter", 1, :raw => true).should be_true
+          store.increment("raw-counter", 2)
+          store.read("raw-counter", :raw => true).to_i.should == 3
+        end
+      end
+
+      it "should decrement a raw key" do
+        with_store_management do |store|
+          store.write("raw-counter", 3, :raw => true).should be_true
+          store.decrement("raw-counter", 2)
+          store.read("raw-counter", :raw => true).to_i.should == 1
+        end
+      end
+
       it "should increment a key by given value" do
         with_store_management do |store|
           store.increment "counter", 3
@@ -194,18 +210,24 @@ module ActiveSupport
       if ::Redis::Store.rails3?
         it "should read multiple keys" do
           @store.write "irish whisky", "Jameson"
-          rabbit, whisky = @store.read_multi "rabbit", "irish whisky"
-          rabbit.raw_value.should === @rabbit
-          whisky.raw_value.should == "Jameson"
+          result = @store.read_multi "rabbit", "irish whisky"
+          result['rabbit'].raw_value.should === @rabbit
+          result['irish whisky'].raw_value.should == "Jameson"
         end
       else
         it "should read multiple keys" do
           @store.write "irish whisky", "Jameson"
-          rabbit, whisky  = @store.read_multi "rabbit", "irish whisky"
-          rabbit.should === @rabbit
-          whisky.should  == "Jameson"
+          result = @store.read_multi "rabbit", "irish whisky"
+          result.should == { 'rabbit' => @rabbit, 'irish whisky' => 'Jameson' }
         end
       end
+      
+      it 'should read multiple keys and return only matches' do
+        @store.delete 'irish whisky'
+        result = @store.read_multi "rabbit", "irish whisky"
+        result.should_not include('irish whisky')
+        result.should include('rabbit')
+      end
 
       describe "namespace" do
         before :each do
@@ -216,7 +238,7 @@ module ActiveSupport
         end
 
         it "should read the data" do
-          @client.should_receive(:call).with(:get, "#{@namespace}:rabbit")
+          @client.should_receive(:call).with([:get, "#{@namespace}:rabbit"])
           @store.read("rabbit")
         end
 
@@ -228,19 +250,19 @@ module ActiveSupport
           # end
         else
           it "should write the data" do
-            @client.should_receive(:call).with(:set, "#{@namespace}:rabbit", Marshal.dump(@white_rabbit))
+            @client.should_receive(:call).with([:set, "#{@namespace}:rabbit", Marshal.dump(@white_rabbit)])
             @store.write "rabbit", @white_rabbit
           end
         end
 
         it "should delete the data" do
-          @client.should_receive(:call).with(:del, "#{@namespace}:rabbit")
+          @client.should_receive(:call).with([:del, "#{@namespace}:rabbit"])
           @store.delete "rabbit"
         end
 
         it "should delete matched data" do
-          @client.should_receive(:call).with(:del, "#{@namespace}:rabbit")
-          @client.should_receive(:call).with(:keys, "theplaylist:rabb*").and_return [ "#{@namespace}:rabbit" ]
+          @client.should_receive(:call).with([:del, "#{@namespace}:rabbit"])
+          @client.should_receive(:call).with([:keys, "theplaylist:rabb*"]).and_return [ "#{@namespace}:rabbit" ]
           @store.delete_matched "rabb*"
         end
 
@@ -251,29 +273,29 @@ module ActiveSupport
           end
         else
           it "should verify existence of an object in the store" do
-            @client.should_receive(:call).with(:exists, "#{@namespace}:rabbit")
+            @client.should_receive(:call).with([:exists, "#{@namespace}:rabbit"])
             @store.exist?("rabbit")
           end
         end
 
         it "should increment a key" do
-          @client.should_receive(:call).with(:incrby, "#{@namespace}:counter", 1)
+          @client.should_receive(:call).with([:incrby, "#{@namespace}:counter", 1])
           @store.increment "counter"
         end
 
         it "should decrement a key" do
-          @client.should_receive(:call).with(:decrby, "#{@namespace}:counter", 1)
+          @client.should_receive(:call).with([:decrby, "#{@namespace}:counter", 1])
           @store.decrement "counter"
         end
 
         it "should fetch data" do
-          @client.should_receive(:call).with(:get, "#{@namespace}:rabbit")
+          @client.should_receive(:call).with([:get, "#{@namespace}:rabbit"])
           @store.fetch "rabbit"
         end
 
         it "should read multiple keys" do
           rabbits = [ Marshal.dump(@rabbit), Marshal.dump(@white_rabbit) ]
-          @client.should_receive(:call).with(:mget, "#{@namespace}:rabbit", "#{@namespace}:white_rabbit").and_return rabbits
+          @client.should_receive(:call).with([:mget, "#{@namespace}:rabbit", "#{@namespace}:white_rabbit"]).and_return rabbits
           @store.read_multi "rabbit", "white_rabbit"
         end
       end

data/spec/redis/store/marshalling_spec.rb

@@ -79,5 +79,41 @@ describe "Redis::Marshalling" do
       rabbit2.should == "\004\bU:\017OpenStruct{\006:\ncolor\"\nwhite"
     end
   end
+
+  describe "binary safety" do
+    it "should marshal objects" do
+      utf8_key = [51339].pack("U*")
+      ascii_rabbit = OpenStruct.new(:name => [128].pack("C*"))
+
+      @store.set(utf8_key, ascii_rabbit)
+      @store.get(utf8_key).should === ascii_rabbit
+    end
+
+    it "should get and set raw values" do
+      utf8_key = [51339].pack("U*")
+      ascii_string = [128].pack("C*")
+
+      @store.set(utf8_key, ascii_string, :raw => true)
+      @store.get(utf8_key, :raw => true).bytes.to_a === ascii_string.bytes.to_a
+    end
+
+    it "should marshal objects on setnx" do
+      utf8_key = [51339].pack("U*")
+      ascii_rabbit = OpenStruct.new(:name => [128].pack("C*"))
+
+      @store.del(utf8_key)
+      @store.setnx(utf8_key, ascii_rabbit)
+      @store.get(utf8_key).should === ascii_rabbit
+    end
+
+    it "should get and set raw values on setnx" do
+      utf8_key = [51339].pack("U*")
+      ascii_string = [128].pack("C*")
+
+      @store.del(utf8_key)
+      @store.setnx(utf8_key, ascii_string, :raw => true)
+      @store.get(utf8_key, :raw => true).bytes.to_a === ascii_string.bytes.to_a
+    end
+  end if defined?(Encoding)
 end
 

data/spec/redis/store/namespace_spec.rb

@@ -16,7 +16,7 @@ describe "Redis::Store::Namespace" do
   it "should only decorate instances that needs to be namespaced" do
     @store = Redis::Store.new
     client = @store.instance_variable_get(:@client)
-    client.should_receive(:call).with(:get, "rabbit")
+    client.should_receive(:call).with([:get, "rabbit"])
     @store.get("rabbit")
   end
 
@@ -25,27 +25,27 @@ describe "Redis::Store::Namespace" do
   end
 
   it "should namespace get" do
-    @client.should_receive(:call).with(:get, "#{@namespace}:rabbit")
+    @client.should_receive(:call).with([:get, "#{@namespace}:rabbit"])
     @store.get("rabbit")
   end
 
   it "should namespace set" do
-    @client.should_receive(:call).with(:set, "#{@namespace}:rabbit", @rabbit)
+    @client.should_receive(:call).with([:set, "#{@namespace}:rabbit", @rabbit])
     @store.set "rabbit", @rabbit
   end
 
   it "should namespace setnx" do
-    @client.should_receive(:call).with(:setnx, "#{@namespace}:rabbit", @rabbit)
+    @client.should_receive(:call).with([:setnx, "#{@namespace}:rabbit", @rabbit])
     @store.setnx "rabbit", @rabbit
   end
 
   it "should namespace del with single key" do
-    @client.should_receive(:call).with(:del, "#{@namespace}:rabbit")
+    @client.should_receive(:call).with([:del, "#{@namespace}:rabbit"])
     @store.del "rabbit"
   end
 
   it "should namespace del with multiple keys" do
-    @client.should_receive(:call).with(:del, "#{@namespace}:rabbit", "#{@namespace}:white_rabbit")
+    @client.should_receive(:call).with([:del, "#{@namespace}:rabbit", "#{@namespace}:white_rabbit"])
     @store.del "rabbit", "white_rabbit"
   end
 
@@ -55,22 +55,22 @@ describe "Redis::Store::Namespace" do
   end
 
   it "should namespace exists" do
-    @client.should_receive(:call).with(:exists, "#{@namespace}:rabbit")
+    @client.should_receive(:call).with([:exists, "#{@namespace}:rabbit"])
     @store.exists "rabbit"
   end
 
   it "should namespace incrby" do
-    @client.should_receive(:call).with(:incrby, "#{@namespace}:counter", 1)
+    @client.should_receive(:call).with([:incrby, "#{@namespace}:counter", 1])
     @store.incrby "counter", 1
   end
 
   it "should namespace decrby" do
-    @client.should_receive(:call).with(:decrby, "#{@namespace}:counter", 1)
+    @client.should_receive(:call).with([:decrby, "#{@namespace}:counter", 1])
     @store.decrby "counter", 1
   end
 
   it "should namespace mget" do
-    @client.should_receive(:call).with(:mget, "#{@namespace}:rabbit", "#{@namespace}:white_rabbit")
+    @client.should_receive(:call).with([:mget, "#{@namespace}:rabbit", "#{@namespace}:white_rabbit"])
     @store.mget "rabbit", "white_rabbit"
   end
 end

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.rc1"
+    Redis::Store::VERSION::STRING.should == "1.0.0.1"
   end
 end

data/tasks/redis.tasks.rb

@@ -103,7 +103,7 @@ namespace :redis do
   end
 
   desc 'Start redis'
-  task :start do
+  task :start => 'dtach:check' do
     RedisRunner.start
   end
 
@@ -153,8 +153,8 @@ namespace :redis do
     sh "mv redis vendor"
 
     commit = case ENV['VERSION']
-      when "1.2.6" then "570e43c8285a4e5e3f31"
-      when "2.2.4" then "2b886275e9756bb8619a"
+      when "1.3.12" then "26ef09a83526e5099bce"
+      when "2.2.8"  then "ec279203df0bc6ddc981"
     end
 
     arguments = commit.nil? ? "pull origin master" : "reset --hard #{commit}"
@@ -170,7 +170,7 @@ namespace :redis do
 
   namespace :replication do
     desc "Starts redis replication servers"
-    task :start do
+    task :start => 'dtach:check' do
       result = RedisReplicationRunner.start_detached
       raise("Could not start redis-server, aborting.") unless result
     end
@@ -186,7 +186,7 @@ namespace :redis do
       system "bundle exec irb -I lib -I extra -r redis-store.rb"
       RedisReplicationRunner.stop
     end
-  end  
+  end
 end
 
 namespace :dtach do
@@ -195,6 +195,13 @@ namespace :dtach do
     puts "\nSee http://dtach.sourceforge.net/ for information about dtach.\n\n"
   end
 
+  desc 'Check that dtach is available'
+  task :check do
+    if !ENV['TRAVIS'] && !system('which dtach')
+      raise "dtach is not installed. Install it manually or run 'rake dtach:install'"
+    end
+  end
+
   desc 'Install dtach 0.8 from source'
   task :install => [:about] do
 

metadata

@@ -1,15 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: redis-store
 version: !ruby/object:Gem::Version 
-  hash: 15424055
-  prerelease: 6
+  hash: 93
+  prerelease: 
   segments: 
   - 1
   - 0
   - 0
-  - rc
   - 1
-  version: 1.0.0.rc1
+  version: 1.0.0.1
 platform: ruby
 authors: 
 - Luca Guidi
@@ -17,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-05 00:00:00 Z
+date: 2011-09-06 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: redis
@@ -27,12 +26,12 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 7
+        hash: 5
         segments: 
         - 2
         - 2
-        - 0
-        version: 2.2.0
+        - 1
+        version: 2.2.1
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -146,9 +145,9 @@ extensions: []
 extra_rdoc_files: 
 - README.md
 files: 
+- .travis.yml
 - CHANGELOG
 - Gemfile
-- Gemfile.lock
 - MIT-LICENSE
 - README.md
 - Rakefile
@@ -213,35 +212,18 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version 
-      hash: 25
+      hash: 3
       segments: 
-      - 1
-      - 3
-      - 1
-      version: 1.3.1
+      - 0
+      version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.8.5
+rubygems_version: 1.8.6
 signing_key: 
 specification_version: 3
 summary: Namespaced Rack::Session, Rack::Cache, I18n and cache Redis stores for Ruby web frameworks.
-test_files: 
-- spec/action_controller/session/redis_session_store_spec.rb
-- spec/active_support/cache/redis_store_spec.rb
-- spec/cache/merb/redis_store_spec.rb
-- spec/cache/sinatra/redis_store_spec.rb
-- spec/i18n/backend/redis_spec.rb
-- spec/rack/cache/entitystore/redis_spec.rb
-- spec/rack/cache/metastore/redis_spec.rb
-- spec/rack/session/redis_spec.rb
-- spec/redis/distributed_store_spec.rb
-- spec/redis/factory_spec.rb
-- spec/redis/store/interface_spec.rb
-- 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
+test_files: []
+

data/Gemfile.lock

@@ -1,180 +0,0 @@
-GEM
-  remote: http://rubygems.org/
-  specs:
-    ParseTree (3.0.6)
-      RubyInline (>= 3.7.0)
-      sexp_processor (>= 3.0.0)
-    RubyInline (3.8.6)
-      ZenTest (~> 4.3)
-    ZenTest (4.4.2)
-    abstract (1.0.0)
-    actionpack (2.3.11)
-      activesupport (= 2.3.11)
-      rack (~> 1.1.0)
-    activesupport (2.3.11)
-    addressable (2.2.2)
-    bcrypt-ruby (2.1.2)
-    columnize (0.3.2)
-    data_objects (0.10.2)
-      addressable (~> 2.1)
-    diff-lcs (1.1.2)
-    dm-aggregates (0.10.2)
-      dm-core (~> 0.10.2)
-    dm-constraints (0.10.2)
-      dm-core (~> 0.10.2)
-    dm-core (0.10.2)
-      addressable (~> 2.1)
-      extlib (~> 0.9.14)
-    dm-migrations (0.10.2)
-      dm-core (~> 0.10.2)
-    dm-serializer (0.10.2)
-      dm-core (~> 0.10.2)
-      fastercsv (~> 1.5.0)
-      json_pure (~> 1.2.0)
-    dm-sweatshop (0.10.2)
-      dm-core (~> 0.10.2)
-      randexp (~> 0.1.4)
-    dm-timestamps (0.10.2)
-      dm-core (~> 0.10.2)
-    dm-types (0.10.2)
-      bcrypt-ruby (~> 2.1.2)
-      dm-core (~> 0.10.2)
-      fastercsv (~> 1.5.0)
-      json_pure (~> 1.2.0)
-      stringex (~> 1.1.0)
-      uuidtools (~> 2.1.1)
-    dm-validations (0.10.2)
-      dm-core (~> 0.10.2)
-    do_sqlite3 (0.10.2)
-      data_objects (= 0.10.2)
-    erubis (2.6.6)
-      abstract (>= 1.0.0)
-    extlib (0.9.15)
-    fastercsv (1.5.3)
-    git (1.2.5)
-    haml (3.0.24)
-    highline (1.6.1)
-    i18n (0.5.0)
-    jeweler (1.5.1)
-      bundler (~> 1.0.0)
-      git (>= 1.2.5)
-      rake
-    json_pure (1.2.4)
-    linecache (0.43)
-    mailfactory (1.4.0)
-      mime-types (>= 1.13.1)
-    merb (1.1.0)
-      dm-aggregates (~> 0.10)
-      dm-constraints (~> 0.10)
-      dm-serializer (~> 0.10)
-      dm-sweatshop (~> 0.10)
-      dm-timestamps (~> 0.10)
-      dm-types (~> 0.10)
-      dm-validations (~> 0.10)
-      do_sqlite3 (~> 0.10)
-      merb-action-args (= 1.1.0)
-      merb-assets (= 1.1.0)
-      merb-auth (= 1.1.0)
-      merb-cache (= 1.1.0)
-      merb-core (= 1.1.0)
-      merb-exceptions (= 1.1.0)
-      merb-gen (= 1.1.0)
-      merb-haml (= 1.1.0)
-      merb-helpers (= 1.1.0)
-      merb-mailer (= 1.1.0)
-      merb-param-protection (= 1.1.0)
-      merb-slices (= 1.1.0)
-      merb_datamapper (= 1.1.0)
-    merb-action-args (1.1.0)
-      ParseTree (>= 2.1.1)
-      merb-core (~> 1.1.0)
-      ruby2ruby (>= 1.1.9)
-    merb-assets (1.1.0)
-      merb-core (~> 1.1.0)
-    merb-auth (1.1.0)
-      merb-auth-core (~> 1.1.0)
-      merb-auth-more (~> 1.1.0)
-      merb-auth-slice-password (~> 1.1.0)
-      merb-core (~> 1.1.0)
-    merb-auth-core (1.1.1)
-      merb-core (~> 1.1)
-    merb-auth-more (1.1.1)
-      merb-auth-core (~> 1.1.1)
-    merb-auth-slice-password (1.1.1)
-      merb-auth-core (~> 1.1.1)
-      merb-auth-more (~> 1.1.1)
-      merb-slices (~> 1.1)
-    merb-cache (1.1.0)
-      merb-core (~> 1.1.0)
-    merb-core (1.1.0)
-      bundler (>= 0.9.3)
-      erubis (>= 2.6.2)
-      extlib (>= 0.9.13)
-      mime-types (>= 1.16)
-      rack
-      rake
-      rspec
-    merb-exceptions (1.1.0)
-      merb-core (~> 1.1.0)
-      merb-mailer (~> 1.1.0)
-    merb-gen (1.1.0)
-      merb-core (~> 1.1.0)
-      templater (>= 1.0.0)
-    merb-haml (1.1.0)
-      haml (>= 2.0.3)
-      merb-core (~> 1.1.0)
-    merb-helpers (1.1.0)
-      merb-core (~> 1.1.0)
-    merb-mailer (1.1.0)
-      mailfactory (>= 1.2.3)
-      merb-core (~> 1.1.0)
-    merb-param-protection (1.1.0)
-      merb-core (~> 1.1.0)
-    merb-slices (1.1.0)
-      merb-core (~> 1.1.0)
-    merb_datamapper (1.1.0)
-      dm-core (~> 0.10)
-      dm-migrations (~> 0.10)
-      merb-core (~> 1.1.0)
-    mime-types (1.16)
-    rack (1.1.0)
-    rack-cache (0.5.3)
-      rack (>= 0.4)
-    rake (0.8.7)
-    randexp (0.1.5)
-      ParseTree
-    redis (2.2.0)
-    rspec (1.3.0)
-    ruby-debug (0.10.4)
-      columnize (>= 0.1)
-      ruby-debug-base (~> 0.10.4.0)
-    ruby-debug-base (0.10.4)
-      linecache (>= 0.3)
-    ruby2ruby (1.2.5)
-      ruby_parser (~> 2.0)
-      sexp_processor (~> 3.0)
-    ruby_parser (2.0.5)
-      sexp_processor (~> 3.0)
-    sexp_processor (3.0.5)
-    stringex (1.1.0)
-    templater (1.0.0)
-      diff-lcs (>= 1.1.2)
-      extlib (>= 0.9.5)
-      highline (>= 1.4.0)
-    uuidtools (2.1.1)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  actionpack (= 2.3.11)
-  activesupport (= 2.3.11)
-  git
-  i18n
-  jeweler
-  merb (= 1.1.0)
-  rack (~> 1.1.0)
-  rack-cache
-  redis (~> 2.2.0)
-  rspec (= 1.3.0)
-  ruby-debug