Merge branch 'master' into ipv6

Conflicts:
	test/internals_test.rb

Author: pietern

CHANGELOG.md

@@ -1,3 +1,7 @@
+# (unreleased)
+
+* Added method `Redis#dup` to duplicate a Redis connection.
+
 # 3.0.6
 
 * Added support for `SCAN` and variants.

README.md

@@ -38,9 +38,19 @@ listening on `localhost`, port 6379. If you need to connect to a remote
 server or a different port, try:
 
 ```ruby
-redis = Redis.new(:host => "10.0.1.1", :port => 6380)
+redis = Redis.new(:host => "10.0.1.1", :port => 6380, :db => 15)
 ```
 
+You can also specify connection options as an URL:
+
+```ruby
+redis = Redis.new(:url => "redis://:[email protected]:6380/15")
+```
+
+By default, the client will try to read the `REDIS_URL` environment variable
+and use that as URL to connect to. The above statement is therefore equivalent
+to setting this environment variable and calling `Redis.new` without arguments.
+
 To connect to Redis listening on a Unix socket, try:
 
 ```ruby

lib/redis.rb

@@ -27,6 +27,7 @@ def self.current=(redis)
   include MonitorMixin
 
   def initialize(options = {})
+    @options = options.dup
     @original_client = @client = Client.new(options)
 
     super() # Monitor#initialize
@@ -2422,6 +2423,10 @@ def inspect
     "#<Redis client v#{Redis::VERSION} for #{id}>"
   end
 
+  def dup
+    self.class.new(@options)
+  end
+
   def method_missing(command, *args)
     synchronize do |client|
       client.call([command] + args)

lib/redis/distributed.rb

@@ -16,9 +16,10 @@ def message
     attr_reader :ring
 
     def initialize(node_configs, options = {})
-      @tag = options.delete(:tag) || /^\{(.+?)\}/
-      @ring = options.delete(:ring) || HashRing.new
-      @default_options = options
+      @tag = options[:tag] || /^\{(.+?)\}/
+      @ring = options[:ring] || HashRing.new
+      @node_configs = node_configs.dup
+      @default_options = options.dup
       node_configs.each { |node_config| add_node(node_config) }
       @subscribed_node = nil
     end
@@ -807,6 +808,10 @@ def inspect
       "#<Redis client v#{Redis::VERSION} for #{nodes.map(&:id).join(', ')}>"
     end
 
+    def dup
+      self.class.new(@node_configs, @default_options)
+    end
+
   protected
 
     def on_each_node(command, *args)

lib/redis/pipeline.rb

@@ -78,7 +78,7 @@ def finish(replies)
         # EXEC command failed.
         raise exec if exec.is_a?(CommandError)
 
-        if exec.size < futures.size - 2
+        if exec.size < futures.size
           # Some command wasn't recognized by Redis.
           raise replies.detect { |r| r.is_a?(CommandError) }
         end

test/distributed_internals_test.rb

@@ -38,4 +38,33 @@ def test_override_id
     assert_equal redis.nodes.last.client.id,  "test1"
     assert_equal "#<Redis client v#{Redis::VERSION} for #{redis.nodes.map(&:id).join(', ')}>", redis.inspect
   end
+
+  def test_can_be_duped_to_create_a_new_connection
+    redis = Redis::Distributed.new(NODES)
+
+    clients = redis.info[0]["connected_clients"].to_i
+
+    r2 = redis.dup
+    r2.ping
+
+    assert_equal clients + 1, redis.info[0]["connected_clients"].to_i
+  end
+
+  def test_keeps_options_after_dup
+    r1 = Redis::Distributed.new(NODES, :tag => /^(\w+):/)
+
+    assert_raise(Redis::Distributed::CannotDistribute) do
+      r1.sinter("foo", "bar")
+    end
+
+    assert_equal [], r1.sinter("baz:foo", "baz:bar")
+
+    r2 = r1.dup
+
+    assert_raise(Redis::Distributed::CannotDistribute) do
+      r2.sinter("foo", "bar")
+    end
+
+    assert_equal [], r2.sinter("baz:foo", "baz:bar")
+  end
 end

test/helper.rb

@@ -141,6 +141,9 @@ module Generic
     def setup
       @log = StringIO.new
       @redis = init _new_client
+
+      # Run GC to make sure orphaned connections are closed.
+      GC.start
     end
 
     def teardown

test/internals_test.rb

@@ -398,4 +398,13 @@ def test_connect_ipv6
       end
     end
   end
+
+  def test_can_be_duped_to_create_a_new_connection
+    clients = r.info["connected_clients"].to_i
+
+    r2 = r.dup
+    r2.ping
+
+    assert_equal clients + 1, r.info["connected_clients"].to_i
+  end
 end

test/pipelining_commands_test.rb

@@ -93,9 +93,7 @@ def test_assignment_of_results_inside_the_block_with_errors
       r.pipelined do
         r.doesnt_exist
         @first = r.sadd("foo", 1)
-        r.doesnt_exist
         @second = r.sadd("foo", 1)
-        r.doesnt_exist
       end
     end
 

test/transactions_test.rb

@@ -67,9 +67,7 @@ def test_assignment_inside_multi_exec_block_with_immediate_command_errors
       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