Merge remote-tracking branch 'origin/master' into 4.0

Author: djanowski

.travis.yml

@@ -6,13 +6,17 @@ rvm:
   - 2.1
   - 2.2
   - 2.3.3
+  - 2.4.1
   - jruby-9
   - rbx-3
 
 gemfile: ".travis/Gemfile"
 
 sudo: false
 
+before_script:
+- if (ruby -e "exit RUBY_VERSION.to_f >= 2.4"); then export RUBYOPT="--enable-frozen-string-literal"; fi; echo $RUBYOPT
+
 env:
   global:
     - VERBOSE=true
@@ -28,6 +32,8 @@ env:
 
 branches:
   only:
+    - staging
+    - trying
     - master
 
 matrix:

.travis/Gemfile

@@ -2,10 +2,12 @@ source "https://rubygems.org"
 
 gemspec :path => "../"
 
-case ENV["conn"]
+case ENV["DRIVER"]
 when "hiredis"
   gem "hiredis"
 when "synchrony"
   gem "hiredis"
   gem "em-synchrony"
 end
+
+gem 'test-unit', '>= 3.2.5'

CHANGELOG.md

@@ -7,6 +7,10 @@
 * Added support for `CLIENT` commands. The lower-level client can be
   accessed via `Redis#_client`.
 
+# 3.3.3
+
+* Improved timeout handling after dropping Timeout module.
+
 # 3.3.2
 
 * Added support for `SPOP` with COUNT. See #628.

README.md

@@ -355,12 +355,12 @@ client and evangelized Redis in Rubyland. Thank you, Ezra.
 requests. You can also ask for help at `#redis-rb` on Freenode.
 
 
-[inchpages-image]: https://inch-ci.org/github/redis/redis-rb.png
+[inchpages-image]: https://inch-ci.org/github/redis/redis-rb.svg
 [inchpages-link]:  https://inch-ci.org/github/redis/redis-rb
-[redis-commands]:  http://redis.io/commands
-[redis-home]:      http://redis.io
+[redis-commands]:  https://redis.io/commands
+[redis-home]:      https://redis.io
 [redis-url]:       http://www.iana.org/assignments/uri-schemes/prov/redis
 [travis-home]:     https://travis-ci.org/
-[travis-image]:    https://secure.travis-ci.org/redis/redis-rb.png?branch=master
+[travis-image]:    https://secure.travis-ci.org/redis/redis-rb.svg?branch=master
 [travis-link]:     https://travis-ci.org/redis/redis-rb
-[rubydoc]:         http://www.rubydoc.info/gems/redis
+[rubydoc]:         https://www.rubydoc.info/gems/redis

bors.toml

@@ -0,0 +1,14 @@
+# Gate on Travis CI
+status = ["continuous-integration/travis-ci/push"]
+
+# Set bors's timeout to 6 hours
+#
+# bors's timeout should always be twice a long as the test suite takes.
+# This is to allow Travis to fast-fail a test; if one of the builders
+# immediately reports a failure, then bors will move on to the next batch,
+# leaving the slower builders to work through the already-doomed run and
+# the next one.
+#
+# At the time it was written, a run had taken 3 hours.
+# bors's default timeout is 4 hours.
+timeout_sec = 14400

lib/redis.rb

@@ -134,10 +134,11 @@ def select(db)
 
   # Ping the server.
   #
+  # @param [optional, String] message
   # @return [String] `PONG`
-  def ping
+  def ping(message = nil)
     synchronize do |client|
-      client.call([:ping])
+      client.call([:ping, message].compact)
     end
   end
 
@@ -468,10 +469,16 @@ def dump(key)
   # @param [String] key
   # @param [String] ttl
   # @param [String] serialized_value
+  # @param [Hash] options
+  #   - `:replace => Boolean`: if false, raises an error if key already exists
+  # @raise [Redis::CommandError]
   # @return [String] `"OK"`
-  def restore(key, ttl, serialized_value)
+  def restore(key, ttl, serialized_value, options = {})
+    args = [:restore, key, ttl, serialized_value]
+    args << 'REPLACE' if options[:replace]
+
     synchronize do |client|
-      client.call([:restore, key, ttl, serialized_value])
+      client.call(args)
     end
   end
 
@@ -1047,7 +1054,7 @@ def llen(key)
   # Prepend one or more values to a list, creating the list if it doesn't exist
   #
   # @param [String] key
-  # @param [String, Array] value string value, or array of string values to push
+  # @param [String, Array<String>] value string value, or array of string values to push
   # @return [Fixnum] the length of the list after the push operation
   def lpush(key, value)
     synchronize do |client|
@@ -1069,7 +1076,7 @@ def lpushx(key, value)
   # Append one or more values to a list, creating the list if it doesn't exist
   #
   # @param [String] key
-  # @param [String] value
+  # @param [String, Array<String>] value string value, or array of string values to push
   # @return [Fixnum] the length of the list after the push operation
   def rpush(key, value)
     synchronize do |client|
@@ -1707,6 +1714,30 @@ def zremrangebyrank(key, start, stop)
     end
   end
 
+  # Count the members, with the same score in a sorted set, within the given lexicographical range.
+  #
+  # @example Count members matching a
+  #   redis.zlexcount("zset", "[a", "[a\xff")
+  #     # => 1
+  # @example Count members matching a-z
+  #   redis.zlexcount("zset", "[a", "[z\xff")
+  #     # => 26
+  #
+  # @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 `[`
+  #
+  # @return [Fixnum] number of members within the specified lexicographical range
+  def zlexcount(key, min, max)
+    synchronize do |client|
+      client.call([:zlexcount, key, min, max])
+    end
+  end
+
   # Return a range of members with the same score in a sorted set, by lexicographical ordering
   #
   # @example Retrieve members matching a

lib/redis/client.rb

@@ -450,12 +450,12 @@ def _parse_options(options)
       case options[:tcp_keepalive]
       when Hash
         [:time, :intvl, :probes].each do |key|
-          unless options[:tcp_keepalive][key].is_a?(Fixnum)
-            raise "Expected the #{key.inspect} key in :tcp_keepalive to be a Fixnum"
+          unless options[:tcp_keepalive][key].is_a?(Integer)
+            raise "Expected the #{key.inspect} key in :tcp_keepalive to be an Integer"
           end
         end
 
-      when Fixnum
+      when Integer
         if options[:tcp_keepalive] >= 60
           options[:tcp_keepalive] = {:time => options[:tcp_keepalive] - 20, :intvl => 10, :probes => 2}
 

lib/redis/connection/ruby.rb

@@ -20,7 +20,7 @@ def initialize(*args)
         super(*args)
 
         @timeout = @write_timeout = nil
-        @buffer = ""
+        @buffer = "".dup
       end
 
       def timeout=(timeout)

lib/redis/distributed.rb

@@ -144,8 +144,8 @@ def dump(key)
     end
 
     # Create a key using the serialized value, previously obtained using DUMP.
-    def restore(key, ttl, serialized_value)
-      node_for(key).restore(key, ttl, serialized_value)
+    def restore(key, ttl, serialized_value, options = {})
+      node_for(key).restore(key, ttl, serialized_value, options)
     end
 
     # Transfer a key from the connected instance to another instance.

redis.gemspec

@@ -34,7 +34,7 @@ Gem::Specification.new do |s|
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
 
-  s.add_development_dependency("test-unit", "3.1.5")
+  s.add_development_dependency("test-unit", ">= 3.1.5")
   s.add_development_dependency("hiredis")
   s.add_development_dependency("em-synchrony")
 end