dldinternet-mixlib-logging 0.6.1 → 0.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bac177cf8605a68e8ea0b84a6aaccb8c5220efbe
-  data.tar.gz: ed43c6563341507c3716fa94484e2376244ad8fd
+  metadata.gz: de70e2156d7330fd40ff51687330b6acb53f47cd
+  data.tar.gz: 8538aac83f7b4ac5fc9ef7642addc6572022f4ce
 SHA512:
-  metadata.gz: 7266fad77965f766127ca7a40b3dc7e973d334b397e14f75e7ead1d5eaf3080a863a1af303a6f097430398896139f5a36e39e3136bc1c23071b95e136867c51f
-  data.tar.gz: dd785117474ceec25a89f640355c33d36644e901d83448aa34b125f26ffd8114716bfa84ef93d61ce154e7343ada5b70bc3c17a6de47bc85b9c74b6667d39cfc
+  metadata.gz: 159ec14f195865bfe714fd25efd0ed840db58296be515a3153f99fa7c3ae7498ba705e244b3d50ef956acc89654bdcc8f257cb711712df847e04f0ba0e536682
+  data.tar.gz: f6c011bc44053550a4a3aeae12f1caeac2d3fcc9130c081bba4c2fc0a1fdaa6107ed4c698720a52ba3a618f5ea608c10a991fc0f3755e3bbc8a1c40674684c83

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    dldinternet-mixlib-logging (0.6.1)
+    dldinternet-mixlib-logging (0.6.2)
       logging (~> 2.0, >= 2.0.0)
 
 GEM

data/lib/dldinternet/mixlib/logging.rb

@@ -471,15 +471,23 @@ unless defined? ::DLDInternet::Mixlib::Logging::ClassMethods
                     from = ''
                   end
                 end
-                l_opts = args[:log_opts].call(::Logging::MAX_LEVEL_LENGTH) || {
-                    :pattern      => "#{from}%d %#{::Logging::MAX_LEVEL_LENGTH}l: %m\n",
-                    :date_pattern => '%Y-%m-%d %H:%M:%S',
-                }
-                logger = ::Logging.logger( STDOUT, l_opts)
-                l_opts = args[:log_opts].call(::Logging::MAX_LEVEL_LENGTH) || {
-                    :pattern      => "#{from}%d %#{::Logging::MAX_LEVEL_LENGTH}l: %m %C\n",
-                    :date_pattern => '%Y-%m-%d %H:%M:%S',
-                }
+                l_opts = if args[:log_opts].is_a?(Proc)
+                           args[:log_opts].call(::Logging::MAX_LEVEL_LENGTH) || {
+                               :pattern      => "#{from}%d %#{::Logging::MAX_LEVEL_LENGTH}l: %m\n",
+                               :date_pattern => '%Y-%m-%d %H:%M:%S',
+                           }
+                         else
+                           args[:log_opts]
+                         end
+                logger = ::Logging.logger( $stdout, l_opts)
+                l_opts = if args[:log_opts].is_a?(Proc)
+                           args[:log_opts].call(::Logging::MAX_LEVEL_LENGTH) || {
+                               :pattern      => "#{from}%d %#{::Logging::MAX_LEVEL_LENGTH}l: %m %C\n",
+                               :date_pattern => '%Y-%m-%d %H:%M:%S',
+                           }
+                         else
+                           args[:log_opts]
+                         end
                 layout = ::Logging::Layouts::Pattern.new(l_opts)
 
                 if args[:log_file] and args[:log_file].instance_of?(String)
@@ -531,11 +539,13 @@ unless defined? ::DLDInternet::Mixlib::Logging::ClassMethods
                 logger.add_appenders appender
 
                 logger.level = args[:log_level] ? args[:log_level] : :warn
-								unless ::Logging::VERSION =~ /^2/
-									logger.trace = true if args[:trace]
-								else
-									logger.caller_tracing = true if args[:trace]
-								end
+                if args[:trace]
+                  if ::Logging::VERSION =~ /^2/
+                    logger.caller_tracing = true
+                  else
+                    logger.trace = true
+                  end
+                end
                 @logger_args = args
               rescue Gem::LoadError
                 logger = FakeLogger.new

data/lib/dldinternet/mixlib/logging/version.rb

@@ -2,7 +2,18 @@ module Dldinternet
   module Mixlib
     module Logging
       # dldinternet-mixlib-logging version
-      VERSION = '0.6.1'
+      VERSION = '0.6.2'
+
+      module Version # :nodoc: all
+        MAJOR, MINOR, RELEASE, *OTHER = VERSION.split '.'
+
+        NUMBERS = [MAJOR, MINOR, RELEASE, *OTHER].freeze
+      end
+
+      # Returns the version string for the library.
+      def self.version
+        VERSION
+      end
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dldinternet-mixlib-logging
 version: !ruby/object:Gem::Version
-  version: 0.6.1
+  version: 0.6.2
 platform: ruby
 authors:
 - Christo De Lange
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-07 00:00:00.000000000 Z
+date: 2016-09-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: logging