redis 4.0.1 → 4.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7e0d0ba2328aca583c0f487729779c2b10b12c7b
-  data.tar.gz: 4a411cfa3512bafe7c2c12ac8a02c02bc87065aa
+  metadata.gz: e8fe8cb80ceaefd35f21b3ae06bdfa7594a1878a
+  data.tar.gz: ec9c330b13ac9639b6033c96b9e92da659eede4e
 SHA512:
-  metadata.gz: 3af7dc63dc7bdc243da306817583db9b6989c21a0714c6652b4a443bfd9c46b2afba0707b028d708a74148bbeedd09d4ec207a0459b3559cb19b95f2f030bb07
-  data.tar.gz: 98d5aed456ebcd3ccdc50980879a3c14be4c8a1874c6febae95579d2fb3828bda2e82b05e62dc6a4966e178993d4a2a20dc3dedd9f8583cd731851eab2f8e164
+  metadata.gz: 215cf01a2c7987aafb818959f1dd70688099b48f51fbc55d0bacc2ebddc27d45f7a60aca57e412a80f94dc6d9316312fa29be1e1077092a92657bd75103cae2a
+  data.tar.gz: f26724045477ec4d5d5351611266489c13f778fe2eed7ace4824f37dcadfc378a69271abe22166fc2da16da0ac0b5236448828d36a0c44146a22dfe0d886045e

data/.travis.yml

@@ -1,4 +1,10 @@
 language: ruby
+cache:
+    directories:
+      - tmp/cache
+before_install:
+  - gem update --system 2.6.14
+  - gem --version
 
 script: make test
 
@@ -6,8 +12,8 @@ rvm:
   - 2.2.2
   - 2.3.3
   - 2.4.1
-  - jruby-9
-  - rbx-3
+  - 2.5.0
+  - jruby-9.1.17.0
 
 gemfile: ".travis/Gemfile"
 
@@ -27,7 +33,7 @@ env:
     - DRIVER=hiredis   REDIS_BRANCH=3.2
     - DRIVER=synchrony REDIS_BRANCH=3.0
     - DRIVER=synchrony REDIS_BRANCH=3.2
-    - DRIVER=ruby      REDIS_BRANCH=unstable
+    - DRIVER=ruby      REDIS_BRANCH=4.0
 
 branches:
   only:
@@ -38,34 +44,16 @@ branches:
 matrix:
   exclude:
     # hiredis
-    - rvm: jruby-9
-      gemfile: .travis/Gemfile
-      env: DRIVER=hiredis REDIS_BRANCH=3.0
-    - rvm: jruby-9
-      gemfile: .travis/Gemfile
-      env: DRIVER=hiredis REDIS_BRANCH=3.2
-    - rvm: jruby-9
-      gemfile: .travis/Gemfile
-      env: DRIVER=hiredis REDIS_BRANCH=3.0
-    - rvm: jruby-9
-      gemfile: .travis/Gemfile
-      env: DRIVER=hiredis REDIS_BRANCH=3.2
+    - rvm: jruby-9.1.17.0
+      env: DRIVER=hiredis   REDIS_BRANCH=3.0
+    - rvm: jruby-9.1.17.0
+      env: DRIVER=hiredis   REDIS_BRANCH=3.2
 
     # synchrony
-    - rvm: jruby-9
-      gemfile: .travis/Gemfile
+    - rvm: jruby-9.1.17.0
       env: DRIVER=synchrony REDIS_BRANCH=3.0
-    - rvm: jruby-9
-      gemfile: .travis/Gemfile
+    - rvm: jruby-9.1.17.0
       env: DRIVER=synchrony REDIS_BRANCH=3.2
-    - rvm: jruby-9
-      gemfile: .travis/Gemfile
-      env: DRIVER=synchrony REDIS_BRANCH=3.0
-    - rvm: jruby-9
-      gemfile: .travis/Gemfile
-      env: DRIVER=synchrony REDIS_BRANCH=3.2
-  allow_failures:
-    - rvm: rbx-3
 
 notifications:
   irc:

data/.travis/Gemfile

@@ -2,6 +2,11 @@ source "https://rubygems.org"
 
 gemspec :path => "../"
 
+# Using jruby-openssl 0.10.0, we get NPEs in jruby tests: https://github.com/redis/redis-rb/issues/756
+platform :jruby do
+  gem 'jruby-openssl', '<0.10.0'
+end
+
 case ENV["DRIVER"]
 when "hiredis"
   gem "hiredis"

data/CHANGELOG.md

@@ -1,3 +1,17 @@
+# 4.0.2
+
+* Added `Redis#unlink`. See #766.
+
+* `Redis.new` now accept a custom connector via `:connector`. See #591.
+
+* `Redis#multi` no longer perform empty transactions. See #747.
+
+* `Redis#hdel` now accepts hash keys as multiple arguments like `#del`. See #755.
+
+* Allow to skip SSL verification. See #745.
+
+* Add Geo commands: `geoadd`, `geohash`, `georadius`, `georadiusbymember`, `geopos`, `geodist`. See #730.
+
 # 4.0.1
 
 * `Redis::Distributed` now supports `mget` and `mapped_mget`. See #687.
@@ -21,6 +35,15 @@
 
 * Dropped official support for Ruby < 2.2.2.
 
+# 3.3.5
+
+* Fixed Ruby 1.8 compatibility after backporting `Redis#connection`. See #719.
+
+# 3.3.4 (yanked)
+
+* `Redis#connection` returns a hash with connection information.
+  You shouldn't need to call `Redis#_client`, ever.
+
 # 3.3.3
 
 * Improved timeout handling after dropping Timeout module.

data/Gemfile

@@ -1,3 +1,8 @@
 source 'https://rubygems.org'
 
 gemspec
+
+# Using jruby-openssl 0.10.0, we get NPEs in jruby tests: https://github.com/redis/redis-rb/issues/756
+platform :jruby do
+  gem 'jruby-openssl', '<0.10.0'
+end

data/README.md

@@ -176,7 +176,7 @@ it can't connect to the server a `Redis::CannotConnectError` error will be raise
 ```ruby
 begin
   redis.ping
-rescue Exception => e
+rescue StandardError => e
   e.inspect
 # => #<Redis::CannotConnectError: Timed out connecting to Redis on 10.0.1.1:6380>
 

data/bin/build

@@ -0,0 +1,71 @@
+#!/usr/bin/env ruby
+
+TARBALL = ARGV[0]
+
+require 'digest/sha1'
+require 'fileutils'
+
+class Builder
+  def initialize(redis_branch, tmp_dir)
+    @redis_branch = redis_branch
+    @tmp_dir = tmp_dir
+    @build_dir = File.join(@tmp_dir, "cache", "redis-#{redis_branch}")
+  end
+
+  def run
+    download_tarball
+    if old_checkum != checksum
+      build
+      update_checksum
+    end
+    0
+  end
+
+  def download_tarball
+    command!('wget', tarball_url, '-O', tarball_path)
+  end
+
+  def tarball_path
+    File.join(@tmp_dir, "redis-#{@redis_branch}.tar.gz")
+  end
+
+  def tarball_url
+    "https://github.com/antirez/redis/archive/#{@redis_branch}.tar.gz"
+  end
+
+  def build
+    FileUtils.rm_rf(@build_dir)
+    FileUtils.mkdir_p(@build_dir)
+    command!('tar', 'xf', tarball_path, '-C', File.expand_path('../', @build_dir))
+    Dir.chdir(@build_dir) do
+      command!('make')
+    end
+  end
+
+  def update_checksum
+    File.write(checksum_path, checksum)
+  end
+
+  def old_checkum
+    File.read(checksum_path)
+  rescue Errno::ENOENT
+    nil
+  end
+
+  def checksum_path
+    File.join(@build_dir, 'build.checksum')
+  end
+
+  def checksum
+    @checksum ||= Digest::SHA1.file(tarball_path).hexdigest
+  end
+
+  def command!(*args)
+    puts "$ #{args.join(' ')}"
+    unless system(*args)
+      raise "Command failed with status #{$?.exitstatus}"
+    end
+  end
+end
+
+exit Builder.new(ARGV[0], ARGV[1]).run

data/lib/redis.rb

@@ -524,6 +524,16 @@ class Redis
     end
   end
 
+  # Unlink one or more keys.
+  #
+  # @param [String, Array<String>] keys
+  # @return [Fixnum] number of keys that were unlinked
+  def unlink(*keys)
+    synchronize do |client|
+      client.call([:unlink] + keys)
+    end
+  end
+
   # Determine if a key exists.
   #
   # @param [String] key
@@ -2102,9 +2112,9 @@ class Redis
   # @param [String] key
   # @param [String, Array<String>] field
   # @return [Fixnum] the number of fields that were removed from the hash
-  def hdel(key, field)
+  def hdel(key, *fields)
     synchronize do |client|
-      client.call([:hdel, key, field])
+      client.call([:hdel, key, *fields])
     end
   end
 
@@ -2710,6 +2720,86 @@ class Redis
     end
   end
 
+  # Adds the specified geospatial items (latitude, longitude, name) to the specified key
+  #
+  # @param [String] key
+  # @param [Array] member arguemnts for member or members: longitude, latitude, name
+  # @return [Intger] number of elements added to the sorted set
+  def geoadd(key, *member)
+    synchronize do |client|
+      client.call([:geoadd, key, member])
+    end
+  end
+
+  # Returns geohash string representing position for specified members of the specified key.
+  #
+  # @param [String] key
+  # @param [String, Array<String>] member one member or array of members
+  # @return [Array<String, nil>] returns array containg geohash string if member is present, nil otherwise
+  def geohash(key, member)
+    synchronize do |client|
+      client.call([:geohash, key, member])
+    end
+  end
+
+
+  # Query a sorted set representing a geospatial index to fetch members matching a
+  # given maximum distance from a point
+  #
+  # @param [Array] args key, longitude, latitude, radius, unit(m|km|ft|mi)
+  # @param ['asc', 'desc'] sort sort returned items from the nearest to the farthest or the farthest to the nearest relative to the center
+  # @param [Integer] count limit the results to the first N matching items
+  # @param ['WITHDIST', 'WITHCOORD', 'WITHHASH'] options to return additional information
+  # @return [Array<String>] may be changed with `options`
+
+  def georadius(*args, **geoptions)
+    geoarguments = _geoarguments(*args, **geoptions)
+
+    synchronize do |client|
+      client.call([:georadius, *geoarguments])
+    end
+  end
+
+  # Query a sorted set representing a geospatial index to fetch members matching a
+  # given maximum distance from an already existing member
+  #
+  # @param [Array] args key, member, radius, unit(m|km|ft|mi)
+  # @param ['asc', 'desc'] sort sort returned items from the nearest to the farthest or the farthest to the nearest relative to the center
+  # @param [Integer] count limit the results to the first N matching items
+  # @param ['WITHDIST', 'WITHCOORD', 'WITHHASH'] options to return additional information
+  # @return [Array<String>] may be changed with `options`
+
+  def georadiusbymember(*args, **geoptions)
+    geoarguments = _geoarguments(*args, **geoptions)
+
+    synchronize do |client|
+      client.call([:georadiusbymember, *geoarguments])
+    end
+  end
+
+  # Returns longitude and latitude of members of a geospatial index
+  #
+  # @param [String] key
+  # @param [String, Array<String>] member one member or array of members
+  # @return [Array<Array<String>, nil>] returns array of elements, where each element is either array of longitude and latitude or nil
+  def geopos(key, member)
+    synchronize do |client|
+      client.call([:geopos, key, member])
+    end
+  end
+
+  # Returns the distance between two members of a geospatial index
+  #
+  # @param [String ]key
+  # @param [Array<String>] members
+  # @param ['m', 'km', 'mi', 'ft'] unit
+  # @return [String, nil] returns distance in spefied unit if both members present, nil otherwise.
+  def geodist(key, member1, member2, unit = 'm')
+    synchronize do |client|
+      client.call([:geodist, key, member1, member2, unit])
+    end
+  end
+
   # Interact with the sentinel command (masters, master, slaves, failover)
   #
   # @param [String] subcommand e.g. `masters`, `master`, `slaves`
@@ -2805,14 +2895,24 @@ private
     }
 
   FloatifyPairs =
-    lambda { |array|
-      if array
-        array.each_slice(2).map do |member, score|
+    lambda { |result|
+      if result.respond_to?(:each_slice)
+        result.each_slice(2).map do |member, score|
           [member, Floatify.call(score)]
         end
+      else
+        result
       end
     }
 
+  def _geoarguments(*args, options: nil, sort: nil, count: nil)
+    args.push sort if sort
+    args.push 'count', count if count
+    args.push options if options
+
+    args.uniq
+  end
+
   def _subscription(method, timeout, channels, block)
     return @client.call([method] + channels) if subscribed?
 

data/lib/redis/client.rb

@@ -150,9 +150,12 @@ class Redis
     end
 
     def call_pipeline(pipeline)
+      commands = pipeline.commands
+      return [] if commands.empty?
+
       with_reconnect pipeline.with_reconnect? do
         begin
-          pipeline.finish(call_pipelined(pipeline.commands)).tap do
+          pipeline.finish(call_pipelined(commands)).tap do
             self.db = pipeline.db if pipeline.db
           end
         rescue ConnectionError => e
@@ -334,6 +337,7 @@ class Redis
       @connection = @options[:driver].connect(@options)
       @pending_reads = 0
     rescue TimeoutError,
+           SocketError,
            Errno::ECONNREFUSED,
            Errno::EHOSTDOWN,
            Errno::EHOSTUNREACH,
@@ -444,6 +448,8 @@ class Redis
       options[:read_timeout]    = Float(options[:read_timeout])
       options[:write_timeout]   = Float(options[:write_timeout])
 
+      options[:reconnect_attempts] = options[:reconnect_attempts].to_i
+
       options[:db] = options[:db].to_i
       options[:driver] = _parse_driver(options[:driver]) || Connection.drivers.last
 

data/lib/redis/connection/ruby.rb

@@ -267,7 +267,10 @@ class Redis
           ssl_sock = new(tcp_sock, ctx)
           ssl_sock.hostname = host
           ssl_sock.connect
-          ssl_sock.post_connection_check(host)
+
+          unless ctx.verify_mode == OpenSSL::SSL::VERIFY_NONE
+            ssl_sock.post_connection_check(host)
+          end
 
           ssl_sock
         end
@@ -294,7 +297,7 @@ class Redis
         end
 
         instance = new(sock)
-        instance.timeout = config[:timeout]
+        instance.timeout = config[:read_timeout]
         instance.write_timeout = config[:write_timeout]
         instance.set_tcp_keepalive config[:tcp_keepalive]
         instance

data/lib/redis/distributed.rb

@@ -161,6 +161,14 @@ class Redis
       end
     end
 
+    # Unlink keys.
+    def unlink(*args)
+      keys_per_node = args.group_by { |key| node_for(key) }
+      keys_per_node.inject(0) do |sum, (node, keys)|
+        sum + node.unlink(*keys)
+      end
+    end
+
     # Determine if a key exists.
     def exists(key)
       node_for(key).exists(key)
@@ -692,8 +700,8 @@ class Redis
     end
 
     # Delete one or more hash fields.
-    def hdel(key, field)
-      node_for(key).hdel(key, field)
+    def hdel(key, *fields)
+      node_for(key).hdel(key, *fields)
     end
 
     # Determine if a hash field exists.

data/lib/redis/pipeline.rb

@@ -22,6 +22,10 @@ class Redis
       @shutdown
     end
 
+    def empty?
+      @futures.empty?
+    end
+
     def call(command, &block)
       # A pipeline that contains a shutdown should not raise ECONNRESET when
       # the connection is gone.
@@ -86,7 +90,11 @@ class Redis
       end
 
       def commands
-        [[:multi]] + super + [[:exec]]
+        if empty?
+          []
+        else
+          [[:multi]] + super + [[:exec]]
+        end
       end
     end
   end

data/lib/redis/version.rb

@@ -1,3 +1,3 @@
 class Redis
-  VERSION = "4.0.1"
+  VERSION = "4.0.2"
 end

data/makefile

@@ -1,7 +1,7 @@
-TEST_FILES   := $(shell find test -name *_test.rb -type f)
-REDIS_BRANCH := unstable
+TEST_FILES   := $(shell find ./test -name *_test.rb -type f)
+REDIS_BRANCH ?= unstable
 TMP          := tmp
-BUILD_DIR    := ${TMP}/redis-${REDIS_BRANCH}
+BUILD_DIR    := ${TMP}/cache/redis-${REDIS_BRANCH}
 TARBALL      := ${TMP}/redis-${REDIS_BRANCH}.tar.gz
 BINARY       := ${BUILD_DIR}/src/redis-server
 PID_PATH     := ${BUILD_DIR}/redis.pid
@@ -11,20 +11,14 @@ PORT         := 6381
 test: ${TEST_FILES}
 	make start
 	env SOCKET_PATH=${SOCKET_PATH} \
-		ruby -v $$(echo $? | tr ' ' '\n' | awk '{ print "-r./" $$0 }') -e ''
+		bundle exec ruby -v -e 'ARGV.each { |test_file| require test_file }' ${TEST_FILES}
 	make stop
 
 ${TMP}:
 	mkdir $@
 
-${TARBALL}: ${TMP}
-	wget https://github.com/antirez/redis/archive/${REDIS_BRANCH}.tar.gz -O $@
-
-${BINARY}: ${TARBALL} ${TMP}
-	rm -rf ${BUILD_DIR}
-	mkdir -p ${BUILD_DIR}
-	tar xf ${TARBALL} -C ${TMP}
-	cd ${BUILD_DIR} && make
+${BINARY}: ${TMP}
+	bin/build ${REDIS_BRANCH} ${TMP}
 
 stop:
 	(test -f ${PID_PATH} && (kill $$(cat ${PID_PATH}) || true) && rm -f ${PID_PATH}) || true

data/test/commands_on_geo_test.rb

@@ -0,0 +1,116 @@
+require_relative "helper"
+
+class TestCommandsGeo < Test::Unit::TestCase
+  include Helper::Client
+
+  def setup
+    super
+
+    target_version "3.2.0" do
+      added_items_count = r.geoadd("Sicily", 13.361389, 38.115556, "Palermo", 15.087269, 37.502669, "Catania")
+      assert_equal 2, added_items_count
+    end
+  end
+
+  def test_georadius_with_sort
+    target_version "3.2.0" do
+      nearest_cities = r.georadius("Sicily", 15, 37, 200, 'km', sort: 'asc')
+      assert_equal %w(Catania Palermo), nearest_cities
+
+      farthest_cities = r.georadius("Sicily", 15, 37, 200, 'km', sort: 'desc')
+      assert_equal %w(Palermo Catania), farthest_cities
+    end
+  end
+
+  def test_georadius_with_count
+    target_version "3.2.0" do
+      city = r.georadius("Sicily", 15, 37, 200, 'km', count: 1)
+      assert_equal %w(Catania), city
+    end
+  end
+
+  def test_georadius_with_options_count_sort
+    target_version "3.2.0" do
+      city = r.georadius("Sicily", 15, 37, 200, 'km', sort: :desc, options: :WITHDIST, count: 1)
+      assert_equal [["Palermo", "190.4424"]], city
+    end
+  end
+
+  def test_georadiusbymember_with_sort
+    target_version "3.2.0" do
+      nearest_cities = r.georadiusbymember("Sicily", "Catania", 200, 'km', sort: 'asc')
+      assert_equal %w(Catania Palermo), nearest_cities
+
+      farthest_cities = r.georadiusbymember("Sicily", "Catania", 200, 'km', sort: 'desc')
+      assert_equal %w(Palermo Catania), farthest_cities
+    end
+  end
+
+  def test_georadiusbymember_with_count
+    target_version "3.2.0" do
+      city = r.georadiusbymember("Sicily", "Catania", 200, 'km', count: 1)
+      assert_equal %w(Catania), city
+    end
+  end
+
+  def test_georadiusbymember_with_options_count_sort
+    target_version "3.2.0" do
+      city = r.georadiusbymember("Sicily", "Catania", 200, 'km', sort: :desc, options: :WITHDIST, count: 1)
+      assert_equal [["Palermo", "166.2742"]], city
+    end
+  end
+
+  def test_geopos
+    target_version "3.2.0" do
+      location = r.geopos("Sicily", "Catania")
+      assert_equal [["15.08726745843887329", "37.50266842333162032"]], location
+
+      locations = r.geopos("Sicily", ["Palermo", "Catania"])
+      assert_equal [["13.36138933897018433", "38.11555639549629859"], ["15.08726745843887329", "37.50266842333162032"]], locations
+    end
+  end
+
+  def test_geopos_nonexistant_location
+    target_version "3.2.0" do
+      location = r.geopos("Sicily", "Rome")
+      assert_equal [nil], location
+
+      locations = r.geopos("Sicily", ["Rome", "Catania"])
+      assert_equal [nil, ["15.08726745843887329", "37.50266842333162032"]], locations
+    end
+  end
+
+  def test_geodist
+    target_version "3.2.0" do
+      distination_in_meters = r.geodist("Sicily", "Palermo", "Catania")
+      assert_equal "166274.1516", distination_in_meters
+
+      distination_in_feet = r.geodist("Sicily", "Palermo", "Catania", 'ft')
+      assert_equal "545518.8700", distination_in_feet
+    end
+  end
+
+  def test_geodist_with_nonexistant_location
+    target_version "3.2.0" do
+      distination = r.geodist("Sicily", "Palermo", "Rome")
+      assert_equal nil, distination
+    end
+  end
+
+  def test_geohash
+    target_version "3.2.0" do
+      geohash = r.geohash("Sicily", "Palermo")
+      assert_equal ["sqc8b49rny0"], geohash
+
+      geohashes = r.geohash("Sicily", ["Palermo", "Catania"])
+      assert_equal %w(sqc8b49rny0 sqdtr74hyu0), geohashes
+    end
+  end
+
+  def test_geohash_with_nonexistant_location
+    target_version "3.2.0" do
+      geohashes = r.geohash("Sicily", ["Palermo", "Rome"])
+      assert_equal ["sqc8b49rny0", nil], geohashes
+    end
+  end
+end

data/test/commands_on_value_types_test.rb

@@ -38,6 +38,42 @@ class TestCommandsOnValueTypes < Test::Unit::TestCase
     assert_equal [], r.keys("*").sort
   end
 
+  def test_unlink
+    target_version "4.0.0" do
+      r.set "foo", "s1"
+      r.set "bar", "s2"
+      r.set "baz", "s3"
+
+      assert_equal ["bar", "baz", "foo"], r.keys("*").sort
+
+      assert_equal 1, r.unlink("foo")
+
+      assert_equal ["bar", "baz"], r.keys("*").sort
+
+      assert_equal 2, r.unlink("bar", "baz")
+
+      assert_equal [], r.keys("*").sort
+    end
+  end
+
+  def test_unlink_with_array_argument
+    target_version "4.0.0" do
+      r.set "foo", "s1"
+      r.set "bar", "s2"
+      r.set "baz", "s3"
+
+      assert_equal ["bar", "baz", "foo"], r.keys("*").sort
+
+      assert_equal 1, r.unlink(["foo"])
+
+      assert_equal ["bar", "baz"], r.keys("*").sort
+
+      assert_equal 2, r.unlink(["bar", "baz"])
+
+      assert_equal [], r.keys("*").sort
+    end
+  end
+
   def test_randomkey
     assert r.randomkey.to_s.empty?
 

data/test/distributed_commands_on_value_types_test.rb

@@ -38,6 +38,42 @@ class TestDistributedCommandsOnValueTypes < Test::Unit::TestCase
     assert_equal [], r.keys("*").sort
   end
 
+  def test_unlink
+    target_version "4.0.0" do
+      r.set "foo", "s1"
+      r.set "bar", "s2"
+      r.set "baz", "s3"
+
+      assert_equal ["bar", "baz", "foo"], r.keys("*").sort
+
+      assert_equal 1, r.unlink("foo")
+
+      assert_equal ["bar", "baz"], r.keys("*").sort
+
+      assert_equal 2, r.unlink("bar", "baz")
+
+      assert_equal [], r.keys("*").sort
+    end
+  end
+
+  def test_unlink_with_array_argument
+    target_version "4.0.0" do
+      r.set "foo", "s1"
+      r.set "bar", "s2"
+      r.set "baz", "s3"
+
+      assert_equal ["bar", "baz", "foo"], r.keys("*").sort
+
+      assert_equal 1, r.unlink(["foo"])
+
+      assert_equal ["bar", "baz"], r.keys("*").sort
+
+      assert_equal 2, r.unlink(["bar", "baz"])
+
+      assert_equal [], r.keys("*").sort
+    end
+  end
+
   def test_randomkey
     assert_raise Redis::Distributed::CannotDistribute do
       r.randomkey

data/test/internals_test.rb

@@ -334,7 +334,13 @@ class TestInternals < Test::Unit::TestCase
           begin
             sa = Socket.pack_sockaddr_in(1024 + Random.rand(63076), hosts[af])
             s.bind(sa)
-          rescue Errno::EADDRINUSE
+          rescue Errno::EADDRINUSE => e
+            # On JRuby (9.1.15.0), if IPv6 is globally disabled on the system,
+            # we get an EADDRINUSE with belows message.
+            if e.message =~ /Protocol family unavailable/
+              return
+            end
+
             tries -= 1
             retry if tries > 0
 

data/test/lint/hashes.rb

@@ -30,6 +30,21 @@ module Lint
       assert_equal nil, r.hget("foo", "f1")
     end
 
+    def test_splat_hdel
+      target_version "2.3.9" do
+        r.hset("foo", "f1", "s1")
+        r.hset("foo", "f2", "s2")
+
+        assert_equal "s1", r.hget("foo", "f1")
+        assert_equal "s2", r.hget("foo", "f2")
+
+        assert_equal 2, r.hdel("foo", "f1", "f2")
+
+        assert_equal nil, r.hget("foo", "f1")
+        assert_equal nil, r.hget("foo", "f2")
+      end
+    end
+
     def test_variadic_hdel
       target_version "2.3.9" do
         r.hset("foo", "f1", "s1")

data/test/pipelining_commands_test.rb

@@ -128,6 +128,14 @@ class TestPipeliningCommands < Test::Unit::TestCase
     end
   end
 
+  def test_futures_raise_when_command_errors_and_needs_transformation
+    assert_raise(Redis::CommandError) do
+      r.pipelined do
+        @result = r.zrange("a", "b", 5, :with_scores => true)
+      end
+    end
+  end
+
   def test_futures_can_be_identified
     r.pipelined do
       @result = r.sadd("foo", 1)

data/test/support/redis_mock.rb

@@ -42,7 +42,7 @@ module RedisMock
           end
         end
       rescue => ex
-        $stderr.puts "Error running mock server: #{ex.message}"
+        $stderr.puts "Error running mock server: #{ex.class}: #{ex.message}"
         $stderr.puts ex.backtrace
         retry
       ensure

data/test/transactions_test.rb

@@ -114,6 +114,16 @@ class TestTransactions < Test::Unit::TestCase
     assert_equal "s1", r.get("foo")
   end
 
+  def test_empty_multi_exec
+    result = nil
+
+    redis_mock(:exec => lambda { |*_| "-ERROR" }) do |redis|
+      result = redis.multi {}
+    end
+
+    assert_equal [], result
+  end
+
   def test_raise_command_errors_when_accessing_futures_after_multi_exec
     begin
       r.multi do |m|

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: redis
 version: !ruby/object:Gem::Version
-  version: 4.0.1
+  version: 4.0.2
 platform: ruby
 authors:
 - Ezra Zygmuntowicz
@@ -16,7 +16,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-09-28 00:00:00.000000000 Z
+date: 2018-08-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: test-unit
@@ -65,7 +65,8 @@ description: |2
       providing an idiomatic interface.
 email:
 - redis-db@googlegroups.com
-executables: []
+executables:
+- build
 extensions: []
 extra_rdoc_files: []
 files:
@@ -82,6 +83,7 @@ files:
 - benchmarking/speed.rb
 - benchmarking/suite.rb
 - benchmarking/worker.rb
+- bin/build
 - bors.toml
 - examples/basic.rb
 - examples/consistency.rb
@@ -115,6 +117,7 @@ files:
 - test/blocking_commands_test.rb
 - test/client_test.rb
 - test/command_map_test.rb
+- test/commands_on_geo_test.rb
 - test/commands_on_hashes_test.rb
 - test/commands_on_hyper_log_log_test.rb
 - test/commands_on_lists_test.rb
@@ -218,6 +221,7 @@ test_files:
 - test/blocking_commands_test.rb
 - test/client_test.rb
 - test/command_map_test.rb
+- test/commands_on_geo_test.rb
 - test/commands_on_hashes_test.rb
 - test/commands_on_hyper_log_log_test.rb
 - test/commands_on_lists_test.rb