redis 2.0.7 → 2.0.8

data/Rakefile

@@ -93,21 +93,7 @@ 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"))
-
-      commands = {}
-
-      doc.xpath("//ul/li").each do |node|
-        node.at_xpath("./a").text.split("/").each do |name|
-          if name =~ /^[A-Z]+$/
-            commands[name.downcase] = node.at_xpath("./tt").text
-          end
-        end
-      end
-
-      commands
+      open("http://dimaion.com/redis/master").read.split
     end
   end
 
@@ -134,33 +120,34 @@ namespace :commands do
 
   task :verify do
     require "redis"
-
-    Dir["test/**/*_test.rb"].each { |f| require "./#{f}" }
+    require "stringio"
 
     log = StringIO.new
 
-    RedisTest::OPTIONS[:logger] = Logger.new(log)
-
-    redis = Redis.new
+    at_exit do
+      redis = Redis.new
 
-    Test::Unit::AutoRunner.run
+      report = ["Command", "\033[0mDefined?\033[0m", "\033[0mTested?\033[0m"]
 
-    report = ["Command", "\033[0mDefined?\033[0m", "\033[0mTested?\033[0m"]
+      yes, no = "\033[1;32mYes\033[0m", "\033[1;31mNo\033[0m"
 
-    yes, no = "\033[1;32mYes\033[0m", "\033[1;31mNo\033[0m"
+      redis_commands.sort.each do |name, _|
+        defined, tested = redis.respond_to?(name), log.string[">> #{name.upcase}"]
 
-    redis_commands.sort.each do |name, _|
-      defined, tested = redis.respond_to?(name), log.string[">> #{name.upcase}"]
+        next if defined && tested
 
-      next if defined && tested
+        report << name
+        report << (defined ? yes : no)
+        report << (tested ? yes : no)
+      end
 
-      report << name
-      report << (defined ? yes : no)
-      report << (tested ? yes : no)
+      IO.popen("rs 0 3", "w") do |io|
+        io.puts report.join("\n")
+      end
     end
 
-    IO.popen("rs 0 3", "w") do |io|
-      io.puts report.join("\n")
-    end
+    Dir["test/**/redis_test.rb"].each { |f| require "./#{f}" }
+
+    RedisTest::OPTIONS[:logger] = Logger.new(log)
   end
 end

data/lib/redis.rb

@@ -1,7 +1,7 @@
 require 'socket'
 
 class Redis
-  VERSION = "2.0.7"
+  VERSION = "2.0.8"
 
   class ProtocolError < RuntimeError
     def initialize(reply_type)
@@ -97,6 +97,10 @@ class Redis
     @client.call(:substr, key, start, stop)
   end
 
+  def strlen(key)
+    @client.call(:strlen, key)
+  end
+
   def hgetall(key)
     Hash[*@client.call(:hgetall, key)]
   end
@@ -157,6 +161,10 @@ class Redis
     @client.call(:lindex, key, index)
   end
 
+  def linsert(key, where, pivot, value)
+    @client.call(:linsert, key, where, pivot, value)
+  end
+
   def lset(key, index, value)
     @client.call(:lset, key, index, value)
   end
@@ -169,10 +177,18 @@ class Redis
     @client.call(:rpush, key, value)
   end
 
+  def rpushx(key, value)
+    @client.call(:rpushx, key, value)
+  end
+
   def lpush(key, value)
     @client.call(:lpush, key, value)
   end
 
+  def lpushx(key, value)
+    @client.call(:lpushx, key, value)
+  end
+
   def rpop(key)
     @client.call(:rpop, key)
   end
@@ -372,6 +388,10 @@ class Redis
     _bool @client.call(:hset, key, field, value)
   end
 
+  def hsetnx(key, field, value)
+    _bool @client.call(:hsetnx, key, field, value)
+  end
+
   def hmset(key, *attrs)
     @client.call(:hmset, key, *attrs)
   end
@@ -412,6 +432,14 @@ class Redis
     @client.call_loop(:monitor, &block)
   end
 
+  def debug(*args)
+    @client.call(:debug, *args)
+  end
+
+  def sync
+    @client.call(:sync)
+  end
+
   def [](key)
     get(key)
   end

data/lib/redis/url.rb

@@ -0,0 +1,69 @@
+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
+require File.expand_path(File.join(File.dirname(__FILE__), "test_helper"))
+require "redis/url"
+
+class RedisURLTest < Test::Unit::TestCase
+  test "default values" do
+    uri = URI.parse("redis://localhost")
+
+    assert_equal "localhost", uri.host
+    assert_equal 6379, uri.port
+    assert_equal 0, uri.db
+    assert_equal nil, uri.password
+  end
+
+  test "password" do
+    uri = URI.parse("redis://secret@localhost")
+
+    assert_equal "localhost", uri.host
+    assert_equal 6379, uri.port
+    assert_equal 0, uri.db
+    assert_equal "secret", uri.password
+  end
+
+  test "db number" do
+    uri = URI.parse("redis://secret@localhost/15")
+
+    assert_equal "localhost", uri.host
+    assert_equal 6379, uri.port
+    assert_equal 15, uri.db
+    assert_equal "secret", uri.password
+  end
+
+  test "port" do
+    uri = URI.parse("redis://localhost:6380")
+
+    assert_equal "localhost", uri.host
+    assert_equal 6380, uri.port
+    assert_equal 0, uri.db
+    assert_equal nil, uri.password
+  end
+
+  test "to_s" do
+    uri = URI.parse("redis://secret@localhost:6380/15")
+
+    assert_equal "redis://secret@localhost:6380/15", uri.to_s
+  end
+end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 2
   - 0
-  - 7
-  version: 2.0.7
+  - 8
+  version: 2.0.8
 platform: ruby
 authors: 
 - Ezra Zygmuntowicz
@@ -21,7 +21,7 @@ autorequire: redis
 bindir: bin
 cert_chain: []
 
-date: 2010-09-13 00:00:00 -03:00
+date: 2010-09-14 00:00:00 -03:00
 default_executable: 
 dependencies: []
 
@@ -43,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