ruby library client is not Redis-rb merged with RubyRedis "engine" by…

… Brian McKinney

client-libraries/ruby/lib/dist_redis.rb

@@ -2,13 +2,20 @@
 require 'hash_ring'
 class DistRedis
   attr_reader :ring
-  def initialize(*servers)
-    srvs = []
-    servers.each do |s|
-      server, port = s.split(':')
-      srvs << Redis.new(:host => server, :port => port)
+  def initialize(opts={})
+    hosts = []
+
+    db = opts[:db] || nil
+    timeout = opts[:timeout] || nil 
+
+    raise Error, "No hosts given" unless opts[:hosts]
+
+    opts[:hosts].each do |h|
+      host, port = h.split(':')
+      hosts << Redis.new(:host => host, :port => port, :db => db, :timeout => timeout, :db => db)
     end
-    @ring = HashRing.new srvs
+
+    @ring = HashRing.new hosts 
   end
 
   def node_for_key(key)

client-libraries/ruby/lib/pipeline.rb

@@ -8,19 +8,13 @@ def initialize(redis)
       @redis = redis
       @commands = []
     end
-
-    def execute_command(data)
-      @commands << data
-      write_and_read if @commands.size >= BUFFER_SIZE
-    end
-
-    def finish
-      write_and_read
+
+    def call_command(command)
+      @commands << command
     end
-
-    def write_and_read
-      @redis.execute_command(@commands.join, true)
-      @redis.read_socket
+
+    def execute
+      @redis.call_command(@commands)
       @commands.clear
     end