redis 3.1.0 → 3.2.0

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    Njk4NjUzM2ZiOTk2NTU0Y2FkYzg5NzU4NDc0Zjg1MmJiMDUwYjFlMg==
-  data.tar.gz: !binary |-
-    MTAxMTMzZmVjY2E2YjI1NzQ3Y2M1YTI5NDk3ZWQ5ZjVmZmExYTMwYg==
+SHA1:
+  metadata.gz: e25c90cb532eea0215afe63b0156fa102446c5f2
+  data.tar.gz: b2acddebb3e293807a9b6bb6a6f986432859afb0
 SHA512:
-  metadata.gz: !binary |-
-    NjkwNTI4ZTg3OTVhNTkwYWViNGQzY2NmZGJiODQ1ZTc1MzNmNzdjNjE0NTkx
-    NzljZTdhZTg1ZjEyYTYxYTJjYmJkYmIwZjYzZTdkNmFlOTNmNDZlY2YzMTY1
-    MTgyZmRmZjNlNTEwNzZlYWJmM2Q3YTkxZTEyZDc1MjZhNWNlODc=
-  data.tar.gz: !binary |-
-    NDQ0NDIyZmVmMWVmMmE5ZGU4ZDQyYzAxODljYTEzODM2YjY5YzAyMWZjNzdh
-    NTEwMjcwZDM2OWRhYWY4ZjUzMTRmOWU5MTNjMDM3ZDM2YjM0YTRhMDc3NGY0
-    MjQ5ZTFhYjg5ODM5NDlmZjMyMDkxMTg1NmI3YjgyZWQwNmQzN2Y=
+  metadata.gz: f599db91c12cf1a0e6a86c114e6ea687f9027d1a58e982f4f68bded6e38409cf4aab46fb742ec2d9fd80e85214a41a7f341399348645bb8765099c8f059b3efe
+  data.tar.gz: 12fb14500e54c7eeb46a79a9b112eb5b85a457c50ae388f505db18b9a2ab826d3c206bd4d5bc778b487a94f7af48d8b5df79f1f01396087c2b856ea2e0b589d8

data/.gitignore

@@ -1,11 +1,13 @@
 *.rdb
 *.swp
 Gemfile.lock
+*.gem
 /tmp/
 /.idea
 /.yardoc
 /coverage/*
 /doc/
+/examples/sentinel/sentinel.conf
 /nohup.out
 /pkg/*
 /rdsrv

data/.travis.yml

@@ -1,52 +1,50 @@
 language: ruby
 
-branches:
-  only:
-    - master
-
 rvm:
   - 1.8.7
-  - 1.9.2
   - 1.9.3
-  - 2.0.0
-  - 2.1.0
+  - 2.1
   - jruby-18mode
   - jruby-19mode
 
-gemfile:
-  - .travis/Gemfile
+gemfile: ".travis/Gemfile"
+
+sudo: false
 
 env:
   global:
     - VERBOSE=true
     - TIMEOUT=1
   matrix:
-    - conn=ruby      REDIS_BRANCH=2.6
-    - conn=hiredis   REDIS_BRANCH=2.6
-    - conn=synchrony REDIS_BRANCH=2.6
     - conn=ruby      REDIS_BRANCH=2.8
+    - conn=hiredis   REDIS_BRANCH=2.8
+    - conn=synchrony REDIS_BRANCH=2.8
     - conn=ruby      REDIS_BRANCH=unstable
 
+branches:
+  only:
+    - master
+
 matrix:
   exclude:
     # hiredis
     - rvm: jruby-18mode
       gemfile: .travis/Gemfile
-      env: conn=hiredis REDIS_BRANCH=2.6
+      env: conn=hiredis REDIS_BRANCH=2.8
     - rvm: jruby-19mode
       gemfile: .travis/Gemfile
-      env: conn=hiredis REDIS_BRANCH=2.6
+      env: conn=hiredis REDIS_BRANCH=2.8
 
     # synchrony
     - rvm: 1.8.7
       gemfile: .travis/Gemfile
-      env: conn=synchrony REDIS_BRANCH=2.6
+      env: conn=synchrony REDIS_BRANCH=2.8
     - rvm: jruby-18mode
       gemfile: .travis/Gemfile
-      env: conn=synchrony REDIS_BRANCH=2.6
+      env: conn=synchrony REDIS_BRANCH=2.8
     - rvm: jruby-19mode
       gemfile: .travis/Gemfile
-      env: conn=synchrony REDIS_BRANCH=2.6
+      env: conn=synchrony REDIS_BRANCH=2.8
 
 notifications:
   irc:

data/CHANGELOG.md

@@ -12,7 +12,15 @@
   security updates in June of 2013; continuing to support it would prevent
   the use of newer features of Ruby.
 
-# 3.1.x (unreleased)
+# 3.2.0
+
+* Redis Sentinel support.
+
+# 3.1.1 (unreleased)
+
+* Added support for variadic `PFCOUNT`.
+
+# 3.1.0
 
 * Added debug log sanitization (#428).
 

data/README.md

@@ -85,6 +85,34 @@ available on [rdoc.info][rdoc].
 
 [rdoc]: http://rdoc.info/github/redis/redis-rb/
 
+## Sentinel support
+
+The client is able to perform automatic failovers by using [Redis
+Sentinel](http://redis.io/topics/sentinel).  Make sure to run Redis 2.8+
+if you want to use this feature.
+
+To connect using Sentinel, use:
+
+```ruby
+SENTINELS = [{:host => "127.0.0.1", :port => 26380},
+             {:host => "127.0.0.1", :port => 26381}]
+
+redis = Redis.new(:url => "redis://mymaster", :sentinels => SENTINELS, :role => :master)
+```
+
+* The master name identifies a group of Redis instances composed of a master
+and one or more slaves (`mymaster` in the example).
+
+* It is possible to optionally provide a role. The allowed roles are `master`
+and `slave`. When the role is `slave`, the client will try to connect to a
+random slave of the specified master.
+
+* When using the Sentinel support you need to specify a list of sentinels to
+connect to. The list does not need to enumerate all your Sentinel instances,
+but a few so that if one is down the client will try the next one. The client
+is able to remember the last Sentinel that was able to reply correctly and will
+use it for the next requests.
+
 ## Storing objects
 
 Redis only stores strings as values. If you want to store an object, you
@@ -166,7 +194,7 @@ end
       to redis, AND
     - your own code prevents the parent process from using the redis
       connection while a child is alive
-   
+
    Improper use of `inherit_socket` will result in corrupted and/or incorrect
    responses.
 

data/examples/consistency.rb

@@ -0,0 +1,114 @@
+# This file implements a simple consistency test for Redis-rb (or any other
+# Redis environment if you pass a different client object) where a client
+# writes to the database using INCR in order to increment keys, but actively
+# remember the value the key should have. Before every write a read is performed
+# to check if the value in the database matches the value expected.
+#
+# In this way this program can check for lost writes, or acknowledged writes
+# that were executed.
+#
+# Copyright (C) 2013-2014 Salvatore Sanfilippo <antirez@gmail.com>
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
+# 
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+# 
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+require 'redis'
+
+class ConsistencyTester
+    def initialize(redis)
+        @r = redis
+        @working_set = 10000
+        @keyspace = 100000
+        @writes = 0
+        @reads = 0
+        @failed_writes = 0
+        @failed_reads = 0
+        @lost_writes = 0
+        @not_ack_writes = 0
+        @delay = 0
+        @cached = {} # We take our view of data stored in the DB.
+        @prefix = [Process.pid.to_s,Time.now.usec,@r.object_id,""].join("|")
+        @errtime = {}
+    end
+
+    def genkey
+        # Write more often to a small subset of keys
+        ks = rand() > 0.5 ? @keyspace : @working_set
+        @prefix+"key_"+rand(ks).to_s
+    end
+
+    def check_consistency(key,value)
+        expected = @cached[key]
+        return if !expected  # We lack info about previous state.
+        if expected > value
+            @lost_writes += expected-value
+        elsif expected < value
+            @not_ack_writes += value-expected
+        end
+    end
+
+    def puterr(msg)
+        if !@errtime[msg] || Time.now.to_i != @errtime[msg]
+            puts msg
+        end
+        @errtime[msg] = Time.now.to_i
+    end
+
+    def test
+        last_report = Time.now.to_i
+        while true
+            # Read
+            key = genkey
+            begin
+                val = @r.get(key)
+                check_consistency(key,val.to_i)
+                @reads += 1
+            rescue => e
+                puterr "Reading: #{e.class}: #{e.message} (#{e.backtrace.first})"
+                @failed_reads += 1
+            end
+
+            # Write
+            begin
+                @cached[key] = @r.incr(key).to_i
+                @writes += 1
+            rescue => e
+                puterr "Writing: #{e.class}: #{e.message} (#{e.backtrace.first})"
+                @failed_writes += 1
+            end
+
+            # Report
+            sleep @delay
+            if Time.now.to_i != last_report
+                report = "#{@reads} R (#{@failed_reads} err) | " +
+                         "#{@writes} W (#{@failed_writes} err) | "
+                report += "#{@lost_writes} lost | " if @lost_writes > 0
+                report += "#{@not_ack_writes} noack | " if @not_ack_writes > 0
+                last_report = Time.now.to_i
+                puts report
+            end
+        end
+    end
+end
+
+Sentinels = [{:host => "127.0.0.1", :port => 26379},
+             {:host => "127.0.0.1", :port => 26380}]
+r = Redis.new(:url => "redis://master1", :sentinels => Sentinels, :role => :master)
+tester = ConsistencyTester.new(r)
+tester.test

data/examples/sentinel.rb

@@ -0,0 +1,41 @@
+require 'redis'
+
+# This example creates a master-slave setup with a sentinel, then connects to
+# it and sends write commands in a loop.
+#
+# After 30 seconds, the master dies. You will be able to see how a new master
+# is elected and things continue to work as if nothing happened.
+#
+# To run this example:
+#
+#   $ ruby -I./lib examples/sentinel.rb
+#
+
+at_exit do
+  begin
+    Process.kill(:INT, $redises)
+  rescue Errno::ESRCH
+  end
+
+  Process.waitall
+end
+
+$redises = spawn("examples/sentinel/start")
+
+Sentinels = [{:host => "127.0.0.1", :port => 26379},
+             {:host => "127.0.0.1", :port => 26380}]
+r = Redis.new(:url => "redis://master1", :sentinels => Sentinels, :role => :master)
+
+# Set keys into a loop.
+#
+# The example traps errors so that you can actually try to failover while
+# running the script to see redis-rb reconfiguring.
+(0..1000000).each{|i|
+    begin
+        r.set(i,i)
+        $stdout.write("SET (#{i} times)\n") if i % 100 == 0
+    rescue => e
+        $stdout.write("E")
+    end
+    sleep(0.01)
+}

data/examples/sentinel/start

@@ -0,0 +1,49 @@
+#! /usr/bin/env ruby
+
+# This is a helper script used together with examples/sentinel.rb
+# It runs two Redis masters, two slaves for each of them, and two sentinels.
+# After 30 seconds, the first master dies.
+#
+# You don't need to run this script yourself. Rather, use examples/sentinel.rb.
+
+require "fileutils"
+
+$pids = []
+
+at_exit do
+  $pids.each do |pid|
+    begin
+      Process.kill(:INT, pid)
+    rescue Errno::ESRCH
+    end
+  end
+
+  Process.waitall
+end
+
+base = File.expand_path(File.dirname(__FILE__))
+
+# Masters
+$pids << spawn("redis-server --port 6380 --loglevel warning")
+$pids << spawn("redis-server --port 6381 --loglevel warning")
+
+# Slaves of Master 1
+$pids << spawn("redis-server --port 63800 --slaveof 127.0.0.1 6380 --loglevel warning")
+$pids << spawn("redis-server --port 63801 --slaveof 127.0.0.1 6380 --loglevel warning")
+
+# Slaves of Master 2
+$pids << spawn("redis-server --port 63810 --slaveof 127.0.0.1 6381 --loglevel warning")
+$pids << spawn("redis-server --port 63811 --slaveof 127.0.0.1 6381 --loglevel warning")
+
+FileUtils.cp(File.join(base, "sentinel.conf"), "tmp/sentinel1.conf")
+FileUtils.cp(File.join(base, "sentinel.conf"), "tmp/sentinel2.conf")
+
+# Sentinels
+$pids << spawn("redis-server tmp/sentinel1.conf --sentinel --port 26379")
+$pids << spawn("redis-server tmp/sentinel2.conf --sentinel --port 26380")
+
+sleep 30
+
+Process.kill(:KILL, $pids[0])
+
+Process.waitall

data/lib/redis.rb

@@ -1588,6 +1588,38 @@ class Redis
     end
   end
 
+  # Return a range of members with the same score in a sorted set, by lexicographical ordering
+  #
+  # @example Retrieve members matching a
+  #   redis.zrangebylex("zset", "[a", "[a\xff")
+  #     # => ["aaren", "aarika", "abagael", "abby"]
+  # @example Retrieve the first 2 members matching a
+  #   redis.zrangebylex("zset", "[a", "[a\xff", :limit => [0, 2])
+  #     # => ["aaren", "aarika"]
+  #
+  # @param [String] key
+  # @param [String] min
+  #   - inclusive minimum is specified by prefixing `(`
+  #   - exclusive minimum is specified by prefixing `[`
+  # @param [String] max
+  #   - inclusive maximum is specified by prefixing `(`
+  #   - exclusive maximum is specified by prefixing `[`
+  # @param [Hash] options
+  #   - `:limit => [offset, count]`: skip `offset` members, return a maximum of
+  #   `count` members
+  #
+  # @return [Array<String>, Array<[String, Float]>]
+  def zrangebylex(key, min, max, options = {})
+    args = []
+
+    limit = options[:limit]
+    args.concat(["LIMIT"] + limit) if limit
+
+    synchronize do |client|
+      client.call([:zrangebylex, key, min, max] + args)
+    end
+  end
+
   # Return a range of members in a sorted set, by score.
   #
   # @example Retrieve members with score `>= 5` and `< 100`
@@ -2449,11 +2481,14 @@ class Redis
 
   # Get the approximate cardinality of members added to HyperLogLog structure.
   #
-  # @param [String] key
+  # If called with multiple keys, returns the approximate cardinality of the
+  # union of the HyperLogLogs contained in the keys.
+  #
+  # @param [String, Array<String>] keys
   # @return [Fixnum]
-  def pfcount(key)
+  def pfcount(*keys)
     synchronize do |client|
-      client.call([:pfcount, key])
+      client.call([:pfcount] + keys)
     end
   end
 

data/lib/redis/client.rb

@@ -75,6 +75,12 @@ class Redis
       @logger = @options[:logger]
       @connection = nil
       @command_map = {}
+
+      if options.include?(:sentinels)
+        @connector = Connector::Sentinel.new(@options)
+      else
+        @connector = Connector.new(@options)
+      end
     end
 
     def connect
@@ -85,6 +91,7 @@ class Redis
         establish_connection
         call [:auth, password] if password
         call [:select, db] if db != 0
+        @connector.check(self)
       end
 
       self
@@ -301,8 +308,12 @@ class Redis
     end
 
     def establish_connection
-      @connection = @options[:driver].connect(@options.dup)
+      server = @connector.resolve.dup
 
+      @options[:host] = server[:host]
+      @options[:port] = server[:port]
+
+      @connection = @options[:driver].connect(server)
     rescue TimeoutError
       raise CannotConnectError, "Timed out connecting to Redis on #{location}"
     rescue Errno::ECONNREFUSED
@@ -365,7 +376,7 @@ class Redis
 
         if uri.scheme == "unix"
           defaults[:path]   = uri.path
-        else
+        elsif uri.scheme == "redis"
           # Require the URL to have at least a host
           raise ArgumentError, "invalid url" unless uri.host
 
@@ -374,6 +385,9 @@ class Redis
           defaults[:port]     = uri.port if uri.port
           defaults[:password] = CGI.unescape(uri.password) if uri.password
           defaults[:db]       = uri.path[1..-1].to_i if uri.path
+          defaults[:role] = :master
+        else
+          raise ArgumentError, "invalid uri scheme '#{uri.scheme}'"
         end
       end
 
@@ -383,10 +397,12 @@ class Redis
       end
 
       if options[:path]
+        # Unix socket
         options[:scheme] = "unix"
         options.delete(:host)
         options.delete(:port)
       else
+        # TCP socket
         options[:host] = options[:host].to_s
         options[:port] = options[:port].to_i
       end
@@ -432,5 +448,96 @@ class Redis
 
       driver
     end
+
+    class Connector
+      def initialize(options)
+        @options = options
+      end
+
+      def resolve
+        @options
+      end
+
+      def check(client)
+      end
+
+      class Sentinel < Connector
+        def initialize(options)
+          super(options)
+
+          @sentinels = options.fetch(:sentinels).dup
+          @role = options[:role].to_s
+          @master = options[:host]
+        end
+
+        def check(client)
+          # Check the instance is really of the role we are looking for.
+          # We can't assume the command is supported since it was introduced
+          # recently and this client should work with old stuff.
+          begin
+            role = client.call([:role])[0]
+          rescue Redis::CommandError
+            # Assume the test is passed if we can't get a reply from ROLE...
+            role = @role
+          end
+
+          if role != @role
+            disconnect
+            raise ConnectionError, "Instance role mismatch. Expected #{@role}, got #{role}."
+          end
+        end
+
+        def resolve
+          result = case @role
+                   when "master"
+                     resolve_master
+                   when "slave"
+                     resolve_slave
+                   else
+                     raise ArgumentError, "Unknown instance role #{@role}"
+                   end
+
+          result || (raise ConnectionError, "Unable to fetch #{@role} via Sentinel.")
+        end
+
+        def sentinel_detect
+          @sentinels.each do |sentinel|
+            client = Client.new(:host => sentinel[:host], :port => sentinel[:port], :timeout => 0.3)
+
+            begin
+              if result = yield(client)
+                # This sentinel responded. Make sure we ask it first next time.
+                @sentinels.delete(sentinel)
+                @sentinels.unshift(sentinel)
+
+                return result
+              end
+            ensure
+              client.disconnect
+            end
+          end
+
+          return nil
+        end
+
+        def resolve_master
+          sentinel_detect do |client|
+            if reply = client.call(["sentinel", "get-master-addr-by-name", @master])
+              {:host => reply[0], :port => reply[1]}
+            end
+          end
+        end
+
+        def resolve_slave
+          sentinel_detect do |client|
+            if reply = client.call(["sentinel", "slaves", @master])
+              slave = Hash[*reply.sample]
+
+              {:host => slave.fetch("ip"), :port => slave.fetch("port")}
+            end
+          end
+        end
+      end
+    end
   end
 end

data/lib/redis/distributed.rb

@@ -792,8 +792,10 @@ class Redis
     end
 
     # Get the approximate cardinality of members added to HyperLogLog structure.
-    def pfcount(key)
-      node_for(key).pfcount(key)
+    def pfcount(*keys)
+      ensure_same_node(:pfcount, keys.flatten(1)) do |node|
+        node.pfcount(keys)
+      end
     end
 
     # Merge multiple HyperLogLog values into an unique value that will approximate the cardinality of the union of

data/lib/redis/version.rb

@@ -1,3 +1,3 @@
 class Redis
-  VERSION = "3.1.0"
+  VERSION = "3.2.0"
 end

data/test/commands_on_sorted_sets_test.rb

@@ -8,6 +8,20 @@ class TestCommandsOnSortedSets < Test::Unit::TestCase
   include Helper::Client
   include Lint::SortedSets
 
+  def test_zrangebylex
+    target_version "2.8.9" do
+      r.zadd "foo", 0, "aaren"
+      r.zadd "foo", 0, "abagael"
+      r.zadd "foo", 0, "abby"
+      r.zadd "foo", 0, "abbygail"
+
+      assert_equal ["aaren", "abagael", "abby", "abbygail"], r.zrangebylex("foo", "[a", "[a\xff")
+      assert_equal ["aaren", "abagael"], r.zrangebylex("foo", "[a", "[a\xff", :limit => [0, 2])
+      assert_equal ["abby", "abbygail"], r.zrangebylex("foo", "(abb", "(abb\xff")
+      assert_equal ["abbygail"], r.zrangebylex("foo", "(abby", "(abby\xff")
+    end
+  end
+
   def test_zcount
     r.zadd "foo", 1, "s1"
     r.zadd "foo", 2, "s2"

data/test/distributed_commands_on_hyper_log_log_test.rb

@@ -19,4 +19,15 @@ class TestDistributedCommandsOnHyperLogLog < Test::Unit::TestCase
     end
   end
 
-end
+  def test_pfcount_multiple_keys_diff_nodes
+    target_version "2.8.9" do
+      assert_raise Redis::Distributed::CannotDistribute do
+        r.pfadd "foo", "s1"
+        r.pfadd "bar", "s2"
+
+        assert r.pfcount("res", "foo", "bar")
+      end
+    end
+  end
+
+end

data/test/helper.rb

@@ -5,6 +5,8 @@ require "test/unit"
 require "logger"
 require "stringio"
 
+(class Random; def self.rand(*args) super end; end) unless defined?(Random)
+
 begin
   require "ruby-debug"
 rescue LoadError

data/test/internals_test.rb

@@ -375,8 +375,16 @@ class TestInternals < Test::Unit::TestCase
       begin
         s = Socket.new(af, Socket::SOCK_STREAM, 0)
         begin
-          sa = Socket.pack_sockaddr_in(9999, hosts[af])
-          s.bind(sa)
+          tries = 5
+          begin
+            sa = Socket.pack_sockaddr_in(1024 + Random.rand(63076), hosts[af])
+            s.bind(sa)
+          rescue Errno::EADDRINUSE
+            tries -= 1
+            retry if tries > 0
+
+            raise
+          end
           yield
         rescue Errno::EADDRNOTAVAIL
         ensure

data/test/lint/hyper_log_log.rb

@@ -33,16 +33,28 @@ module Lint
 
     def test_variadic_pfcount
       target_version "2.8.9" do
-        assert_equal 0, r.pfcount(["foo", "bar"])
+        assert_equal 0, r.pfcount(["{1}foo", "{1}bar"])
 
-        assert_equal true, r.pfadd("foo", "s1")
-        assert_equal true, r.pfadd("bar", "s1")
-        assert_equal true, r.pfadd("bar", "s2")
+        assert_equal true, r.pfadd("{1}foo", "s1")
+        assert_equal true, r.pfadd("{1}bar", "s1")
+        assert_equal true, r.pfadd("{1}bar", "s2")
+
+        assert_equal 2, r.pfcount("{1}foo", "{1}bar")
+      end
+    end
+
+    def test_variadic_pfcount_expanded
+      target_version "2.8.9" do
+        assert_equal 0, r.pfcount("{1}foo", "{1}bar")
+
+        assert_equal true, r.pfadd("{1}foo", "s1")
+        assert_equal true, r.pfadd("{1}bar", "s1")
+        assert_equal true, r.pfadd("{1}bar", "s2")
 
-        assert_equal 2, r.pfcount(["foo", "bar"])
+        assert_equal 2, r.pfcount("{1}foo", "{1}bar")
       end
     end
 
   end
 
-end
+end

data/test/publish_subscribe_test.rb

@@ -191,7 +191,7 @@ class TestPublishSubscribe < Test::Unit::TestCase
   def test_subscribe_past_a_timeout
     # For some reason, a thread here doesn't reproduce the issue.
     sleep = %{sleep #{OPTIONS[:timeout] * 2}}
-    publish = %{echo "publish foo bar\r\n" | nc 127.0.0.1 #{OPTIONS[:port]}}
+    publish = %{ruby -rsocket -e 't=TCPSocket.new("127.0.0.1",#{OPTIONS[:port]});t.write("publish foo bar\\r\\n");t.read(4);t.close'}
     cmd = [sleep, publish].join("; ")
 
     IO.popen(cmd, "r+") do |pipe|

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: redis
 version: !ruby/object:Gem::Version
-  version: 3.1.0
+  version: 3.2.0
 platform: ruby
 authors:
 - Ezra Zygmuntowicz
@@ -16,36 +16,36 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-06 00:00:00.000000000 Z
+date: 2014-12-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: ! "    A Ruby client that tries to match Redis' API one-to-one, while
-  still\n    providing an idiomatic interface. It features thread-safety,\n    client-side
-  sharding, pipelining, and an obsession for performance.\n"
+description: |2
+      A Ruby client that tries to match Redis' API one-to-one, while still
+      providing an idiomatic interface. It features thread-safety,
+      client-side sharding, pipelining, and an obsession for performance.
 email:
 - redis-db@googlegroups.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .order
-- .travis.yml
-- .travis/Gemfile
-- .yardopts
+- ".gitignore"
+- ".travis.yml"
+- ".travis/Gemfile"
+- ".yardopts"
 - CHANGELOG.md
 - Gemfile
 - LICENSE
@@ -57,10 +57,14 @@ files:
 - benchmarking/suite.rb
 - benchmarking/worker.rb
 - examples/basic.rb
+- examples/consistency.rb
 - examples/dist_redis.rb
 - examples/incr-decr.rb
 - examples/list.rb
 - examples/pubsub.rb
+- examples/sentinel.rb
+- examples/sentinel/sentinel.conf
+- examples/sentinel/start
 - examples/sets.rb
 - examples/unicorn/config.ru
 - examples/unicorn/unicorn.rb
@@ -153,12 +157,12 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
@@ -232,4 +236,3 @@ test_files:
 - test/transactions_test.rb
 - test/unknown_commands_test.rb
 - test/url_param_test.rb
-has_rdoc: 

data/.order

@@ -1,170 +0,0 @@
-{
-  "connection": [
-    "auth",
-    "select",
-    "ping",
-    "echo",
-    "quit"
-  ],
-  "server": [
-    "bgrewriteaof",
-    "bgsave",
-    "config",
-    "dbsize",
-    "debug",
-    "flushall",
-    "flushdb",
-    "info",
-    "lastsave",
-    "monitor",
-    "save",
-    "shutdown",
-    "slaveof",
-    "slowlog",
-    "sync",
-    "time",
-    "client"
-  ],
-  "generic": [
-    "persist",
-    "expire",
-    "expireat",
-    "ttl",
-    "pexpire",
-    "pexpireat",
-    "pttl",
-    "dump",
-    "restore",
-    "del",
-    "exists",
-    "keys",
-    "migrate",
-    "move",
-    "object",
-    "randomkey",
-    "rename",
-    "renamenx",
-    "sort",
-    "type"
-  ],
-  "string": [
-    "decr",
-    "decrby",
-    "incr",
-    "incrby",
-    "incrbyfloat",
-    "set",
-    "setex",
-    "psetex",
-    "setnx",
-    "mset",
-    "mapped_mset",
-    "msetnx",
-    "mapped_msetnx",
-    "get",
-    "mget",
-    "mapped_mget",
-    "setrange",
-    "getrange",
-    "setbit",
-    "getbit",
-    "append",
-    "bitcount",
-    "getset",
-    "strlen",
-    "bitop"
-  ],
-  "list": [
-    "llen",
-    "lpush",
-    "lpushx",
-    "rpush",
-    "rpushx",
-    "lpop",
-    "rpop",
-    "rpoplpush",
-    "_bpop",
-    "blpop",
-    "brpop",
-    "brpoplpush",
-    "lindex",
-    "linsert",
-    "lrange",
-    "lrem",
-    "lset",
-    "ltrim"
-  ],
-  "set": [
-    "scard",
-    "sadd",
-    "srem",
-    "spop",
-    "srandmember",
-    "smove",
-    "sismember",
-    "smembers",
-    "sdiff",
-    "sdiffstore",
-    "sinter",
-    "sinterstore",
-    "sunion",
-    "sunionstore"
-  ],
-  "sorted_set": [
-    "zcard",
-    "zadd",
-    "zincrby",
-    "zrem",
-    "zscore",
-    "zrange",
-    "zrevrange",
-    "zrank",
-    "zrevrank",
-    "zremrangebyrank",
-    "zrangebyscore",
-    "zrevrangebyscore",
-    "zremrangebyscore",
-    "zcount",
-    "zinterstore",
-    "zunionstore"
-  ],
-  "hash": [
-    "hlen",
-    "hset",
-    "hsetnx",
-    "hmset",
-    "mapped_hmset",
-    "hget",
-    "hmget",
-    "mapped_hmget",
-    "hdel",
-    "hexists",
-    "hincrby",
-    "hincrbyfloat",
-    "hkeys",
-    "hvals",
-    "hgetall"
-  ],
-  "pubsub": [
-    "publish",
-    "subscribed?",
-    "subscribe",
-    "unsubscribe",
-    "psubscribe",
-    "punsubscribe"
-  ],
-  "transactions": [
-    "watch",
-    "unwatch",
-    "pipelined",
-    "multi",
-    "exec",
-    "discard"
-  ],
-  "scripting": [
-    "script",
-    "_eval",
-    "eval",
-    "evalsha"
-  ]
-}