daikon 0.3.0 → 0.4.0

data/daikon.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{daikon}
-  s.version = "0.3.0"
+  s.version = "0.4.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Nick Quaranto"]
-  s.date = %q{2010-11-29}
+  s.date = %q{2010-12-06}
   s.default_executable = %q{daikon}
   s.description = %q{daikon, a radishapp.com client}
   s.email = %q{nick@quaran.to}
@@ -36,6 +36,7 @@ Gem::Specification.new do |s|
     "lib/daikon/configuration.rb",
     "lib/daikon/daemon.rb",
     "lib/daikon/namespace_tools.rb",
+    "lib/daikon/redis_hacks.rb",
     "spec/client_spec.rb",
     "spec/configuration_spec.rb",
     "spec/daemon_spec.rb",

data/lib/daikon.rb

@@ -22,7 +22,8 @@ require 'daikon/namespace_tools'
 require 'daikon/configuration'
 require 'daikon/client'
 require 'daikon/daemon'
+require 'daikon/redis_hacks'
 
 module Daikon
-  VERSION = "0.3.0"
+  VERSION = "0.4.0"
 end

data/lib/daikon/client.rb

@@ -17,17 +17,21 @@ module Daikon
     def setup(config, logger = nil)
       self.config = config
       self.logger = logger
-      self.redis  = Redis.new(:host => config.redis_host, :port => config.redis_port)
+      self.redis  = connect
       self.http   = Net::HTTP::Persistent.new
       http.headers['Authorization'] = config.api_key
 
       log "Started Daikon v#{VERSION}"
     end
 
+    def connect
+      Redis.new(:host => config.redis_host, :port => config.redis_port)
+    end
+
     def start_monitor
       self.monitor = StringIO.new
       Thread.new do
-        Redis.new(:port => config.redis_port).monitor do |line|
+        connect.monitor do |line|
           monitor.puts line
         end
       end

data/lib/daikon/redis_hacks.rb

@@ -0,0 +1,43 @@
+# All of this craziness is necessary since redis-rb doesn't support the
+# old way of connecting to MONITOR since it doesn't return the format bytes
+
+class Redis
+  def monitor(&block)
+    @_redis_version ||= info["redis_version"]
+
+    if @_redis_version < "2"
+      @client.call_loop_with_old_protocol(:monitor, &block)
+    else
+      @client.call_loop(:monitor, &block)
+    end
+  end
+
+  class Client
+    def call_loop_with_old_protocol(*args)
+      without_socket_timeout do
+        process(args) do
+          loop { yield(read_with_old_protocol) }
+        end
+      end
+    end
+
+    def read_with_old_protocol
+      begin
+        connection.read_with_old_protocol
+      rescue Errno::EAGAIN
+        disconnect
+        raise Errno::EAGAIN, "Timeout reading from the socket"
+      rescue Errno::ECONNRESET
+        raise Errno::ECONNRESET, "Connection lost"
+      end
+    end
+  end
+
+  class Connection
+    def read_with_old_protocol
+      reply_type = @sock.gets
+      raise Errno::ECONNRESET unless reply_type
+      reply_type
+    end
+  end
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: daikon
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 15
   prerelease: false
   segments: 
   - 0
-  - 3
+  - 4
   - 0
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors: 
 - Nick Quaranto
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-29 00:00:00 -05:00
+date: 2010-12-06 00:00:00 -05:00
 default_executable: daikon
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -195,6 +195,7 @@ files:
 - lib/daikon/configuration.rb
 - lib/daikon/daemon.rb
 - lib/daikon/namespace_tools.rb
+- lib/daikon/redis_hacks.rb
 - spec/client_spec.rb
 - spec/configuration_spec.rb
 - spec/daemon_spec.rb