bunny 0.9.0.pre5 → 0.9.0.pre6

data/.gitignore

@@ -18,3 +18,4 @@ playground/*
 *.org
 repl-*
 debug/*
+*.dump

data/ChangeLog.md

@@ -1,3 +1,49 @@
+## Changes between Bunny 0.9.0.pre5 and 0.9.0.pre6
+
+### Automatic Network Failure Recovery
+
+Automatic Network Failure Recovery is a new Bunny feature that was earlier
+impemented and vetted out in [amqp gem](http://rubyamqp.info). What it does
+is, when a network activity loop detects an issue, it will try to
+periodically recover [first TCP, then] AMQP 0.9.1 connection, reopen
+all channels, recover all exchanges, queues, bindings and consumers
+on those channels (to be clear: this only includes entities and consumers added via
+Bunny).
+
+Publishers and consumers will continue operating shortly after the network
+connection recovers.
+
+Learn more in the [Error Handling and Recovery](http://rubybunny.info/articles/error_handling.html)
+documentation guide.
+
+### Confirms Listeners
+
+Bunny now supports listeners (callbacks) on
+
+``` ruby
+ch.confirm_select do |delivery_tag, multiple, nack|
+  # handle confirms (e.g. perform retries) here
+end
+```
+
+Contributed by Greg Brockman.
+
+### Publisher Confirms Improvements
+
+Publisher confirms implementation now uses non-strict equality (`<=`) for
+cases when multiple messages are confirmed by RabbitMQ at once.
+
+`Bunny::Channel#unconfirmed_set` is now part of the public API that lets
+developers access unconfirmed delivery tags to perform retries and such.
+
+Contributed by Greg Brockman.
+
+### Publisher Confirms Concurrency Fix
+
+`Bunny::Channel#wait_for_confirms` will now correctly block the calling
+thread until all pending confirms are received.
+
+
 ## Changes between Bunny 0.9.0.pre4 and 0.9.0.pre5
 
 ### Channel Errors Reset

data/README.md

@@ -37,7 +37,7 @@ gem install bunny --pre
 To use Bunny 0.9.x in a project managed with Bundler:
 
 ``` ruby
-gem "bunny", ">= 0.9.0.pre4" # optionally: , :git => "git://github.com/ruby-amqp/bunny.git", :branch => "master"
+gem "bunny", ">= 0.9.0.pre6" # optionally: , :git => "git://github.com/ruby-amqp/bunny.git", :branch => "master"
 ```
 
 

data/examples/connection/authentication_failure.rb

@@ -0,0 +1,16 @@
+#!/usr/bin/env ruby
+# encoding: utf-8
+
+require "bundler"
+Bundler.setup
+
+$:.unshift(File.expand_path("../../../lib", __FILE__))
+
+require 'bunny'
+
+begin
+  conn = Bunny.new("amqp://guest8we78w7e8:guest2378278@127.0.0.1")
+  conn.start
+rescue Bunny::PossibleAuthenticationFailureError => e
+  puts "Could not authenticate as #{conn.username}"
+end

data/examples/connection/automatic_recovery_with_client_named_queues.rb

@@ -0,0 +1,28 @@
+#!/usr/bin/env ruby
+# encoding: utf-8
+
+require "bundler"
+Bundler.setup
+
+$:.unshift(File.expand_path("../../../lib", __FILE__))
+
+require 'bunny'
+
+conn = Bunny.new(:heartbeat_interval => 8)
+conn.start
+
+ch = conn.create_channel
+x  = ch.topic("bunny.examples.recovery.topic", :durable => false)
+q  = ch.queue("bunny.examples.recovery.client_named_queue1", :durable => false)
+
+q.bind(x, :routing_key => "abc").bind(x, :routing_key => "def")
+
+q.subscribe do |delivery_info, metadata, payload|
+  puts "Consumed #{payload}"
+end
+
+loop do
+  sleep 3
+  puts "Tick"
+  x.publish(rand.to_s, :routing_key => ["abc", "def", "ghi", "xyz"].sample)
+end

data/examples/connection/automatic_recovery_with_multiple_consumers.rb

@@ -0,0 +1,40 @@
+#!/usr/bin/env ruby
+# encoding: utf-8
+
+require "bundler"
+Bundler.setup
+
+$:.unshift(File.expand_path("../../../lib", __FILE__))
+
+require 'bunny'
+
+conn = Bunny.new(:heartbeat_interval => 8)
+conn.start
+
+ch1 = conn.create_channel
+x1  = ch1.topic("bunny.examples.recovery.e1", :durable => false)
+q1  = ch1.queue("bunny.examples.recovery.q1", :durable => false)
+
+q1.bind(x1, :routing_key => "abc").bind(x1, :routing_key => "def")
+
+ch2 = conn.create_channel
+x2  = ch2.topic("bunny.examples.recovery.e2", :durable => false)
+q2  = ch2.queue("bunny.examples.recovery.q2", :durable => false)
+
+q2.bind(x2, :routing_key => "abc").bind(x2, :routing_key => "def")
+
+q1.subscribe do |delivery_info, metadata, payload|
+  puts "Consumed #{payload} at stage one"
+  x2.publish(payload, :routing_key => ["abc", "def", "xyz"].sample)
+end
+
+q2.subscribe do |delivery_info, metadata, payload|
+  puts "Consumed #{payload} at stage two"
+end
+
+loop do
+  sleep 3
+  rk = ["abc", "def", "ghi", "xyz"].sample
+  puts "Publishing with routing key #{rk}"
+  x1.publish(rand.to_s, :routing_key => rk)
+end

data/examples/connection/automatic_recovery_with_server_named_queues.rb

@@ -0,0 +1,28 @@
+#!/usr/bin/env ruby
+# encoding: utf-8
+
+require "bundler"
+Bundler.setup
+
+$:.unshift(File.expand_path("../../../lib", __FILE__))
+
+require 'bunny'
+
+conn = Bunny.new(:heartbeat_interval => 8)
+conn.start
+
+ch = conn.create_channel
+x  = ch.topic("bunny.examples.recovery.topic", :durable => false)
+q  = ch.queue("", :durable => false)
+
+q.bind(x, :routing_key => "abc").bind(x, :routing_key => "def")
+
+q.subscribe do |delivery_info, metadata, payload|
+  puts "Consumed #{payload}"
+end
+
+loop do
+  sleep 3
+  puts "Tick"
+  x.publish(rand.to_s, :routing_key => ["abc", "def", "ghi", "xyz"].sample)
+end

data/examples/connection/channel_level_exception.rb

@@ -0,0 +1,35 @@
+#!/usr/bin/env ruby
+# encoding: utf-8
+
+require "bundler"
+Bundler.setup
+
+$:.unshift(File.expand_path("../../../lib", __FILE__))
+
+require 'bunny'
+
+conn = Bunny.new(:heartbeat_interval => 8)
+conn.start
+
+begin
+  ch1 = conn.create_channel
+  ch1.queue_delete("queue_that_should_not_exist#{rand}")
+rescue Bunny::NotFound => e
+  puts "Channel-level exception! Code: #{e.channel_close.reply_code}, message: #{e.channel_close.reply_text}"
+end
+
+
+begin
+  ch2 = conn.create_channel
+  q   = "bunny.examples.recovery.q#{rand}"
+
+  ch2.queue_declare(q, :durable => false)
+  ch2.queue_declare(q, :durable => true)
+rescue Bunny::PreconditionFailed => e
+  puts "Channel-level exception! Code: #{e.channel_close.reply_code}, message: #{e.channel_close.reply_text}"
+ensure
+  conn.create_channel.queue_delete(q)
+end
+
+puts "Disconnecting..."
+conn.close

data/examples/connection/unknown_host.rb

@@ -8,6 +8,9 @@ $:.unshift(File.expand_path("../../../lib", __FILE__))
 
 require 'bunny'
 
-conn = Bunny.new("amqp://guest:guest@aksjhdkajshdkj.example82737.com")
-conn.start
-
+begin
+  conn = Bunny.new("amqp://guest:guest@aksjhdkajshdkj.example82737.com")
+  conn.start
+rescue Bunny::TCPConnectionFailed => e
+  puts "Connection to #{conn.hostname} failed"
+end

data/lib/bunny/channel.rb

@@ -18,7 +18,7 @@ module Bunny
     #
 
     attr_accessor :id, :connection, :status, :work_pool
-    attr_reader :next_publish_seq_no, :queues, :exchanges
+    attr_reader :next_publish_seq_no, :queues, :exchanges, :unconfirmed_set, :consumers
 
 
     def initialize(connection = nil, id = nil, work_pool = ConsumerWorkPool.new(1))
@@ -215,6 +215,8 @@ module Bunny
       end
       raise_if_continuation_resulted_in_a_channel_error!
 
+      @prefetch_count = prefetch_count
+
       @last_basic_qos_ok
     end
 
@@ -572,15 +574,17 @@ module Bunny
 
     # confirm.*
 
-    def confirm_select
+    def confirm_select(callback=nil)
       raise_if_no_longer_open!
 
       if @next_publish_seq_no == 0
-        @confirms_continuations = []
+        @confirms_continuations = ::Queue.new
         @unconfirmed_set        = Set.new
         @next_publish_seq_no    = 1
       end
 
+      @confirms_callback = callback
+
       @connection.send_frame(AMQ::Protocol::Confirm::Select.encode(@id, false))
       Bunny::Timer.timeout(1, ClientTimeout) do
         @last_confirm_select_ok = @continuations.pop
@@ -597,6 +601,47 @@ module Bunny
     end
 
 
+    #
+    # Recovery
+    #
+
+    def recover_from_network_failure
+      # puts "Recovering channel #{@id} from network failure..."
+      recover_prefetch_setting
+      recover_exchanges
+      # this includes recovering bindings
+      recover_queues
+      recover_consumers
+    end
+
+    def recover_prefetch_setting
+      basic_qos(@prefetch_count) if @prefetch_count
+    end
+
+    def recover_exchanges
+      @exchanges.values.dup.each do |x|
+        x.recover_from_network_failure
+      end
+    end
+
+    def recover_queues
+      @queues.values.dup.each do |q|
+        q.recover_from_network_failure
+      end
+    end
+
+    def recover_consumers
+      unless @consumers.empty?
+        @work_pool = ConsumerWorkPool.new(@work_pool.size)
+        @work_pool.start
+      end
+      @consumers.values.dup.each do |c|
+        c.recover_from_network_failure
+      end
+    end
+
+
+
     #
     # Implementation
     #
@@ -660,10 +705,8 @@ module Bunny
       when AMQ::Protocol::Confirm::SelectOk then
         @continuations.push(method)
       when AMQ::Protocol::Basic::Ack then
-        # TODO: implement confirm listeners
         handle_ack_or_nack(method.delivery_tag, method.multiple, false)
       when AMQ::Protocol::Basic::Nack then
-        # TODO: implement confirm listeners
         handle_ack_or_nack(method.delivery_tag, method.multiple, true)
       when AMQ::Protocol::Channel::Close then
         # puts "Exception on channel #{@id}: #{method.reply_code} #{method.reply_text}"
@@ -711,7 +754,7 @@ module Bunny
 
     def handle_ack_or_nack(delivery_tag, multiple, nack)
       if multiple
-        @unconfirmed_set.delete_if { |i| i < delivery_tag }
+        @unconfirmed_set.delete_if { |i| i <= delivery_tag }
       else
         @unconfirmed_set.delete(delivery_tag)
       end
@@ -720,6 +763,8 @@ module Bunny
         @only_acks_received = (@only_acks_received && !nack)
 
         @confirms_continuations.push(true) if @unconfirmed_set.empty?
+
+        @confirms_callback.call(delivery_tag, multiple, nack) if @confirms_callback
       end
     end
 
@@ -730,6 +775,14 @@ module Bunny
       @work_pool.start unless @work_pool.started?
     end
 
+    def maybe_pause_consumer_work_pool!
+      @work_pool.pause if @work_pool && @work_pool.started?
+    end
+
+    def maybe_kill_consumer_work_pool!
+      @work_pool.kill if @work_pool && @work_pool.started?
+    end
+
     def read_next_frame(options = {})
       @connection.read_next_frame(options = {})
     end
@@ -739,11 +792,15 @@ module Bunny
     def synchronize(&block)
       @publishing_mutex.synchronize(&block)
     end
-    
+
     def deregister_queue(queue)
       @queues.delete(queue.name)
     end
 
+    def deregister_queue_named(name)
+      @queues.delete(name)
+    end
+
     def register_queue(queue)
       @queues[queue.name] = queue
     end
@@ -751,7 +808,7 @@ module Bunny
     def find_queue(name)
       @queues[name]
     end
-    
+
     def deregister_exchange(exchange)
       @exchanges.delete(exchange.name)
     end

data/lib/bunny/consumer.rb

@@ -58,5 +58,13 @@ module Bunny
     def inspect
       "#<#{self.class.name}:#{object_id} @channel_id=#{@channel.number} @queue=#{self.queue_name}> @consumer_tag=#{@consumer_tag} @exclusive=#{@exclusive} @no_ack=#{@no_ack}>"
     end
+
+    #
+    # Recovery
+    #
+
+    def recover_from_network_failure
+      @channel.basic_consume_with(self)
+    end
   end
 end

data/lib/bunny/consumer_work_pool.rb

@@ -9,6 +9,8 @@ module Bunny
     # API
     #
 
+    attr_reader :size
+
     def initialize(size = 1)
       @size  = size
       @queue = ::Queue.new
@@ -46,6 +48,18 @@ module Bunny
       @threads.each { |t| t.join }
     end
 
+    def pause
+      @threads.each { |t| t.stop }
+    end
+
+    def resume
+      @threads.each { |t| t.run }
+    end
+
+    def kill
+      @threads.each { |t| t.kill }
+    end
+
     protected
 
     def run_loop

data/lib/bunny/exceptions.rb

@@ -16,9 +16,9 @@ module Bunny
   class ConnectionClosedError < StandardError
     def initialize(frame)
       if frame.respond_to?(:method_class)
-        super("Trying to send frame through a closed connection. Frame is #{frame.inspect}")
-      else
         super("Trying to send frame through a closed connection. Frame is #{frame.inspect}, method class is #{frame.method_class}")
+      else
+        super("Trying to send frame through a closed connection. Frame is #{frame.inspect}")
       end
     end
   end
@@ -44,7 +44,6 @@ module Bunny
   ConnectionError = TCPConnectionFailed
   ServerDownError = TCPConnectionFailed
 
-  # TODO
   class ForcedChannelCloseError < StandardError; end
   class ForcedConnectionCloseError < StandardError; end
   class MessageError < StandardError; end
@@ -131,4 +130,10 @@ module Bunny
 
   class ChannelError < ConnectionLevelException
   end
+
+  class InvalidCommand < ConnectionLevelException
+  end
+
+  class UnexpectedFrame < ConnectionLevelException
+  end
 end

data/lib/bunny/exchange.rb

@@ -126,6 +126,11 @@ module Bunny
       self
     end
 
+    def recover_from_network_failure
+      # puts "Recovering exchange #{@name} from network failure"
+      declare! unless predefined?
+    end
+
 
     #
     # Implementation
@@ -139,6 +144,11 @@ module Bunny
       end
     end
 
+    # @return [Boolean] true if this exchange is a pre-defined one (amq.direct, amq.fanout, amq.match and so on)
+    def predefined?
+      @name && ((@name == AMQ::Protocol::EMPTY_STRING) || !!(@name =~ /^amq\./i))
+    end # predefined?
+
     protected
 
     # @private

data/lib/bunny/main_loop.rb

@@ -18,10 +18,15 @@ module Bunny
       @thread    = Thread.new(&method(:run_loop))
     end
 
+    def resume
+      start
+    end
+
+
     def run_loop
       loop do
         begin
-          break if @stopping
+          break if @stopping || @network_is_down
 
           frame = @transport.read_next_frame
           @session.signal_activity!
@@ -50,6 +55,10 @@ module Bunny
           # should happen per operation and not in this loop
         rescue Errno::EBADF => ebadf
           # ignored, happens when we loop after the transport has already been closed
+        rescue AMQ::Protocol::EmptyResponseError, IOError, Errno::EPIPE, Errno::EAGAIN => e
+          puts "Exception in the main loop: #{e.class.name}"
+          @network_is_down = true
+          @session.handle_network_failure(e)
         rescue Exception => e
           puts e.class.name
           puts e.message

data/lib/bunny/queue.rb

@@ -26,6 +26,8 @@ module Bunny
       @auto_delete      = @options[:auto_delete]
       @arguments        = @options[:arguments]
 
+      @bindings         = Array.new
+
       @default_consumer = nil
 
       declare! unless opts[:no_declare]
@@ -65,12 +67,33 @@ module Bunny
     def bind(exchange, opts = {})
       @channel.queue_bind(@name, exchange, opts)
 
+      exchange_name = if exchange.respond_to?(:name)
+                        exchange.name
+                      else
+                        exchange
+                      end
+
+
+      # store bindings for automatic recovery. We need to be very careful to
+      # not cause an infinite rebinding loop here when we recover. MK.
+      binding = { :exchange => exchange_name, :routing_key => (opts[:routing_key] || opts[:key]), :arguments => opts[:arguments] }
+      @bindings.push(binding) unless @bindings.include?(binding)
+
       self
     end
 
     def unbind(exchange, opts = {})
       @channel.queue_unbind(@name, exchange, opts)
 
+      exchange_name = if exchange.respond_to?(:name)
+                        exchange.name
+                      else
+                        exchange
+                      end
+
+
+      @bindings.delete_if { |b| b[:exchange] == exchange_name && b[:routing_key] == (opts[:routing_key] || opts[:key]) && b[:arguments] == opts[:arguments] }
+
       self
     end
 
@@ -84,11 +107,12 @@ module Bunny
 
       ctag       = opts.fetch(:consumer_tag, @channel.generate_consumer_tag)
       consumer   = Consumer.new(@channel,
-                                @name,
+                                self,
                                 ctag,
                                 !opts[:ack],
                                 opts[:exclusive],
                                 opts[:arguments])
+      puts "Added consumer #{ctag} on queue #{@name}"
       consumer.on_delivery(&block)
       consumer.on_cancellation(&opts[:on_cancellation]) if opts[:on_cancellation]
 
@@ -172,6 +196,34 @@ module Bunny
       s[:consumer_count]
     end
 
+    #
+    # Recovery
+    #
+
+    def recover_from_network_failure
+      # puts "Recovering queue #{@name} from network failure"
+
+      if self.server_named?
+        old_name = @name.dup
+        @name    = AMQ::Protocol::EMPTY_STRING
+
+        @channel.deregister_queue_named(old_name)
+      end
+
+      declare!
+      begin
+        @channel.register_queue(self)
+      rescue Exception => e
+        puts "Caught #{e.inspect} while registering #{@name}!"
+      end
+      recover_bindings
+    end
+
+    def recover_bindings
+      @bindings.each do |b|
+        self.bind(b[:exchange], b)
+      end
+    end
 
 
     #

data/lib/bunny/session.rb

@@ -111,13 +111,15 @@ module Bunny
     alias ssl? uses_ssl?
 
     def start
-      @status = :connecting
+      @continuations = ::Queue.new
+      @status        = :connecting
 
       self.initialize_transport
 
       self.init_connection
       self.open_connection
 
+      @event_loop = nil
       self.start_main_loop
 
       @default_channel = self.create_channel
@@ -233,9 +235,7 @@ module Bunny
     def close_connection(sync = true)
       @transport.send_frame(AMQ::Protocol::Connection::Close.encode(200, "Goodbye", 0, 0))
 
-      if @heartbeat_sender
-        @heartbeat_sender.stop
-      end
+      maybe_shutdown_heartbeat_sender
       @status   = :not_connected
 
       if sync
@@ -303,6 +303,60 @@ module Bunny
       end
     end
 
+    def handle_network_failure(exception)
+      if !recovering_from_network_failure?
+        @recovering_from_network_failure = true
+        if recoverable_network_failure?(exception)
+          # puts "Recovering from a network failure..."
+          @channels.each do |n, ch|
+            ch.maybe_kill_consumer_work_pool!
+          end
+          maybe_shutdown_heartbeat_sender
+
+          recover_from_network_failure
+        else
+          # TODO: investigate if we can be a bit smarter here. MK.
+        end
+      end
+    end
+
+    def recoverable_network_failure?(exception)
+      # TODO: investigate if we can be a bit smarter here. MK.
+      true
+    end
+
+    def recovering_from_network_failure?
+      @recovering_from_network_failure
+    end
+
+    def recover_from_network_failure
+      begin
+        # puts "About to start recovery..."
+        start
+
+        if open?
+          @recovering_from_network_failure = false
+
+          recover_channels
+        end
+      rescue TCPConnectionFailed, AMQ::Protocol::EmptyResponseError => e
+        # puts "TCP connection failed, reconnecting in 5 seconds"
+        sleep 5.0
+        retry if recoverable_network_failure?(e)
+      end
+    end
+
+    def recover_channels
+      # default channel is reopened right after connection
+      # negotiation is completed, so make sure we do not try to open
+      # it twice. MK.
+      @channels.reject { |n, ch| ch == @default_channel }.each do |n, ch|
+        ch.open
+
+        ch.recover_from_network_failure
+      end
+    end
+
     def send_raw(*args)
       @transport.write(*args)
     end
@@ -311,8 +365,14 @@ module Bunny
       case frame
       when AMQ::Protocol::Connection::Close then
         klass = case frame.reply_code
+                when 503 then
+                  InvalidCommand
                 when 504 then
                   ChannelError
+                when 504 then
+                  UnexpectedFrame
+                else
+                  raise "Unknown reply code: #{frame.reply_code}, text: #{frame.reply_text}"
                 end
 
         klass.new("Connection-level error: #{frame.reply_text}", self, frame)
@@ -488,13 +548,18 @@ module Bunny
     end
 
     def initialize_heartbeat_sender
+      # puts "Initializing heartbeat sender..."
       @heartbeat_sender = HeartbeatSender.new(@transport)
       @heartbeat_sender.start(@heartbeat)
     end
 
+    def maybe_shutdown_heartbeat_sender
+      @heartbeat_sender.stop if @heartbeat_sender
+    end
+
 
     def initialize_transport
-      @transport = Transport.new(@host, @port, @opts)
+      @transport = Transport.new(self, @host, @port, @opts)
     end
 
     # Sends AMQ protocol header (also known as preamble).

data/lib/bunny/transport.rb

@@ -14,12 +14,13 @@ module Bunny
     DEFAULT_CONNECTION_TIMEOUT = 5.0
 
 
-    attr_reader :host, :port, :socket, :connect_timeout
+    attr_reader :session, :host, :port, :socket, :connect_timeout
 
-    def initialize(host, port, opts)
-      @host = host
-      @port = port
-      @opts = opts
+    def initialize(session, host, port, opts)
+      @session = session
+      @host    = host
+      @port    = port
+      @opts    = opts
 
       @ssl             = opts[:ssl] || false
       @ssl_cert        = opts[:ssl_cert]
@@ -61,24 +62,18 @@ module Bunny
     # @raise [ClientTimeout]
     def write(*args)
       begin
-        raise Bunny::ConnectionError.new('No connection - socket has not been created', @host, @port) if !@socket
+        raise Bunny::ConnectionError.new("No connection: socket is nil. ", @host, @port) if !@socket
         if @read_write_timeout
           Bunny::Timer.timeout(@read_write_timeout, Bunny::ClientTimeout) do
-            @socket.write(*args)
+            @socket.write(*args) if open?
           end
         else
-          @socket.write(*args)
+          @socket.write(*args) if open?
         end
       rescue Errno::EPIPE, Errno::EAGAIN, Bunny::ClientTimeout, IOError => e
         close
 
-        m = case e
-            when String then
-              e
-            when Exception then
-              e.message
-            end
-        raise Bunny::ConnectionError.new(m, @host, @port)
+        @session.handle_network_failure(e)
       end
     end
     alias send_raw write
@@ -97,7 +92,7 @@ module Bunny
     end
 
     def flush
-      @socket.flush
+      @socket.flush if @socket
     end
 
     def read_fully(*args)
@@ -135,13 +130,31 @@ module Bunny
     # @private
     def send_frame(frame)
       if closed?
-        raise ConnectionClosedError.new(frame)
+        @session.handle_network_failure(ConnectionClosedError.new(frame))
       else
         send_raw(frame.encode)
       end
     end
 
 
+    def self.reacheable?(host, port, timeout)
+      begin
+        s = Bunny::Socket.open(host, port,
+                               :socket_timeout => timeout)
+
+        true
+      rescue SocketError, Timeout::Error => e
+        false
+      ensure
+        s.close if s
+      end
+    end
+
+    def self.ping!(host, port, timeout)
+      raise ConnectionTimeout.new("#{host}:#{port} is unreachable") if !reacheable?(host, port, timeout)
+    end
+
+
     protected
 
     def initialize_socket

data/lib/bunny/version.rb

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

data/spec/unit/transport_spec.rb

@@ -0,0 +1,15 @@
+require "spec_helper"
+
+describe Bunny::Transport, ".reachable?" do
+  it "returns true for google.com, 80" do
+    Bunny::Transport.reacheable?("google.com", 80, 1).should be_true
+  end
+
+  it "returns true for google.com, 8088" do
+    Bunny::Transport.reacheable?("google.com", 8088, 1).should be_false
+  end
+
+  it "returns false for google1237982792837.com, 8277" do
+    Bunny::Transport.reacheable?("google1237982792837.com", 8277, 1).should be_false
+  end
+end

metadata

@@ -1,213 +1,213 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: bunny
-version: !ruby/object:Gem::Version
-  version: 0.9.0.pre5
+version: !ruby/object:Gem::Version 
   prerelease: 6
+  version: 0.9.0.pre6
 platform: ruby
-authors:
-- Chris Duncan
-- Eric Lindvall
-- Jakub Stastny aka botanicus
-- Michael S. Klishin
-- Stefan Kaes
-autorequire:
+authors: 
+  - Chris Duncan
+  - Eric Lindvall
+  - Jakub Stastny aka botanicus
+  - Michael S. Klishin
+  - Stefan Kaes
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-09 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
-  name: amq-protocol
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 1.0.1
-    none: false
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 1.0.1
-    none: false
-  prerelease: false
-  type: :runtime
+
+date: 2013-01-14 00:00:00 Z
+dependencies: 
+  - !ruby/object:Gem::Dependency 
+    name: amq-protocol
+    prerelease: false
+    requirement: &id001 !ruby/object:Gem::Requirement 
+      none: false
+      requirements: 
+        - - ">="
+          - !ruby/object:Gem::Version 
+            version: 1.0.1
+    type: :runtime
+    version_requirements: *id001
 description: Easy to use synchronous Ruby client for RabbitMQ
-email:
-- !binary |-
-  Y2VsbGRlZUBnbWFpbC5jb20=
-- !binary |-
-  ZXJpY0A1c3RvcHMuY29t
-- !binary |-
-  c3Rhc3RueUAxMDFpZGVhcy5jeg==
-- !binary |-
-  bWljaGFlbEBub3ZlbWJlcmFpbi5jb20=
-- !binary |-
-  c2thZXNAcmFpbHNleHByZXNzLmRl
+email: 
+  - celldee@gmail.com
+  - eric@5stops.com
+  - stastny@101ideas.cz
+  - michael@novemberain.com
+  - skaes@railsexpress.de
 executables: []
+
 extensions: []
-extra_rdoc_files:
-- README.md
-files:
-- .gitignore
-- .rspec
-- .travis.yml
-- .yardopts
-- ChangeLog.md
-- Gemfile
-- LICENSE
-- README.md
-- bin/ci/before_build.sh
-- bunny.gemspec
-- examples/connection/heartbeat.rb
-- examples/connection/unknown_host.rb
-- examples/guides/exchanges/direct_exchange_routing.rb
-- examples/guides/exchanges/fanout_exchange_routing.rb
-- examples/guides/exchanges/headers_exchange_routing.rb
-- examples/guides/exchanges/mandatory_messages.rb
-- examples/guides/extensions/alternate_exchange.rb
-- examples/guides/extensions/basic_nack.rb
-- examples/guides/extensions/consumer_cancellation_notification.rb
-- examples/guides/extensions/dead_letter_exchange.rb
-- examples/guides/extensions/exchange_to_exchange_bindings.rb
-- examples/guides/extensions/per_message_ttl.rb
-- examples/guides/extensions/per_queue_message_ttl.rb
-- examples/guides/extensions/publisher_confirms.rb
-- examples/guides/extensions/queue_lease.rb
-- examples/guides/extensions/sender_selected_distribution.rb
-- examples/guides/getting_started/blabbr.rb
-- examples/guides/getting_started/hello_world.rb
-- examples/guides/getting_started/weathr.rb
-- examples/guides/queues/redeliveries.rb
-- lib/bunny.rb
-- lib/bunny/authentication/credentials_encoder.rb
-- lib/bunny/authentication/external_mechanism_encoder.rb
-- lib/bunny/authentication/plain_mechanism_encoder.rb
-- lib/bunny/channel.rb
-- lib/bunny/channel_id_allocator.rb
-- lib/bunny/compatibility.rb
-- lib/bunny/concurrent/condition.rb
-- lib/bunny/consumer.rb
-- lib/bunny/consumer_tag_generator.rb
-- lib/bunny/consumer_work_pool.rb
-- lib/bunny/delivery_info.rb
-- lib/bunny/exceptions.rb
-- lib/bunny/exchange.rb
-- lib/bunny/framing.rb
-- lib/bunny/heartbeat_sender.rb
-- lib/bunny/main_loop.rb
-- lib/bunny/message_properties.rb
-- lib/bunny/queue.rb
-- lib/bunny/return_info.rb
-- lib/bunny/session.rb
-- lib/bunny/socket.rb
-- lib/bunny/system_timer.rb
-- lib/bunny/transport.rb
-- lib/bunny/version.rb
-- spec/compatibility/queue_declare_spec.rb
-- spec/higher_level_api/integration/basic_ack_spec.rb
-- spec/higher_level_api/integration/basic_cancel_spec.rb
-- spec/higher_level_api/integration/basic_consume_spec.rb
-- spec/higher_level_api/integration/basic_get_spec.rb
-- spec/higher_level_api/integration/basic_nack_spec.rb
-- spec/higher_level_api/integration/basic_publish_spec.rb
-- spec/higher_level_api/integration/basic_qos_spec.rb
-- spec/higher_level_api/integration/basic_recover_spec.rb
-- spec/higher_level_api/integration/basic_reject_spec.rb
-- spec/higher_level_api/integration/basic_return_spec.rb
-- spec/higher_level_api/integration/channel_close_spec.rb
-- spec/higher_level_api/integration/channel_flow_spec.rb
-- spec/higher_level_api/integration/channel_open_spec.rb
-- spec/higher_level_api/integration/channel_open_stress_spec.rb
-- spec/higher_level_api/integration/confirm_select_spec.rb
-- spec/higher_level_api/integration/connection_spec.rb
-- spec/higher_level_api/integration/consumer_cancellation_notification_spec.rb
-- spec/higher_level_api/integration/dead_lettering_spec.rb
-- spec/higher_level_api/integration/exchange_bind_spec.rb
-- spec/higher_level_api/integration/exchange_declare_spec.rb
-- spec/higher_level_api/integration/exchange_delete_spec.rb
-- spec/higher_level_api/integration/exchange_unbind_spec.rb
-- spec/higher_level_api/integration/message_properties_access_spec.rb
-- spec/higher_level_api/integration/publisher_confirms_spec.rb
-- spec/higher_level_api/integration/queue_bind_spec.rb
-- spec/higher_level_api/integration/queue_declare_spec.rb
-- spec/higher_level_api/integration/queue_delete_spec.rb
-- spec/higher_level_api/integration/queue_purge_spec.rb
-- spec/higher_level_api/integration/queue_unbind_spec.rb
-- spec/higher_level_api/integration/sender_selected_distribution_spec.rb
-- spec/higher_level_api/integration/tx_commit_spec.rb
-- spec/higher_level_api/integration/tx_rollback_spec.rb
-- spec/issues/issue78_spec.rb
-- spec/issues/issue83_spec.rb
-- spec/lower_level_api/integration/basic_cancel_spec.rb
-- spec/lower_level_api/integration/basic_consume_spec.rb
-- spec/spec_helper.rb
-- spec/unit/bunny_spec.rb
-- spec/unit/concurrent/condition_spec.rb
+
+extra_rdoc_files: 
+  - README.md
+files: 
+  - .gitignore
+  - .rspec
+  - .travis.yml
+  - .yardopts
+  - ChangeLog.md
+  - Gemfile
+  - LICENSE
+  - README.md
+  - bin/ci/before_build.sh
+  - bunny.gemspec
+  - examples/connection/authentication_failure.rb
+  - examples/connection/automatic_recovery_with_client_named_queues.rb
+  - examples/connection/automatic_recovery_with_multiple_consumers.rb
+  - examples/connection/automatic_recovery_with_server_named_queues.rb
+  - examples/connection/channel_level_exception.rb
+  - examples/connection/heartbeat.rb
+  - examples/connection/unknown_host.rb
+  - examples/guides/exchanges/direct_exchange_routing.rb
+  - examples/guides/exchanges/fanout_exchange_routing.rb
+  - examples/guides/exchanges/headers_exchange_routing.rb
+  - examples/guides/exchanges/mandatory_messages.rb
+  - examples/guides/extensions/alternate_exchange.rb
+  - examples/guides/extensions/basic_nack.rb
+  - examples/guides/extensions/consumer_cancellation_notification.rb
+  - examples/guides/extensions/dead_letter_exchange.rb
+  - examples/guides/extensions/exchange_to_exchange_bindings.rb
+  - examples/guides/extensions/per_message_ttl.rb
+  - examples/guides/extensions/per_queue_message_ttl.rb
+  - examples/guides/extensions/publisher_confirms.rb
+  - examples/guides/extensions/queue_lease.rb
+  - examples/guides/extensions/sender_selected_distribution.rb
+  - examples/guides/getting_started/blabbr.rb
+  - examples/guides/getting_started/hello_world.rb
+  - examples/guides/getting_started/weathr.rb
+  - examples/guides/queues/redeliveries.rb
+  - lib/bunny.rb
+  - lib/bunny/authentication/credentials_encoder.rb
+  - lib/bunny/authentication/external_mechanism_encoder.rb
+  - lib/bunny/authentication/plain_mechanism_encoder.rb
+  - lib/bunny/channel.rb
+  - lib/bunny/channel_id_allocator.rb
+  - lib/bunny/compatibility.rb
+  - lib/bunny/concurrent/condition.rb
+  - lib/bunny/consumer.rb
+  - lib/bunny/consumer_tag_generator.rb
+  - lib/bunny/consumer_work_pool.rb
+  - lib/bunny/delivery_info.rb
+  - lib/bunny/exceptions.rb
+  - lib/bunny/exchange.rb
+  - lib/bunny/framing.rb
+  - lib/bunny/heartbeat_sender.rb
+  - lib/bunny/main_loop.rb
+  - lib/bunny/message_properties.rb
+  - lib/bunny/queue.rb
+  - lib/bunny/return_info.rb
+  - lib/bunny/session.rb
+  - lib/bunny/socket.rb
+  - lib/bunny/system_timer.rb
+  - lib/bunny/transport.rb
+  - lib/bunny/version.rb
+  - spec/compatibility/queue_declare_spec.rb
+  - spec/higher_level_api/integration/basic_ack_spec.rb
+  - spec/higher_level_api/integration/basic_cancel_spec.rb
+  - spec/higher_level_api/integration/basic_consume_spec.rb
+  - spec/higher_level_api/integration/basic_get_spec.rb
+  - spec/higher_level_api/integration/basic_nack_spec.rb
+  - spec/higher_level_api/integration/basic_publish_spec.rb
+  - spec/higher_level_api/integration/basic_qos_spec.rb
+  - spec/higher_level_api/integration/basic_recover_spec.rb
+  - spec/higher_level_api/integration/basic_reject_spec.rb
+  - spec/higher_level_api/integration/basic_return_spec.rb
+  - spec/higher_level_api/integration/channel_close_spec.rb
+  - spec/higher_level_api/integration/channel_flow_spec.rb
+  - spec/higher_level_api/integration/channel_open_spec.rb
+  - spec/higher_level_api/integration/channel_open_stress_spec.rb
+  - spec/higher_level_api/integration/confirm_select_spec.rb
+  - spec/higher_level_api/integration/connection_spec.rb
+  - spec/higher_level_api/integration/consumer_cancellation_notification_spec.rb
+  - spec/higher_level_api/integration/dead_lettering_spec.rb
+  - spec/higher_level_api/integration/exchange_bind_spec.rb
+  - spec/higher_level_api/integration/exchange_declare_spec.rb
+  - spec/higher_level_api/integration/exchange_delete_spec.rb
+  - spec/higher_level_api/integration/exchange_unbind_spec.rb
+  - spec/higher_level_api/integration/message_properties_access_spec.rb
+  - spec/higher_level_api/integration/publisher_confirms_spec.rb
+  - spec/higher_level_api/integration/queue_bind_spec.rb
+  - spec/higher_level_api/integration/queue_declare_spec.rb
+  - spec/higher_level_api/integration/queue_delete_spec.rb
+  - spec/higher_level_api/integration/queue_purge_spec.rb
+  - spec/higher_level_api/integration/queue_unbind_spec.rb
+  - spec/higher_level_api/integration/sender_selected_distribution_spec.rb
+  - spec/higher_level_api/integration/tx_commit_spec.rb
+  - spec/higher_level_api/integration/tx_rollback_spec.rb
+  - spec/issues/issue78_spec.rb
+  - spec/issues/issue83_spec.rb
+  - spec/lower_level_api/integration/basic_cancel_spec.rb
+  - spec/lower_level_api/integration/basic_consume_spec.rb
+  - spec/spec_helper.rb
+  - spec/unit/bunny_spec.rb
+  - spec/unit/concurrent/condition_spec.rb
+  - spec/unit/transport_spec.rb
 homepage: http://github.com/ruby-amqp/bunny
-licenses:
-- MIT
-post_install_message:
+licenses: 
+  - MIT
+post_install_message: 
 rdoc_options: []
-require_paths:
-- lib
-required_ruby_version: !ruby/object:Gem::Requirement
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: !binary |-
-        MA==
+
+require_paths: 
+  - lib
+required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
-required_rubygems_version: !ruby/object:Gem::Requirement
-  requirements:
-  - - !binary |-
-      Pg==
-    - !ruby/object:Gem::Version
-      version: 1.3.1
+  requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
+  requirements: 
+    - - ">"
+      - !ruby/object:Gem::Version 
+        version: 1.3.1
 requirements: []
-rubyforge_project:
+
+rubyforge_project: 
 rubygems_version: 1.8.24
-signing_key:
+signing_key: 
 specification_version: 3
 summary: Easy to use synchronous Ruby client for RabbitMQ
-test_files:
-- spec/compatibility/queue_declare_spec.rb
-- spec/higher_level_api/integration/basic_ack_spec.rb
-- spec/higher_level_api/integration/basic_cancel_spec.rb
-- spec/higher_level_api/integration/basic_consume_spec.rb
-- spec/higher_level_api/integration/basic_get_spec.rb
-- spec/higher_level_api/integration/basic_nack_spec.rb
-- spec/higher_level_api/integration/basic_publish_spec.rb
-- spec/higher_level_api/integration/basic_qos_spec.rb
-- spec/higher_level_api/integration/basic_recover_spec.rb
-- spec/higher_level_api/integration/basic_reject_spec.rb
-- spec/higher_level_api/integration/basic_return_spec.rb
-- spec/higher_level_api/integration/channel_close_spec.rb
-- spec/higher_level_api/integration/channel_flow_spec.rb
-- spec/higher_level_api/integration/channel_open_spec.rb
-- spec/higher_level_api/integration/channel_open_stress_spec.rb
-- spec/higher_level_api/integration/confirm_select_spec.rb
-- spec/higher_level_api/integration/connection_spec.rb
-- spec/higher_level_api/integration/consumer_cancellation_notification_spec.rb
-- spec/higher_level_api/integration/dead_lettering_spec.rb
-- spec/higher_level_api/integration/exchange_bind_spec.rb
-- spec/higher_level_api/integration/exchange_declare_spec.rb
-- spec/higher_level_api/integration/exchange_delete_spec.rb
-- spec/higher_level_api/integration/exchange_unbind_spec.rb
-- spec/higher_level_api/integration/message_properties_access_spec.rb
-- spec/higher_level_api/integration/publisher_confirms_spec.rb
-- spec/higher_level_api/integration/queue_bind_spec.rb
-- spec/higher_level_api/integration/queue_declare_spec.rb
-- spec/higher_level_api/integration/queue_delete_spec.rb
-- spec/higher_level_api/integration/queue_purge_spec.rb
-- spec/higher_level_api/integration/queue_unbind_spec.rb
-- spec/higher_level_api/integration/sender_selected_distribution_spec.rb
-- spec/higher_level_api/integration/tx_commit_spec.rb
-- spec/higher_level_api/integration/tx_rollback_spec.rb
-- spec/issues/issue78_spec.rb
-- spec/issues/issue83_spec.rb
-- spec/lower_level_api/integration/basic_cancel_spec.rb
-- spec/lower_level_api/integration/basic_consume_spec.rb
-- spec/spec_helper.rb
-- spec/unit/bunny_spec.rb
-- spec/unit/concurrent/condition_spec.rb
+test_files: 
+  - spec/compatibility/queue_declare_spec.rb
+  - spec/higher_level_api/integration/basic_ack_spec.rb
+  - spec/higher_level_api/integration/basic_cancel_spec.rb
+  - spec/higher_level_api/integration/basic_consume_spec.rb
+  - spec/higher_level_api/integration/basic_get_spec.rb
+  - spec/higher_level_api/integration/basic_nack_spec.rb
+  - spec/higher_level_api/integration/basic_publish_spec.rb
+  - spec/higher_level_api/integration/basic_qos_spec.rb
+  - spec/higher_level_api/integration/basic_recover_spec.rb
+  - spec/higher_level_api/integration/basic_reject_spec.rb
+  - spec/higher_level_api/integration/basic_return_spec.rb
+  - spec/higher_level_api/integration/channel_close_spec.rb
+  - spec/higher_level_api/integration/channel_flow_spec.rb
+  - spec/higher_level_api/integration/channel_open_spec.rb
+  - spec/higher_level_api/integration/channel_open_stress_spec.rb
+  - spec/higher_level_api/integration/confirm_select_spec.rb
+  - spec/higher_level_api/integration/connection_spec.rb
+  - spec/higher_level_api/integration/consumer_cancellation_notification_spec.rb
+  - spec/higher_level_api/integration/dead_lettering_spec.rb
+  - spec/higher_level_api/integration/exchange_bind_spec.rb
+  - spec/higher_level_api/integration/exchange_declare_spec.rb
+  - spec/higher_level_api/integration/exchange_delete_spec.rb
+  - spec/higher_level_api/integration/exchange_unbind_spec.rb
+  - spec/higher_level_api/integration/message_properties_access_spec.rb
+  - spec/higher_level_api/integration/publisher_confirms_spec.rb
+  - spec/higher_level_api/integration/queue_bind_spec.rb
+  - spec/higher_level_api/integration/queue_declare_spec.rb
+  - spec/higher_level_api/integration/queue_delete_spec.rb
+  - spec/higher_level_api/integration/queue_purge_spec.rb
+  - spec/higher_level_api/integration/queue_unbind_spec.rb
+  - spec/higher_level_api/integration/sender_selected_distribution_spec.rb
+  - spec/higher_level_api/integration/tx_commit_spec.rb
+  - spec/higher_level_api/integration/tx_rollback_spec.rb
+  - spec/issues/issue78_spec.rb
+  - spec/issues/issue83_spec.rb
+  - spec/lower_level_api/integration/basic_cancel_spec.rb
+  - spec/lower_level_api/integration/basic_consume_spec.rb
+  - spec/spec_helper.rb
+  - spec/unit/bunny_spec.rb
+  - spec/unit/concurrent/condition_spec.rb
+  - spec/unit/transport_spec.rb