redis 3.0.7 → 3.1.0

checksums.yaml

@@ -1,7 +1,15 @@
 ---
-SHA1:
-  metadata.gz: f19cb52776a7c819c4e77758ef023e958a9929f8
-  data.tar.gz: 38c26138524df7d89fe8c876d23d22d424cbeace
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    Njk4NjUzM2ZiOTk2NTU0Y2FkYzg5NzU4NDc0Zjg1MmJiMDUwYjFlMg==
+  data.tar.gz: !binary |-
+    MTAxMTMzZmVjY2E2YjI1NzQ3Y2M1YTI5NDk3ZWQ5ZjVmZmExYTMwYg==
 SHA512:
-  metadata.gz: d448483ee949db61aafe63bfa1a81ca0eba4ebf3310303d06642a48bb806736219d39e16a739cba2ebdd080270e93307c46a07ee5caa1e390ba11f7e3ca7f66f
-  data.tar.gz: c2bc48a670e248fa68b8bb149d73bac42e060212019f8ae7cbc0c14555040b9616e3673ca809bfa97f8038a10e02c94a49d1211a6300c323d83bc3742c8b1a68
+  metadata.gz: !binary |-
+    NjkwNTI4ZTg3OTVhNTkwYWViNGQzY2NmZGJiODQ1ZTc1MzNmNzdjNjE0NTkx
+    NzljZTdhZTg1ZjEyYTYxYTJjYmJkYmIwZjYzZTdkNmFlOTNmNDZlY2YzMTY1
+    MTgyZmRmZjNlNTEwNzZlYWJmM2Q3YTkxZTEyZDc1MjZhNWNlODc=
+  data.tar.gz: !binary |-
+    NDQ0NDIyZmVmMWVmMmE5ZGU4ZDQyYzAxODljYTEzODM2YjY5YzAyMWZjNzdh
+    NTEwMjcwZDM2OWRhYWY4ZjUzMTRmOWU5MTNjMDM3ZDM2YjM0YTRhMDc3NGY0
+    MjQ5ZTFhYjg5ODM5NDlmZjMyMDkxMTg1NmI3YjgyZWQwNmQzN2Y=

data/.gitignore

@@ -1,5 +1,7 @@
 *.rdb
 *.swp
+Gemfile.lock
+/tmp/
 /.idea
 /.yardoc
 /coverage/*

data/.travis.yml

@@ -9,6 +9,7 @@ rvm:
   - 1.9.2
   - 1.9.3
   - 2.0.0
+  - 2.1.0
   - jruby-18mode
   - jruby-19mode
 
@@ -17,6 +18,7 @@ gemfile:
 
 env:
   global:
+    - VERBOSE=true
     - TIMEOUT=1
   matrix:
     - conn=ruby      REDIS_BRANCH=2.6
@@ -51,5 +53,4 @@ notifications:
     - irc.freenode.net#redis-rb
   email:
     - damian.janowski@gmail.com
-    - michel@soveran.com
     - pcnoordhuis@gmail.com

data/CHANGELOG.md

@@ -1,6 +1,33 @@
-# (unreleased)
+# 4.x (unreleased)
 
-...
+## Planned breaking changes:
+* `Redis#client` will no longer expose the underlying `Redis::Client`;
+  it has not yet been determined how 4.0 will expose the underlying
+  functionality, but we will make every attempt to provide a final minor
+  release of 3.x that provides the new interfaces in order to facilitate
+  a smooth transition.
+
+* Ruby 1.8.7 (and the 1.8 modes of JRuby and Rubinius) will no longer be
+  supported; 1.8.x entered end-of-life in June of 2012 and stopped receiving
+  security updates in June of 2013; continuing to support it would prevent
+  the use of newer features of Ruby.
+
+# 3.1.x (unreleased)
+
+* Added debug log sanitization (#428).
+
+* Added support for HyperLogLog commands (Redis 2.8.9, #432).
+
+* Added support for `BITPOS` command (Redis 2.9.11, #412).
+
+* The client will now automatically reconnect after a fork (#414).
+
+* If you want to disable the fork-safety check and prefer to share the
+  connection across child processes, you can now pass the `inherit_socket`
+  option (#409).
+
+* If you want the client to attempt to reconnect more than once, you can now
+  pass the `reconnect_attempts` option (#347)
 
 # 3.0.7
 

data/Gemfile

@@ -0,0 +1,4 @@
+# encoding: utf-8
+source 'https://rubygems.org'
+
+gemspec

data/README.md

@@ -1,8 +1,10 @@
-# redis-rb [![Build Status][travis-image]][travis-link]
+# redis-rb [![Build Status][travis-image]][travis-link] [![Inline docs][inchpages-image]][inchpages-link]
 
 [travis-image]: https://secure.travis-ci.org/redis/redis-rb.png?branch=master
 [travis-link]: http://travis-ci.org/redis/redis-rb
 [travis-home]: http://travis-ci.org/
+[inchpages-image]: http://inch-pages.github.io/github/redis/redis-rb.png
+[inchpages-link]: http://inch-pages.github.io/github/redis/redis-rb
 
 A Ruby client library for [Redis][redis-home].
 
@@ -156,6 +158,18 @@ end
 # => 1
 ```
 
+## Expert-Mode Options
+
+ - `inherit_socket: true`: disable safety check that prevents a forked child
+   from sharing a socket with its parent; this is potentially useful in order to mitigate connection churn when:
+    - many short-lived forked children of one process need to talk
+      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.
+
 ## Alternate drivers
 
 By default, redis-rb uses Ruby's socket library to talk with Redis.

data/Rakefile

@@ -1,12 +1,7 @@
-require 'rubygems'
-require 'rubygems/package_task'
-require 'rake/testtask'
+require "rake/testtask"
 
 ENV["REDIS_BRANCH"] ||= "unstable"
 
-$:.unshift File.join(File.dirname(__FILE__), 'lib')
-require 'redis/version'
-
 REDIS_DIR = File.expand_path(File.join("..", "test"), __FILE__)
 REDIS_CNF = File.join(REDIS_DIR, "test.conf")
 REDIS_PID = File.join(REDIS_DIR, "db", "redis.pid")
@@ -34,6 +29,10 @@ task :start => BINARY do
       abort "could not start redis-server"
     end
   end
+
+  at_exit do
+    Rake::Task["stop"].invoke
+  end
 end
 
 desc "Stop the Redis server"
@@ -44,12 +43,18 @@ task :stop do
   end
 end
 
+desc "Clean up testing artifacts"
+task :clean do
+  FileUtils.rm_f(BINARY)
+end
+
 file BINARY do
   branch = ENV.fetch("REDIS_BRANCH")
 
   sh <<-SH
   mkdir -p tmp;
   cd tmp;
+  rm -rf redis-#{branch};
   wget https://github.com/antirez/redis/archive/#{branch}.tar.gz -O #{branch}.tar.gz;
   tar xf #{branch}.tar.gz;
   cd redis-#{branch};
@@ -58,346 +63,6 @@ file BINARY do
 end
 
 Rake::TestTask.new do |t|
-  t.options = "-v"
+  t.options = "-v" if $VERBOSE
   t.test_files = FileList["test/*_test.rb"]
 end
-
-task :doc => ["doc:generate", "doc:prepare"]
-
-namespace :doc do
-  task :generate do
-    require "shellwords"
-
-    `rm -rf doc`
-
-    current_branch = `git branch`[/^\* (.*)$/, 1]
-
-    begin
-      tags = `git tag -l`.split("\n").sort.reverse
-
-      tags.each do |tag|
-        `git checkout -q #{tag} 2>/dev/null`
-
-        unless $?.success?
-          $stderr.puts "Need a clean working copy. Please git-stash away."
-          exit 1
-        end
-
-        puts tag
-
-        `mkdir -p doc/#{tag}`
-
-        files = `git ls-tree -r HEAD lib`.split("\n").map do |line|
-          line[/\t(.*)$/, 1]
-        end
-
-        opts = [
-          "--title", "A Ruby client for Redis",
-          "--output", "doc/#{tag}",
-          "--no-cache",
-          "--no-save",
-          "-q",
-          *files
-        ]
-
-        `yardoc #{Shellwords.shelljoin opts}`
-      end
-    ensure
-      `git checkout -q #{current_branch}`
-    end
-  end
-
-  task :prepare do
-    versions = `git tag -l`.split("\n").grep(/^v/).sort
-    latest_version = versions.last
-
-    File.open("doc/.htaccess", "w") do |file|
-      file.puts "RedirectMatch 302 ^/?$ /#{latest_version}"
-    end
-
-    File.open("doc/robots.txt", "w") do |file|
-      file.puts "User-Agent: *"
-
-      (versions - [latest_version]).each do |version|
-        file.puts "Disallow: /#{version}"
-      end
-    end
-
-    google_analytics = <<-EOS
-    <script type="text/javascript">
-
-      var _gaq = _gaq || [];
-      _gaq.push(['_setAccount', 'UA-11356145-2']);
-      _gaq.push(['_trackPageview']);
-
-      (function() {
-        var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
-        ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
-        var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
-      })();
-
-    </script>
-    EOS
-
-    Dir["doc/**/*.html"].each do |path|
-      lines = IO.readlines(path)
-
-      File.open(path, "w") do |file|
-        lines.each do |line|
-          if line.include?("</head>")
-            file.write(google_analytics)
-          end
-
-          file.write(line)
-        end
-      end
-    end
-  end
-
-  task :deploy do
-    system "rsync --del -avz doc/ redis-rb.keyvalue.org:deploys/redis-rb.keyvalue.org/"
-  end
-end
-
-class Source
-
-  MATCHER = "(?:\\s{%d}#[^\\n]*\\n)*^\\s{%d}def ([a-z_?]+)(?:\(.*?\))?\\n.*?^\\s{%d}end\\n\\n"
-
-  def initialize(data, options = {})
-    @doc = parse(File.read(data), options)
-  end
-
-  def methods
-    @doc.select do |d|
-      d.is_a?(Method)
-    end.map do |d|
-      d.name
-    end
-  end
-
-  def move(a, b)
-    ao = @doc.find { |m| m.is_a?(Method) && m.name == a }
-    bo = @doc.find { |m| m.is_a?(Method) && m.name == b }
-    ai = @doc.index(ao)
-    bi = @doc.index(bo)
-
-    @doc.delete_at(ai)
-    @doc.insert(bi, ao)
-
-    nil
-  end
-
-  def to_s
-    @doc.join
-  end
-
-  protected
-
-  def parse(data, options = {})
-    re = Regexp.new(MATCHER % ([options[:indent]] * 3), Regexp::MULTILINE)
-    tail = data.dup
-    doc = []
-
-    while match = re.match(tail)
-      doc << match.pre_match
-      doc << Method.new(match)
-      tail = match.post_match
-    end
-
-    doc << tail if tail
-    doc
-  end
-
-  class Method
-
-    def initialize(match)
-      @match = match
-    end
-
-    def name
-      @match[1]
-    end
-
-    def to_s
-      @match[0]
-    end
-  end
-end
-
-namespace :commands do
-  def redis_commands
-    $redis_commands ||= doc.keys.map do |key|
-      key.split(" ").first.downcase
-    end.uniq
-  end
-
-  def doc
-    $doc ||= begin
-      require "open-uri"
-      require "json"
-
-      JSON.parse(open("https://github.com/antirez/redis-doc/raw/master/commands.json").read)
-    end
-  end
-
-  task :order do
-    require "json"
-
-    reference = if File.exist?(".order")
-                  JSON.parse(File.read(".order"))
-                else
-                  {}
-                end
-
-    buckets = {}
-    doc.each do |k, v|
-      buckets[v["group"]] ||= []
-      buckets[v["group"]] << k.split.first.downcase
-      buckets[v["group"]].uniq!
-    end
-
-    result = (reference.keys + (buckets.keys - reference.keys)).map do |g|
-      [g, reference[g] + (buckets[g] - reference[g])]
-    end
-
-    File.open(".order", "w") do |f|
-      f.write(JSON.pretty_generate(Hash[result]))
-    end
-  end
-
-  def reorder(file, options = {})
-    require "json"
-    require "set"
-
-    STDERR.puts "reordering #{file}..."
-
-    reference = if File.exist?(".order")
-                  JSON.parse(File.read(".order"))
-                else
-                  {}
-                end
-
-    dst = Source.new(file, options)
-
-    src_methods = reference.map { |k, v| v }.flatten
-    dst_methods = dst.methods
-
-    src_set = Set.new(src_methods)
-    dst_set = Set.new(dst_methods)
-
-    intersection = src_set & dst_set
-    intersection.delete("initialize")
-
-    loop do
-      src_methods = reference.map { |k, v| v }.flatten
-      dst_methods = dst.methods
-
-      src_methods = src_methods.select do |m|
-        intersection.include?(m)
-      end
-
-      dst_methods = dst_methods.select do |m|
-        intersection.include?(m)
-      end
-
-      if src_methods == dst_methods
-        break
-      end
-
-      rv = yield(src_methods, dst_methods, dst)
-      break if rv == false
-    end
-
-    File.open(file, "w") do |f|
-      f.write(dst.to_s)
-    end
-  end
-
-  task :reorder do
-    blk = lambda do |src_methods, dst_methods, dst|
-      src_methods.zip(dst_methods).each do |a, b|
-        if a != b
-          dst.move(a, b)
-          break
-        end
-      end
-    end
-
-    reorder "lib/redis.rb", :indent => 2, &blk
-    reorder "lib/redis/distributed.rb", :indent => 4, &blk
-  end
-
-  def missing(file, options = {})
-    src = Source.new(file, options)
-
-    defined_methods = src.methods.map(&:downcase)
-    required_methods = redis_commands.map(&:downcase)
-
-    STDOUT.puts "missing in #{file}:"
-    STDOUT.puts (required_methods - defined_methods).inspect
-  end
-
-  task :missing do
-    missing "lib/redis.rb", :indent => 2
-    missing "lib/redis/distributed.rb", :indent => 4
-  end
-
-  def document(file)
-    source = File.read(file)
-
-    doc.each do |name, command|
-      source.sub!(/(?:^ *# .*\n)*(^ *#\n(^ *# .+?\n)*)*^( *)def #{name.downcase}(\(|$)/) do
-        extra_comments, indent, extra_args = $1, $3, $4
-        comment = "#{indent}# #{command["summary"].strip}."
-
-        IO.popen("par p#{2 + indent.size} 80", "r+") do |io|
-          io.puts comment
-          io.close_write
-          comment = io.read
-        end
-
-        "#{comment}#{extra_comments}#{indent}def #{name.downcase}#{extra_args}"
-      end
-    end
-
-    File.open(file, "w") { |f| f.write(source) }
-  end
-
-  task :doc do
-    document "lib/redis.rb"
-    document "lib/redis/distributed.rb"
-  end
-
-  task :verify do
-    require "redis"
-    require "stringio"
-
-    require "./test/helper"
-
-    OPTIONS[:logger] = Logger.new("./tmp/log")
-
-    Rake::Task["test:ruby"].invoke
-
-    redis = Redis.new
-
-    report = ["Command", "\033[0mDefined?\033[0m", "\033[0mTested?\033[0m"]
-
-    yes, no = "\033[1;32mYes\033[0m", "\033[1;31mNo\033[0m"
-
-    log = File.read("./tmp/log")
-
-    redis_commands.sort.each do |name, _|
-      defined, tested = redis.respond_to?(name), log[">> #{name.upcase}"]
-
-      next if defined && tested
-
-      report << name
-      report << (defined ? yes : no)
-      report << (tested ? yes : no)
-    end
-
-    IO.popen("rs 0 3", "w") do |io|
-      io.puts report.join("\n")
-    end
-  end
-end

data/lib/redis.rb

@@ -906,6 +906,27 @@ class Redis
     end
   end
 
+  # Return the position of the first bit set to 1 or 0 in a string.
+  #
+  # @param [String] key
+  # @param [Fixnum] bit whether to look for the first 1 or 0 bit
+  # @param [Fixnum] start start index
+  # @param [Fixnum] stop stop index
+  # @return [Fixnum] the position of the first 1/0 bit.
+  #                  -1 if looking for 1 and it is not found or start and stop are given.
+  def bitpos(key, bit, start=nil, stop=nil)
+    if stop and not start
+      raise(ArgumentError, 'stop parameter specified without start parameter')
+    end
+
+    synchronize do |client|
+      command = [:bitpos, key, bit]
+      command << start if start
+      command << stop if stop
+      client.call(command)
+    end
+  end
+
   # Set the string value of a key and return its old value.
   #
   # @param [String] key
@@ -2415,6 +2436,39 @@ class Redis
     end
   end
 
+  # Add one or more members to a HyperLogLog structure.
+  #
+  # @param [String] key
+  # @param [String, Array<String>] member one member, or array of members
+  # @return [Boolean] true if at least 1 HyperLogLog internal register was altered. false otherwise.
+  def pfadd(key, member)
+    synchronize do |client|
+      client.call([:pfadd, key, member], &_boolify)
+    end
+  end
+
+  # Get the approximate cardinality of members added to HyperLogLog structure.
+  #
+  # @param [String] key
+  # @return [Fixnum]
+  def pfcount(key)
+    synchronize do |client|
+      client.call([:pfcount, key])
+    end
+  end
+
+  # Merge multiple HyperLogLog values into an unique value that will approximate the cardinality of the union of
+  # the observed Sets of the source HyperLogLog structures.
+  #
+  # @param [String] dest_key destination key
+  # @param [String, Array<String>] source_key source key, or array of keys
+  # @return [Boolean]
+  def pfmerge(dest_key, *source_key)
+    synchronize do |client|
+      client.call([:pfmerge, dest_key, *source_key], &_boolify_set)
+    end
+  end
+
   def id
     @original_client.id
   end

data/lib/redis/client.rb

@@ -16,7 +16,9 @@ class Redis
       :db => 0,
       :driver => nil,
       :id => nil,
-      :tcp_keepalive => 0
+      :tcp_keepalive => 0,
+      :reconnect_attempts => 1,
+      :inherit_socket => false
     }
 
     def options
@@ -59,6 +61,10 @@ class Redis
       @options[:driver]
     end
 
+    def inherit_socket?
+      @options[:inherit_socket]
+    end
+
     attr_accessor :logger
     attr_reader :connection
     attr_reader :command_map
@@ -218,8 +224,11 @@ class Redis
 
     def io
       yield
-    rescue TimeoutError
-      raise TimeoutError, "Connection timed out"
+    rescue TimeoutError => e1
+      # Add a message to the exception without destroying the original stack
+      e2 = TimeoutError.new("Connection timed out")
+      e2.set_backtrace(e1.backtrace)
+      raise e2
     rescue Errno::ECONNRESET, Errno::EPIPE, Errno::ECONNABORTED, Errno::EBADF, Errno::EINVAL => e
       raise ConnectionError, "Connection lost (%s)" % [e.class.name.split("::").last]
     end
@@ -271,13 +280,23 @@ class Redis
 
       begin
         commands.each do |name, *args|
-          @logger.debug("Redis >> #{name.to_s.upcase} #{args.map(&:to_s).join(" ")}")
+          logged_args = args.map do |a|
+            case
+            when a.respond_to?(:inspect) then a.inspect
+            when a.respond_to?(:to_s)    then a.to_s
+            else
+              # handle poorly-behaved descendants of BasicObject
+              klass = a.instance_exec { (class << self; self end).superclass }
+              "\#<#{klass}:#{a.__id__}>"
+            end
+          end
+          @logger.debug("[Redis] command=#{name.to_s.upcase} args=#{logged_args.join(' ')}")
         end
 
         t1 = Time.now
         yield
       ensure
-        @logger.debug("Redis >> %0.2fms" % ((Time.now - t1) * 1000)) if t1
+        @logger.debug("[Redis] call_time=%0.2f ms" % ((Time.now - t1) * 1000)) if t1
       end
     end
 
@@ -291,26 +310,27 @@ class Redis
     end
 
     def ensure_connected
-      tries = 0
+      attempts = 0
 
       begin
+        attempts += 1
+
         if connected?
-          if Process.pid != @pid
+          unless inherit_socket? || Process.pid == @pid
             raise InheritedError,
               "Tried to use a connection from a child process without reconnecting. " +
-              "You need to reconnect to Redis after forking."
+              "You need to reconnect to Redis after forking " +
+              "or set :inherit_socket to true."
           end
         else
           connect
         end
 
-        tries += 1
-
         yield
-      rescue ConnectionError
+      rescue ConnectionError, InheritedError
         disconnect
 
-        if tries < 2 && @reconnect
+        if attempts <= @options[:reconnect_attempts] && @reconnect
           retry
         else
           raise
@@ -359,7 +379,7 @@ class Redis
 
       # Use default when option is not specified or nil
       defaults.keys.each do |key|
-        options[key] ||= defaults[key]
+        options[key] = defaults[key] if options[key].nil?
       end
 
       if options[:path]

data/lib/redis/distributed.rb

@@ -323,6 +323,11 @@ class Redis
       end
     end
 
+    # Return the position of the first bit set to 1 or 0 in a string.
+    def bitpos(key, bit, start=nil, stop=nil)
+      node_for(key).bitpos(key, bit, start, stop)
+    end
+
     # Set the string value of a key and return its old value.
     def getset(key, value)
       node_for(key).getset(key, value)
@@ -781,6 +786,24 @@ class Redis
       on_each_node(:script, subcommand, *args)
     end
 
+    # Add one or more members to a HyperLogLog structure.
+    def pfadd(key, member)
+      node_for(key).pfadd(key, member)
+    end
+
+    # Get the approximate cardinality of members added to HyperLogLog structure.
+    def pfcount(key)
+      node_for(key).pfcount(key)
+    end
+
+    # Merge multiple HyperLogLog values into an unique value that will approximate the cardinality of the union of
+    # the observed Sets of the source HyperLogLog structures.
+    def pfmerge(dest_key, *source_key)
+      ensure_same_node(:pfmerge, [dest_key, *source_key]) do |node|
+        node.pfmerge(dest_key, *source_key)
+      end
+    end
+
     def _eval(cmd, args)
       script = args.shift
       options = args.pop if args.last.is_a?(Hash)

data/lib/redis/version.rb

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

data/test/bitpos_test.rb

@@ -0,0 +1,69 @@
+# encoding: UTF-8
+
+require File.expand_path("helper", File.dirname(__FILE__))
+
+unless defined?(Enumerator)
+  Enumerator = Enumerable::Enumerator
+end
+
+class TestBitpos < Test::Unit::TestCase
+
+  include Helper::Client
+
+  def test_bitpos_empty_zero
+    target_version "2.9.11" do
+      r.del "foo"
+      assert_equal 0, r.bitpos("foo", 0)
+    end
+  end
+
+  def test_bitpos_empty_one
+    target_version "2.9.11" do
+      r.del "foo"
+      assert_equal -1, r.bitpos("foo", 1)
+    end
+  end
+
+  def test_bitpos_zero
+    target_version "2.9.11" do
+      r.set "foo", "\xff\xf0\x00"
+      assert_equal 12, r.bitpos("foo", 0)
+    end
+  end
+
+  def test_bitpos_one
+    target_version "2.9.11" do
+      r.set "foo", "\x00\x0f\x00"
+      assert_equal 12, r.bitpos("foo", 1)
+    end
+  end
+
+  def test_bitpos_zero_end_is_given
+    target_version "2.9.11" do
+      r.set "foo", "\xff\xff\xff"
+      assert_equal 24, r.bitpos("foo", 0)
+      assert_equal 24, r.bitpos("foo", 0, 0)
+      assert_equal -1, r.bitpos("foo", 0, 0, -1)
+    end
+  end
+
+  def test_bitpos_one_intervals
+    target_version "2.9.11" do
+      r.set "foo", "\x00\xff\x00"
+      assert_equal 8,  r.bitpos("foo", 1, 0, -1)
+      assert_equal 8,  r.bitpos("foo", 1, 1, -1)
+      assert_equal -1, r.bitpos("foo", 1, 2, -1)
+      assert_equal -1, r.bitpos("foo", 1, 2, 200)
+      assert_equal 8,  r.bitpos("foo", 1, 1, 1)
+    end
+  end
+
+  def test_bitpos_raise_exception_if_stop_not_start
+    target_version "2.9.11" do
+      assert_raises(ArgumentError) do
+        r.bitpos("foo", 0, nil, 2)
+      end
+    end
+  end
+
+end

data/test/commands_on_hyper_log_log_test.rb

@@ -0,0 +1,21 @@
+# encoding: UTF-8
+
+require File.expand_path("helper", File.dirname(__FILE__))
+require "lint/hyper_log_log"
+
+class TestCommandsOnHyperLogLog < Test::Unit::TestCase
+
+  include Helper::Client
+  include Lint::HyperLogLog
+
+  def test_pfmerge
+    target_version "2.8.9" do
+      r.pfadd "foo", "s1"
+      r.pfadd "bar", "s2"
+
+      assert_equal true, r.pfmerge("res", "foo", "bar")
+      assert_equal 2, r.pfcount("res")
+    end
+  end
+
+end

data/test/distributed_commands_on_hyper_log_log_test.rb

@@ -0,0 +1,22 @@
+# encoding: UTF-8
+
+require File.expand_path("helper", File.dirname(__FILE__))
+require "lint/hyper_log_log"
+
+class TestDistributedCommandsOnHyperLogLog < Test::Unit::TestCase
+
+  include Helper::Distributed
+  include Lint::HyperLogLog
+
+  def test_pfmerge
+    target_version "2.8.9" do
+      assert_raise Redis::Distributed::CannotDistribute do
+        r.pfadd "foo", "s1"
+        r.pfadd "bar", "s2"
+
+        assert r.pfmerge("res", "foo", "bar")
+      end
+    end
+  end
+
+end

data/test/fork_safety_test.rb

@@ -0,0 +1,65 @@
+# encoding: UTF-8
+
+require File.expand_path("helper", File.dirname(__FILE__))
+
+class TestForkSafety < Test::Unit::TestCase
+
+  include Helper::Client
+  include Helper::Skipable
+
+  driver(:ruby, :hiredis) do
+    def test_fork_safety
+      redis = Redis.new(OPTIONS)
+      redis.set "foo", 1
+
+      child_pid = fork do
+        begin
+          # InheritedError triggers a reconnect,
+          # so we need to disable reconnects to force
+          # the exception bubble up
+          redis.without_reconnect do
+            redis.set "foo", 2
+          end
+        rescue Redis::InheritedError
+          exit 127
+        end
+      end
+
+      _, status = Process.wait2(child_pid)
+
+      assert_equal 127, status.exitstatus
+      assert_equal "1", redis.get("foo")
+
+    rescue NotImplementedError => error
+      raise unless error.message =~ /fork is not available/
+      return skip(error.message)
+    end
+
+    def test_fork_safety_with_enabled_inherited_socket
+      redis = Redis.new(OPTIONS.merge(:inherit_socket => true))
+      redis.set "foo", 1
+
+      child_pid = fork do
+        begin
+          # InheritedError triggers a reconnect,
+          # so we need to disable reconnects to force
+          # the exception bubble up
+          redis.without_reconnect do
+            redis.set "foo", 2
+          end
+        rescue Redis::InheritedError
+          exit 127
+        end
+      end
+
+      _, status = Process.wait2(child_pid)
+
+      assert_equal 0, status.exitstatus
+      assert_equal "2", redis.get("foo")
+
+    rescue NotImplementedError => error
+      raise unless error.message =~ /fork is not available/
+      return skip(error.message)
+    end
+  end
+end

data/test/helper.rb

@@ -40,14 +40,13 @@ def init(redis)
       Make sure Redis is running on localhost, port #{PORT}.
       This testing suite connects to the database 15.
 
-      To install redis:
-        visit <http://redis.io/download/>.
+      Try this once:
 
-      To start the server:
-        rake start
+        $ rake clean
 
-      To stop the server:
-        rake stop
+      Then run the build again:
+
+        $ rake
 
     EOS
     exit 1
@@ -215,4 +214,17 @@ module Helper
       Redis::Distributed.new(NODES, _format_options(options).merge(:driver => ENV["conn"]))
     end
   end
+
+  # Basic support for `skip` in 1.8.x
+  # Note: YOU MUST use `return skip(message)` in order to appropriately bail
+  # from a running test.
+  module Skipable
+    Skipped = Class.new(RuntimeError)
+
+    def skip(message = nil, bt = caller)
+      return super if defined?(super)
+
+      $stderr.puts("SKIPPED: #{self} #{message || 'no reason given'}")
+    end
+  end
 end

data/test/internals_test.rb

@@ -9,8 +9,8 @@ class TestInternals < Test::Unit::TestCase
   def test_logger
     r.ping
 
-    assert log.string =~ /Redis >> PING/
-      assert log.string =~ /Redis >> \d+\.\d+ms/
+    assert log.string["[Redis] command=PING"]
+    assert log.string =~ /\[Redis\] call_time=\d+\.\d+ ms/
   end
 
   def test_logger_with_pipelining
@@ -19,8 +19,8 @@ class TestInternals < Test::Unit::TestCase
       r.get "foo"
     end
 
-    assert log.string["SET foo bar"]
-    assert log.string["GET foo"]
+    assert log.string[" command=SET args=\"foo\" \"bar\""]
+    assert log.string[" command=GET args=\"foo\""]
   end
 
   def test_recovers_from_failed_commands
@@ -157,7 +157,7 @@ class TestInternals < Test::Unit::TestCase
     end
   end
 
-  def close_on_ping(seq)
+  def close_on_ping(seq, options = {})
     $request = 0
 
     command = lambda do
@@ -169,7 +169,7 @@ class TestInternals < Test::Unit::TestCase
       rv
     end
 
-    redis_mock(:ping => command, :timeout => 0.1) do |redis|
+    redis_mock({:ping => command}, {:timeout => 0.1}.merge(options)) do |redis|
       yield(redis)
     end
   end
@@ -218,6 +218,22 @@ class TestInternals < Test::Unit::TestCase
     end
   end
 
+  def test_retry_with_custom_reconnect_attempts
+    close_on_ping([0, 1], :reconnect_attempts => 2) do |redis|
+      assert_equal "2", redis.ping
+    end
+  end
+
+  def test_retry_with_custom_reconnect_attempts_can_still_fail
+    close_on_ping([0, 1, 2], :reconnect_attempts => 2) do |redis|
+      assert_raise Redis::ConnectionError do
+        redis.ping
+      end
+
+      assert !redis.client.connected?
+    end
+  end
+
   def test_don_t_retry_when_second_read_in_pipeline_raises_econnreset
     close_on_ping([1]) do |redis|
       assert_raise Redis::ConnectionError do

data/test/lint/hyper_log_log.rb

@@ -0,0 +1,48 @@
+module Lint
+
+  module HyperLogLog
+
+    def test_pfadd
+      target_version "2.8.9" do
+        assert_equal true, r.pfadd("foo", "s1")
+        assert_equal true, r.pfadd("foo", "s2")
+        assert_equal false, r.pfadd("foo", "s1")
+
+        assert_equal 2, r.pfcount("foo")
+      end
+    end
+
+    def test_variadic_pfadd
+      target_version "2.8.9" do
+        assert_equal true, r.pfadd("foo", ["s1", "s2"])
+        assert_equal true, r.pfadd("foo", ["s1", "s2", "s3"])
+
+        assert_equal 3, r.pfcount("foo")
+      end
+    end
+
+    def test_pfcount
+      target_version "2.8.9" do
+        assert_equal 0, r.pfcount("foo")
+
+        assert_equal true, r.pfadd("foo", "s1")
+
+        assert_equal 1, r.pfcount("foo")
+      end
+    end
+
+    def test_variadic_pfcount
+      target_version "2.8.9" do
+        assert_equal 0, r.pfcount(["foo", "bar"])
+
+        assert_equal true, r.pfadd("foo", "s1")
+        assert_equal true, r.pfadd("bar", "s1")
+        assert_equal true, r.pfadd("bar", "s2")
+
+        assert_equal 2, r.pfcount(["foo", "bar"])
+      end
+    end
+
+  end
+
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: redis
 version: !ruby/object:Gem::Version
-  version: 3.0.7
+  version: 3.1.0
 platform: ruby
 authors:
 - Ezra Zygmuntowicz
@@ -16,26 +16,25 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-21 00:00:00.000000000 Z
+date: 2014-06-06 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: |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.
+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"
 email:
 - redis-db@googlegroups.com
 executables: []
@@ -48,6 +47,7 @@ files:
 - .travis/Gemfile
 - .yardopts
 - CHANGELOG.md
+- Gemfile
 - LICENSE
 - README.md
 - Rakefile
@@ -79,9 +79,11 @@ files:
 - lib/redis/subscribe.rb
 - lib/redis/version.rb
 - redis.gemspec
+- test/bitpos_test.rb
 - test/blocking_commands_test.rb
 - test/command_map_test.rb
 - test/commands_on_hashes_test.rb
+- test/commands_on_hyper_log_log_test.rb
 - test/commands_on_lists_test.rb
 - test/commands_on_sets_test.rb
 - test/commands_on_sorted_sets_test.rb
@@ -91,6 +93,7 @@ files:
 - test/db/.gitkeep
 - test/distributed_blocking_commands_test.rb
 - test/distributed_commands_on_hashes_test.rb
+- test/distributed_commands_on_hyper_log_log_test.rb
 - test/distributed_commands_on_lists_test.rb
 - test/distributed_commands_on_sets_test.rb
 - test/distributed_commands_on_sorted_sets_test.rb
@@ -109,11 +112,13 @@ files:
 - test/distributed_transactions_test.rb
 - test/encoding_test.rb
 - test/error_replies_test.rb
+- test/fork_safety_test.rb
 - test/helper.rb
 - test/helper_test.rb
 - test/internals_test.rb
 - test/lint/blocking_commands.rb
 - test/lint/hashes.rb
+- test/lint/hyper_log_log.rb
 - test/lint/lists.rb
 - test/lint/sets.rb
 - test/lint/sorted_sets.rb
@@ -148,18 +153,83 @@ 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: []
 rubyforge_project: 
-rubygems_version: 2.0.14
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: A Ruby client library for Redis
-test_files: []
+test_files:
+- test/bitpos_test.rb
+- test/blocking_commands_test.rb
+- test/command_map_test.rb
+- test/commands_on_hashes_test.rb
+- test/commands_on_hyper_log_log_test.rb
+- test/commands_on_lists_test.rb
+- test/commands_on_sets_test.rb
+- test/commands_on_sorted_sets_test.rb
+- test/commands_on_strings_test.rb
+- test/commands_on_value_types_test.rb
+- test/connection_handling_test.rb
+- test/db/.gitkeep
+- test/distributed_blocking_commands_test.rb
+- test/distributed_commands_on_hashes_test.rb
+- test/distributed_commands_on_hyper_log_log_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
+- test/distributed_connection_handling_test.rb
+- test/distributed_internals_test.rb
+- test/distributed_key_tags_test.rb
+- test/distributed_persistence_control_commands_test.rb
+- test/distributed_publish_subscribe_test.rb
+- test/distributed_remote_server_control_commands_test.rb
+- test/distributed_scripting_test.rb
+- test/distributed_sorting_test.rb
+- test/distributed_test.rb
+- test/distributed_transactions_test.rb
+- test/encoding_test.rb
+- test/error_replies_test.rb
+- test/fork_safety_test.rb
+- test/helper.rb
+- test/helper_test.rb
+- test/internals_test.rb
+- test/lint/blocking_commands.rb
+- test/lint/hashes.rb
+- test/lint/hyper_log_log.rb
+- test/lint/lists.rb
+- test/lint/sets.rb
+- test/lint/sorted_sets.rb
+- test/lint/strings.rb
+- test/lint/value_types.rb
+- test/persistence_control_commands_test.rb
+- test/pipelining_commands_test.rb
+- test/publish_subscribe_test.rb
+- test/remote_server_control_commands_test.rb
+- test/scanning_test.rb
+- test/scripting_test.rb
+- test/sorting_test.rb
+- test/support/connection/hiredis.rb
+- test/support/connection/ruby.rb
+- test/support/connection/synchrony.rb
+- test/support/redis_mock.rb
+- test/support/wire/synchrony.rb
+- test/support/wire/thread.rb
+- test/synchrony_driver.rb
+- test/test.conf
+- test/thread_safety_test.rb
+- test/transactions_test.rb
+- test/unknown_commands_test.rb
+- test/url_param_test.rb
+has_rdoc: