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

Author: djanowski

.travis.yml

@@ -6,8 +6,10 @@ rvm:
   - 2.0
   - 2.1
   - 2.2
+  - 2.3.0
   - jruby-18mode
   - jruby-19mode
+  - jruby-9.0.5.0
   - rbx-2
 
 gemfile: ".travis/Gemfile"
@@ -37,6 +39,9 @@ matrix:
     - rvm: jruby-19mode
       gemfile: .travis/Gemfile
       env: conn=hiredis REDIS_BRANCH=2.8
+    - rvm: jruby-9.0.5.0
+      gemfile: .travis/Gemfile
+      env: conn=hiredis REDIS_BRANCH=2.8
 
     # synchrony
     - rvm: 1.8.7
@@ -48,12 +53,13 @@ matrix:
     - rvm: jruby-19mode
       gemfile: .travis/Gemfile
       env: conn=synchrony REDIS_BRANCH=2.8
+    - rvm: jruby-9.0.5.0
+      gemfile: .travis/Gemfile
+      env: conn=synchrony REDIS_BRANCH=2.8
   allow_failures:
     - rvm: rbx-2
 
 notifications:
   irc:
     - irc.freenode.net#redis-rb
-  email:
-    - [email protected]
-    - [email protected]
+  email: false

README.md

@@ -332,9 +332,11 @@ This library is tested using [Travis][travis-home], where it is tested
 against the following interpreters and drivers:
 
 * MRI 1.8.7 (drivers: ruby, hiredis)
-* MRI 1.9.2 (drivers: ruby, hiredis, synchrony)
 * MRI 1.9.3 (drivers: ruby, hiredis, synchrony)
-* MRI 2.0.0 (drivers: ruby, hiredis, synchrony)
+* MRI 2.0 (drivers: ruby, hiredis, synchrony)
+* MRI 2.1 (drivers: ruby, hiredis, synchrony)
+* MRI 2.2 (drivers: ruby, hiredis, synchrony)
+* MRI 2.3 (drivers: ruby, hiredis, synchrony)
 * JRuby 1.7 (1.8 mode) (drivers: ruby)
 * JRuby 1.7 (1.9 mode) (drivers: ruby)
 

lib/redis.rb

@@ -884,7 +884,7 @@ def mget(*keys, &blk)
   # Get the values of all the given keys.
   #
   # @example
-  #   redis.mapped_mget("key1", "key1")
+  #   redis.mapped_mget("key1", "key2")
   #     # => { "key1" => "v1", "key2" => "v2" }
   #
   # @param [Array<String>] keys array of keys

redis.gemspec

@@ -39,6 +39,6 @@ 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("rake")
-  s.add_development_dependency("test-unit")
+  s.add_development_dependency("rake", "<11.0.0")
+  s.add_development_dependency("test-unit", "3.1.5")
 end

test/distributed_internals_test.rb

@@ -72,7 +72,7 @@ def test_colliding_node_ids
     nodes = ["redis://localhost:#{PORT}/15", "redis://localhost:#{PORT}/15", *NODES]
 
     assert_raise(RuntimeError) do
-      redis = Redis::Distributed.new nodes
+      Redis::Distributed.new nodes
     end
   end
 

test/lint/sorted_sets.rb

@@ -39,8 +39,8 @@ def test_zadd
         # INCR option
         assert_equal 1.0, r.zadd("foo", 1, "s1", :incr => true)
         assert_equal 11.0, r.zadd("foo", 10, "s1", :incr => true)
-        assert_equal -Infinity, r.zadd("bar", "-inf", "s1", :incr => true)
-        assert_equal +Infinity, r.zadd("bar", "+inf", "s2", :incr => true)
+        assert_equal(-Infinity, r.zadd("bar", "-inf", "s1", :incr => true))
+        assert_equal(+Infinity, r.zadd("bar", "+inf", "s2", :incr => true))
         r.del "foo", "bar"
 
         # Incompatible options combination
@@ -101,8 +101,8 @@ def test_variadic_zadd
         # INCR option
         assert_equal 1.0, r.zadd("foo", [1, "s1"], :incr => true)
         assert_equal 11.0, r.zadd("foo", [10, "s1"], :incr => true)
-        assert_equal -Infinity, r.zadd("bar", ["-inf", "s1"], :incr => true)
-        assert_equal +Infinity, r.zadd("bar", ["+inf", "s2"], :incr => true)
+        assert_equal(-Infinity, r.zadd("bar", ["-inf", "s1"], :incr => true))
+        assert_equal(+Infinity, r.zadd("bar", ["+inf", "s2"], :incr => true))
         assert_raise(Redis::CommandError) { r.zadd("foo", [1, "s1", 2, "s2"], :incr => true) }
         r.del "foo", "bar"