bunny 2.14.2 → 2.17.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7a6ffb6e1661c9921afd766382444c1d194f5b816d35021f9f49ab4382adced6
-  data.tar.gz: 4f7ef1377379a4fa087110316c149c0f012239247537467bfd788463d8c0a904
+  metadata.gz: 3f3ba4a5565a42eace00f8789c1be953871d9dc57d42028a94a9dd70a586271e
+  data.tar.gz: c7d2fdf832b466a27c7ae884e6195729d31a6bf1cb6accde9818c2f72b46cdc6
 SHA512:
-  metadata.gz: 73ada01a49fb86a5ffe95548b79df15169cd63ba47481c2303f5ea314f04e14e97c4f9e7e42b095969bf5259633d15803a4eb116743c054007d4694af62b6fa2
-  data.tar.gz: b6c533137ea821b45c2dd7e8cc54a87c09384a6e15bad8ae505c3c9ea2ef3c3ed8a53153832bc1a0773adc566888a832e689837abfe8f5f4d1a90e7cf2966da6
+  metadata.gz: 26a352492ca652429975e45ec36fad12ebfd3c94e66babb879afb0f09dcec0158affc820f8a29fd07a25d8db6ac9312fd31ebc5b1a3d4c315ecfeeb880a5a8f2
+  data.tar.gz: 393fa99fb87c7784eccd0f5019fe3668b39064e15935d85f4134c85aa6b138849d0026addb814f49d00f606b9157b78878863c875d2ad6480b17b3053dcb98fb

data/.travis.yml

@@ -1,3 +1,4 @@
+dist: bionic
 language: ruby
 bundler_args: --without development
 cache: bundler
@@ -10,10 +11,11 @@ before_script:
 script: "bundle exec rake integration_without_recovery"
 rvm:
   - ruby-head
-  - "2.6.0"
-  - "2.5.1"
-  - "2.4.2"
-  - "2.3.5"
+  - "2.7.1"
+  - "2.6.6"
+  - "2.5.8"
+  - "2.4.10"
+  - "2.3.8"
 notifications:
   email: michael@rabbitmq.com
 services:
@@ -21,8 +23,8 @@ services:
 branches:
   only:
     - master
-    - 2.12.x-stable
-    - 2.11.x-stable
+    - 2.14.x-stable
+    - 2.13.x-stable
 env:
   - CI=true
 matrix:

data/ChangeLog.md

@@ -1,22 +1,70 @@
-## Changes between Bunny 2.14.2 and 2.14.3 (in development)
+## Changes between Bunny 2.17.x and 2.18.0 (in development)
 
 No changes yet.
 
 
-## Changes between Bunny 2.14.1 and 2.14.2 (Apr 24th, 2019)
+## Changes between Bunny 2.16.x and 2.17.0 (Sep 11th, 2020)
 
-### Lazy Peer Certificate Chain Information Logging
+### Easier to Specify a Client-Propvided Connection Name
 
-Peer certificate chain information is now logged lazily, which prevents
-an obscure exception originating ASN.1 parser and makes the logging
-code evaluate only when it is really necessary.
+It is now easier to provide a client-provided (custom) connection
+name that will be displayed in the RabbitMQ management UI and mentioned in
+[server logs](https://www.rabbitmq.com/logging.html).
 
-GitHub issue: [#578](https://github.com/ruby-amqp/bunny/pull/578)
+Instead of
 
-Contributed by Garrett Thornburg.
+``` ruby
+conn = Bunny.new(client_properties: {connection_name: 'app ABC #{rand}'})
+conn.start
+```
+
+a new top-level connection option now can be used:
+
+``` ruby
+conn = Bunny.new(connection_name: 'app ABC #{rand}')
+conn.start
+```
+
+Contributed by @brerx.
+
+GitHub issue: [ruby-amqp/bunny#600](https://github.com/ruby-amqp/bunny/pull/600)
+
+
+## Changes between Bunny 2.15.0 and 2.16.0 (Aug 14th, 2020)
+
+### Asynchronous Exception Delegate
+
+Bunny now can delete asynchronous connection (`Bunny::Session`) exception to an arbitrary
+delegate object. Use the `:session_error_handler` connection setting to pass it.
+The value defaults to `Thread.current`.
 
+Contributed by @bbascarevic.
 
-## Changes between Bunny 2.14.0 and 2.14.1 (Feb 26th, 2019)
+GitHub issue: [ruby-amqp/bunny#597](https://github.com/ruby-amqp/bunny/issues/597)
+
+
+## Changes between Bunny 2.14.0 and 2.15.0 (Apr 8th, 2020)
+
+### More Defensive Thread Join Operations
+
+Bunny is now more defensive around thread join operations which it performs
+when stopping its consumer work pool.
+
+`Thread#join` can cause an unhandled exception to be re-raised at
+a very surprising moment. This behavior can also be affected by 3rd party
+libraries, e.g. those that do connection pooling. While Bunny cannot
+fully avoid every possible surprising failure, it now avoids at least
+one such problematic interaction triggered by a custom [interrupt handler](https://ruby-doc.org/core-2.5.1/Thread.html#method-c-handle_interrupt)
+in a 3rd party library.
+
+GitHub issue: [#589](https://github.com/ruby-amqp/bunny/issues/589)
+
+Contributed by @fuegas.
+
+### Dependency Updates
+
+`amq-protocol` dependency has been bumped to `2.3.1` to support `connection.update-secret`
+protocol extension.
 
 ### Gem Installation Fixed on Windows
 
@@ -24,7 +72,16 @@ Contributed by Garrett Thornburg.
 
 Contributed by Jack Xiaosong Xu.
 
-GitHub issue: [#573](https://github.com/ruby-amqp/bunny/pull/574)
+### Lazy Peer Certificate Chain Information Logging
+
+Peer certificate chain information is now logged lazily, which prevents
+an obscure exception originating ASN.1 parser and makes the logging
+code evaluate only when it is really necessary.
+
+GitHub issue: [#578](https://github.com/ruby-amqp/bunny/pull/578)
+
+Contributed by Garrett Thornburg.
+
 
 ## Changes between Bunny 2.13.0 and 2.14.0 (Feb 20th, 2019)
 

data/Gemfile

@@ -33,8 +33,8 @@ group :development do
 end
 
 group :test do
-  gem "rspec", "~> 3.8.0"
-  gem "rabbitmq_http_api_client", "~> 1.11.0", require: "rabbitmq/http/client"
+  gem "rspec", "~> 3.9.0"
+  gem "rabbitmq_http_api_client", "~> 1.13.0", require: "rabbitmq/http/client"
   gem "toxiproxy", "~> 1.0.3"
 end
 

data/README.md

@@ -43,12 +43,11 @@ Specific examples:
    Web applications that display that information in the real time.
 
 
-
 ## Supported Ruby Versions
 
 Modern Bunny versions support
 
- * CRuby 2.2 through 2.5 (inclusive)
+ * CRuby 2.3 through 2.7 (inclusive)
 
 Bunny works sufficiently well on JRuby but there are known
 JRuby bugs in versions prior to JRuby 9000 that cause high CPU burn. JRuby users should
@@ -71,10 +70,10 @@ a stable public API.
 Change logs per release series:
 
  * [master](https://github.com/ruby-amqp/bunny/blob/master/ChangeLog.md)
+ * [2.16.x](https://github.com/ruby-amqp/bunny/blob/2.16.x-stable/ChangeLog.md)
+ * [2.15.x](https://github.com/ruby-amqp/bunny/blob/2.15.x-stable/ChangeLog.md)
+ * [2.14.x](https://github.com/ruby-amqp/bunny/blob/2.14.x-stable/ChangeLog.md)
  * [2.13.x](https://github.com/ruby-amqp/bunny/blob/2.13.x-stable/ChangeLog.md)
- * [2.12.x](https://github.com/ruby-amqp/bunny/blob/2.12.x-stable/ChangeLog.md)
- * [2.11.x](https://github.com/ruby-amqp/bunny/blob/2.11.x-stable/ChangeLog.md)
- * [2.10.x](https://github.com/ruby-amqp/bunny/blob/2.10.x-stable/ChangeLog.md)
 
 
 
@@ -97,7 +96,7 @@ gem install bunny
 To use Bunny in a project managed with Bundler:
 
 ``` ruby
-gem "bunny", ">= 2.13.0"
+gem "bunny", ">= 2.16.1"
 ```
 
 

data/bunny.gemspec

@@ -8,8 +8,8 @@ Gem::Specification.new do |s|
   s.name = "bunny"
   s.version = Bunny::VERSION.dup
   s.homepage = "http://rubybunny.info"
-  s.summary = "Easy to use Ruby client for RabbitMQ"
-  s.description = "Easy to use, feature complete Ruby client for RabbitMQ"
+  s.summary = "Popular easy to use Ruby client for RabbitMQ"
+  s.description = "Easy to use, feature complete Ruby client for RabbitMQ 3.3 and later versions."
   s.license = "MIT"
   s.required_ruby_version = Gem::Requirement.new(">= 2.2")
 
@@ -21,10 +21,10 @@ Gem::Specification.new do |s|
     "Michael S. Klishin",
     "Stefan Kaes"]
 
-  s.email = ["mklishin@pivotal.io"]
+  s.email = ["michael.s.klishin@gmail.com"]
 
   # Dependencies
-  s.add_runtime_dependency 'amq-protocol', '~> 2.3', '>= 2.3.0'
+  s.add_runtime_dependency 'amq-protocol', '~> 2.3', '>= 2.3.1'
 
   # Files.
   s.extra_rdoc_files = ["README.md"]

data/docker/Dockerfile

@@ -7,11 +7,15 @@ RUN wget -O - "https://github.com/rabbitmq/signing-keys/releases/download/2.0/ra
 COPY apt/sources.list.d/bintray.rabbitmq.list /etc/apt/sources.list.d/bintray.rabbitmq.list
 COPY apt/preferences.d/erlang                 /etc/apt/preferences.d/erlang
 
-RUN apt-get update -y
+RUN apt-get update -y && apt-get upgrade -y
+
+RUN apt-get install -y erlang-base \
+                       erlang-asn1 erlang-crypto erlang-eldap erlang-ftp erlang-inets \
+                       erlang-mnesia erlang-os-mon erlang-parsetools erlang-public-key \
+                       erlang-runtime-tools erlang-snmp erlang-ssl \
+                       erlang-syntax-tools erlang-tftp erlang-tools erlang-xmerl
 
-RUN apt-get upgrade -y && \
-    apt-get install -y erlang-asn1 erlang-crypto erlang-public-key erlang-ssl && \
-    apt-get install -y rabbitmq-server
+RUN apt-get install -y rabbitmq-server
 
 COPY docker-entrypoint.sh /
 

data/docker/docker-entrypoint.sh

@@ -6,9 +6,9 @@ delay=5
 echo 'Starting a RabbitMQ node'
 $server -detached
 
-echo "Waiting $delay seconds for RabbitMQ to start."
+echo "Waiting for RabbitMQ to finish startup..."
 
-sleep $delay
+$ctl await_startup --timeout 15
 
 $ctl add_user bunny_gem bunny_password
 $ctl add_user bunny_reader reader_password

data/lib/bunny/channel.rb

@@ -1156,7 +1156,7 @@ module Bunny
 
     # @group Exchange operations (exchange.*)
 
-    # Declares a exchange using echange.declare AMQP 0.9.1 method.
+    # Declares a exchange using exchange.declare AMQP 0.9.1 method.
     #
     # @param [String] name The name of the exchange. Note that LF and CR characters
     #                       will be stripped from the value.

data/lib/bunny/cruby/socket.rb

@@ -32,6 +32,9 @@ module Bunny
         socket.setsockopt(::Socket::IPPROTO_TCP, ::Socket::TCP_NODELAY, true)
       end
       socket.setsockopt(::Socket::SOL_SOCKET, ::Socket::SO_KEEPALIVE, true) if options.fetch(:keepalive, true)
+      socket.instance_eval do
+        @__bunny_socket_eof_flag__ = false
+      end
       socket.extend self
       socket.options = { :host => host, :port => port }.merge(options)
       socket

data/lib/bunny/queue.rb

@@ -158,9 +158,6 @@ module Bunny
     # @option opts [Boolean] :ack (false) [DEPRECATED] Use :manual_ack instead
     # @option opts [Boolean] :manual_ack (false) Will this consumer use manual acknowledgements?
     # @option opts [Boolean] :exclusive (false) Should this consumer be exclusive for this queue?
-    # @option opts [Boolean] :block (false) Should the call block the calling thread? This option can be useful for keeping the main thread of
-    #                                       a script alive. It is incompatible with automatic connection recovery
-    #                                       and is not generally recommended.
     # @option opts [#call] :on_cancellation Block to execute when this consumer is cancelled remotely (e.g. via the RabbitMQ Management plugin)
     # @option opts [String] :consumer_tag Unique consumer identifier. It is usually recommended to let Bunny generate it for you.
     # @option opts [Hash] :arguments ({}) Additional (optional) arguments, typically used by RabbitMQ extensions

data/lib/bunny/reader_loop.rb

@@ -9,17 +9,17 @@ module Bunny
   # @private
   class ReaderLoop
 
-    def initialize(transport, session, session_thread)
-      @transport      = transport
-      @session        = session
-      @session_thread = session_thread
-      @logger         = @session.logger
+    def initialize(transport, session, session_error_handler)
+      @transport             = transport
+      @session               = session
+      @session_error_handler = session_error_handler
+      @logger                = @session.logger
 
-      @mutex          = Mutex.new
+      @mutex                 = Mutex.new
 
-      @stopping        = false
-      @stopped         = false
-      @network_is_down = false
+      @stopping              = false
+      @stopped               = false
+      @network_is_down       = false
     end
 
 
@@ -37,7 +37,8 @@ module Bunny
         begin
           break if @mutex.synchronize { @stopping || @stopped || @network_is_down }
           run_once
-        rescue AMQ::Protocol::EmptyResponseError, IOError, SystemCallError, Timeout::Error => e
+        rescue AMQ::Protocol::EmptyResponseError, IOError, SystemCallError, Timeout::Error,
+               OpenSSL::OpenSSLError => e
           break if terminate? || @session.closing? || @session.closed?
 
           @network_is_down = true
@@ -46,7 +47,7 @@ module Bunny
             @session.handle_network_failure(e)
           else
             log_exception(e)
-            @session_thread.raise(Bunny::NetworkFailure.new("detected a network failure: #{e.message}", e))
+            @session_error_handler.raise(Bunny::NetworkFailure.new("detected a network failure: #{e.message}", e))
           end
         rescue ShutdownSignal => _
           @mutex.synchronize { @stopping = true }
@@ -57,7 +58,7 @@ module Bunny
             log_exception(e)
 
             @network_is_down = true
-            @session_thread.raise(Bunny::NetworkFailure.new("caught an unexpected exception in the network loop: #{e.message}", e))
+            @session_error_handler.raise(Bunny::NetworkFailure.new("caught an unexpected exception in the network loop: #{e.message}", e))
           end
         rescue Errno::EBADF => _ebadf
           break if terminate?
@@ -115,7 +116,14 @@ module Bunny
     end
 
     def join
-      @thread.join if @thread
+      # Thread#join can/would trigger a re-raise of an unhandled exception in this thread.
+      # In addition, Thread.handle_interrupt can be used by other libraries or application code
+      # that would make this join operation fail with an obscure exception.
+      # So we try to save everyone some really unpleasant debugging time by introducing
+      # this condition which typically would not evaluate to true anyway.
+      #
+      # See ruby-amqp/bunny#589 and ruby-amqp/bunny#590 for background.
+      @thread.join if @thread && @thread != Thread.current
     end
 
     def kill

data/lib/bunny/session.rb

@@ -89,6 +89,7 @@ module Bunny
     # @return [Integer] Timeout for blocking protocol operations (queue.declare, queue.bind, etc), in milliseconds. Default is 15000.
     attr_reader :continuation_timeout
     attr_reader :network_recovery_interval
+    attr_reader :connection_name
     attr_accessor :socket_configurator
 
     # @param [String, Hash] connection_string_or_opts Connection string or a hash of connection options
@@ -124,9 +125,11 @@ module Bunny
     # @option connection_string_or_opts [Integer] :recovery_attempts (nil) Max number of recovery attempts, nil means forever
     # @option connection_string_or_opts [Integer] :reset_recovery_attempts_after_reconnection (true) Should recovery attempt counter be reset after successful reconnection? When set to false, the attempt counter will last through the entire lifetime of the connection object.
     # @option connection_string_or_opts [Boolean] :recover_from_connection_close (true) Should this connection recover after receiving a server-sent connection.close (e.g. connection was force closed)?
+    # @option connection_string_or_opts [Object] :session_error_handler (Thread.current) Object which responds to #raise that will act as a session error handler. Defaults to Thread.current, which will raise asynchronous exceptions in the thread that created the session.
     #
     # @option optz [String] :auth_mechanism ("PLAIN") Authentication mechanism, PLAIN or EXTERNAL
     # @option optz [String] :locale ("PLAIN") Locale RabbitMQ should use
+    # @option optz [String] :connection_name (nil) Client-provided connection name, if any. Note that the value returned does not uniquely identify a connection and cannot be used as a connection identifier in HTTP API requests.
     #
     # @see http://rubybunny.info/articles/connecting.html Connecting to RabbitMQ guide
     # @see http://rubybunny.info/articles/tls.html TLS/SSL guide
@@ -171,6 +174,7 @@ module Bunny
                                else
                                  opts[:automatically_recover] || opts[:automatic_recovery]
                                end
+      @recovering_from_network_failure = false
       @max_recovery_attempts = opts[:recovery_attempts]
       @recovery_attempts     = @max_recovery_attempts
       # When this is set, connection attempts won't be reset after
@@ -184,6 +188,7 @@ module Bunny
       @continuation_timeout   = opts.fetch(:continuation_timeout, DEFAULT_CONTINUATION_TIMEOUT)
 
       @status             = :not_connected
+      @manually_closed    = false
       @blocked            = false
 
       # these are negotiated with the broker during the connection tuning phase
@@ -195,7 +200,9 @@ module Bunny
       @client_heartbeat   = self.heartbeat_from(opts)
 
       client_props         = opts[:properties] || opts[:client_properties] || {}
+      @connection_name     = client_props[:connection_name] || opts[:connection_name]
       @client_properties   = DEFAULT_CLIENT_PROPERTIES.merge(client_props)
+                                                      .merge(connection_name: connection_name)
       @mechanism           = normalize_auth_mechanism(opts.fetch(:auth_mechanism, "PLAIN"))
       @credentials_encoder = credentials_encoder_for(@mechanism)
       @locale              = @opts.fetch(:locale, DEFAULT_LOCALE)
@@ -211,9 +218,9 @@ module Bunny
       @address_index_mutex = @mutex_impl.new
 
       @channels            = Hash.new
-      @recovery_completed = opts[:recovery_completed]
+      @recovery_completed  = opts[:recovery_completed]
 
-      @origin_thread       = Thread.current
+      @session_error_handler = opts.fetch(:session_error_handler, Thread.current)
 
       self.reset_continuations
       self.initialize_transport
@@ -340,6 +347,14 @@ module Bunny
       self
     end
 
+    def update_secret(value, reason)
+      @transport.send_frame(AMQ::Protocol::Connection::UpdateSecret.encode(value, reason))
+      @last_update_secret_ok = wait_on_continuations
+      raise_if_continuation_resulted_in_a_connection_error!
+
+      @last_update_secret_ok
+    end
+
     # Socket operation write timeout used by this connection
     # @return [Integer]
     # @private
@@ -630,6 +645,8 @@ module Bunny
       when AMQ::Protocol::Connection::Unblocked then
         @blocked = false
         @unblock_callback.call(method) if @unblock_callback
+      when AMQ::Protocol::Connection::UpdateSecretOk then
+        @continuations.push(method)
       when AMQ::Protocol::Channel::Close then
         begin
           ch = synchronised_find_channel(ch_number)
@@ -850,7 +867,7 @@ module Bunny
 
       clean_up_on_shutdown
       if threaded?
-        @origin_thread.raise(@last_connection_error)
+        @session_error_handler.raise(@last_connection_error)
       else
         raise @last_connection_error
       end
@@ -1007,7 +1024,7 @@ module Bunny
 
     # @private
     def reader_loop
-      @reader_loop ||= ReaderLoop.new(@transport, self, Thread.current)
+      @reader_loop ||= ReaderLoop.new(@transport, self, @session_error_handler)
     end
 
     # @private
@@ -1270,7 +1287,7 @@ module Bunny
           end
 
           if threaded?
-            @origin_thread.raise(e)
+            @session_error_handler.raise(e)
           else
             raise e
           end
@@ -1316,7 +1333,7 @@ module Bunny
         @transport = Transport.new(self,
                                    host_from_address(address),
                                    port_from_address(address),
-                                   @opts.merge(:session_thread => @origin_thread)
+                                   @opts.merge(:session_error_handler => @session_error_handler)
                                   )
 
         # Reset the cached progname for the logger only when no logger was provided

data/lib/bunny/transport.rb

@@ -35,7 +35,7 @@ module Bunny
 
     def initialize(session, host, port, opts)
       @session        = session
-      @session_thread = opts[:session_thread]
+      @session_error_handler = opts[:session_error_handler]
       @host    = host
       @port    = port
       @opts    = opts
@@ -146,7 +146,7 @@ module Bunny
           if @session.automatically_recover?
             @session.handle_network_failure(e)
           else
-            @session_thread.raise(Bunny::NetworkFailure.new("detected a network failure: #{e.message}", e))
+            @session_error_handler.raise(Bunny::NetworkFailure.new("detected a network failure: #{e.message}", e))
           end
         end
       end
@@ -170,7 +170,7 @@ module Bunny
           if @session.automatically_recover?
             @session.handle_network_failure(e)
           else
-            @session_thread.raise(Bunny::NetworkFailure.new("detected a network failure: #{e.message}", e))
+            @session_error_handler.raise(Bunny::NetworkFailure.new("detected a network failure: #{e.message}", e))
           end
         end
       end
@@ -188,7 +188,7 @@ module Bunny
         if @session.automatically_recover?
           @session.handle_network_failure(e)
         else
-          @session_thread.raise(Bunny::NetworkFailure.new("detected a network failure: #{e.message}", e))
+          @session_error_handler.raise(Bunny::NetworkFailure.new("detected a network failure: #{e.message}", e))
         end
       end
     end
@@ -245,7 +245,7 @@ module Bunny
         if @session.automatically_recover?
           raise
         else
-          @session_thread.raise(Bunny::NetworkFailure.new("detected a network failure: #{e.message}", e))
+          @session_error_handler.raise(Bunny::NetworkFailure.new("detected a network failure: #{e.message}", e))
         end
       end
     end

data/lib/bunny/version.rb

@@ -2,5 +2,5 @@
 
 module Bunny
   # @return [String] Version of the library
-  VERSION = "2.14.2"
+  VERSION = "2.17.0"
 end

data/repl

@@ -1,3 +1,3 @@
 #!/bin/sh
 
-bundle exec ripl -Ilib -r'bunny' -r'ripl/multi_line' -r'ripl/irb'
+bundle exec ruby `which ripl` -Ilib -r'bunny' -r'ripl/multi_line' -r'ripl/irb'

data/spec/higher_level_api/integration/basic_cancel_spec.rb

@@ -20,7 +20,7 @@ describe Bunny::Consumer, "#cancel" do
       t = Thread.new do
         ch         = connection.create_channel
         q          = ch.queue(queue_name, auto_delete: true, durable: false)
-        consumer = q.subscribe(block: false) do |_, _, payload|
+        consumer = q.subscribe do |_, _, payload|
           delivered_data << payload
         end
 
@@ -58,7 +58,7 @@ describe Bunny::Consumer, "#cancel" do
           delivered_data << payload
         end
 
-        q.subscribe_with(consumer, block: false)
+        q.subscribe_with(consumer)
       end
       t.abort_on_exception = true
       sleep 1.0
@@ -91,7 +91,7 @@ describe Bunny::Consumer, "#cancel" do
           delivered_data << payload
         end
 
-        q.subscribe_with(consumer, block: false)
+        q.subscribe_with(consumer)
       end
       t.abort_on_exception = true
       sleep 1.0
@@ -122,7 +122,7 @@ describe Bunny::Consumer, "#cancel" do
           delivered_data << payload
         end
 
-        q.subscribe_with(consumer, block: false)
+        q.subscribe_with(consumer)
       end
       t.abort_on_exception = true
       sleep 1.0

data/spec/higher_level_api/integration/basic_consume_spec.rb

@@ -189,17 +189,17 @@ describe Bunny::Queue, "#subscribe" do
         ch = connection.create_channel
         q  = ch.queue(queue_name)
 
-        c1  = q.subscribe(exclusive: false, manual_ack: false, block: false) do |delivery_info, properties, payload|
+        c1  = q.subscribe(exclusive: false, manual_ack: false) do |delivery_info, properties, payload|
         end
         c1.cancel
 
-        c2  = q.subscribe(exclusive: false, manual_ack: false, block: false) do |delivery_info, properties, payload|
+        c2  = q.subscribe(exclusive: false, manual_ack: false) do |delivery_info, properties, payload|
           delivered_keys << delivery_info.routing_key
           delivered_data << payload
         end
         c2.cancel
 
-        q.subscribe(exclusive: false, manual_ack: false, block: true) do |delivery_info, properties, payload|
+        q.subscribe(exclusive: false, manual_ack: false) do |delivery_info, properties, payload|
           delivered_keys << delivery_info.routing_key
           delivered_data << payload
         end

data/spec/higher_level_api/integration/connection_spec.rb

@@ -560,4 +560,30 @@ describe Bunny::Session do
       described_class.new(logger: logger)
     end
   end
+
+  context "initialized with a custom connection name" do
+    it "uses provided connection name with default connection string" do
+      conn = Bunny.new(connection_name: 'test_name')
+
+      expect(conn.connection_name).to eq 'test_name'
+    end
+
+    it "uses provided connection name from client property hash" do
+      conn = Bunny.new(client_properties: {connection_name: 'cp/test_name'})
+
+      expect(conn.connection_name).to eq 'cp/test_name'
+    end
+
+    it "uses provided connection name with custom connection string" do
+      conn = Bunny.new('amqp://guest:guest@rabbitmq:5672', connection_name: 'test_name3')
+
+      expect(conn.connection_name).to eq 'test_name3'
+    end
+
+    it "uses provided connection name with hash options" do
+      conn = Bunny.new(user: 'user', password: 'p455w0rd', connection_name: 'test_name4')
+
+      expect(conn.connection_name).to eq 'test_name4'
+    end
+  end
 end

data/spec/higher_level_api/integration/tls_connection_spec.rb

@@ -3,248 +3,260 @@ require "spec_helper"
 
 require "socket"
 
-unless ENV["CI"]
-  CERTIFICATE_DIR = ENV.fetch("BUNNY_CERTIFICATE_DIR", "./spec/tls")
-  puts "Will use certificates from #{CERTIFICATE_DIR}"
-
-  shared_examples_for "successful TLS connection" do
-    it "succeeds" do
-      expect(subject).to be_tls
-      ch = subject.create_channel
-      ch.confirm_select
-
-      q  = ch.queue("", exclusive: true)
-      x  = ch.default_exchange
-
-      x.publish("xyzzy", routing_key: q.name).
-        publish("xyzzy", routing_key: q.name).
-        publish("xyzzy", routing_key: q.name).
-        publish("xyzzy", routing_key: q.name)
-
-      x.wait_for_confirms
-      expect(q.message_count).to eq 4
-
-      i = 0
-      q.subscribe do |delivery_info, _, payload|
-        i += 1
-      end
-      sleep 1.0
-      expect(i).to eq 4
-      expect(q.message_count).to eq 0
-
-      ch.close
-    end
-  end
+CERTIFICATE_DIR = ENV.fetch("BUNNY_CERTIFICATE_DIR", "./spec/tls")
+puts "Will use certificates from #{CERTIFICATE_DIR}"
 
-  def local_hostname
-    ENV.fetch("BUNNY_RABBITMQ_HOSTNAME", "localhost")
-  end
+shared_examples_for "successful TLS connection" do
+  it "succeeds", skip: ENV["CI"] do
+    expect(subject).to be_tls
+    ch = subject.create_channel
+    ch.confirm_select
+
+    q  = ch.queue("", exclusive: true)
+    x  = ch.default_exchange
+
+    x.publish("xyzzy", routing_key: q.name).
+      publish("xyzzy", routing_key: q.name).
+      publish("xyzzy", routing_key: q.name).
+      publish("xyzzy", routing_key: q.name)
 
-  context "initialized with :tls => true" do
-    let(:subject) do
-      Bunny.new(
-        hostname:  local_hostname(),
-        user:     "bunny_gem",
-        password: "bunny_password",
-        vhost:    "bunny_testbed",
-        tls: true,
-        verify_peer: verify_peer,
-        tls_cert: "#{CERTIFICATE_DIR}/client_certificate.pem",
-        tls_key: "#{CERTIFICATE_DIR}/client_key.pem",
-        tls_ca_certificates: ["#{CERTIFICATE_DIR}/ca_certificate.pem"])
+    x.wait_for_confirms
+    expect(q.message_count).to eq 4
+
+    i = 0
+    q.subscribe do |delivery_info, _, payload|
+      i += 1
     end
+    sleep 1.0
+    expect(i).to eq 4
+    expect(q.message_count).to eq 0
 
-    context "peer verification is off" do
-      let(:verify_peer) { false }
+    ch.close
+  end
+end
 
-      it "uses TLS port" do
-        expect(subject.port).to eq AMQ::Protocol::TLS_PORT
-      end
+def local_hostname
+  ENV.fetch("BUNNY_RABBITMQ_HOSTNAME", "localhost")
+end
 
-      it "sends the SNI details" do
-        # https://github.com/ruby-amqp/bunny/issues/440
-        subject.start
-        expect(subject.transport.socket.hostname).to_not be_empty
-      end
+def no_tls12_supported?
+  not tls12_supported?
+end
 
-      after :each do
-        subject.close
-      end
-    end
+def tls12_supported?
+  begin
+    ctx = OpenSSL::SSL::SSLContext.new
+    ctx.min_version = ctx.max_version = OpenSSL::SSL::TLS1_2_VERSION
+    true
+  rescue
+    false
+  end
+end
 
-    context "peer verification is on" do
-      let(:verify_peer) { true }
+context "initialized with tls: true", skip: ENV["CI"] do
+  let(:subject) do
+    Bunny.new(
+      hostname:  local_hostname(),
+      user:     "bunny_gem",
+      password: "bunny_password",
+      vhost:    "bunny_testbed",
+      tls: true,
+      verify_peer: verify_peer,
+      tls_cert: "#{CERTIFICATE_DIR}/client_certificate.pem",
+      tls_key: "#{CERTIFICATE_DIR}/client_key.pem",
+      tls_ca_certificates: ["#{CERTIFICATE_DIR}/ca_certificate.pem"])
+  end
+
+  context "peer verification is off" do
+    let(:verify_peer) { false }
 
-      it "uses TLS port" do
-        expect(subject.port).to eq AMQ::Protocol::TLS_PORT
-      end
+    it "uses TLS port" do
+      expect(subject.port).to eq AMQ::Protocol::TLS_PORT
     end
-  end
 
-  describe "TLS connection to RabbitMQ with client certificates" do
-    let(:subject) do
-      c = Bunny.new(
-        hostname: local_hostname(),
-        username: "bunny_gem",
-        password: "bunny_password",
-        vhost: "bunny_testbed",
-        tls: true,
-        tls_cert: "#{CERTIFICATE_DIR}/client_certificate.pem",
-        tls_key: "#{CERTIFICATE_DIR}/client_key.pem",
-        tls_ca_certificates: ["#{CERTIFICATE_DIR}/ca_certificate.pem"],
-        verify_peer: false)
-      c.start
-      c
+    it "sends the SNI details" do
+      # https://github.com/ruby-amqp/bunny/issues/440
+      subject.start
+      expect(subject.transport.socket.hostname).to_not be_empty
     end
 
     after :each do
       subject.close
     end
-
-    include_examples "successful TLS connection"
   end
 
+  context "peer verification is on" do
+    let(:verify_peer) { true }
 
-  describe "TLS connection to RabbitMQ without client certificates" do
-    let(:subject) do
-      c = Bunny.new(
-        hostname: local_hostname(),
-        username: "bunny_gem",
-        password: "bunny_password",
-        vhost: "bunny_testbed",
-        tls: true,
-        tls_ca_certificates: ["#{CERTIFICATE_DIR}/ca_certificate.pem"],
-        verify_peer: false)
-      c.start
-      c
+    it "uses TLS port" do
+      expect(subject.port).to eq AMQ::Protocol::TLS_PORT
     end
+  end
+end
 
-    after :each do
-      subject.close
-    end
+describe "TLS connection to RabbitMQ with client certificates", skip: ENV["CI"] do
+  let(:subject) do
+    c = Bunny.new(
+      hostname: local_hostname(),
+      username: "bunny_gem",
+      password: "bunny_password",
+      vhost: "bunny_testbed",
+      tls: true,
+      tls_cert: "#{CERTIFICATE_DIR}/client_certificate.pem",
+      tls_key: "#{CERTIFICATE_DIR}/client_key.pem",
+      tls_ca_certificates: ["#{CERTIFICATE_DIR}/ca_certificate.pem"],
+      verify_peer: false)
+    c.start
+    c
+  end
 
-    include_examples "successful TLS connection"
+  after :each do
+    subject.close
   end
 
+  include_examples "successful TLS connection"
+end
 
-  describe "TLS connection to RabbitMQ with a connection string" do
-    let(:subject) do
-      c = Bunny.new("amqps://bunny_gem:bunny_password@#{local_hostname()}/bunny_testbed",
-        tls_cert: "#{CERTIFICATE_DIR}/client_certificate.pem",
-        tls_key: "#{CERTIFICATE_DIR}/client_key.pem",
-        tls_ca_certificates: ["#{CERTIFICATE_DIR}/ca_certificate.pem"],
-        verify_peer: false)
-      c.start
-      c
-    end
 
-    after :each do
-      subject.close
-    end
+describe "TLS connection to RabbitMQ without client certificates", skip: ENV["CI"] do
+  let(:subject) do
+    c = Bunny.new(
+      hostname: local_hostname(),
+      username: "bunny_gem",
+      password: "bunny_password",
+      vhost: "bunny_testbed",
+      tls: true,
+      tls_ca_certificates: ["#{CERTIFICATE_DIR}/ca_certificate.pem"],
+      verify_peer: false)
+    c.start
+    c
+  end
 
-    include_examples "successful TLS connection"
+  after :each do
+    subject.close
+  end
 
-    context "when URI contains query parameters" do
-      subject(:session) do
-        Bunny.new("amqps://bunny_gem:bunny_password@#{local_hostname()}/bunny_testbed?heartbeat=10&connection_timeout=100&channel_max=1000&verify=false&cacertfile=#{CERTIFICATE_DIR}/ca_certificate.pem&certfile=#{CERTIFICATE_DIR}/client_certificate.pem&keyfile=#{CERTIFICATE_DIR}/client_key.pem")
-      end
+  include_examples "successful TLS connection"
+end
 
-      it "parses extra connection parameters" do
-        session.start
 
-        expect(session.uses_tls?).to eq(true)
-        expect(session.transport.verify_peer).to eq(false)
-        expect(session.transport.tls_ca_certificates).to eq(["#{CERTIFICATE_DIR}/ca_certificate.pem"])
-        expect(session.transport.tls_certificate_path).to eq("#{CERTIFICATE_DIR}/client_certificate.pem")
-        expect(session.transport.tls_key_path).to eq("#{CERTIFICATE_DIR}/client_key.pem")
-      end
-    end
+describe "TLS connection to RabbitMQ with a connection string", skip: ENV["CI"] do
+  let(:subject) do
+    c = Bunny.new("amqps://bunny_gem:bunny_password@#{local_hostname()}/bunny_testbed",
+      tls_cert: "#{CERTIFICATE_DIR}/client_certificate.pem",
+      tls_key: "#{CERTIFICATE_DIR}/client_key.pem",
+      tls_ca_certificates: ["#{CERTIFICATE_DIR}/ca_certificate.pem"],
+      verify_peer: false)
+    c.start
+    c
   end
 
+  after :each do
+    subject.close
+  end
 
-  describe "TLS connection to RabbitMQ with a connection string and w/o client certificate and key" do
-    let(:subject) do
-      c = Bunny.new("amqps://bunny_gem:bunny_password@#{local_hostname()}/bunny_testbed",
-        tls_ca_certificates: ["#{CERTIFICATE_DIR}/ca_certificate.pem"],
-        verify_peer: verify_peer)
-      c.start
-      c
+  include_examples "successful TLS connection"
+
+  context "when URI contains query parameters" do
+    subject(:session) do
+      Bunny.new("amqps://bunny_gem:bunny_password@#{local_hostname()}/bunny_testbed?heartbeat=10&connection_timeout=100&channel_max=1000&verify=false&cacertfile=#{CERTIFICATE_DIR}/ca_certificate.pem&certfile=#{CERTIFICATE_DIR}/client_certificate.pem&keyfile=#{CERTIFICATE_DIR}/client_key.pem")
     end
 
-    after :each do
-      subject.close
+    it "parses extra connection parameters" do
+      session.start
+
+      expect(session.uses_tls?).to eq(true)
+      expect(session.transport.verify_peer).to eq(false)
+      expect(session.transport.tls_ca_certificates).to eq(["#{CERTIFICATE_DIR}/ca_certificate.pem"])
+      expect(session.transport.tls_certificate_path).to eq("#{CERTIFICATE_DIR}/client_certificate.pem")
+      expect(session.transport.tls_key_path).to eq("#{CERTIFICATE_DIR}/client_key.pem")
     end
+  end
+end
 
-    context "peer verification is off" do
-      let(:verify_peer) { false }
 
-      include_examples "successful TLS connection"
+describe "TLS connection to RabbitMQ with a connection string and w/o client certificate and key", skip: ENV["CI"] do
+  let(:subject) do
+    c = Bunny.new("amqps://bunny_gem:bunny_password@#{local_hostname()}/bunny_testbed",
+      tls_ca_certificates: ["#{CERTIFICATE_DIR}/ca_certificate.pem"],
+      verify_peer: verify_peer)
+    c.start
+    c
+  end
 
-      it "sends the SNI details" do
-        # https://github.com/ruby-amqp/bunny/issues/440
-        expect(subject.transport.socket.hostname).to_not be_empty
-      end
-    end
+  after :each do
+    subject.close
+  end
 
-    context "peer verification is on" do
-      let(:verify_peer) { true }
+  context "peer verification is off" do
+    let(:verify_peer) { false }
 
-      include_examples "successful TLS connection"
+    include_examples "successful TLS connection"
 
-      it "sends the SNI details" do
-        # https://github.com/ruby-amqp/bunny/issues/440
-        expect(subject.transport.socket.hostname).to_not be_empty
-      end
+    it "sends the SNI details" do
+      # https://github.com/ruby-amqp/bunny/issues/440
+      expect(subject.transport.socket.hostname).to_not be_empty
     end
   end
 
+  context "peer verification is on" do
+    let(:verify_peer) { true }
 
-  describe "TLS connection to RabbitMQ with client certificates provided inline" do
-    let(:subject) do
-      c = Bunny.new(
-        hostname: local_hostname(),
-        username: "bunny_gem",
-        password: "bunny_password",
-        vhost: "bunny_testbed",
-        tls: true,
-        tls_cert: File.read("#{CERTIFICATE_DIR}/client_certificate.pem"),
-        tls_key: File.read("#{CERTIFICATE_DIR}/client_key.pem"),
-        tls_ca_certificates: ["#{CERTIFICATE_DIR}/ca_certificate.pem"],
-        verify_peer: false)
-      c.start
-      c
-    end
+    include_examples "successful TLS connection"
 
-    after :each do
-      subject.close
+    it "sends the SNI details" do
+      # https://github.com/ruby-amqp/bunny/issues/440
+      expect(subject.transport.socket.hostname).to_not be_empty
     end
+  end
+end
 
-    include_examples "successful TLS connection"
+
+describe "TLS connection to RabbitMQ with client certificates provided inline", skip: ENV["CI"] do
+  let(:subject) do
+    c = Bunny.new(
+      hostname: local_hostname(),
+      username: "bunny_gem",
+      password: "bunny_password",
+      vhost: "bunny_testbed",
+      tls: true,
+      tls_cert: File.read("#{CERTIFICATE_DIR}/client_certificate.pem"),
+      tls_key: File.read("#{CERTIFICATE_DIR}/client_key.pem"),
+      tls_ca_certificates: ["#{CERTIFICATE_DIR}/ca_certificate.pem"],
+      verify_peer: false)
+    c.start
+    c
   end
 
-  describe "TLS connection to RabbitMQ with tls_version TLSv1.1 specified" do
-    let(:subject) do
-      c = Bunny.new(
-        hostname: local_hostname(),
-        username: "bunny_gem",
-        password: "bunny_password",
-        vhost: "bunny_testbed",
-        tls: true,
-        tls_protocol: :TLSv1_1,
-        tls_ca_certificates: ["#{CERTIFICATE_DIR}/ca_certificate.pem"],
-        verify_peer: false)
-      c.start
-      c
-    end
+  after :each do
+    subject.close
+  end
 
-    after :each do
-      subject.close
-    end
+  include_examples "successful TLS connection"
+end
 
-    include_examples "successful TLS connection"
+describe "TLS connection to RabbitMQ with tls_version TLSv1.2 specified", skip: ENV["CI"] do
+  let(:subject) do
+    c = Bunny.new(
+      hostname: local_hostname(),
+      username: "bunny_gem",
+      password: "bunny_password",
+      vhost: "bunny_testbed",
+      tls: true,
+      tls_protocol: :TLSv1_2,
+      tls_ca_certificates: ["#{CERTIFICATE_DIR}/ca_certificate.pem"],
+      verify_peer: false)
+    c.start
+    c
+  end
 
-    it "connects using TLSv1.1" do
-      expect(subject.transport.socket.ssl_version).to eq "TLSv1.1"
-    end
+  after :each do
+    subject.close
+  end
+
+  include_examples "successful TLS connection"
+
+  it "connects using TLSv1.2", skip: no_tls12_supported? do
+    expect(subject.transport.socket.ssl_version).to eq "TLSv1.2"
   end
 end

data/spec/issues/issue202_spec.rb

@@ -4,7 +4,7 @@ describe Bunny::Session do
   context "with unreachable host" do
     it "raises Bunny::TCPConnectionFailed" do
       begin
-        conn = Bunny.new(:hostname => "192.192.192.192")
+        conn = Bunny.new(:hostname => "127.0.0.254", :port => 1433)
         conn.start
 
         fail "expected 192.192.192.192 to be unreachable"

data/spec/issues/issue78_spec.rb

@@ -24,7 +24,7 @@ unless ENV["CI"]
         ch2 = @connection1.create_channel
 
         q   = ch1.queue("", exclusive: true)
-        q.subscribe(manual_ack: false, block: false) do |delivery_info, properties, payload|
+        q.subscribe(manual_ack: false) do |delivery_info, properties, payload|
           delivered_data << payload
         end
         sleep 0.5
@@ -57,7 +57,7 @@ unless ENV["CI"]
         sleep 0.7
         expect(q.message_count).to eq 3
 
-        q.subscribe(manual_ack: false, block: false) do |delivery_info, properties, payload|
+        q.subscribe(manual_ack: false) do |delivery_info, properties, payload|
           delivered_data << payload
         end
         sleep 0.7

data/spec/unit/exchange_recovery_spec.rb

@@ -1,5 +1,5 @@
-require_relative '../../lib/bunny/channel'
-require_relative '../../lib/bunny/exchange'
+require 'bunny/channel'
+require 'bunny/exchange'
 
 module Bunny
   describe Exchange do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bunny
 version: !ruby/object:Gem::Version
-  version: 2.14.2
+  version: 2.17.0
 platform: ruby
 authors:
 - Chris Duncan
@@ -12,31 +12,32 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-04-24 00:00:00.000000000 Z
+date: 2020-09-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: amq-protocol
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 2.3.0
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.3'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.3.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 2.3.0
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.3'
-description: Easy to use, feature complete Ruby client for RabbitMQ
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.3.1
+description: Easy to use, feature complete Ruby client for RabbitMQ 3.3 and later
+  versions.
 email:
-- mklishin@pivotal.io
+- michael.s.klishin@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files:
@@ -240,10 +241,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
-summary: Easy to use Ruby client for RabbitMQ
+summary: Popular easy to use Ruby client for RabbitMQ
 test_files:
 - spec/config/enabled_plugins
 - spec/config/rabbitmq.conf