redis 0.1 → 0.1.1

data/Rakefile

@@ -8,7 +8,7 @@ require 'tasks/redis.tasks'
 
 GEM = 'redis'
 GEM_NAME = 'redis'
-GEM_VERSION = '0.1'
+GEM_VERSION = '0.1.1'
 AUTHORS = ['Ezra Zygmuntowicz', 'Taylor Weibley', 'Matthew Clark', 'Brian McKinney', 'Salvatore Sanfilippo', 'Luca Guidi']
 EMAIL = "ez@engineyard.com"
 HOMEPAGE = "http://github.com/ezmobius/redis-rb"

data/lib/pipeline.rb

@@ -1,5 +1,3 @@
-require "redis"
-
 class Redis
   class Pipeline < Redis
     BUFFER_SIZE = 50_000

data/lib/redis.rb

@@ -31,14 +31,18 @@ class Redis
     "sadd"      => true,
     "srem"      => true,
     "sismember" => true,
+    "rpoplpush" => true,
     "echo"      => true,
     "getset"    => true,
-    "smove"     => true
+    "smove"     => true,
+    "zadd"      => true,
+    "zrem"      => true,
+    "zscore"    => true
   }
-
+  
   MULTI_BULK_COMMANDS = {
-    "mset"   => true,
-    "msetnx" => true
+    "mset"      => true,
+    "msetnx"    => true
   }
 
   BOOLEAN_PROCESSOR = lambda{|r| r == 1 }
@@ -49,6 +53,8 @@ class Redis
     "sadd"      => BOOLEAN_PROCESSOR,
     "srem"      => BOOLEAN_PROCESSOR,
     "smove"     => BOOLEAN_PROCESSOR,
+    "zadd"      => BOOLEAN_PROCESSOR,
+    "zrem"      => BOOLEAN_PROCESSOR,
     "move"      => BOOLEAN_PROCESSOR,
     "setnx"     => BOOLEAN_PROCESSOR,
     "del"       => BOOLEAN_PROCESSOR,
@@ -97,7 +103,14 @@ class Redis
     "set_move"             => "smove",
     "set_unless_exists"    => "setnx",
     "rename_unless_exists" => "renamenx",
-    "type?"                => "type"
+    "type?"                => "type",
+    "zset_add"             => "zadd",
+    "zset_count"           => 'zcard',
+    "zset_range_by_score"  => 'zrangebyscore',
+    "zset_reverse_range"   => 'zrevrange',
+    "zset_range"           => 'zrange',
+    "zset_delete"          => 'zrem',
+    "zset_score"           => 'zscore'
   }
 
   DISABLED_COMMANDS = {
@@ -155,8 +168,13 @@ class Redis
       secs   = Integer(timeout)
       usecs  = Integer((timeout - secs) * 1_000_000)
       optval = [secs, usecs].pack("l_2")
-      sock.setsockopt Socket::SOL_SOCKET, Socket::SO_RCVTIMEO, optval
-      sock.setsockopt Socket::SOL_SOCKET, Socket::SO_SNDTIMEO, optval
+      begin
+        sock.setsockopt Socket::SOL_SOCKET, Socket::SO_RCVTIMEO, optval
+        sock.setsockopt Socket::SOL_SOCKET, Socket::SO_SNDTIMEO, optval
+      rescue Exception => ex
+        # Solaris, for one, does not like/support socket timeouts.
+        @logger.info "Unable to use raw socket timeouts: #{ex.class.name}: #{ex.message}" if @logger
+      end
     end
     sock
   end

data/spec/redis_spec.rb

@@ -275,6 +275,22 @@ describe "redis" do
     @r.lrem('list', 1, 'hello').should == 1
     @r.lrange('list', 0, -1).should == ['goodbye']
   end
+
+  it "should be able to pop values from a list and push them onto a temp list(RPOPLPUSH)" do
+    @r.rpush "list", 'one'
+    @r.rpush "list", 'two'
+    @r.rpush "list", 'three'
+    @r.type('list').should == "list"
+    @r.llen('list').should == 3
+    @r.lrange('list',0,-1).should == ['one', 'two', 'three']
+    @r.lrange('tmp',0,-1).should == []
+    @r.rpoplpush('list', 'tmp').should == 'three'
+    @r.lrange('tmp',0,-1).should == ['three']
+    @r.rpoplpush('list', 'tmp').should == 'two'
+    @r.lrange('tmp',0,-1).should == ['two', 'three']
+    @r.rpoplpush('list', 'tmp').should == 'one'
+    @r.lrange('tmp',0,-1).should == ['one','two','three']
+  end
   #
   it "should be able add members to a set (SADD)" do
     @r.sadd "set", 'key1'
@@ -415,6 +431,103 @@ describe "redis" do
     @r.sort('dogs', :get => ['dog:*:name', 'dog:*:breed'], :limit => [0,1], :order => 'desc alpha').should == ['taj', 'terrier']
   end
   #
+  it "should be able count the members of a zset" do
+    @r.set_add "set", 'key1'
+    @r.set_add "set", 'key2'
+    @r.zset_add 'zset', 1, 'set'
+    @r.zset_count('zset').should == 1
+    @r.delete('set')
+    @r.delete('zset')
+  end
+  # 
+  it "should be able add members to a zset" do
+    @r.set_add "set", 'key1'
+    @r.set_add "set", 'key2'
+    @r.zset_add 'zset', 1, 'set'
+    @r.zset_range('zset', 0, 1).should == ['set']
+    @r.zset_count('zset').should == 1
+    @r.delete('set')
+    @r.delete('zset')
+  end
+  # 
+  it "should be able delete members to a zset" do
+    @r.set_add "set", 'key1'
+    @r.set_add "set", 'key2'
+    @r.type?('set').should == "set"
+    @r.set_add "set2", 'key3'
+    @r.set_add "set2", 'key4'
+    @r.type?('set2').should == "set"
+    @r.zset_add 'zset', 1, 'set'
+    @r.zset_count('zset').should == 1
+    @r.zset_add 'zset', 2, 'set2'
+    @r.zset_count('zset').should == 2
+    @r.zset_delete 'zset', 'set'
+    @r.zset_count('zset').should == 1
+    @r.delete('set')
+    @r.delete('set2')
+    @r.delete('zset')
+  end
+  # 
+  it "should be able to get a range of values from a zset" do
+    @r.set_add "set", 'key1'
+    @r.set_add "set", 'key2'
+    @r.set_add "set2", 'key3'
+    @r.set_add "set2", 'key4'
+    @r.set_add "set3", 'key1'
+    @r.type?('set').should == 'set'
+    @r.type?('set2').should == 'set'
+    @r.type?('set3').should == 'set'
+    @r.zset_add 'zset', 1, 'set'
+    @r.zset_add 'zset', 2, 'set2'
+    @r.zset_add 'zset', 3, 'set3'
+    @r.zset_count('zset').should == 3
+    @r.zset_range('zset', 0, 3).should == ['set', 'set2', 'set3']
+    @r.delete('set')
+    @r.delete('set2')
+    @r.delete('set3')
+    @r.delete('zset')
+  end
+  # 
+  it "should be able to get a reverse range of values from a zset" do
+    @r.set_add "set", 'key1'
+    @r.set_add "set", 'key2'
+    @r.set_add "set2", 'key3'
+    @r.set_add "set2", 'key4'
+    @r.set_add "set3", 'key1'
+    @r.type?('set').should == 'set'
+    @r.type?('set2').should == 'set'
+    @r.type?('set3').should == 'set'
+    @r.zset_add 'zset', 1, 'set'
+    @r.zset_add 'zset', 2, 'set2'
+    @r.zset_add 'zset', 3, 'set3'
+    @r.zset_count('zset').should == 3
+    @r.zset_reverse_range('zset', 0, 3).should == ['set3', 'set2', 'set']
+    @r.delete('set')
+    @r.delete('set2')
+    @r.delete('set3')
+    @r.delete('zset')
+  end
+  # 
+  it "should be able to get a range by score of values from a zset" do
+    @r.set_add "set", 'key1'
+    @r.set_add "set", 'key2'
+    @r.set_add "set2", 'key3'
+    @r.set_add "set2", 'key4'
+    @r.set_add "set3", 'key1'
+    @r.set_add "set4", 'key4'
+    @r.zset_add 'zset', 1, 'set'
+    @r.zset_add 'zset', 2, 'set2'
+    @r.zset_add 'zset', 3, 'set3'
+    @r.zset_add 'zset', 4, 'set4'
+    @r.zset_count('zset').should == 4
+    @r.zset_range_by_score('zset', 2, 3).should == ['set2', 'set3']
+    @r.delete('set')
+    @r.delete('set2')
+    @r.delete('set3')
+    @r.delete('set4')
+    @r.delete('zset')
+  end
+  
   it "should provide info (INFO)" do
     [:last_save_time, :redis_version, :total_connections_received, :connected_clients, :total_commands_processed, :connected_slaves, :uptime_in_seconds, :used_memory, :uptime_in_days, :changes_since_last_save].each do |x|
     @r.info.keys.should include(x)

data/tasks/redis.tasks.rb

@@ -93,7 +93,11 @@ namespace :redis do
   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)
-    sh "cd #{RedisRunner.redisdir} && git pull" if File.exists?("#{RedisRunner.redisdir}/.git")
+
+    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"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: redis
 version: !ruby/object:Gem::Version 
-  version: "0.1"
+  version: 0.1.1
 platform: ruby
 authors: 
 - Ezra Zygmuntowicz
@@ -14,7 +14,7 @@ autorequire: redis
 bindir: bin
 cert_chain: []
 
-date: 2009-10-28 00:00:00 -07:00
+date: 2009-12-03 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency