bunny 2.6.3 → 2.6.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 09f8221a4c018999983c6ff9d805866d2a2fe31e
-  data.tar.gz: 285410a65a2ff20efcafabc1ea3528584c8baf23
+  metadata.gz: 805ab484c94b0c54cafc8d9a895b86b2e204ccbc
+  data.tar.gz: 3982bbb9af0f8c6b4352535804c2fb00f01b8b5c
 SHA512:
-  metadata.gz: dd0a5fd69a7c527b6db252cf903fe3e84967ab07053880c954379f1476004546871acf34959f47e5662bdc701077940ff945d46fb3340f7cc0f7d471696c9230
-  data.tar.gz: 023e1c74e51481e9cae6dbb3014b84e2d397a25234cb225424de62df3340b1d83ed82d2d0f170c6304d5a99d7bfb7ab095e4a7e58db86bbaf529632b6f97f4b3
+  metadata.gz: cd8285ba649b6868d7298f9695b45909753b8a477709e938d4a844365ad87a78644902ffc93105599bbccf56878e5dab4432bdd9ccca2b315ef44855fbe6f06a
+  data.tar.gz: 828eb8792fccbbc8b624ba0a1b6abea3d44523089676479c6e5371c5505ef33ec32f4c3621db3fb93f5f81dfaf3043c87429c841544d4343eba6ad534e6e269f

data/.travis.yml

@@ -2,10 +2,11 @@ language: ruby
 bundler_args: --without development
 cache: bundler
 before_script: "./bin/ci/before_build"
-script: "bundle exec rspec -cf documentation spec"
+script: "bundle exec rake integration_without_recovery"
 rvm:
-  - "2.3.0"
-  - "2.2.2"
+  - "2.4.0"
+  - "2.3.3"
+  - "2.2"
 notifications:
   email: michael@rabbitmq.com
 services:
@@ -13,3 +14,6 @@ services:
 branches:
   only:
     - master
+    - 2.6.x-stable
+env:
+  - CI=true

data/ChangeLog.md

@@ -1,6 +1,27 @@
-## Changes between Bunny 2.6.2 and 2.6.3 (unreleased)
+## Changes between Bunny 2.6.3 and 2.6.4 (unreleased)
 
-No changes yet.
+### Recovery Attempt Counting Strategy Changed
+
+Previous behehavior is not unreasonable but is not what many users and
+even RabbitMQ team members come to expect. Therefore it can be
+considered a bug.
+
+Previously a reconnection counter was preserved between successful
+recoveries. This made the integration test that uses server-sent
+connection.close possible.
+
+With this change, the counter is reset after successful reconnection
+but there's an option to go back to the original behavior. We also do
+a hell of a lot more logging.
+
+GitHub issue: [#408](https://github.com/ruby-amqp/bunny/issues/408)
+
+
+## Changes between Bunny 2.6.2 and 2.6.3 (January 19th, 2016)
+
+### Retry on new Ruby 2.1+ variations of `EAGAIN`, `EWOULDBLOCK`
+
+GitHub issue: [#456](https://github.com/ruby-amqp/bunny/issues/456)
 
 
 ## Changes between Bunny 2.6.1 and 2.6.2 (December 17th, 2016)

data/Gemfile

@@ -32,8 +32,8 @@ group :development do
 end
 
 group :test do
-  gem "rspec", "~> 3.4.0"
-  gem "rabbitmq_http_api_client", "~> 1.6.0"
+  gem "rspec", "~> 3.5.0"
+  gem "rabbitmq_http_api_client", "~> 1.8.0"
 end
 
 gemspec
@@ -50,4 +50,4 @@ def custom_gem(name, options = Hash.new)
   end
 end
 
-custom_gem "amq-protocol", :git => "git://github.com/ruby-amqp/amq-protocol.git", :branch => "master"
+custom_gem "amq-protocol", git: "https://github.com/ruby-amqp/amq-protocol", branch: "master"

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2009 – 2016 Chris Duncan, Jakub Stastny aka botanicus,
+Copyright (c) 2009 – 2017 Chris Duncan, Jakub Stastny aka botanicus,
 Michael S. Klishin, Eric Lindvall, Stefan Kaes and contributors.
 
 Permission is hereby granted, free of charge, to any person obtaining

data/README.md

@@ -48,7 +48,7 @@ Specific examples:
 
 Modern Bunny versions support
 
- * CRuby 2.0 through 2.3
+ * CRuby 2.0 through 2.4
 
 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
@@ -88,7 +88,7 @@ gem install bunny
 To use Bunny in a project managed with Bundler:
 
 ``` ruby
-gem "bunny", ">= 2.5.1"
+gem "bunny", ">= 2.6.3"
 ```
 
 

data/lib/bunny/channel.rb

@@ -1975,7 +1975,7 @@ module Bunny
     def guarding_against_stale_delivery_tags(tag, &block)
       case tag
         # if a fixnum was passed, execute unconditionally. MK.
-      when Fixnum then
+      when Integer then
         block.call
         # versioned delivery tags should be checked to avoid
         # sending out stale (invalid) tags after channel was reopened

data/lib/bunny/channel_id_allocator.rb

@@ -25,7 +25,7 @@ module Bunny
 
     # Returns next available channel id. This method is thread safe.
     #
-    # @return [Fixnum]
+    # @return [Integer]
     # @api public
     # @see ChannelManager#release_channel_id
     # @see ChannelManager#reset_channel_id_allocator
@@ -37,7 +37,7 @@ module Bunny
 
     # Releases previously allocated channel id. This method is thread safe.
     #
-    # @param [Fixnum] i Channel id to release
+    # @param [Integer] i Channel id to release
     # @api public
     # @see ChannelManager#next_channel_id
     # @see ChannelManager#reset_channel_id_allocator
@@ -51,7 +51,7 @@ module Bunny
     # Returns true if given channel id has been previously allocated and not yet released.
     # This method is thread safe.
     #
-    # @param [Fixnum] i Channel id to check
+    # @param [Integer] i Channel id to check
     # @return [Boolean] true if given channel id has been previously allocated and not yet released
     # @api public
     # @see ChannelManager#next_channel_id

data/lib/bunny/concurrent/continuation_queue.rb

@@ -28,13 +28,17 @@ module Bunny
         timeout = timeout_in_ms ? timeout_in_ms / 1000.0 : nil
 
         @lock.synchronize do
-          if @q.empty?
-            @cond.wait(@lock, timeout)
-            raise ::Timeout::Error if @q.empty?
+          timeout_strikes_at = Time.now.utc + (timeout || 0)
+          while @q.empty?
+            wait = if timeout
+                     timeout_strikes_at - Time.now.utc
+                   else
+                     nil
+                   end
+            @cond.wait(@lock, wait)
+            raise ::Timeout::Error if wait && Time.now.utc >= timeout_strikes_at
           end
           item = @q.shift
-          @cond.signal
-
           item
         end
       end

data/lib/bunny/exceptions.rb

@@ -97,6 +97,12 @@ module Bunny
     end
   end
 
+  class ConnectionAlreadyClosed < Exception
+    def initialize
+      super('Connection has been already closed')
+    end
+  end
+
   class ShutdownSignal < Exception
   end
 

data/lib/bunny/session.rb

@@ -117,8 +117,9 @@ module Bunny
     # @option connection_string_or_opts [IO, String] :logfile DEPRECATED: use :log_file instead.  The file or path to use when creating a logger.  Defaults to STDOUT.
     # @option connection_string_or_opts [Integer] :log_level The log level to use when creating a logger.  Defaults to LOGGER::WARN
     # @option connection_string_or_opts [Boolean] :automatically_recover (true) Should automatically recover from network failures?
-    # @option connection_string_or_opts [Integer] :recovery_attempts (nil) Max number of recovery attempts, nil means forever, 0 means never
-    # @option connection_string_or_opts [Boolean] :recover_from_connection_close (true) Recover from server-sent connection.close
+    # @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 optz [String] :auth_mechanism ("PLAIN") Authentication mechanism, PLAIN or EXTERNAL
     # @option optz [String] :locale ("PLAIN") Locale RabbitMQ should use
@@ -164,7 +165,13 @@ module Bunny
                                else
                                  opts[:automatically_recover] || opts[:automatic_recovery]
                                end
-      @recovery_attempts     = opts[:recovery_attempts]
+      @max_recovery_attempts = opts[:recovery_attempts]
+      @recovery_attempts     = @max_recovery_attempts
+      # When this is set, connection attempts won't be reset after
+      # successful reconnection. Some find this behavior more sensible
+      # than the per-failure attempt counter. MK.
+      @reset_recovery_attempt_counter_after_reconnection = opts.fetch(:reset_recovery_attempts_after_reconnection, true)
+
       @network_recovery_interval = opts.fetch(:network_recovery_interval, DEFAULT_NETWORK_RECOVERY_INTERVAL)
       @recover_from_connection_close = opts.fetch(:recover_from_connection_close, true)
       # in ms
@@ -318,6 +325,7 @@ module Bunny
         @status_mutex.synchronize { @status = :not_connected }
         raise TCPConnectionFailedForAllHosts
       end
+      @status_mutex.synchronize { @manually_closed = false }
 
       self
     end
@@ -336,6 +344,7 @@ module Bunny
     # @return [Bunny::Channel] Newly opened channel
     def create_channel(n = nil, consumer_pool_size = 1, consumer_pool_abort_on_exception = false, consumer_pool_shutdown_timeout = 60)
       raise ArgumentError, "channel number 0 is reserved in the protocol and cannot be used" if 0 == n
+      raise ConnectionAlreadyClosed if manually_closed?
 
       @channel_mutex.synchronize do
         if n && (ch = @channels[n])
@@ -362,7 +371,10 @@ module Bunny
 
         clean_up_on_shutdown
       end
-      @status_mutex.synchronize { @status = :closed }
+      @status_mutex.synchronize do
+        @status = :closed
+        @manually_closed = true
+      end
     end
     alias stop close
 
@@ -397,6 +409,11 @@ module Bunny
       @status_mutex.synchronize { @status == :closed }
     end
 
+    # @return [Boolean] true if this AMQP 0.9.1 connection has been programmatically closed
+    def manually_closed?
+      @status_mutex.synchronize { @manually_closed == true }
+    end
+
     # @return [Boolean] true if this AMQP 0.9.1 connection is open
     def open?
       @status_mutex.synchronize do
@@ -640,7 +657,7 @@ module Bunny
         begin
           @recovering_from_network_failure = true
           if recoverable_network_failure?(exception)
-            @logger.warn "Recovering from a network failure..."
+            announce_network_failure_recovery
             @channel_mutex.synchronize do
               @channels.each do |n, ch|
                 ch.maybe_kill_consumer_work_pool!
@@ -651,7 +668,7 @@ module Bunny
 
             recover_from_network_failure
           else
-            # TODO: investigate if we can be a bit smarter here. MK.
+            @logger.error "Exception #{exception.message} is considered unrecoverable..."
           end
         ensure
           @recovering_from_network_failure = false
@@ -661,7 +678,8 @@ module Bunny
 
     # @private
     def recoverable_network_failure?(exception)
-      # TODO: investigate if we can be a bit smarter here. MK.
+      # No reasonably smart strategy was suggested in a few years.
+      # So just recover unconditionally. MK.
       true
     end
 
@@ -670,10 +688,19 @@ module Bunny
       @recovering_from_network_failure
     end
 
+    # @private
+    def announce_network_failure_recovery
+      if recovery_attempts_limited?
+        @logger.warn "Will recover from a network failure (#{@recovery_attempts} out of #{@max_recovery_attempts} left)..."
+      else
+        @logger.warn "Will recover from a network failure (no retry limit)..."
+      end
+    end
+
     # @private
     def recover_from_network_failure
       sleep @network_recovery_interval
-      @logger.debug "About to start connection recovery..."
+      @logger.debug "Will attempt connection recovery..."
 
       self.initialize_transport
 
@@ -681,7 +708,16 @@ module Bunny
       self.start
 
       if open?
+
         @recovering_from_network_failure = false
+        @logger.debug "Connection is now open"
+        if @reset_recovery_attempt_counter_after_reconnection
+          @logger.debug "Resetting recovery attempt counter after successful reconnection"
+          reset_recovery_attempt_counter!
+        else
+          @logger.debug "Not resetting recovery attempt counter after successful reconnection, as configured"
+        end
+        reset_recovery_attempt_counter!
 
         recover_channels
       end
@@ -692,14 +728,36 @@ module Bunny
       @logger.warn "TCP connection failed, reconnecting in #{@network_recovery_interval} seconds"
       sleep @network_recovery_interval
       if should_retry_recovery?
-        @recovery_attempts -= 1 if @recovery_attempts
-        retry if recoverable_network_failure?(e)
+        decrement_recovery_attemp_counter!
+        if recoverable_network_failure?(e)
+          announce_network_failure_recovery
+          retry
+        end
+      else
+        @logger.error "Ran out of recovery attempts (limit set to #{@max_recovery_attempts})"
       end
     end
 
+    # @private
+    def recovery_attempts_limited?
+      !!@max_recovery_attempts
+    end
+
     # @private
     def should_retry_recovery?
-      @recovery_attempts.nil? || @recovery_attempts > 1
+      !recovery_attempts_limited? || @recovery_attempts > 1
+    end
+
+    # @private
+    def decrement_recovery_attemp_counter!
+      @recovery_attempts -= 1 if @recovery_attempts
+      @logger.debug "#{@recovery_attempts} recovery attempts left"
+      @recovery_attempts
+    end
+
+    # @private
+    def reset_recovery_attempt_counter!
+      @recovery_attempts = @max_recovery_attempts
     end
 
     # @private

data/lib/bunny/transport.rb

@@ -419,7 +419,7 @@ certificate, connection upgrade will fail!
       if !@verify_peer
         @logger.warn <<-MSG
 Using TLS but peer hostname verification is disabled. This is convenient for local development
-but prone man-in-the-middle attacks. Please set :verify_peer => true in production!
+but prone to man-in-the-middle attacks. Please set verify_peer: true in production!
         MSG
       end
 

data/lib/bunny/version.rb

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

data/spec/higher_level_api/integration/basic_ack_spec.rb

@@ -2,7 +2,7 @@ require "spec_helper"
 
 describe Bunny::Channel, "#ack" do
   let(:connection) do
-    c = Bunny.new(:user => "bunny_gem", :password => "bunny_password", :vhost => "bunny_testbed")
+    c = Bunny.new(username: "bunny_gem", password: "bunny_password", vhost: "bunny_testbed")
     c.start
     c
   end
@@ -14,19 +14,19 @@ describe Bunny::Channel, "#ack" do
   context "with a valid (known) delivery tag" do
     it "acknowledges a message" do
       ch = connection.create_channel
-      q  = ch.queue("bunny.basic.ack.manual-acks", :exclusive => true)
+      q  = ch.queue("bunny.basic.ack.manual-acks", exclusive: true)
       x  = ch.default_exchange
 
-      x.publish("bunneth", :routing_key => q.name)
+      x.publish("bunneth", routing_key: q.name)
       sleep 0.5
       expect(q.message_count).to eq 1
-      delivery_details, properties, content = q.pop(:manual_ack => true)
+      delivery_details, properties, content = q.pop(manual_ack: true)
 
       ch.ack(delivery_details.delivery_tag, true)
       ch.close
 
       ch = connection.create_channel
-      q  = ch.queue("bunny.basic.ack.manual-acks", :exclusive => true)
+      q  = ch.queue("bunny.basic.ack.manual-acks", exclusive: true)
       expect(q.message_count).to eq 0
       ch.close
     end
@@ -35,21 +35,21 @@ describe Bunny::Channel, "#ack" do
   context "with a valid (known) delivery tag (multiple = true)" do
     it "acknowledges a message" do
       ch = connection.create_channel
-      q  = ch.queue("bunny.basic.ack.manual-acks", :exclusive => true)
+      q  = ch.queue("bunny.basic.ack.manual-acks", exclusive: true)
       x  = ch.default_exchange
 
-      x.publish("bunneth", :routing_key => q.name)
-      x.publish("bunneth", :routing_key => q.name)
+      x.publish("bunneth", routing_key: q.name)
+      x.publish("bunneth", routing_key: q.name)
       sleep 0.5
       expect(q.message_count).to eq 2
-      delivery_details_1, _properties, _content = q.pop(:manual_ack => true)
-      delivery_details_2, _properties, _content = q.pop(:manual_ack => true)
+      delivery_details_1, _properties, _content = q.pop(manual_ack: true)
+      delivery_details_2, _properties, _content = q.pop(manual_ack: true)
 
       ch.ack(delivery_details_2.delivery_tag, true)
       ch.close
 
       ch = connection.create_channel
-      q  = ch.queue("bunny.basic.ack.manual-acks", :exclusive => true)
+      q  = ch.queue("bunny.basic.ack.manual-acks", exclusive: true)
       expect(q.message_count).to eq 0
       ch.close
     end
@@ -58,21 +58,21 @@ describe Bunny::Channel, "#ack" do
   context "with a valid (known) delivery tag (multiple = false)" do
     it "acknowledges a message" do
       ch = connection.create_channel
-      q  = ch.queue("bunny.basic.ack.manual-acks", :exclusive => true)
+      q  = ch.queue("bunny.basic.ack.manual-acks", exclusive: true)
       x  = ch.default_exchange
 
-      x.publish("bunneth", :routing_key => q.name)
-      x.publish("bunneth", :routing_key => q.name)
+      x.publish("bunneth", routing_key: q.name)
+      x.publish("bunneth", routing_key: q.name)
       sleep 0.5
       expect(q.message_count).to eq 2
-      delivery_details_1, _properties, _content = q.pop(:manual_ack => true)
-      delivery_details_2, _properties, _content = q.pop(:manual_ack => true)
+      delivery_details_1, _properties, _content = q.pop(manual_ack: true)
+      delivery_details_2, _properties, _content = q.pop(manual_ack: true)
 
       ch.ack(delivery_details_2.delivery_tag, false)
       ch.close
 
       ch = connection.create_channel
-      q  = ch.queue("bunny.basic.ack.manual-acks", :exclusive => true)
+      q  = ch.queue("bunny.basic.ack.manual-acks", exclusive: true)
       expect(q.message_count).to eq 1
       ch.close
     end
@@ -81,14 +81,14 @@ describe Bunny::Channel, "#ack" do
   context "with a valid (known) delivery tag and automatic ack mode" do
     it "results in a channel exception" do
       ch = connection.create_channel
-      q  = ch.queue("bunny.basic.ack.manual-acks", :exclusive => true)
+      q  = ch.queue("bunny.basic.ack.manual-acks", exclusive: true)
       x  = ch.default_exchange
 
-      q.subscribe(:manual_ack => false) do |delivery_info, properties, payload|
+      q.subscribe(manual_ack: false) do |delivery_info, properties, payload|
         ch.ack(delivery_info.delivery_tag, false)
       end
 
-      x.publish("bunneth", :routing_key => q.name)
+      x.publish("bunneth", routing_key: q.name)
       sleep 0.5
       expect do
         q.message_count
@@ -99,13 +99,13 @@ describe Bunny::Channel, "#ack" do
   context "with an invalid (random) delivery tag" do
     it "causes a channel-level error" do
       ch = connection.create_channel
-      q  = ch.queue("bunny.basic.ack.unknown-delivery-tag", :exclusive => true)
+      q  = ch.queue("bunny.basic.ack.unknown-delivery-tag", exclusive: true)
       x  = ch.default_exchange
 
-      x.publish("bunneth", :routing_key => q.name)
+      x.publish("bunneth", routing_key: q.name)
       sleep 0.5
       expect(q.message_count).to eq 1
-      _, _, content = q.pop(:manual_ack => true)
+      _, _, content = q.pop(manual_ack: true)
 
       ch.on_error do |ch, channel_close|
         @channel_close = channel_close
@@ -120,17 +120,17 @@ describe Bunny::Channel, "#ack" do
   context "with a valid (known) delivery tag" do
     it "gets a depricated message warning for using :ack" do
       ch = connection.create_channel
-      q  = ch.queue("bunny.basic.ack.manual-acks", :exclusive => true)
+      q  = ch.queue("bunny.basic.ack.manual-acks", exclusive: true)
       x  = ch.default_exchange
 
-      x.publish("bunneth", :routing_key => q.name)
+      x.publish("bunneth", routing_key: q.name)
       sleep 0.5
       expect(q.message_count).to eq 1
 
       orig_stderr = $stderr
       $stderr = StringIO.new
 
-      delivery_details, properties, content = q.pop(:ack => true)
+      delivery_details, properties, content = q.pop(ack: true)
 
       $stderr.rewind
       expect($stderr.string.chomp).to eq("[DEPRECATION] `:ack` is deprecated.  Please use `:manual_ack` instead.\n[DEPRECATION] `:ack` is deprecated.  Please use `:manual_ack` instead.")
@@ -141,7 +141,7 @@ describe Bunny::Channel, "#ack" do
       ch.close
 
       ch = connection.create_channel
-      q  = ch.queue("bunny.basic.ack.manual-acks", :exclusive => true)
+      q  = ch.queue("bunny.basic.ack.manual-acks", exclusive: true)
       expect(q.message_count).to eq 0
       ch.close
     end
@@ -150,7 +150,7 @@ end
 
 describe Bunny::Channel, "#basic_ack" do
   let(:connection) do
-    c = Bunny.new(:user => "bunny_gem", :password => "bunny_password", :vhost => "bunny_testbed")
+    c = Bunny.new(username: "bunny_gem", password: "bunny_password", vhost: "bunny_testbed")
     c.start
     c
   end
@@ -162,21 +162,21 @@ describe Bunny::Channel, "#basic_ack" do
   context "with a valid (known) delivery tag (multiple = true)" do
     it "acknowledges a message" do
       ch = connection.create_channel
-      q  = ch.queue("bunny.basic.ack.manual-acks", :exclusive => true)
+      q  = ch.queue("bunny.basic.ack.manual-acks", exclusive: true)
       x  = ch.default_exchange
 
-      x.publish("bunneth", :routing_key => q.name)
-      x.publish("bunneth", :routing_key => q.name)
+      x.publish("bunneth", routing_key: q.name)
+      x.publish("bunneth", routing_key: q.name)
       sleep 0.5
       expect(q.message_count).to eq 2
-      delivery_details_1, _properties, _content = q.pop(:manual_ack => true)
-      delivery_details_2, _properties, _content = q.pop(:manual_ack => true)
+      delivery_details_1, _properties, _content = q.pop(manual_ack: true)
+      delivery_details_2, _properties, _content = q.pop(manual_ack: true)
 
       ch.basic_ack(delivery_details_2.delivery_tag.to_i, true)
       ch.close
 
       ch = connection.create_channel
-      q  = ch.queue("bunny.basic.ack.manual-acks", :exclusive => true)
+      q  = ch.queue("bunny.basic.ack.manual-acks", exclusive: true)
       expect(q.message_count).to eq 0
       ch.close
     end
@@ -185,21 +185,21 @@ describe Bunny::Channel, "#basic_ack" do
   context "with a valid (known) delivery tag (multiple = false)" do
     it "acknowledges a message" do
       ch = connection.create_channel
-      q  = ch.queue("bunny.basic.ack.manual-acks", :exclusive => true)
+      q  = ch.queue("bunny.basic.ack.manual-acks", exclusive: true)
       x  = ch.default_exchange
 
-      x.publish("bunneth", :routing_key => q.name)
-      x.publish("bunneth", :routing_key => q.name)
+      x.publish("bunneth", routing_key: q.name)
+      x.publish("bunneth", routing_key: q.name)
       sleep 0.5
       expect(q.message_count).to eq 2
-      delivery_details_1, _properties, _content = q.pop(:manual_ack => true)
-      delivery_details_2, _properties, _content = q.pop(:manual_ack => true)
+      delivery_details_1, _properties, _content = q.pop(manual_ack: true)
+      delivery_details_2, _properties, _content = q.pop(manual_ack: true)
 
       ch.basic_ack(delivery_details_2.delivery_tag.to_i, false)
       ch.close
 
       ch = connection.create_channel
-      q  = ch.queue("bunny.basic.ack.manual-acks", :exclusive => true)
+      q  = ch.queue("bunny.basic.ack.manual-acks", exclusive: true)
       expect(q.message_count).to eq 1
       ch.close
     end
@@ -208,21 +208,21 @@ describe Bunny::Channel, "#basic_ack" do
   context "with a valid (known) delivery tag (multiple = default)" do
     it "acknowledges a message" do
       ch = connection.create_channel
-      q  = ch.queue("bunny.basic.ack.manual-acks", :exclusive => true)
+      q  = ch.queue("bunny.basic.ack.manual-acks", exclusive: true)
       x  = ch.default_exchange
 
-      x.publish("bunneth", :routing_key => q.name)
-      x.publish("bunneth", :routing_key => q.name)
+      x.publish("bunneth", routing_key: q.name)
+      x.publish("bunneth", routing_key: q.name)
       sleep 0.5
       expect(q.message_count).to eq 2
-      delivery_details_1, _properties, _content = q.pop(:manual_ack => true)
-      delivery_details_2, _properties, _content = q.pop(:manual_ack => true)
+      delivery_details_1, _properties, _content = q.pop(manual_ack: true)
+      delivery_details_2, _properties, _content = q.pop(manual_ack: true)
 
       ch.basic_ack(delivery_details_2.delivery_tag.to_i)
       ch.close
 
       ch = connection.create_channel
-      q  = ch.queue("bunny.basic.ack.manual-acks", :exclusive => true)
+      q  = ch.queue("bunny.basic.ack.manual-acks", exclusive: true)
       expect(q.message_count).to eq 1
       ch.close
     end