bunny 2.14.4 → 2.15.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cf0bcb6bc92f6092788f0eeffed76f438be49f1341857a6e5a94254544cf44e3
-  data.tar.gz: 317240a20f888087e959999b7cbe10d57fe423316032bc6fa6f2a6733e8dd50c
+  metadata.gz: 6abcaa979facd973a801a4433d3a6985e15e89aa84cc0078cc464af3be6c4542
+  data.tar.gz: d8bc430b598d1a267fe075028e9536efeeb008c72d9387daaaa30c79391d54d8
 SHA512:
-  metadata.gz: d0c159c08871fdf203a322543489d9c563d45c855f407f9e069adc6f3f0d97f7b0fb8d7ac90a5280dfdc2cea81dbef53e0c2b217be2064373432d0ca0d889626
-  data.tar.gz: 4d8a071b4d8494ad3976d842a705cf3d8323d8c14c61a0c147c309cc07ebc77bf6420243a597c68a3cde9b4b7a6cb5f17e25bab7972cf607f1d1d55b8bd88cdb
+  metadata.gz: 384472c28da9fabdf01a9e1c403c9009bf000cd8a3256cbffab531f7e5582425d15320255a966b89c5075f1fb1bc029deef21e1d5fd776de2d4f9714e8f1553f
+  data.tar.gz: 2ccbfbde0c9f0a2ff0202cb1160d569cbbdc94095e79d021d59a9e7949fd1579189fddcb61849125d4cfefce7ad0a733943f7d3a54097e7fb2ed83117f15ec1f

data/.travis.yml

@@ -11,9 +11,10 @@ before_script:
 script: "bundle exec rake integration_without_recovery"
 rvm:
   - ruby-head
-  - "2.6.3"
-  - "2.5.5"
-  - "2.4.5"
+  - "2.7.1"
+  - "2.6.6"
+  - "2.5.8"
+  - "2.4.10"
   - "2.3.8"
 notifications:
   email: michael@rabbitmq.com
@@ -22,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,9 +1,4 @@
-## Changes between Bunny 2.14.4 and 2.14.5 (in development)
-
-No changes.
-
-
-## Changes between Bunny 2.14.3 and 2.14.4 (Feb 11th, 2020)
+## Changes between Bunny 2.14.0 and 2.15.0 (Apr 8th, 2020)
 
 ### More Defensive Thread Join Operations
 
@@ -21,20 +16,16 @@ GitHub issue: [#589](https://github.com/ruby-amqp/bunny/issues/589)
 
 Contributed by @fuegas.
 
+### Dependency Updates
 
-## Changes between Bunny 2.14.2 and 2.14.3 (Sep 29th, 2019)
-
-### OpenSSL Exceptions Trigger Recovery
-
-OpenSSL exceptions on a fully established connection will now kick off
-connection recovery.
-
-GitHub issue: [#583](https://github.com/ruby-amqp/bunny/issues/583)
+`amq-protocol` dependency has been bumped to `2.3.1` to support `connection.update-secret`
+protocol extension.
 
-Contributed by Carl Hörberg.
+### Gem Installation Fixed on Windows
 
+`bin/ci`, a directory with symlinks, is no longer included into the gem.
 
-## Changes between Bunny 2.14.1 and 2.14.2 (Apr 24th, 2019)
+Contributed by Jack Xiaosong Xu.
 
 ### Lazy Peer Certificate Chain Information Logging
 
@@ -47,16 +38,6 @@ GitHub issue: [#578](https://github.com/ruby-amqp/bunny/pull/578)
 Contributed by Garrett Thornburg.
 
 
-## Changes between Bunny 2.14.0 and 2.14.1 (Feb 26th, 2019)
-
-### Gem Installation Fixed on Windows
-
-`bin/ci`, a directory with symlinks, is no longer included into the gem.
-
-Contributed by Jack Xiaosong Xu.
-
-GitHub issue: [#573](https://github.com/ruby-amqp/bunny/pull/574)
-
 ## Changes between Bunny 2.13.0 and 2.14.0 (Feb 20th, 2019)
 
 ### Improved Peer Verification Failure Logging

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

@@ -71,10 +71,10 @@ a stable public API.
 Change logs per release series:
 
  * [master](https://github.com/ruby-amqp/bunny/blob/master/ChangeLog.md)
+ * [2.14.x](https://github.com/ruby-amqp/bunny/blob/2.13.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 +97,7 @@ gem install bunny
 To use Bunny in a project managed with Bundler:
 
 ``` ruby
-gem "bunny", ">= 2.13.0"
+gem "bunny", ">= 2.14.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/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/session.rb

@@ -342,6 +342,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
@@ -632,6 +640,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)

data/lib/bunny/version.rb

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

data/repl

@@ -1,3 +1,3 @@
 #!/bin/sh
 
-bundle exec ruby -w `which 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/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.4
+  version: 2.15.0
 platform: ruby
 authors:
 - Chris Duncan
@@ -12,31 +12,32 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-02-11 00:00:00.000000000 Z
+date: 2020-04-08 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