bunny 0.7.5 → 0.7.6

data/.gitignore

@@ -7,3 +7,4 @@
 .yardoc
 .rvmrc
 Gemfile.lock
+.rbx/*

data/.travis.yml

@@ -3,9 +3,10 @@ bundler_args: --without development
 script: "bundle exec rspec spec"
 rvm:
   - 1.8.7
-  - 1.9.2
   - ree
-  - 1.8.7-p174
+  - 1.9.2
+  - 1.9.3
+  - rbx-2.0
 notifications:
   recipients:
     - celldee@gmail.com

data/CHANGELOG

@@ -1,3 +1,7 @@
+= Version 0.7.6
+
+ * API mismatch between Timer/SystemTimer on Ruby 1.9 vs Ruby 1.8 is resolved.
+
 = Version 0.7.3
 
   * AMQP connection URI parser now respects port

data/lib/bunny.rb

@@ -67,8 +67,8 @@ module Bunny
 
   Timer = if RUBY_VERSION < "1.9"
             begin
-              require 'system_timer'
-              SystemTimer
+              require File.expand_path(File.join(File.dirname(__FILE__), 'system_timer.rb'))
+              Bunny::SystemTimer
             rescue LoadError
               Timeout
             end

data/lib/bunny/system_timer.rb

@@ -0,0 +1,14 @@
+# encoding: utf-8
+
+module Bunny
+  # Used for ruby < 1.9.x
+  class SystemTimer < ::SystemTimer
+
+    def timeout(seconds, exception)
+      timeout_after(seconds) do
+        yield
+      end
+    end
+
+  end
+end

data/lib/bunny/version.rb

@@ -1,5 +1,5 @@
 # encoding: utf-8
 
 module Bunny
-  VERSION = "0.7.5"
+  VERSION = "0.7.6"
 end

data/spec/spec_08/connection_spec.rb

@@ -11,5 +11,15 @@ describe Bunny do
     lambda { b.start}.should raise_error(Bunny::ProtocolError)
   end
 
+  it "should be able to open a TCPSocket with a timeout" do
+    b = Bunny.new(:spec => "0.8")
+    connect_timeout = 1
+    lambda { 
+      Bunny::Timer::timeout(connect_timeout, Qrack::ConnectionTimeout) do
+        TCPSocket.new(b.host, b.port) 
+      end
+    }.should_not raise_error(Exception)
+  end
+
 end
 

data/spec/spec_09/connection_spec.rb

@@ -16,4 +16,14 @@ describe Bunny do
     b.host.should eql("tagadab")
   end
 
+  it "should be able to open a TCPSocket with a timeout" do
+    b = Bunny.new(:spec => "0.9")
+    connect_timeout = 1
+    lambda { 
+      Bunny::Timer::timeout(connect_timeout, Qrack::ConnectionTimeout) do
+        TCPSocket.new(b.host, b.port) 
+      end
+    }.should_not raise_error(Exception)
+  end
+
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: bunny
 version: !ruby/object:Gem::Version 
-  hash: 9
+  hash: 15
   prerelease: 
   segments: 
   - 0
   - 7
-  - 5
-  version: 0.7.5
+  - 6
+  version: 0.7.6
 platform: ruby
 authors: 
 - Chris Duncan
@@ -19,7 +19,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-09-11 00:00:00 +04:00
+date: 2011-09-21 00:00:00 +04:00
 default_executable: 
 dependencies: []
 
@@ -77,6 +77,7 @@ files:
 - lib/bunny/queue09.rb
 - lib/bunny/subscription08.rb
 - lib/bunny/subscription09.rb
+- lib/bunny/system_timer.rb
 - lib/bunny/version.rb
 - lib/qrack/amq-client-url.rb
 - lib/qrack/channel.rb
@@ -107,7 +108,7 @@ has_rdoc: true
 homepage: http://github.com/ruby-amqp/bunny
 licenses: []
 
-post_install_message: "[\e[32mVersion 0.7.3\e[0m] AMQP connection URI parser now respects port\n"
+post_install_message: "[\e[32mVersion 0.7.6\e[0m] API mismatch between Timer/SystemTimer on Ruby 1.9 vs Ruby 1.8 is resolved.\n"
 rdoc_options: 
 - --main
 - README.rdoc