redis-store 0.3.8 → 0.3.9

data/Gemfile.lock

@@ -0,0 +1,181 @@
+GEM
+  remote: http://rubygems.org/
+  specs:
+    ParseTree (3.0.5)
+      RubyInline (>= 3.7.0)
+      sexp_processor (>= 3.0.0)
+    RubyInline (3.8.4)
+      ZenTest
+    ZenTest (4.3.3)
+    abstract (1.0.0)
+    actionpack (2.3.5)
+      activesupport (= 2.3.5)
+      rack (~> 1.0.0)
+    activesupport (2.3.5)
+    addressable (2.1.2)
+    bcrypt-ruby (2.1.2)
+    columnize (0.3.1)
+    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)
+    gemcutter (0.6.1)
+    git (1.2.5)
+    haml (3.0.15)
+    highline (1.6.1)
+    jeweler (1.4.0)
+      gemcutter (>= 0.1.0)
+      git (>= 1.2.5)
+      rubyforge (>= 2.0.0)
+    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.0.0)
+    rack-cache (0.5.2)
+      rack (>= 0.4)
+    rake (0.8.7)
+    randexp (0.1.5)
+      ParseTree
+    redis (1.0.5)
+    rspec (1.3.0)
+    ruby-debug (0.10.3)
+      columnize (>= 0.1)
+      ruby-debug-base (~> 0.10.3.0)
+    ruby-debug-base (0.10.3)
+      linecache (>= 0.3)
+    ruby2ruby (1.2.4)
+      ruby_parser (~> 2.0)
+      sexp_processor (~> 3.0)
+    ruby_parser (2.0.4)
+      sexp_processor (~> 3.0)
+    rubyforge (2.0.4)
+      json_pure (>= 1.1.7)
+    sexp_processor (3.0.4)
+    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.5)
+  activesupport (= 2.3.5)
+  git
+  jeweler
+  merb
+  rack (= 1.0.0)
+  rack-cache
+  redis (= 1.0.5)
+  rspec
+  ruby-debug

data/MIT-LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2009 Luca Guidi
+Copyright (c) 2009-2010 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

@@ -4,15 +4,15 @@
 
 Download and install Redis from [http://code.google.com/p/redis/](http://code.google.com/p/redis/)
 
-    curl -OL http://redis.googlecode.com/files/redis-1.02.tar.gz
-    tar -zxvf redis-1.02.tar.gz
-    mv redis-1.02 redis
+    curl -OL http://redis.googlecode.com/files/redis-1.2.5.tar.gz
+    tar -zxvf redis-1.2.5.tar.gz
+    mv redis-1.2.5 redis
     cd redis
     make
 
 Install the gems
 
-    sudo gem install redis-rb redis-store
+    sudo gem install redis redis-store
 
 ## Cache store
 
@@ -26,7 +26,7 @@ Provides a cache store for your Ruby web framework of choice.
 
 ### Merb
 
-    dependency "redis-store", "0.3.7"
+    dependency "redis-store", "0.3.9"
     dependency("merb-cache", merb_gems_version) do
       Merb::Cache.setup do
         register(:redis, Merb::Cache::RedisStore, :servers => ["127.0.0.1:6379"])
@@ -58,12 +58,12 @@ Provides a Redis store for Rack::Session. See [http://rack.rubyforge.org/doc/Rac
 
 ### Rails
 
-    config.gem "redis-store", :source => "http://gemcutter.org", :lib => "redis-store"
-    ActionController::Base.session_store = Rack::Session::Redis
+    config.gem "redis-store"
+    ActionController::Base.session_store = :redis_session_store
 
 ### Merb
 
-    dependency "redis-store", "0.3.7"
+    dependency "redis-store", "0.3.9"
     Merb::Config.use do |c|
       c[:session_store] = "redis"
     end
@@ -103,13 +103,13 @@ Provides a Redis store for HTTP caching. See [http://github.com/rtomayko/rack-ca
     gem install jeweler bundler
     git clone git://github.com/jodosha/redis-store.git
     cd redis-store
-    gem bundle
+    bundle install
     rake dtach:install
     rake redis:install
     rake
 
-If you are on **Snow Leopard** you have to run `env ARCHFLAGS="-arch x86_64" gem bundle`
+If you are on **Snow Leopard** you have to run `env ARCHFLAGS="-arch x86_64" bundle install`
 
 ## Copyright
 
-(c) 2009 Luca Guidi - [http://lucaguidi.com](http://lucaguidi.com), released under the MIT license
+(c) 2010 Luca Guidi - [http://lucaguidi.com](http://lucaguidi.com), released under the MIT license

data/VERSION

@@ -1 +1 @@
-0.3.8
+0.3.9

data/lib/redis/distributed_marshaled.rb

@@ -13,6 +13,6 @@ class Redis
       ring.nodes
     end
 
-    alias_method :flushdb, :delete_cloud!
+    alias_method :flushdb, :delete_cloud! if respond_to?(:delete_cloud!)
   end
 end

data/redis-store.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{redis-store}
-  s.version = "0.3.8"
+  s.version = "0.3.9"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Luca Guidi"]
-  s.date = %q{2010-05-21}
+  s.date = %q{2010-08-06}
   s.description = %q{Rack::Session, Rack::Cache and cache Redis stores for Ruby web frameworks.}
   s.email = %q{guidi.luca@gmail.com}
   s.extra_rdoc_files = [
@@ -18,6 +18,7 @@ Gem::Specification.new do |s|
   s.files = [
     ".gitignore",
      "Gemfile",
+     "Gemfile.lock",
      "MIT-LICENSE",
      "README.md",
      "Rakefile",

data/tasks/redis.tasks.rb

@@ -1,25 +1,44 @@
-# steal the cool tasks from redis-rb
-require 'rbconfig'
-require "rubygems"
-require "bundler"
-Bundler.setup
-redis_path = $:.
-  find {|path| path =~ /redis-/ }.
-  split("/").
-  tap do |array|
-    array.replace(
-      array[0..array.index(array.find {|segment| segment =~ /redis-/})]
-    )
-  end.
-  join("/")
-
-load "#{redis_path}/tasks/redis.tasks.rb"
+# inspired by old Rake tasks from redis-rb
+require 'rake'
+require 'fileutils'
+require 'open-uri'
 
 class RedisRunner
   def self.port
     6379
   end
 
+  def self.redisdir
+    @@redisdir ||= File.expand_path File.join(File.dirname(__FILE__), '..', 'vendor', 'redis')
+  end
+
+  def self.redisconfdir
+    '/etc/redis.conf'
+  end
+
+  def self.dtach_socket
+    '/tmp/redis.dtach'
+  end
+
+  # Just check for existance of dtach socket
+  def self.running?
+    File.exists? dtach_socket
+  end
+
+  def self.start
+    puts 'Detach with Ctrl+\  Re-attach with rake redis:attach'
+    sleep 3
+    exec "dtach -A #{dtach_socket} redis-server #{redisconfdir}"
+  end
+
+  def self.start_detached
+    system "dtach -n #{dtach_socket} redis-server #{redisconfdir}"
+  end
+
+  def self.attach
+    exec "dtach -a #{dtach_socket}"
+  end
+
   def self.stop
     system %(echo "SHUTDOWN" | nc localhost #{port})
   end
@@ -76,3 +95,126 @@ class RedisClusterRunner
     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 'Start redis'
+  task :start do
+    RedisRunner.start
+  end
+
+  desc 'Stop redis'
+  task :stop do
+    RedisRunner.stop
+  end
+
+  desc 'Restart redis'
+  task :restart do
+    RedisRunner.stop
+    RedisRunner.start
+  end
+
+  desc 'Attach to redis dtach socket'
+  task :attach do
+    RedisRunner.attach
+  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.2.6": "570e43c8285a4e5e3f31"
+    end
+
+    arguments = commit.nil? ? "pull origin master" : "reset --hard #{commit}"
+    sh "cd #{RedisRunner.redisdir} && git #{arguments}"
+  end
+
+  desc "Open an IRb session"
+  task :console do
+    RedisRunner.start_detached
+    system "bundle exec irb -I lib -I extra -r redis-store.rb"
+    RedisRunner.stop
+  end
+
+  namespace :cluster do
+    desc "Starts the redis_cluster"
+    task :start do
+      result = RedisClusterRunner.start_detached
+      raise("Could not start redis-server, aborting.") unless result
+    end
+
+    desc "Stops the redis_cluster"
+    task :stop do
+      RedisClusterRunner.stop
+    end
+  end  
+end
+
+namespace :dtach do
+  desc 'About dtach'
+  task :about do
+    puts "\nSee http://dtach.sourceforge.net/ for information about dtach.\n\n"
+  end
+
+  desc 'Install dtach 0.8 from source'
+  task :install => [:about] do
+
+    Dir.chdir('/tmp/')
+    unless File.exists?('/tmp/dtach-0.8.tar.gz')
+      require 'net/http'
+
+      url = 'http://downloads.sourceforge.net/project/dtach/dtach/0.8/dtach-0.8.tar.gz'
+      open('/tmp/dtach-0.8.tar.gz', 'wb') do |file| file.write(open(url).read) end
+    end
+
+    unless File.directory?('/tmp/dtach-0.8')
+      system('tar xzf dtach-0.8.tar.gz')
+    end
+
+    Dir.chdir('/tmp/dtach-0.8/')
+    sh 'cd /tmp/dtach-0.8/ && ./configure && make'
+    sh 'sudo cp /tmp/dtach-0.8/dtach /usr/bin/'
+
+    puts 'Dtach successfully installed to /usr/bin.'
+  end
+end
+
+def invoke_with_redis_cluster(task_name)
+  begin
+    Rake::Task["redis:cluster:start"].invoke
+    Rake::Task[task_name].invoke
+  ensure
+    Rake::Task["redis:cluster:stop"].invoke
+  end
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: redis-store
 version: !ruby/object:Gem::Version 
-  hash: 3
+  hash: 1
   prerelease: false
   segments: 
   - 0
   - 3
-  - 8
-  version: 0.3.8
+  - 9
+  version: 0.3.9
 platform: ruby
 authors: 
 - Luca Guidi
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-21 00:00:00 +02:00
+date: 2010-08-06 00:00:00 +02:00
 default_executable: 
 dependencies: []
 
@@ -30,6 +30,7 @@ extra_rdoc_files:
 files: 
 - .gitignore
 - Gemfile
+- Gemfile.lock
 - MIT-LICENSE
 - README.md
 - Rakefile