redis 2.2.2 → 3.0.0.rc1

data/test/lint/strings.rb

@@ -1,3 +1,7 @@
+require File.expand_path("../redis_mock", File.dirname(__FILE__))
+
+include RedisMock::Helper
+
 test "SET and GET" do |r|
   r.set("foo", "s1")
 
@@ -33,14 +37,12 @@ test "SET and GET with ASCII characters" do |r|
   end
 end if defined?(Encoding)
 
-test "SETEX" do |r|
-  r.setex("foo", 1, "s1")
-
-  assert "s1" == r.get("foo")
-
-  sleep 2
+test "SETEX" do
+  redis_mock(:setex => lambda { |*args| "+#{args.join(" ")}" }) do
+    r = Redis.new(OPTIONS.merge(:port => 6380))
 
-  assert nil == r.get("foo")
+    assert_equal "foo 1 s1", r.setex("foo", 1, "s1")
+  end
 end
 
 test "GETSET" do |r|
@@ -95,12 +97,6 @@ test "APPEND" do |r|
   assert "s1" == r.get("foo")
 end
 
-test "SUBSTR" do |r|
-  r.set "foo", "lorem"
-
-  assert "ore" == r.substr("foo", 1, 3)
-end
-
 test "GETBIT" do |r|
   r.set("foo", "a")
 

data/test/lint/value_types.rb

@@ -1,3 +1,7 @@
+require File.expand_path("../redis_mock", File.dirname(__FILE__))
+
+include RedisMock::Helper
+
 test "EXISTS" do |r|
   assert false == r.exists("foo")
 
@@ -23,25 +27,19 @@ test "KEYS" do |r|
 end
 
 test "EXPIRE" do |r|
-  r.set("foo", "s1")
-  r.expire("foo", 1)
-
-  assert "s1" == r.get("foo")
-
-  sleep 2
+  redis_mock(:expire => lambda { |*args| args == ["foo", "1"] ? ":1" : ":0" }) do
+    r = Redis.new(OPTIONS.merge(:port => 6380))
 
-  assert nil == r.get("foo")
+    assert r.expire("foo", 1)
+  end
 end
 
 test "EXPIREAT" do |r|
-  r.set("foo", "s1")
-  r.expireat("foo", Time.now.to_i + 1)
-
-  assert "s1" == r.get("foo")
+  redis_mock(:expireat => lambda { |*args| args == ["foo", "1328236326"] ? ":1" : ":0" }) do
+    r = Redis.new(OPTIONS.merge(:port => 6380))
 
-  sleep 2
-
-  assert nil == r.get("foo")
+    assert r.expireat("foo", 1328236326)
+  end
 end
 
 test "PERSIST" do |r|
@@ -81,4 +79,3 @@ test "MOVE" do |r|
   assert "s1" == r.get("foo")
   assert "s3" == r.get("bar")
 end
-

data/test/persistence_control_commands_test.rb

@@ -19,4 +19,3 @@ end
 test "LASTSAVE" do |r|
   assert Time.at(r.lastsave) <= Time.now
 end
-

data/test/pipelining_commands_test.rb

@@ -76,6 +76,69 @@ test "Returning the result of a pipeline" do |r|
   assert ["OK", "bar", nil] == result
 end
 
+test "Assignment of results inside the block" do |r|
+  r.pipelined do
+    @first = r.sadd("foo", 1)
+    @second = r.sadd("foo", 1)
+  end
+
+  assert_equal true, @first.value
+  assert_equal false, @second.value
+end
+
+# Although we could support accessing the values in these futures,
+# it doesn't make a lot of sense.
+test "Assignment of results inside the block with errors" do |r|
+  assert_raise do
+    r.pipelined do
+      r.doesnt_exist
+      @first = r.sadd("foo", 1)
+      r.doesnt_exist
+      @second = r.sadd("foo", 1)
+      r.doesnt_exist
+    end
+  end
+
+  assert_raise(Redis::FutureNotReady) { @first.value }
+  assert_raise(Redis::FutureNotReady) { @second.value }
+end
+
+test "Assignment of results inside a nested block" do |r|
+  r.pipelined do
+    @first = r.sadd("foo", 1)
+
+    r.pipelined do
+      @second = r.sadd("foo", 1)
+    end
+  end
+
+  assert_equal true, @first.value
+  assert_equal false, @second.value
+end
+
+test "Futures raise when confused with something else" do |r|
+  r.pipelined do
+    @result = r.sadd("foo", 1)
+  end
+
+  assert_raise(NoMethodError) { @result.to_s }
+end
+
+test "Futures raise when trying to access their values too early" do |r|
+  r.pipelined do
+    assert_raise(Redis::FutureNotReady) do
+      r.sadd("foo", 1).value
+    end
+  end
+end
+
+test "Returning the result of an empty pipeline" do |r|
+  result = r.pipelined do
+  end
+
+  assert [] == result
+end
+
 test "Nesting pipeline blocks" do |r|
   r.pipelined do
     r.set("foo", "s1")
@@ -88,29 +151,29 @@ test "Nesting pipeline blocks" do |r|
   assert "s2" == r.get("bar")
 end
 
-test "INFO in a pipeline" do |r|
+test "INFO in a pipeline returns hash" do |r|
   result = r.pipelined do
     r.info
   end
 
-  assert result.first.kind_of?(String)
+  assert result.first.kind_of?(Hash)
 end
 
-test "CONFIG GET in a pipeline" do |r|
+test "CONFIG GET in a pipeline returns hash" do |r|
   result = r.pipelined do
     r.config(:get, "*")
   end
 
-  assert result.first.kind_of?(Array)
+  assert result.first.kind_of?(Hash)
 end
 
-test "HGETALL in a pipeline should not return hash" do |r|
+test "HGETALL in a pipeline returns hash" do |r|
   r.hmset("hash", "field", "value")
   result = r.pipelined do
     r.hgetall("hash")
   end
 
-  assert ["field", "value"] == result.first
+  assert result.first == { "field" => "value" }
 end
 
 test "KEYS in a pipeline" do |r|

data/test/publish_subscribe_test.rb

@@ -112,7 +112,7 @@ test "SUBSCRIBE within SUBSCRIBE" do |r|
 end
 
 test "other commands within a SUBSCRIBE" do |r|
-  assert_raise RuntimeError do
+  assert_raise Redis::CommandError do
     r.subscribe("foo") do |on|
       on.subscribe do |channel, total|
         r.set("bar", "s2")

data/test/redis_mock.rb

@@ -10,9 +10,10 @@ module RedisMock
       @thread = Thread.new { run(&block) }
     end
 
-    # This raises an exception in the thread calling @server.accept which
-    # in turn will cause the thread to terminate.
+    # Bail out of @server.accept before closing the socket. This is required
+    # to avoid EADDRINUSE after a couple of iterations.
     def shutdown
+      @thread.terminate if @thread
       @server.close if @server
     rescue => ex
       $stderr.puts "Error closing mock server: #{ex.message}" if VERBOSE
@@ -34,12 +35,18 @@ module RedisMock
 
             response = yield(*parts)
 
-            if response.nil?
+            # Convert a nil response to :close
+            response ||= :close
+
+            if response == :exit
+              session.shutdown(Socket::SHUT_RDWR)
+              return # exit server body
+            elsif response == :close
               session.shutdown(Socket::SHUT_RDWR)
-              break
+              break # exit connection body
             else
               session.write(response)
-              session.write("\r\n")
+              session.write("\r\n") unless response.end_with?("\r\n")
             end
           end
         rescue Errno::ECONNRESET
@@ -49,6 +56,8 @@ module RedisMock
     rescue => ex
       $stderr.puts "Error running mock server: #{ex.message}" if VERBOSE
       $stderr.puts ex.backtrace if VERBOSE
+    ensure
+      @server.close
     end
   end
 

data/test/remote_server_control_commands_test.rb

@@ -16,8 +16,8 @@ test "INFO" do |r|
 end
 
 test "INFO COMMANDSTATS" do |r|
-  # Only available on Redis >= 2.3.0
-  next if r.info["redis_version"] < "2.3.0"
+  # Only available on Redis >= 2.9.0
+  next if version(r) < 209000
 
   r.config(:resetstat)
   r.ping
@@ -80,3 +80,9 @@ test "SYNC" do |r|
     assert "OK" == redis.sync
   end
 end
+
+test "SLOWLOG" do |r|
+  r.slowlog(:reset)
+  result = r.slowlog(:len)
+  assert result == 0
+end

data/test/sorting_test.rb

@@ -41,4 +41,3 @@ test "SORT with STORE" do |r|
   r.sort("bar", :get => "foo:*", :store => "baz")
   assert ["s1", "s2"] == r.lrange("baz", 0, -1)
 end
-

data/test/test.conf

@@ -1,6 +1,7 @@
 dir ./test/db
 pidfile ./redis.pid
 port 6379
+unixsocket /tmp/redis.sock
 timeout 300
 loglevel debug
 logfile stdout

data/test/transactions_test.rb

@@ -23,7 +23,61 @@ test "MULTI/EXEC with a block" do |r|
   end
 
   assert "s1" == r.get("foo")
+end
+
+test "MULTI/EXEC with a block doesn't return replies for MULTI and EXEC" do |r|
+  r1, r2, nothing_else = r.multi do |multi|
+    multi.set "foo", "s1"
+    multi.get "foo"
+  end
+
+  assert_equal "OK", r1
+  assert_equal "s1", r2
+  assert_equal nil, nothing_else
+end
+
+test "Assignment inside MULTI/EXEC block" do |r|
+  r.multi do |m|
+    @first = m.sadd("foo", 1)
+    @second = m.sadd("foo", 1)
+  end
+
+  assert_equal true, @first.value
+  assert_equal false, @second.value
+end
+
+# Although we could support accessing the values in these futures,
+# it doesn't make a lot of sense.
+test "Assignment inside MULTI/EXEC block with delayed command errors" do |r|
+  assert_raise do
+    r.multi do |m|
+      @first = m.set("foo", "s1")
+      @second = m.incr("foo") # not an integer
+      @third = m.lpush("foo", "value") # wrong kind of value
+    end
+  end
+
+  assert_equal "OK", @first.value
+  assert_raise { @second.value }
+  assert_raise { @third.value }
+end
+
+test "Assignment inside MULTI/EXEC block with immediate command errors" do |r|
+  assert_raise do
+    r.multi do |m|
+      m.doesnt_exist
+      @first = m.sadd("foo", 1)
+      m.doesnt_exist
+      @second = m.sadd("foo", 1)
+      m.doesnt_exist
+    end
+  end
+
+  assert_raise(Redis::FutureNotReady) { @first.value }
+  assert_raise(Redis::FutureNotReady) { @second.value }
+end
 
+test "Raise immediate errors in MULTI/EXEC" do |r|
   assert_raise(RuntimeError) do
     r.multi do |multi|
       multi.set "bar", "s2"
@@ -36,29 +90,49 @@ test "MULTI/EXEC with a block" do |r|
   assert nil == r.get("baz")
 end
 
-test "Don't raise (and ignore) immediate error in MULTI/EXEC" do |r|
-  result = r.multi do |m|
-    m.set("foo", "s1")
-    m.unknown_command
+test "Transformed replies as return values for MULTI/EXEC block" do |r|
+  info, _ = r.multi do |m|
+    r.info
   end
 
-  assert 1 == result.size
-  assert "OK" == result.first
-  assert "s1" == r.get("foo")
+  assert info.kind_of?(Hash)
+end
+
+test "Transformed replies inside MULTI/EXEC block" do |r|
+  r.multi do |m|
+    @info = r.info
+  end
+
+  assert @info.value.kind_of?(Hash)
 end
 
-test "Don't raise delayed error in MULTI/EXEC" do |r|
-  result = r.multi do |m|
-    m.set("foo", "s1")
-    m.incr("foo") # not an integer
-    m.lpush("foo", "value") # wrong kind of value
+test "Raise command errors in MULTI/EXEC" do |r|
+  assert_raise do
+    r.multi do |m|
+      m.set("foo", "s1")
+      m.incr("foo") # not an integer
+      m.lpush("foo", "value") # wrong kind of value
+    end
   end
 
-  assert result[1].message =~ /not an integer/i
-  assert result[2].message =~ /wrong kind of value/i
   assert "s1" == r.get("foo")
 end
 
+test "Raise command errors when accessing futures after MULTI/EXEC" do |r|
+  begin
+    r.multi do |m|
+      m.set("foo", "s1")
+      @counter = m.incr("foo") # not an integer
+    end
+  rescue Exception
+    # Not gonna deal with it
+  end
+
+  # We should test for Redis::Error here, but hiredis doesn't yet do
+  # custom error classes.
+  assert_raise(RuntimeError) { @counter.value }
+end
+
 test "MULTI with a block yielding the client" do |r|
   r.multi do |multi|
     multi.set "foo", "s1"
@@ -97,4 +171,3 @@ test "UNWATCH with a modified key" do |r|
 
   assert "s2" == r.get("foo")
 end
-

data/test/unknown_commands_test.rb

@@ -7,8 +7,7 @@ setup do
 end
 
 test "should try to work" do |r|
-  assert_raise RuntimeError do
+  assert_raise Redis::CommandError do
     r.not_yet_implemented_command
   end
 end
-

data/test/url_param_test.rb

@@ -57,4 +57,3 @@ test "uses REDIS_URL over default if available" do
 
   ENV.delete("REDIS_URL")
 end
-

metadata

@@ -1,8 +1,8 @@
 --- !ruby/object:Gem::Specification
 name: redis
 version: !ruby/object:Gem::Version
-  version: 2.2.2
-  prerelease: 
+  version: 3.0.0.rc1
+  prerelease: 6
 platform: ruby
 authors:
 - Ezra Zygmuntowicz
@@ -14,19 +14,66 @@ authors:
 - Michel Martens
 - Damian Janowski
 - Pieter Noordhuis
-autorequire: redis
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-08-04 00:00:00.000000000 -03:00
-default_executable: 
-dependencies: []
-description: Ruby client library for Redis, the key value storage server
-email: ez@engineyard.com
+date: 2012-03-10 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: &2152542300 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *2152542300
+- !ruby/object:Gem::Dependency
+  name: cutest
+  requirement: &2152541580 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *2152541580
+- !ruby/object:Gem::Dependency
+  name: hiredis
+  requirement: &2152541000 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *2152541000
+- !ruby/object:Gem::Dependency
+  name: em-synchrony
+  requirement: &2152540580 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *2152540580
+description: ! "    A simple Ruby client trying to match Redis' API one-to-one while
+  still providing a Rubystic interface.\n    It features thread safety, client-side
+  sharding, and an obsession for performance.\n"
+email:
+- redis-db@googlegroups.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- .yardopts
 - CHANGELOG.md
 - LICENSE
 - README.md
@@ -48,7 +95,6 @@ files:
 - examples/unicorn/unicorn.rb
 - lib/redis.rb
 - lib/redis/client.rb
-- lib/redis/compat.rb
 - lib/redis/connection.rb
 - lib/redis/connection/command_helper.rb
 - lib/redis/connection/hiredis.rb
@@ -56,11 +102,13 @@ files:
 - lib/redis/connection/ruby.rb
 - lib/redis/connection/synchrony.rb
 - lib/redis/distributed.rb
+- lib/redis/errors.rb
 - lib/redis/hash_ring.rb
 - lib/redis/pipeline.rb
 - lib/redis/subscribe.rb
 - lib/redis/version.rb
 - redis.gemspec
+- test/command_map_test.rb
 - test/commands_on_hashes_test.rb
 - test/commands_on_lists_test.rb
 - test/commands_on_sets_test.rb
@@ -73,6 +121,7 @@ files:
 - test/distributed_commands_on_hashes_test.rb
 - test/distributed_commands_on_lists_test.rb
 - test/distributed_commands_on_sets_test.rb
+- test/distributed_commands_on_sorted_sets_test.rb
 - test/distributed_commands_on_strings_test.rb
 - test/distributed_commands_on_value_types_test.rb
 - test/distributed_commands_requiring_clustering_test.rb
@@ -88,6 +137,7 @@ files:
 - test/encoding_test.rb
 - test/error_replies_test.rb
 - test/helper.rb
+- test/helper_test.rb
 - test/internals_test.rb
 - test/lint/hashes.rb
 - test/lint/internals.rb
@@ -108,8 +158,7 @@ files:
 - test/transactions_test.rb
 - test/unknown_commands_test.rb
 - test/url_param_test.rb
-has_rdoc: true
-homepage: http://github.com/ezmobius/redis-rb
+homepage: https://github.com/ezmobius/redis-rb
 licenses: []
 post_install_message: 
 rdoc_options: []
@@ -124,16 +173,17 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>='
+  - - ! '>'
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
-rubyforge_project: redis-rb
-rubygems_version: 1.6.2
+rubyforge_project: 
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
-summary: Ruby client library for Redis, the key value storage server
+summary: A Ruby client library for the Redis key-value store.
 test_files:
+- test/command_map_test.rb
 - test/commands_on_hashes_test.rb
 - test/commands_on_lists_test.rb
 - test/commands_on_sets_test.rb
@@ -146,6 +196,7 @@ test_files:
 - test/distributed_commands_on_hashes_test.rb
 - test/distributed_commands_on_lists_test.rb
 - test/distributed_commands_on_sets_test.rb
+- test/distributed_commands_on_sorted_sets_test.rb
 - test/distributed_commands_on_strings_test.rb
 - test/distributed_commands_on_value_types_test.rb
 - test/distributed_commands_requiring_clustering_test.rb
@@ -161,6 +212,7 @@ test_files:
 - test/encoding_test.rb
 - test/error_replies_test.rb
 - test/helper.rb
+- test/helper_test.rb
 - test/internals_test.rb
 - test/lint/hashes.rb
 - test/lint/internals.rb