beetle 0.2.1 → 0.2.2

data/beetle.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name    = "beetle"
-  s.version = "0.2.1"
+  s.version = "0.2.2"
 
   s.required_rubygems_version = ">= 1.3.1"
   s.authors            = ["Stefan Kaes", "Pascal Friederich", "Ali Jelveh", "Sebastian Roebke"]
@@ -31,7 +31,7 @@ Gem::Specification.new do |s|
   s.specification_version = 3
   s.add_runtime_dependency("uuid4r",                [">= 0.1.1"])
   s.add_runtime_dependency("bunny",                 [">= 0.6.0"])
-  s.add_runtime_dependency("redis",                 [">= 2.0.3"])
+  s.add_runtime_dependency("redis",                 [">= 2.0.4"])
   s.add_runtime_dependency("amqp",                  [">= 0.6.7"])
   s.add_runtime_dependency("activesupport",         [">= 2.3.4"])
   s.add_runtime_dependency("daemons",               [">= 1.0.10"])

data/lib/beetle.rb

@@ -54,4 +54,5 @@ module Beetle
     end
   end
 
+  Timer = RUBY_VERSION < "1.9" ? SystemTimer : Timeout
 end

data/lib/beetle/message.rb

@@ -279,7 +279,7 @@ module Beetle
     end
 
     def run_handler(handler)
-      Redis::Timer.timeout(@timeout.to_f) { @handler_result = handler.call(self) }
+      Timer.timeout(@timeout.to_f) { @handler_result = handler.call(self) }
       RC::OK
     rescue Exception => @exception
       Beetle::reraise_expectation_errors!

data/lib/beetle/redis_ext.rb

@@ -51,29 +51,3 @@ class Redis #:nodoc:
     info["role"] == "slave" && info["master_host"] == host && info["master_port"] == port.to_s
   end
 end
-
-class Redis::Client #:nodoc:
-  protected
-  def connect_to(host, port)
-    if @timeout != 0 and Redis::Timer
-      begin
-        Redis::Timer.timeout(@timeout){ @sock = TCPSocket.new(host, port) }
-      rescue Timeout::Error
-        @sock = nil
-        raise Timeout::Error, "Timeout connecting to the server"
-      end
-    else
-      @sock = TCPSocket.new(host, port)
-    end
-
-    @sock.setsockopt Socket::IPPROTO_TCP, Socket::TCP_NODELAY, 1
-
-    # If the timeout is set we set the low level socket options in order
-    # to make sure a blocking read will return after the specified number
-    # of seconds. This hack is from memcached ruby client.
-    self.timeout = @timeout
-
-  rescue Errno::ECONNREFUSED
-    raise Errno::ECONNREFUSED, "Unable to connect to Redis on #{host}:#{port}"
-  end
-end

data/test/beetle/redis_ext_test.rb

@@ -56,15 +56,9 @@ module Beetle
   end
 
   class RedisTimeoutTest < Test::Unit::TestCase
-    test "should use Redis::Timer if timeout is greater 0" do
+    test "should use a timer" do
       r = Redis.new(:host => "localhost", :port => 6390, :timeout => 1)
-      Redis::Timer.expects(:timeout).with(1).raises(Timeout::Error)
-      assert_equal({}, r.info_with_rescue)
-    end
-
-    test "should not use Redis::Timer if timeout 0" do
-      r = Redis.new(:host => "localhost", :port => 6390, :timeout => 0)
-      Redis::Timer.expects(:timeout).never
+      r.client.expects(:with_timeout).with(1).raises(Timeout::Error)
       assert_equal({}, r.info_with_rescue)
     end
   end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: beetle
 version: !ruby/object:Gem::Version 
-  hash: 21
+  hash: 19
   prerelease: false
   segments: 
   - 0
   - 2
-  - 1
-  version: 0.2.1
+  - 2
+  version: 0.2.2
 platform: ruby
 authors: 
 - Stefan Kaes
@@ -18,7 +18,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-22 00:00:00 +02:00
+date: 2010-07-26 00:00:00 +02:00
 default_executable: beetle
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -61,12 +61,12 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 9
+        hash: 7
         segments: 
         - 2
         - 0
-        - 3
-        version: 2.0.3
+        - 4
+        version: 2.0.4
   type: :runtime
   version_requirements: *id003
 - !ruby/object:Gem::Dependency