redis 3.0.0.rc1 → 3.0.0.rc2

data/test/unknown_commands_test.rb

@@ -1,13 +1,14 @@
- # encoding: UTF-8
+# encoding: UTF-8
 
-require File.expand_path("./helper", File.dirname(__FILE__))
+require "helper"
 
-setup do
-  init Redis.new(OPTIONS)
-end
+class TestUnknownCommands < Test::Unit::TestCase
+
+  include Helper::Client
 
-test "should try to work" do |r|
-  assert_raise Redis::CommandError do
-    r.not_yet_implemented_command
+  def test_should_try_to_work
+    assert_raise Redis::CommandError do
+      r.not_yet_implemented_command
+    end
   end
 end

data/test/url_param_test.rb

@@ -1,59 +1,64 @@
 # encoding: UTF-8
 
-require File.expand_path("./helper", File.dirname(__FILE__))
+require "helper"
 
-test "URL defaults to 127.0.0.1:6379" do
-  redis = Redis.connect
+class TestUrlParam < Test::Unit::TestCase
 
-  assert "127.0.0.1" == redis.client.host
-  assert 6379 == redis.client.port
-  assert 0 == redis.client.db
-  assert nil == redis.client.password
-end
+  include Helper::Client
 
-test "allows to pass in a URL" do
-  redis = Redis.connect :url => "redis://:secr3t@foo.com:999/2"
+  def test_url_defaults_to_______________
+    redis = Redis.new
 
-  assert "foo.com" == redis.client.host
-  assert 999 == redis.client.port
-  assert 2 == redis.client.db
-  assert "secr3t" == redis.client.password
-end
+    assert_equal "127.0.0.1", redis.client.host
+    assert_equal 6379, redis.client.port
+    assert_equal 0, redis.client.db
+    assert_equal nil, redis.client.password
+  end
 
-test "override URL if path option is passed" do
-  redis = Redis.connect :url => "redis://:secr3t@foo.com/foo:999/2", :path => "/tmp/redis.sock"
+  def test_allows_to_pass_in_a_url
+    redis = Redis.new :url => "redis://:secr3t@foo.com:999/2"
 
-  assert "/tmp/redis.sock" == redis.client.path
-  assert nil == redis.client.host
-  assert nil == redis.client.port
-end
+    assert_equal "foo.com", redis.client.host
+    assert_equal 999, redis.client.port
+    assert_equal 2, redis.client.db
+    assert_equal "secr3t", redis.client.password
+  end
 
-test "overrides URL if another connection option is passed" do
-  redis = Redis.connect :url => "redis://:secr3t@foo.com:999/2", :port => 1000
+  def test_override_url_if_path_option_is_passed
+    redis = Redis.new :url => "redis://:secr3t@foo.com/foo:999/2", :path => "/tmp/redis.sock"
 
-  assert "foo.com" == redis.client.host
-  assert 1000 == redis.client.port
-  assert 2 == redis.client.db
-  assert "secr3t" == redis.client.password
-end
+    assert_equal "/tmp/redis.sock", redis.client.path
+    assert_equal nil, redis.client.host
+    assert_equal nil, redis.client.port
+  end
 
-test "does not modify the passed options" do
-  options = { :url => "redis://:secr3t@foo.com:999/2" }
+  def test_overrides_url_if_another_connection_option_is_passed
+    redis = Redis.new :url => "redis://:secr3t@foo.com:999/2", :port => 1000
 
-  redis = Redis.connect(options)
+    assert_equal "foo.com", redis.client.host
+    assert_equal 1000, redis.client.port
+    assert_equal 2, redis.client.db
+    assert_equal "secr3t", redis.client.password
+  end
 
-  assert({ :url => "redis://:secr3t@foo.com:999/2" } == options)
-end
+  def test_does_not_modify_the_passed_options
+    options = { :url => "redis://:secr3t@foo.com:999/2" }
+
+    Redis.new(options)
+
+    assert({ :url => "redis://:secr3t@foo.com:999/2" } == options)
+  end
 
-test "uses REDIS_URL over default if available" do
-  ENV["REDIS_URL"] = "redis://:secr3t@foo.com:999/2"
+  def test_uses_redis_url_over_default_if_available
+    ENV["REDIS_URL"] = "redis://:secr3t@foo.com:999/2"
 
-  redis = Redis.connect
+    redis = Redis.new
 
-  assert "foo.com" == redis.client.host
-  assert 999 == redis.client.port
-  assert 2 == redis.client.db
-  assert "secr3t" == redis.client.password
+    assert_equal "foo.com", redis.client.host
+    assert_equal 999, redis.client.port
+    assert_equal 2, redis.client.db
+    assert_equal "secr3t", redis.client.password
 
-  ENV.delete("REDIS_URL")
+    ENV.delete("REDIS_URL")
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: redis
 version: !ruby/object:Gem::Version
-  version: 3.0.0.rc1
+  version: 3.0.0.rc2
   prerelease: 6
 platform: ruby
 authors:
@@ -17,11 +17,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-10 00:00:00.000000000 Z
+date: 2012-05-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &2152542300 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -29,43 +29,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2152542300
-- !ruby/object:Gem::Dependency
-  name: cutest
-  requirement: &2152541580 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: *2152541580
-- !ruby/object:Gem::Dependency
-  name: hiredis
-  requirement: &2152541000 !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: *2152541000
-- !ruby/object:Gem::Dependency
-  name: em-synchrony
-  requirement: &2152540580 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: *2152540580
-description: ! "    A simple Ruby client trying to match Redis' API one-to-one while
-  still providing a Rubystic interface.\n    It features thread safety, client-side
-  sharding, and an obsession for performance.\n"
+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: []
@@ -73,17 +45,17 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- .travis.yml
+- .travis/Gemfile
 - .yardopts
 - CHANGELOG.md
 - LICENSE
 - README.md
 - Rakefile
-- TODO.md
 - benchmarking/logging.rb
 - benchmarking/pipeline.rb
 - benchmarking/speed.rb
 - benchmarking/suite.rb
-- benchmarking/thread_safety.rb
 - benchmarking/worker.rb
 - examples/basic.rb
 - examples/dist_redis.rb
@@ -108,6 +80,7 @@ files:
 - lib/redis/subscribe.rb
 - lib/redis/version.rb
 - redis.gemspec
+- test/blocking_commands_test.rb
 - test/command_map_test.rb
 - test/commands_on_hashes_test.rb
 - test/commands_on_lists_test.rb
@@ -139,8 +112,8 @@ files:
 - test/helper.rb
 - test/helper_test.rb
 - test/internals_test.rb
+- test/lint/blocking_commands.rb
 - test/lint/hashes.rb
-- test/lint/internals.rb
 - test/lint/lists.rb
 - test/lint/sets.rb
 - test/lint/sorted_sets.rb
@@ -149,16 +122,21 @@ files:
 - test/persistence_control_commands_test.rb
 - test/pipelining_commands_test.rb
 - test/publish_subscribe_test.rb
-- test/redis_mock.rb
 - test/remote_server_control_commands_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
-homepage: https://github.com/ezmobius/redis-rb
+homepage: https://github.com/redis/redis-rb
 licenses: []
 post_install_message: 
 rdoc_options: []
@@ -178,11 +156,12 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: A Ruby client library for the Redis key-value store.
 test_files:
+- test/blocking_commands_test.rb
 - test/command_map_test.rb
 - test/commands_on_hashes_test.rb
 - test/commands_on_lists_test.rb
@@ -214,8 +193,8 @@ test_files:
 - test/helper.rb
 - test/helper_test.rb
 - test/internals_test.rb
+- test/lint/blocking_commands.rb
 - test/lint/hashes.rb
-- test/lint/internals.rb
 - test/lint/lists.rb
 - test/lint/sets.rb
 - test/lint/sorted_sets.rb
@@ -224,12 +203,18 @@ test_files:
 - test/persistence_control_commands_test.rb
 - test/pipelining_commands_test.rb
 - test/publish_subscribe_test.rb
-- test/redis_mock.rb
 - test/remote_server_control_commands_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: 

data/TODO.md

@@ -1,4 +0,0 @@
-# 2.3
-
-* Remove the splat from the prototypes of `Client#call`, `Client#call_loop`,
-  `Pipeline#call` and `Subscription#call`.

data/benchmarking/thread_safety.rb

@@ -1,38 +0,0 @@
-# Run with
-#
-#   $ ruby -Ilib benchmarking/thread_safety.rb
-#
-
-begin
-  require "bench"
-rescue LoadError
-  $stderr.puts "`gem install bench` and try again."
-  exit 1
-end
-
-require "redis"
-
-def stress(redis)
-  redis.flushdb
-
-  n = (ARGV.shift || 2000).to_i
-
-  n.times do |i|
-    key = "foo:#{i}"
-    redis.set key, i
-    redis.get key
-  end
-end
-
-thread_unsafe = Redis.new(:thread_safe => false)
-thread_safe = Redis.new(:thread_safe => true)
-
-benchmark "Thread-unsafe" do
-  stress(thread_unsafe)
-end
-
-benchmark "Thread-safe" do
-  stress(thread_safe)
-end
-
-run 10

data/test/lint/internals.rb

@@ -1,36 +0,0 @@
-test "Logger" do |r, log|
-  r.ping
-
-  assert log.string =~ /Redis >> PING/
-  assert log.string =~ /Redis >> \d+\.\d+ms/
-end
-
-test "Logger with pipelining" do |r, log|
-  r.pipelined do
-    r.set "foo", "bar"
-    r.get "foo"
-  end
-
-  assert log.string["SET foo bar"]
-  assert log.string["GET foo"]
-end if $TEST_PIPELINING
-
-test "Recovers from failed commands" do |r, _|
-  # See http://github.com/ezmobius/redis-rb/issues#issue/28
-
-  assert_raise do
-    r.command_that_doesnt_exist
-  end
-
-  assert_nothing_raised do
-    r.info
-  end
-end
-
-test "raises on protocol errors" do
-  redis_mock(:ping => lambda { |*_| "foo" }) do
-    assert_raise(Redis::ProtocolError) do
-      Redis.connect(:port => 6380).ping
-    end
-  end
-end