redis 2.0.1 → 2.0.2

data/README.markdown

@@ -117,4 +117,4 @@ Check the [Redis Command Reference](http://code.google.com/p/redis/wiki/CommandR
 
 ## Contributing
 
-[Fork the project](http://github.com/ezmobius/redis-rb) and send pull requests. You can also ask for help at `#redis` on Freenode.
+[Fork the project](http://github.com/ezmobius/redis-rb) and send pull requests. You can also ask for help at `#redis-rb` on Freenode.

data/Rakefile

@@ -40,16 +40,22 @@ task :run => [:start, :test, :stop]
 
 desc "Start the Redis server"
 task :start do
-  unless File.exists?(REDIS_PID)
-    system "redis-server #{REDIS_CNF}"
-  end
+  redis_running = \
+    begin
+      File.exists?(REDIS_PID) && Process.kill(0, File.read(REDIS_PID).to_i)
+    rescue Errno::ESRCH
+      FileUtils.rm REDIS_PID
+      false
+    end
+
+  system "redis-server #{REDIS_CNF}" unless redis_running
 end
 
 desc "Stop the Redis server"
 task :stop do
   if File.exists?(REDIS_PID)
-    system "kill #{File.read(REDIS_PID)}"
-    system "rm #{REDIS_PID}"
+    Process.kill "INT", File.read(REDIS_PID).to_i
+    FileUtils.rm REDIS_PID
   end
 end
 
@@ -85,6 +91,7 @@ end
 namespace :commands do
   def redis_commands
     $redis_commands ||= begin
+      require "open-uri"
       require "nokogiri"
 
       doc = Nokogiri::HTML(open("http://code.google.com/p/redis/wiki/CommandReference"))
@@ -127,7 +134,7 @@ namespace :commands do
   task :verify do
     require "redis"
 
-    Dir["test/**/*_test.rb"].each { |f| require f }
+    Dir["test/**/*_test.rb"].each { |f| require "./#{f}" }
 
     log = StringIO.new
 

data/lib/redis.rb

@@ -1,7 +1,7 @@
 require 'socket'
 
 class Redis
-  VERSION = "2.0.1"
+  VERSION = "2.0.2"
 
   class ProtocolError < RuntimeError
     def initialize(reply_type)
@@ -157,12 +157,12 @@ class Redis
     @client.call(:rpop, key)
   end
 
-  def blpop(key, timeout)
-    @client.call_without_timeout(:blpop, key, timeout)
+  def blpop(*args)
+    @client.call_without_timeout(:blpop, *args)
   end
 
-  def brpop(key, timeout)
-    @client.call_without_timeout(:brpop, key, timeout)
+  def brpop(*args)
+    @client.call_without_timeout(:brpop, *args)
   end
 
   def rpoplpush(source, destination)
@@ -452,6 +452,8 @@ class Redis
   def quit
     @client.call(:quit)
   rescue Errno::ECONNRESET
+  ensure
+    @client.disconnect
   end
 
   def pipelined
@@ -519,6 +521,10 @@ class Redis
     @client.id
   end
 
+  def inspect
+    "#<Redis client v#{Redis::VERSION} connected to #{id} (Redis v#{info["redis_version"]})>"
+  end
+
   def method_missing(command, *args)
     @client.call(command, *args)
   end

data/lib/redis/client.rb

@@ -110,7 +110,7 @@ class Redis
           self.timeout = 0
           yield
         ensure
-          self.timeout = @timeout
+          self.timeout = @timeout if connected?
         end
       end
     end

data/lib/redis/url.rb

@@ -0,0 +1,23 @@
+require "uri/generic"
+
+module URI
+  class Redis < Generic
+    DEFAULT_PORT = 6379
+
+    COMPONENT = [:scheme, :password, :host, :port, :db].freeze
+
+    def db
+      path[1..-1].to_i
+    end
+
+    alias password user
+
+  protected
+    def check_path(value)
+      if super(value)
+      end
+    end
+  end
+
+  @@schemes["REDIS"] = Redis
+end

metadata

@@ -1,13 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: redis
 version: !ruby/object:Gem::Version 
-  hash: 13
   prerelease: false
   segments: 
   - 2
   - 0
-  - 1
-  version: 2.0.1
+  - 2
+  version: 2.0.2
 platform: ruby
 authors: 
 - Ezra Zygmuntowicz
@@ -22,7 +21,7 @@ autorequire: redis
 bindir: bin
 cert_chain: []
 
-date: 2010-05-29 00:00:00 -03:00
+date: 2010-06-21 00:00:00 -03:00
 default_executable: 
 dependencies: []
 
@@ -44,6 +43,7 @@ files:
 - lib/redis/hash_ring.rb
 - lib/redis/pipeline.rb
 - lib/redis/subscribe.rb
+- lib/redis/url.rb
 - lib/redis.rb
 has_rdoc: true
 homepage: http://github.com/ezmobius/redis-rb
@@ -59,7 +59,6 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
@@ -68,7 +67,6 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"