redis-store 1.0.0.1 → 1.1.0.rc

data/lib/redis/store.rb

@@ -1,3 +1,6 @@
+require 'redis/store/ttl'
+require 'redis/store/interface'
+
 class Redis
   class Store < self
     include Ttl, Interface
@@ -8,14 +11,6 @@ class Redis
       _extend_namespace   options
     end
 
-    def self.rails3? #:nodoc:
-      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

data/lib/redis/store/interface.rb

@@ -12,6 +12,10 @@ class Redis
       def setnx(key, value, options = nil)
         super(key, value)
       end
+
+      def setex(key, expiry, value, options = nil)
+        super(key, expiry, value)
+      end
     end
   end
 end

data/lib/redis/store/marshalling.rb

@@ -9,6 +9,10 @@ class Redis
         _marshal(value, options) { |value| super encode(key), encode(value), options }
       end
 
+      def setex(key, expiry, value, options = nil)
+        _marshal(value, options) { |value| super encode(key), expiry, encode(value), options }
+      end
+
       def get(key, options = nil)
         _unmarshal super(key), options
       end

data/lib/redis/store/version.rb

@@ -1,12 +1,5 @@
 class Redis
   class Store < self
-    module VERSION #:nodoc:
-      MAJOR = 1
-      MINOR = 0
-      TINY  = 0
-      BUILD = 1
-
-      STRING = [MAJOR, MINOR, TINY, BUILD].join('.')
-    end
+    VERSION = '1.1.0.rc'
   end
 end

data/lib/tasks/redis.tasks.rb

@@ -0,0 +1,167 @@
+require 'rake'
+require 'rake/testtask'
+require 'fileutils'
+require 'open-uri'
+
+class RedisRunner
+  def self.redisdir
+    File.expand_path("../../../vendor/redis", __FILE__)
+  end
+
+  def self.configuration
+    File.expand_path("../../../test/config/redis.conf", __FILE__)
+  end
+
+  def self.pid_file
+    File.expand_path(Dir.pwd + "/tmp/pids/redis.pid")
+  end
+
+  def self.pid
+    File.open(pid_file).read.to_i
+  end
+
+  def self.start
+    system %(redis-server #{configuration})
+  end
+
+  def self.stop
+    begin
+      Process.kill('SIGTERM', pid)
+    rescue
+      # Suppress exceptions for Travis CI
+    end
+  end
+end
+
+class NodeOneRedisRunner < RedisRunner
+  def self.configuration
+    File.expand_path("../../../test/config/node-one.conf", __FILE__)
+  end
+
+  def self.pid_file
+    File.expand_path(Dir.pwd + "/tmp/pids/node-one.pid")
+  end
+end
+
+class NodeTwoRedisRunner < RedisRunner
+  def self.configuration
+    File.expand_path("../../../test/config/node-two.conf", __FILE__)
+  end
+
+  def self.pid_file
+    File.expand_path(Dir.pwd + "/tmp/pids/node-two.pid")
+  end
+end
+
+class RedisReplicationRunner
+  def self.runners
+    [ RedisRunner, NodeOneRedisRunner, NodeTwoRedisRunner ]
+  end
+
+  def self.start
+    runners.each do |runner|
+      runner.start
+    end
+  end
+
+  def self.stop
+    runners.each do |runner|
+      runner.stop
+    end
+  end
+end
+
+namespace :redis do
+  desc 'About redis'
+  task :about do
+    puts "\nSee http://code.google.com/p/redis/ for information about redis.\n\n"
+  end
+
+  desc 'Install the lastest verison of Redis from Github (requires git, duh)'
+  task :install => [ :about, :download, :make ] do
+    %w(redis-benchmark redis-cli redis-server).each do |bin|
+      if File.exist?(path = "#{RedisRunner.redisdir}/src/#{bin}")
+        sh "sudo cp #{path} /usr/bin/"
+      else
+        sh "sudo cp #{RedisRunner.redisdir}/#{bin} /usr/bin/"
+      end
+    end
+
+    puts "Installed redis-benchmark, redis-cli and redis-server to /usr/bin/"
+
+    sh "sudo cp #{RedisRunner.redisdir}/redis.conf /etc/"
+    puts "Installed redis.conf to /etc/ \n You should look at this file!"
+  end
+
+  task :make do
+    sh "cd #{RedisRunner.redisdir} && make clean"
+    sh "cd #{RedisRunner.redisdir} && make"
+  end
+
+  desc "Download package"
+  task :download do
+    require 'git'
+
+    sh "rm -rf #{RedisRunner.redisdir} && mkdir -p vendor && rm -rf redis"
+    Git.clone("git://github.com/antirez/redis.git", "redis")
+    sh "mv redis vendor"
+
+    commit = case ENV['VERSION']
+      when "1.3.12"  then "26ef09a83526e5099bce"
+      when "2.2.12"  then "5960ac9dec5184bf4184"
+      when "2.2.4"   then "2b886275e9756bb8619a"
+      when "2.0.5"   then "9b695bb0a00c01ad4d55"
+    end
+
+    arguments = commit.nil? ? "pull origin master" : "reset --hard #{commit}"
+    sh "cd #{RedisRunner.redisdir} && git #{arguments}"
+  end
+
+  namespace :test do
+    desc "Run all the examples by starting a background Redis instance"
+    task :suite => 'redis:test:prepare' do
+      invoke_with_redis_replication 'redis:test:run'
+    end
+
+    Rake::TestTask.new(:run) do |t|
+      t.libs.push 'lib'
+      t.test_files = FileList['test/**/*_test.rb']
+      t.ruby_opts  = ["-I test"]
+      t.verbose    = true
+    end
+
+    task :prepare do
+      FileUtils.mkdir_p 'tmp/pids'
+      FileUtils.rm Dir.glob('tmp/*.rdb')
+    end
+  end
+
+  namespace :replication do
+    desc "Starts redis replication servers"
+    task :start do
+      RedisReplicationRunner.start
+    end
+
+    desc "Stops redis replication servers"
+    task :stop do
+      RedisReplicationRunner.stop
+    end
+
+    desc "Open an IRb session with the master/slave replication"
+    task :console do
+      RedisReplicationRunner.start
+      system "bundle exec irb -I lib -I extra -r redis-store.rb"
+      RedisReplicationRunner.stop
+    end
+  end
+end
+
+def invoke_with_redis_replication(task_name)
+  begin
+    Rake::Task["redis:replication:start"].invoke
+    Rake::Task[task_name].invoke
+  ensure
+    Rake::Task["redis:replication:stop"].invoke
+  end
+end
+

data/redis-store.gemspec

@@ -1,105 +1,30 @@
-# Generated by jeweler
-# DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
+$:.push File.expand_path("../lib", __FILE__)
+require "redis/store/version"
 
 Gem::Specification.new do |s|
-  s.name = %q{redis-store}
-  s.version = "1.0.0.1"
-
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = [%q{Luca Guidi}]
-  s.date = %q{2011-09-06}
+  s.name        = "redis-store"
+  s.version     = Redis::Store::VERSION
+  s.authors     = ["Luca Guidi"]
+  s.email       = ["guidi.luca@gmail.com"]
+  s.homepage    = ""
+  s.summary     = %q{Redis stores for Ruby frameworks}
   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",
-    "MIT-LICENSE",
-    "README.md",
-    "Rakefile",
-    "VERSION",
-    "lib/action_controller/session/redis_session_store.rb",
-    "lib/active_support/cache/redis_store.rb",
-    "lib/cache/merb/redis_store.rb",
-    "lib/cache/sinatra/redis_store.rb",
-    "lib/i18n/backend/redis.rb",
-    "lib/rack/cache/redis_entitystore.rb",
-    "lib/rack/cache/redis_metastore.rb",
-    "lib/rack/session/merb.rb",
-    "lib/rack/session/redis.rb",
-    "lib/redis-store.rb",
-    "lib/redis/distributed_store.rb",
-    "lib/redis/factory.rb",
-    "lib/redis/store.rb",
-    "lib/redis/store/interface.rb",
-    "lib/redis/store/marshalling.rb",
-    "lib/redis/store/namespace.rb",
-    "lib/redis/store/ttl.rb",
-    "lib/redis/store/version.rb",
-    "redis-store.gemspec",
-    "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/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",
-    "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",
-    "tasks/redis.tasks.rb"
-  ]
-  s.homepage = %q{http://github.com/jodosha/redis-store}
-  s.require_paths = [%q{lib}]
-  s.rubygems_version = %q{1.8.6}
-  s.summary = %q{Namespaced Rack::Session, Rack::Cache, I18n and cache Redis stores for Ruby web frameworks.}
 
-  if s.respond_to? :specification_version then
-    s.specification_version = 3
+  s.rubyforge_project = "redis-store"
+
+  s.files         = `git ls-files`.split("\n")
+  s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
+  s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
+  s.require_paths = ["lib"]
+
+  s.add_dependency 'redis', '~> 2.2.0'
 
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      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"])
-      s.add_development_dependency(%q<merb>, ["= 1.1.0"])
-      s.add_development_dependency(%q<rspec>, ["= 1.3.0"])
-      s.add_development_dependency(%q<i18n>, [">= 0"])
-      s.add_development_dependency(%q<ruby-debug>, [">= 0"])
-    else
-      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"])
-      s.add_dependency(%q<merb>, ["= 1.1.0"])
-      s.add_dependency(%q<rspec>, ["= 1.3.0"])
-      s.add_dependency(%q<i18n>, [">= 0"])
-      s.add_dependency(%q<ruby-debug>, [">= 0"])
-    end
-  else
-    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"])
-    s.add_dependency(%q<merb>, ["= 1.1.0"])
-    s.add_dependency(%q<rspec>, ["= 1.3.0"])
-    s.add_dependency(%q<i18n>, [">= 0"])
-    s.add_dependency(%q<ruby-debug>, [">= 0"])
-  end
+  s.add_development_dependency 'rake',      '~> 0.9.2.2'
+  s.add_development_dependency 'bundler',   '~> 1.1.rc'
+  s.add_development_dependency 'mocha',     '~> 0.10.0'
+  s.add_development_dependency 'minitest',  '~> 2.8.0'
+  s.add_development_dependency 'purdytest', '~> 1.0.0'
+  s.add_development_dependency 'git',       '~> 1.2.5'
 end
 

data/{spec → test}/config/node-one.conf

@@ -14,11 +14,11 @@
 
 # By default Redis does not run as a daemon. Use 'yes' if you need it.
 # Note that Redis will write a pid file in /var/run/redis.pid when daemonized.
-daemonize no
+daemonize yes
 
 # When running daemonized, Redis writes a pid file in /var/run/redis.pid by
 # default. You can specify a custom pid file location here.
-pidfile /var/run/redis.pid
+pidfile ./tmp/pids/node-one.pid
 
 # Accept connections on the specified port, default is 6379.
 # If port 0 is specified Redis will not listen on a TCP socket.

data/{spec → test}/config/node-two.conf

@@ -14,11 +14,11 @@
 
 # By default Redis does not run as a daemon. Use 'yes' if you need it.
 # Note that Redis will write a pid file in /var/run/redis.pid when daemonized.
-daemonize no
+daemonize yes
 
 # When running daemonized, Redis writes a pid file in /var/run/redis.pid by
 # default. You can specify a custom pid file location here.
-pidfile /var/run/redis.pid
+pidfile ./tmp/pids/node-two.pid
 
 # Accept connections on the specified port, default is 6379.
 # If port 0 is specified Redis will not listen on a TCP socket.

data/{spec → test}/config/redis.conf

@@ -14,11 +14,12 @@
 
 # By default Redis does not run as a daemon. Use 'yes' if you need it.
 # Note that Redis will write a pid file in /var/run/redis.pid when daemonized.
-daemonize no
+daemonize yes
 
 # When running daemonized, Redis writes a pid file in /var/run/redis.pid by
 # default. You can specify a custom pid file location here.
-pidfile /var/run/redis.pid
+# pidfile /var/run/redis.pid
+pidfile ./tmp/pids/redis.pid
 
 # Accept connections on the specified port, default is 6379.
 # If port 0 is specified Redis will not listen on a TCP socket.

data/{spec/redis/distributed_store_spec.rb → test/redis/distributed_store_test.rb}

@@ -1,7 +1,7 @@
-require 'spec_helper'
+require 'test_helper'
 
 describe "Redis::DistributedStore" do
-  before(:each) do
+  def setup
     @dmr = Redis::DistributedStore.new [
       {:host => "localhost", :port => "6380", :db => 0},
       {:host => "localhost", :port => "6381", :db => 0}
@@ -11,44 +11,42 @@ describe "Redis::DistributedStore" do
     @dmr.set "rabbit", @rabbit
   end
 
-  after(:all) do
+  def teardown
     @dmr.ring.nodes.each { |server| server.flushdb }
   end
 
-  it "should accept connection params" do
+  it "accepts connection params" do
     dmr = Redis::DistributedStore.new [ :host => "localhost", :port => "6380", :db => "1" ]
     dmr.ring.nodes.size == 1
     mr = dmr.ring.nodes.first
-    mr.to_s.should == "Redis Client connected to localhost:6380 against DB 1"
+    mr.to_s.must_equal("Redis Client connected to localhost:6380 against DB 1")
   end
 
-  it "should force reconnection" do
+  it "forces reconnection" do
     @dmr.nodes.each do |node|
-      node.should_receive(:reconnect)
+      node.expects(:reconnect)
     end
 
     @dmr.reconnect
   end
 
-  it "should set an object" do
+  it "sets an object" do
     @dmr.set "rabbit", @white_rabbit
-    @dmr.get("rabbit").should == @white_rabbit
+    @dmr.get("rabbit").must_equal(@white_rabbit)
   end
 
-  it "should get an object" do
-    @dmr.get("rabbit").should == @rabbit
+  it "gets an object" do
+    @dmr.get("rabbit").must_equal(@rabbit)
   end
 
   describe "namespace" do
-    before :each do
+    it "uses namespaced key" do
       @dmr = Redis::DistributedStore.new [
         {:host => "localhost", :port => "6380", :db => 0},
         {:host => "localhost", :port => "6381", :db => 0}
       ], :namespace => "theplaylist"
-    end
 
-    it "should use namespaced key" do
-      @dmr.should_receive(:node_for).with("theplaylist:rabbit").and_return @dmr.nodes.first
+      @dmr.expects(:node_for).with("theplaylist:rabbit").returns(@dmr.nodes.first)
       @dmr.get "rabbit"
     end
   end