bunny 0.9.0.pre11 → 0.9.0.pre12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 83dfd362f0b0debb9919c5970dca6755de1d0604
-  data.tar.gz: cc5877189c28c76efd33bc6a04cb09801b144220
+  metadata.gz: 9ee7de4a1d5a24771bf6fe5f7e070c6d6afd6340
+  data.tar.gz: 3068de841ec8bbe3368b695866430a8f3859cf5a
 SHA512:
-  metadata.gz: 2ea6375cc2de43483d8f50ad1fcc7395ebd54b0fd590d262bf8962a2872874bd7688790fd84d65b0a71ef027a6edc44d80193232d8b13d2c7179ffbbc3108e12
-  data.tar.gz: 97ec376b03d8cacfaa805c689da8ee5eb7f82bfce40a7f900fc055317fb314ca73c8e4f57c7d256f3ff95aa094bdfd700a35471ac19c7f13c0642ef386a3b071
+  metadata.gz: 8ebc06c578c1ef13ac197f44aac01f38ca469bccada8f500aaeb80a3b3e3320ce19588cdfce825b1b669e4eef48305b1d169bae22ffb94208ed25828fe4a8786
+  data.tar.gz: 27bf9c563f423846c0cb3402779a043b2faf8b83a82099c8b5868934a8bff0b1b3164149b3b9c2a762a41b4f1d6b6fb66c6fcf560ba5b0ad9d10ee4b3520ff34

data/ChangeLog.md

@@ -1,3 +1,16 @@
+## Changes between Bunny 0.9.0.pre11 and 0.9.0.pre12
+
+### Ruby 1.8 Compatibility Regression Fix
+
+`Bunny::Socket` no longer uses Ruby 1.9-specific constants.
+
+
+### Bunny::Channel#wait_for_confirms Return Value Regression Fix
+
+`Bunny::Channel#wait_for_confirms` returns `true` or `false` again.
+
+
+
 ## Changes between Bunny 0.9.0.pre10 and 0.9.0.pre11
 
 ### Bunny::Session#create_channel Now Accepts Consumer Work Pool Size

data/README.md

@@ -33,12 +33,12 @@ To install Bunny 0.9.x with RubyGems:
 gem install bunny --pre
 ```
 
-the most recent 0.9.x version is `0.9.0.pre10`.
+the most recent 0.9.x version is `0.9.0.pre11`.
 
 To use Bunny 0.9.x in a project managed with Bundler:
 
 ``` ruby
-gem "bunny", ">= 0.9.0.pre10" # optionally: , :git => "git://github.com/ruby-amqp/bunny.git", :branch => "master"
+gem "bunny", ">= 0.9.0.pre11" # optionally: , :git => "git://github.com/ruby-amqp/bunny.git", :branch => "master"
 ```
 
 

data/lib/bunny/channel.rb

@@ -1309,6 +1309,7 @@ module Bunny
     # @see http://rubybunny.info/articles/extensions.html RabbitMQ Extensions guide
     # @api public
     def wait_for_confirms
+      @only_acks_received = true
       wait_on_confirms_continuations
 
       @only_acks_received
@@ -1562,6 +1563,7 @@ module Bunny
 
       @unconfirmed_set_mutex.synchronize do
         @only_acks_received = (@only_acks_received && !nack)
+        @logger.debug "Channel #{@id}: @only_acks_received = #{@only_acks_received.inspect}, nack: #{nack.inspect}"
 
         @confirms_continuations.push(true) if @unconfirmed_set.empty?
 

data/lib/bunny/socket.rb

@@ -8,6 +8,10 @@ module Bunny
   class Socket < TCPSocket
     attr_accessor :options
 
+    # IO::WaitReadable is 1.9+ only
+    READ_RETRY_EXCEPTION_CLASSES = [Errno::EAGAIN, Errno::EWOULDBLOCK]
+    READ_RETRY_EXCEPTION_CLASSES << IO::WaitReadable if IO.const_defined?(:WaitReadable)
+
     def self.open(host, port, options = {})
       Timeout.timeout(options[:socket_timeout]) do
         sock = new(host, port)
@@ -39,7 +43,7 @@ module Bunny
       rescue EOFError
         # @eof will break Rubinius' TCPSocket implementation. MK.
         @__bunny_socket_eof_flag__ = true
-      rescue Errno::EAGAIN, Errno::EWOULDBLOCK, IO::WaitReadable
+      rescue *READ_RETRY_EXCEPTION_CLASSES
         if IO.select([self], nil, nil, timeout)
           retry
         else

data/lib/bunny/version.rb

@@ -1,5 +1,5 @@
 # encoding: utf-8
 
 module Bunny
-  VERSION = "0.9.0.pre11"
+  VERSION = "0.9.0.pre12"
 end

data/spec/higher_level_api/integration/publisher_confirms_spec.rb

@@ -28,7 +28,7 @@ describe Bunny::Channel do
       end
 
       ch.next_publish_seq_no.should == 501
-      ch.wait_for_confirms
+      ch.wait_for_confirms.should be_true
       sleep 0.25
 
       q.message_count.should == 500

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bunny
 version: !ruby/object:Gem::Version
-  version: 0.9.0.pre11
+  version: 0.9.0.pre12
 platform: ruby
 authors:
 - Chris Duncan
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-14 00:00:00.000000000 Z
+date: 2013-05-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: amq-protocol