bunny 1.7.0 → 1.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ea321437a2d9950b2f2805e707dda557eef218e7
-  data.tar.gz: fdffb1a797acfa57566398ca2fdc9c142fbfc675
+  metadata.gz: c6e1ab5b64d51e0a5723b686711573c11a39cf5a
+  data.tar.gz: f8700621a089b0f6cd594c7f2fc1d6677cd321aa
 SHA512:
-  metadata.gz: 56cf2d1d7c7eabe6b694760e0bec181969aa33168ccf7f963aa8d6083a3476bcd35595319a4416a3e24f739358395c85fac567dc8a34bb13cdc35bf5c5ec3406
-  data.tar.gz: 3746761d4ba98aa2eedcd6ba4f4a7d22473349b4b8a84232069dcbbde45e1fddb71906b645a73f87f5b16e0b485822694a076f15ef46ce6d0f7d7750575a306f
+  metadata.gz: 0682d6723a1530cfcb39b384027108ea306206fc7c275b86961d8fed701f7363688cd9cac888e97b890463bbff126194a04954dbc3821c6dd9463586182c81c5
+  data.tar.gz: 79e3f21253c27c279050a7c5d730a4d65e2ae122f72a64b7830e0d07c56cc108063c791f1b00b1ae9eea997088e2bcbe2d758bcb46d1ea0d65e62f004b4bc5be

data/ChangeLog.md

@@ -1,3 +1,21 @@
+## Changes between Bunny 1.7.0 and 1.7.1
+
+### amq-protocol Dependendency Locked to 1.9.x
+
+Since `amq-protocol` 2.0 requires Ruby 2.0 or later, 1.7.x versions of Bunny
+must use `1.9.2`.
+
+GH issue: [#336](https://github.com/ruby-amqp/bunny/issues/336).
+
+### Logger Output Remains Consistent
+
+Setting the `@logger.progname` attribute changes the output of the logger.
+This is not expected behaviour when the client provides a custom logger.
+Behaviour remains unchainged when the internally initialized logger is used.
+
+Contributed by Justin Carter.
+
+
 ## Changes between Bunny 1.6.0 and 1.7.0
 
 ### TLS Peer Verification Enabled by Default

data/bunny.gemspec

@@ -29,7 +29,7 @@ Gem::Specification.new do |s|
     map { |mail| Base64.decode64(mail) }
 
   # Dependencies
-  s.add_dependency "amq-protocol", ">= 1.9.2"
+  s.add_dependency "amq-protocol", "~> 1.9.2"
 
   # Files.
   s.has_rdoc = true

data/lib/bunny/jruby/socket.rb

@@ -5,7 +5,8 @@ module Bunny
     # TCP socket extension that uses Socket#readpartial to avoid excessive CPU
     # burn after some time. See issue #165.
     # @private
-    class Socket < Bunny::Socket
+    module Socket
+      include Bunny::Socket
 
       # Reads given number of bytes with an optional timeout
       #

data/lib/bunny/session.rb

@@ -144,10 +144,11 @@ module Bunny
       @user            = self.username_from(opts)
       @pass            = self.password_from(opts)
       @vhost           = self.vhost_from(opts)
-      @logfile         = opts[:log_file] || opts[:logfile] || STDOUT
       @threaded        = opts.fetch(:threaded, true)
 
-      @logger          = opts.fetch(:logger, init_logger(opts[:log_level] || ENV["BUNNY_LOG_LEVEL"] || Logger::WARN))
+      log_file         = opts[:log_file] || opts[:logfile] || STDOUT
+      log_level        = opts[:log_level] || ENV["BUNNY_LOG_LEVEL"] || Logger::WARN
+      @logger          = opts.fetch(:logger, init_default_logger(log_file, log_level))
 
       # should automatic recovery from network failures be used?
       @automatically_recover = if opts[:automatically_recover].nil? && opts[:automatic_recovery].nil?
@@ -1103,8 +1104,8 @@ module Bunny
         @transport.close rescue nil # Let's make sure the previous transport socket is closed
         @transport = Transport.new(self, host, @port, @opts.merge(:session_thread => @origin_thread))
 
-        # Reset the cached progname for the logger
-        @logger.progname = to_s if @logger.respond_to?(:progname)
+        # Reset the cached progname for the logger only when no logger was provided
+        @default_logger.progname = self.to_s
 
         @transport
       else
@@ -1157,12 +1158,13 @@ module Bunny
     end
 
     # @private
-    def init_logger(level)
-      lgr          = ::Logger.new(@logfile)
-      lgr.level    = normalize_log_level(level)
-      lgr.progname = self.to_s
-
-      lgr
+    def init_default_logger(logfile, level)
+      @default_logger = begin
+                          lgr = ::Logger.new(logfile)
+                          lgr.level    = normalize_log_level(level)
+                          lgr.progname = self.to_s
+                          lgr
+                        end
     end
 
     # @private

data/lib/bunny/version.rb

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

data/spec/higher_level_api/integration/connection_spec.rb

@@ -435,5 +435,10 @@ describe Bunny::Session do
 
       conn.close
     end
+
+    it "doesn't reassign the logger's progname attribute" do
+      expect(logger).not_to receive(:progname=)
+      described_class.new(:hostname => "localhost", :logger => logger)
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bunny
 version: !ruby/object:Gem::Version
-  version: 1.7.0
+  version: 1.7.1
 platform: ruby
 authors:
 - Chris Duncan
@@ -12,20 +12,20 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-05 00:00:00.000000000 Z
+date: 2015-08-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: amq-protocol
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.9.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.9.2
 description: Easy to use, feature complete Ruby client for RabbitMQ 3.3 and later
@@ -233,7 +233,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: Popular easy to use Ruby client for RabbitMQ