bunny 1.0.0.rc1 → 1.0.0.rc2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c339ebb8c3d6a344a35638a8c685e7e5986719e1
-  data.tar.gz: e59fed7a29900b78dcaa9bf9e67ecb7824948054
+  metadata.gz: 7a93cb605a6fdd64b33d36cf15c2348e3a63d1f4
+  data.tar.gz: fb0cf9a5bbfa5d87a01a3e88ac5b4e194912cb6a
 SHA512:
-  metadata.gz: 4172c0cf99d0fca5c2c5fa40d07a5ad82be055dea6867a4d19ecd54599059ea9a0ec16f317083ab4b27d0ad807159b57e5bbccf23440a1f5ef3a3bf3ee8baf08
-  data.tar.gz: e0d292b13d4bed1cb5bf046453dd11ad3562359364d0ee9c15ff4934ebaee461344c087ea63fa31e43f5fd56f0af8d2f54375c1cc7217c454aa3b55cfb873b89
+  metadata.gz: 9dddb5e6345033db760b2b12be7c5bd61831d5a68d64b6b471c22557beae60d2a48aec300becea2509bfe66b5acf25ce606e7f8ed6a37c9be279ffb365da326c
+  data.tar.gz: eaf13dac3eb2d00be80afd360890dc85633054ff2acdb899fb0166958e4ca0a2ec5dd09fa1bc9d71f8e6e1d464773398e5d4d3673283eb081cb5e89baa157f9c

data/ChangeLog.md

@@ -1,4 +1,12 @@
-## Changes between Bunny 1.0.0.pre6 and 1.0.0.pre7
+## Changes between Bunny 1.0.0.rc1 and 1.0.0.rc2
+
+### Ruby 1.8.7 Compatibility Fixes
+
+Ruby 1.8.7 compatibility fixes around timeouts.
+
+
+
+## Changes between Bunny 1.0.0.pre6 and 1.0.0.rc1
 
 ### amq-protocol Update
 

data/Gemfile

@@ -19,7 +19,7 @@ extend Module.new {
   end
 }
 
-gem "SystemTimer", "1.2", :platform => :ruby_18
+gem "SystemTimer", "~> 1.2.3", :platform => :ruby_18
 
 gem "rake", ">= 10.0.4"
 gem "effin_utf8"

data/README.md

@@ -90,7 +90,7 @@ gem install bunny
 To use Bunny in a project managed with Bundler:
 
 ``` ruby
-gem "bunny", ">= 0.10.0"
+gem "bunny", ">= 1.0.0.rc1"
 ```
 
 

data/lib/bunny/concurrent/continuation_queue.rb

@@ -21,7 +21,7 @@ module Bunny
 
       def poll(timeout_in_ms = nil)
         if timeout_in_ms
-          Bunny::Timeout.timeout(timeout_in_ms / 1000, Timeout::Error) do
+          Bunny::Timeout.timeout(timeout_in_ms / 1000, ::Timeout::Error) do
             @q.pop
           end
         else

data/lib/bunny/socket.rb

@@ -14,7 +14,7 @@ module Bunny
     READ_RETRY_EXCEPTION_CLASSES << IO::WaitReadable if IO.const_defined?(:WaitReadable)
 
     def self.open(host, port, options = {})
-      Timeout.timeout(options[:socket_timeout]) do
+      Timeout.timeout(options[:socket_timeout], ClientTimeout) do
         sock = new(host, port)
         if Socket.constants.include?('TCP_NODELAY') || Socket.constants.include?(:TCP_NODELAY)
           sock.setsockopt(::Socket::IPPROTO_TCP, ::Socket::TCP_NODELAY, true)

data/lib/bunny/transport.rb

@@ -250,12 +250,12 @@ module Bunny
 
     def initialize_socket
       begin
-        @socket = Bunny::Timeout.timeout(@connect_timeout, ConnectionTimeout) do
+        @socket = Bunny::Timeout.timeout(@connect_timeout, ClientTimeout) do
           Bunny::Socket.open(@host, @port,
                              :keepalive      => @opts[:keepalive],
                              :socket_timeout => @connect_timeout)
         end
-      rescue StandardError, ConnectionTimeout => e
+      rescue StandardError, ClientTimeout => e
         @status = :not_connected
         raise Bunny::TCPConnectionFailed.new(e, self.hostname, self.port)
       end

data/lib/bunny/version.rb

@@ -2,5 +2,5 @@
 
 module Bunny
   # @return [String] Version of the library
-  VERSION = "1.0.0.rc1"
+  VERSION = "1.0.0.rc2"
 end

data/spec/stress/connection_open_close_spec.rb

@@ -1,11 +1,11 @@
 require "spec_helper"
 
-unless RUBY_ENGINE == "jruby" && !ENV["FORCE_JRUBY_RUN"]
+unless defined?(JRUBY_VERSION) && !ENV["FORCE_JRUBY_RUN"]
   describe Bunny::Session do
     # creating thousands of connections means creating
     # twice as many threads and this won't fly with the JVM
     # in CI containers. MK.
-    n = if RUBY_ENGINE == "jruby"
+    n = if defined?(JRUBY_VERSION)
           250
         else
           2500

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bunny
 version: !ruby/object:Gem::Version
-  version: 1.0.0.rc1
+  version: 1.0.0.rc2
 platform: ruby
 authors:
 - Chris Duncan
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-01 00:00:00.000000000 Z
+date: 2013-10-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: amq-protocol