redis 2.0.0.rc3 → 2.0.0

data/Rakefile

@@ -1,7 +1,6 @@
 require 'rubygems'
 require 'rake/gempackagetask'
 require 'rake/testtask'
-require 'tasks/redis.tasks'
 
 $:.unshift File.join(File.dirname(__FILE__), 'lib')
 require 'redis'
@@ -9,7 +8,7 @@ require 'redis'
 GEM = 'redis'
 GEM_NAME = 'redis'
 GEM_VERSION = Redis::VERSION
-AUTHORS = ['Ezra Zygmuntowicz', 'Taylor Weibley', 'Matthew Clark', 'Brian McKinney', 'Salvatore Sanfilippo', 'Luca Guidi']
+AUTHORS = ['Ezra Zygmuntowicz', 'Taylor Weibley', 'Matthew Clark', 'Brian McKinney', 'Salvatore Sanfilippo', 'Luca Guidi', 'Michel Martens', 'Damian Janowski']
 EMAIL = "ez@engineyard.com"
 HOMEPAGE = "http://github.com/ezmobius/redis-rb"
 SUMMARY = "Ruby client library for Redis, the key value storage server"
@@ -64,7 +63,7 @@ end
 
 desc "install the gem locally"
 task :install => [:package] do
-  sh %{sudo gem install pkg/#{GEM}-#{GEM_VERSION}}
+  sh %{gem install pkg/#{GEM}-#{GEM_VERSION}}
 end
 
 desc "create a gemspec file"

data/lib/redis.rb

@@ -1,7 +1,7 @@
 require 'socket'
 
 class Redis
-  VERSION = "2.0.0.rc3"
+  VERSION = "2.0.0"
 
   class ProtocolError < RuntimeError
     def initialize(reply_type)
@@ -69,6 +69,14 @@ class Redis
     @client.call(:mget, *keys)
   end
 
+  def append(key, value)
+    @client.call(:append, key, value)
+  end
+
+  def substr(key, start, stop)
+    @client.call(:substr, key, start, stop)
+  end
+
   def hgetall(key)
     Hash[*@client.call(:hgetall, key)]
   end
@@ -225,6 +233,14 @@ class Redis
     _bool @client.call(:zadd, key, score, member)
   end
 
+  def zrank(key, member)
+    @client.call(:zrank, key, member)
+  end
+
+  def zrevrank(key, member)
+    @client.call(:zrevrank, key, member)
+  end
+
   def zincrby(key, increment, member)
     @client.call(:zincrby, key, increment, member)
   end
@@ -263,7 +279,7 @@ class Redis
   end
 
   def zremrangebyrank(key, start, stop)
-    @client.call(:zremrangebyscore, key, start, stop)
+    @client.call(:zremrangebyrank, key, start, stop)
   end
 
   def zscore(key, member)
@@ -274,12 +290,22 @@ class Redis
     _bool @client.call(:zrem, key, member)
   end
 
-  def zinter(destination, keys)
-    @client.call(:zinter, destination, keys.size, *keys)
+  def zinterstore(destination, keys, options = {})
+    command = CommandOptions.new(options) do |c|
+      c.splat :weights
+      c.value :aggregate
+    end
+
+    @client.call(:zinterstore, destination, keys.size, *(keys + command.to_a))
   end
 
-  def zunion(destination, keys)
-    @client.call(:zunion, destination, keys.size, *keys)
+  def zunionstore(destination, keys, options = {})
+    command = CommandOptions.new(options) do |c|
+      c.splat :weights
+      c.value :aggregate
+    end
+
+    @client.call(:zunionstore, destination, keys.size, *(keys + command.to_a))
   end
 
   def move(key, db)
@@ -322,6 +348,10 @@ class Redis
     @client.call(:hmset, key, *attrs)
   end
 
+  def mapped_hmset(key, hash)
+    hmset(key, *hash.to_a.flatten)
+  end
+
   def hlen(key)
     @client.call(:hlen, key)
   end
@@ -330,6 +360,10 @@ class Redis
     @client.call(:hvals, key)
   end
 
+  def hincrby(key, field, increment)
+    @client.call(:hincrby, key, field, increment)
+  end
+
   def discard
     @client.call(:discard)
   end
@@ -338,8 +372,8 @@ class Redis
     _bool @client.call(:hexists, key, field)
   end
 
-  def monitor
-    raise NotImplementedError
+  def monitor(&block)
+    @client.call_loop(:monitor, &block)
   end
 
   def [](key)
@@ -439,11 +473,12 @@ class Redis
 
     begin
       yield(self)
-      exec
     rescue Exception => e
       discard
       raise e
     end
+
+    exec
   end
 
   def publish(channel, message)

data/lib/redis/distributed.rb

@@ -126,6 +126,14 @@ class Redis
       get(key)
     end
 
+    def append(key, value)
+      node_for(key).append(key, value)
+    end
+
+    def substr(key, start, stop)
+      node_for(key).substr(key, start, stop)
+    end
+
     def []=(key,value)
       set(key, value)
     end
@@ -346,15 +354,15 @@ class Redis
       node_for(key).zscore(key, member)
     end
 
-    def zinter(destination, keys)
-      ensure_same_node(:zinter, destination, *keys) do |node|
-        node.zinter(destination, keys)
+    def zinterstore(destination, keys, options = {})
+      ensure_same_node(:zinterstore, destination, *keys) do |node|
+        node.zinterstore(destination, keys, options)
       end
     end
 
-    def zunion(destination, keys)
-      ensure_same_node(:zunion, destination, *keys) do |node|
-        node.zunion(destination, keys)
+    def zunionstore(destination, keys, options = {})
+      ensure_same_node(:zunionstore, destination, *keys) do |node|
+        node.zunionstore(destination, keys, options)
       end
     end
 
@@ -394,6 +402,10 @@ class Redis
       node_for(key).hmset(key, *attrs)
     end
 
+    def hincrby(key, field, increment)
+      node_for(key).hincrby(key, field, increment)
+    end
+
     def sort(key, options = {})
       keys = [key, options[:by], options[:store], *Array(options[:get])].compact
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: redis
 version: !ruby/object:Gem::Version 
-  prerelease: true
+  hash: 15
+  prerelease: false
   segments: 
   - 2
   - 0
   - 0
-  - rc3
-  version: 2.0.0.rc3
+  version: 2.0.0
 platform: ruby
 authors: 
 - Ezra Zygmuntowicz
@@ -16,11 +16,13 @@ authors:
 - Brian McKinney
 - Salvatore Sanfilippo
 - Luca Guidi
+- Michel Martens
+- Damian Janowski
 autorequire: redis
 bindir: bin
 cert_chain: []
 
-date: 2010-05-06 00:00:00 -03:00
+date: 2010-05-14 00:00:00 -03:00
 default_executable: 
 dependencies: []
 
@@ -36,16 +38,13 @@ files:
 - LICENSE
 - README.markdown
 - Rakefile
-- lib/edis.rb
 - lib/redis/client.rb
 - lib/redis/compat.rb
 - lib/redis/distributed.rb
 - lib/redis/hash_ring.rb
 - lib/redis/pipeline.rb
-- lib/redis/raketasks.rb
 - lib/redis/subscribe.rb
 - lib/redis.rb
-- tasks/redis.tasks.rb
 has_rdoc: true
 homepage: http://github.com/ezmobius/redis-rb
 licenses: []
@@ -56,25 +55,27 @@ rdoc_options: []
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
-      - 1
-      - 3
-      - 1
-      version: 1.3.1
+      - 0
+      version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Ruby client library for Redis, the key value storage server

data/lib/edis.rb

@@ -1,3 +0,0 @@
-# This file allows for the running of redis-rb with a nice
-# command line look-and-feel: irb -rubygems -redis foo.rb
-require 'redis'

data/lib/redis/raketasks.rb

@@ -1 +0,0 @@
-require File.dirname(__FILE__) + "/../../tasks/redis.tasks"

data/tasks/redis.tasks.rb

@@ -1,140 +0,0 @@
-# Inspired by rabbitmq.rake the Redbox project at http://github.com/rick/redbox/tree/master
-require 'rake'
-require 'fileutils'
-require 'open-uri'
-
-class RedisRunner
-  
-  def self.redisdir
-    "/tmp/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 6379'
-  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|
-      sh "sudo cp /tmp/redis/#{bin} /usr/bin/"
-    end
-
-    puts "Installed redis-benchmark, redis-cli and redis-server to /usr/bin/"
-        
-    unless File.exists?('/etc/redis.conf')
-      sh 'sudo cp /tmp/redis/redis.conf /etc/'
-      puts "Installed redis.conf to /etc/ \n You should look at this file!"
-    end  
-  end
-  
-  task :make do
-    sh "cd #{RedisRunner.redisdir} && make clean"
-    sh "cd #{RedisRunner.redisdir} && make"
-  end
-  
-  desc "Download package"
-  task :download do
-    sh 'rm -rf /tmp/redis/' if File.exists?("#{RedisRunner.redisdir}/.svn")
-    sh 'git clone git://github.com/antirez/redis.git /tmp/redis' unless File.exists?(RedisRunner.redisdir)
-
-    if File.exists?("#{RedisRunner.redisdir}/.git")
-      arguments = ENV['COMMIT'].nil? ? "pull" : "reset --hard #{ENV['COMMIT']}"
-      sh "cd #{RedisRunner.redisdir} && git #{arguments}"
-    end
-  end    
-
-  desc "Open an IRb session"
-  task :console do
-    RedisRunner.start_detached
-    system "irb -I lib -I extra -r redis.rb"
-    RedisRunner.stop
-  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
-