bunny 2.6.2 → 2.6.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a408c8cc518f3c5eda506652d04b7791df76836d
-  data.tar.gz: bb55d125ab3558d5c21292f10e9999a5b6d12a6e
+  metadata.gz: 09f8221a4c018999983c6ff9d805866d2a2fe31e
+  data.tar.gz: 285410a65a2ff20efcafabc1ea3528584c8baf23
 SHA512:
-  metadata.gz: fef4df3286150c5baca2823526187fc3cec59a41bf54ac23cbac9a58964070882a17866208d1232f8812742647473729b499429bb1fd6ebe9ffcb4676d34c54b
-  data.tar.gz: c7846c6d797c577fb4e34997bf68b4e490893d2e02b12b4e40b5870ab6b028aebdc091be637c4603e8e9d6640bdb14a1cc7056d5cfd5a3335baa33768962c25b
+  metadata.gz: dd0a5fd69a7c527b6db252cf903fe3e84967ab07053880c954379f1476004546871acf34959f47e5662bdc701077940ff945d46fb3340f7cc0f7d471696c9230
+  data.tar.gz: 023e1c74e51481e9cae6dbb3014b84e2d397a25234cb225424de62df3340b1d83ed82d2d0f170c6304d5a99d7bfb7ab095e4a7e58db86bbaf529632b6f97f4b3

data/ChangeLog.md

@@ -1,8 +1,17 @@
-## Changes between Bunny 2.6.1 and 2.6.2 (unreleased)
+## Changes between Bunny 2.6.2 and 2.6.3 (unreleased)
 
 No changes yet.
 
 
+## Changes between Bunny 2.6.1 and 2.6.2 (December 17th, 2016)
+
+### Do Not Modify Host Arrays
+
+Bunny now can work with frozen host arrays.
+
+GitHub issue: [#446](https://github.com/ruby-amqp/bunny/issues/446)
+
+
 
 ## Changes between Bunny 2.6.0 and 2.6.1 (October 23rd, 2016)
 

data/lib/bunny/cruby/socket.rb

@@ -9,8 +9,21 @@ module Bunny
   module Socket
     attr_accessor :options
 
-    READ_RETRY_EXCEPTION_CLASSES = [Errno::EAGAIN, Errno::EWOULDBLOCK, IO::WaitReadable]
-    WRITE_RETRY_EXCEPTION_CLASSES = [Errno::EAGAIN, Errno::EWOULDBLOCK, IO::WaitWritable]
+    READ_RETRY_EXCEPTION_CLASSES = if defined?(IO::EAGAINWaitReadable)
+                                     # Ruby 2.1+
+                                     [Errno::EAGAIN, Errno::EWOULDBLOCK, IO::WaitReadable,
+                                      IO::EAGAINWaitReadable, IO::EWOULDBLOCKWaitReadable]
+                                   else
+                                     # 2.0
+                                     [Errno::EAGAIN, Errno::EWOULDBLOCK, IO::WaitReadable]
+                                   end
+    WRITE_RETRY_EXCEPTION_CLASSES = if defined?(IO::EAGAINWaitWritable)
+                                      [Errno::EAGAIN, Errno::EWOULDBLOCK, IO::WaitWritable,
+                                       IO::EAGAINWaitWritable, IO::EWOULDBLOCKWaitWritable]
+                                    else
+                                      # 2.0
+                                      [Errno::EAGAIN, Errno::EWOULDBLOCK, IO::WaitWritable]
+                                    end
 
     def self.open(host, port, options = {})
       socket = ::Socket.tcp(host, port, nil, nil,

data/lib/bunny/cruby/ssl_socket.rb

@@ -8,8 +8,21 @@ module Bunny
     # methods found in Bunny::Socket.
     class SSLSocket < OpenSSL::SSL::SSLSocket
 
-      READ_RETRY_EXCEPTION_CLASSES = [Errno::EAGAIN, Errno::EWOULDBLOCK, IO::WaitReadable]
-      WRITE_RETRY_EXCEPTION_CLASSES = [Errno::EAGAIN, Errno::EWOULDBLOCK, IO::WaitWritable]
+    READ_RETRY_EXCEPTION_CLASSES = if defined?(IO::EAGAINWaitReadable)
+                                     # Ruby 2.1+
+                                     [Errno::EAGAIN, Errno::EWOULDBLOCK, IO::WaitReadable,
+                                      IO::EAGAINWaitReadable, IO::EWOULDBLOCKWaitReadable]
+                                   else
+                                     # 2.0
+                                     [Errno::EAGAIN, Errno::EWOULDBLOCK, IO::WaitReadable]
+                                   end
+    WRITE_RETRY_EXCEPTION_CLASSES = if defined?(IO::EAGAINWaitWritable)
+                                      [Errno::EAGAIN, Errno::EWOULDBLOCK, IO::WaitWritable,
+                                       IO::EAGAINWaitWritable, IO::EWOULDBLOCKWaitWritable]
+                                    else
+                                      # 2.0
+                                      [Errno::EAGAIN, Errno::EWOULDBLOCK, IO::WaitWritable]
+                                    end
 
       # Reads given number of bytes with an optional timeout
       #

data/lib/bunny/session.rb

@@ -209,7 +209,7 @@ module Bunny
       end
 
       if (options[:host] || options[:hostname]) && (options[:hosts] || options[:addresses])
-        @logger.warn "The connection options contain both a host and an array of hosts, the single host is ignored."
+        @logger.warn "Connection options contain both a host and an array of hosts (addresses), please pick one."
       end
     end
 

data/lib/bunny/version.rb

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

data/spec/higher_level_api/integration/connection_spec.rb

@@ -282,8 +282,7 @@ describe Bunny::Session do
 
       it "logs a warning when there is a single host and an array" do
         described_class.new(addresses: [address], host: host, logger: logger)
-        expect(io.string).to include 'WARN -- : The connection options contain '\
-          'both a host and an array of hosts, the single host is ignored.'
+        expect(io.string).to match(/both a host and an array of hosts/)
       end
 
       it "converts hosts in addresses to addresses" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bunny
 version: !ruby/object:Gem::Version
-  version: 2.6.2
+  version: 2.6.3
 platform: ruby
 authors:
 - Chris Duncan
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-17 00:00:00.000000000 Z
+date: 2017-01-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: amq-protocol