dldinternet-mixlib-logging 0.4.0 → 0.4.1

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    N2MwNTdkM2RmNmI2Mzc2YjA5NDRjYjBhMzk5NGE4ODYzOGI3OTZhYw==
+    YjRkYTJmNGJiMmNhYzlhNDAxMTk0Mzc1MjkyMzY0NjBjZTJkYTFmMw==
   data.tar.gz: !binary |-
-    ZGFiMmI5MzZjNWUxZWE3NmQwOTdjYzc5NTA3YTczMjFmMTc3NWJmOA==
+    NDg3NDQ2MWU3ZGNkMTBiZjA4ZGQwNzYyYTgxMDBhNTFlMTBkNzA0Zg==
 SHA512:
   metadata.gz: !binary |-
-    OGNiNzM2NGRhNTE5ZmQ4ZmRmM2M3Mzg2YjZlNzEwZmQ2MDE3ZmFkMDhhNzQx
-    NjgwMjhhYTBjMzIxMWQxZGE0ZTM3NWI2MGRkY2U5MGU3Mjk1N2Y0MzQzZTU5
-    MjUwMWVjYWQzZjZiZTMzMjhkMTkxYWVlNTI4ZjQ3YmM1NDI2MmQ=
+    OWFkN2UzYWY1MWNhMTExZWI3YjlmMDU2NWVhMzMzZGVhNTBkMjI4YzA5YThj
+    MmUzNjBkYTZmYjdmMzExZWQ5NjFlNGU2NjI1MGNjZWNhMjE2MjI2MzhiYWQ0
+    YzYxMDJkOWYxYzUzZTVhNTZiMjUwMzVjZjUyYzdkZDZiODg1ODM=
   data.tar.gz: !binary |-
-    OGQ2NjQzYTVjNTk0NWYwN2I0YWI0OTRmZDk2M2VkMWM4OWNmMjc0NzQ5ZGQ0
-    NzgxZjI0NmVhNjMxNzJlMTBiYmMxZDc0ZTUxNWZmZThkYTA5ZWU2ODFlY2Vm
-    OTE4NGQ3M2Q4MjVkNWY2NDAxYTAwMWMwZjE5Y2MxZTYyYzg1ODI=
+    Mzg2NWI2ODU2YmZjMzc3MGRiMTk3YTY4NmYxYjIwZTRkMzY0YzRkYzkzMjMw
+    ZTY3OTNjNDg5NTkzNmRmNDVhNDk4MjE3NDg3ZDZmNTA4YWQxOTA5MmU4MmZi
+    NWU1MjcyNWMyMjE1Y2Q5NWEyYzM1ODE3MGY5ZTdiYTNhYWQ0ZWE=

data/lib/dldinternet/mixlib/logging.rb

@@ -6,9 +6,10 @@ unless defined? ::DLDInternet::Mixlib::Logging::ClassMethods
     module Mixlib
       module Logging
 
-        require "rubygems"
+        require 'rubygems'
         require 'rubygems/gem_runner'
         require 'rubygems/exceptions'
+        Object.send(:remove_const, :Logging) # Logging 1.8.2 claims Object.constants.include?(:Logging) so nobody else can extend it ... :(
         require 'logging'
 
         module ::Logging
@@ -114,33 +115,31 @@ unless defined? ::DLDInternet::Mixlib::Logging::ClassMethods
 
           end
 
-        end
-
-        class ::Logging::ColorScheme
-          def scheme(s=nil)
-            @scheme = s if s
-            @scheme
+          class ::Logging::ColorScheme
+            def scheme(s=nil)
+              @scheme = s if s
+              @scheme
+            end
           end
-        end
 
-        class ::Logging::Logger
-          class << self
-            def define_log_methods( logger )
-              ::Logging::LEVELS.each do |name,num|
-                code =  "undef :#{name}  if method_defined? :#{name}\n"
-                code << "undef :#{name}? if method_defined? :#{name}?\n"
-
-                unless logger.level.is_a?(Fixnum)
-                  puts "logger.level for #{logger.name} is a #{logger.level.class} instead of a Fixnum!!!"
-                  exit -1
-                end
-                if logger.level > num
-                  code << <<-CODE
+          class ::Logging::Logger
+            class << self
+              def define_log_methods( logger )
+                ::Logging::LEVELS.each do |name,num|
+                  code =  "undef :#{name}  if method_defined? :#{name}\n"
+                  code << "undef :#{name}? if method_defined? :#{name}?\n"
+
+                  unless logger.level.is_a?(Fixnum)
+                    puts "logger.level for #{logger.name} is a #{logger.level.class} instead of a Fixnum!!!"
+                    exit -1
+                  end
+                  if logger.level > num
+                    code << <<-CODE
                   def #{name}?( ) false end
                   def #{name}( data = nil, trace = false ) false end
-                  CODE
-                else
-                  code << <<-CODE
+                    CODE
+                  else
+                    code << <<-CODE
                   def #{name}?( ) true end
                   def #{name}( data = nil, trace = nil )
                     caller = Kernel.caller[3]
@@ -153,138 +152,140 @@ unless defined? ::DLDInternet::Mixlib::Logging::ClassMethods
                     end
                     true
                   end
-                  CODE
-                end
+                    CODE
+                  end
 
-                logger._meta_eval(code, __FILE__, __LINE__)
+                  logger._meta_eval(code, __FILE__, __LINE__)
+                end
+                logger
               end
-              logger
-            end
-
-            # Overrides the new method such that only one Logger will be created
-            # for any given logger name.
-            #
-            def new( *args )
-              return super if args.empty?
-
-              repo = ::Logging::Repository.instance
-              name = repo.to_key(args.shift)
-              opts = args.last.instance_of?(Hash) ? args.pop : {}
-
-              @mutex.synchronize do
-                logger = repo[name]
-                if logger.nil?
 
-                  master = repo.master_for(name)
-                  if master
-                    if repo.has_logger?(master)
-                      logger = repo[master]
+              # Overrides the new method such that only one Logger will be created
+              # for any given logger name.
+              #
+              def new( *args )
+                return super if args.empty?
+
+                repo = ::Logging::Repository.instance
+                name = repo.to_key(args.shift)
+                opts = args.last.instance_of?(Hash) ? args.pop : {}
+
+                @mutex.synchronize do
+                  logger = repo[name]
+                  if logger.nil?
+
+                    master = repo.master_for(name)
+                    if master
+                      if repo.has_logger?(master)
+                        logger = repo[master]
+                      else
+                        logger = super(master)
+                        repo[master] = logger
+                        repo.children(master).each {|c| c.__send__(:parent=, logger)}
+                      end
+                      repo[name] = logger
                     else
-                      logger = super(master)
-                      repo[master] = logger
-                      repo.children(master).each {|c| c.__send__(:parent=, logger)}
+                      logger = super(name, opts)
+                      repo[name] = logger
+                      repo.children(name).each {|c| c.__send__(:parent=, logger)}
                     end
-                    repo[name] = logger
-                  else
-                    logger = super(name, opts)
-                    repo[name] = logger
-                    repo.children(name).each {|c| c.__send__(:parent=, logger)}
                   end
+                  logger
                 end
-                logger
               end
+
             end
 
-          end
+            # call-seq:
+            #    Logger.new( name )
+            #    Logger[name]
+            #
+            # Returns the logger identified by _name_.
+            #
+            # When _name_ is a +String+ or a +Symbol+ it will be used "as is" to
+            # retrieve the logger. When _name_ is a +Class+ the class name will be
+            # used to retrieve the logger. When _name_ is an object the name of the
+            # object's class will be used to retrieve the logger.
+            #
+            # Example:
+            #
+            #   obj = MyClass.new
+            #
+            #   log1 = Logger.new(obj)
+            #   log2 = Logger.new(MyClass)
+            #   log3 = Logger['MyClass']
+            #
+            #   log1.object_id == log2.object_id         # => true
+            #   log2.object_id == log3.object_id         # => true
+            #
+            def initialize( name, *args )
+              case name
+                when String
+                  raise(ArgumentError, "logger must have a name") if name.empty?
+                else raise(ArgumentError, "logger name must be a String") end
+
+              repo = ::Logging::Repository.instance
+              opts = args.last.instance_of?(Hash) ? args.pop : {}
+              _setup(name, opts.merge({:parent => repo.parent(name)}))
+            end
 
-          # call-seq:
-          #    Logger.new( name )
-          #    Logger[name]
-          #
-          # Returns the logger identified by _name_.
-          #
-          # When _name_ is a +String+ or a +Symbol+ it will be used "as is" to
-          # retrieve the logger. When _name_ is a +Class+ the class name will be
-          # used to retrieve the logger. When _name_ is an object the name of the
-          # object's class will be used to retrieve the logger.
-          #
-          # Example:
-          #
-          #   obj = MyClass.new
-          #
-          #   log1 = Logger.new(obj)
-          #   log2 = Logger.new(MyClass)
-          #   log3 = Logger['MyClass']
-          #
-          #   log1.object_id == log2.object_id         # => true
-          #   log2.object_id == log3.object_id         # => true
-          #
-          def initialize( name, *args )
-            case name
-              when String
-                raise(ArgumentError, "logger must have a name") if name.empty?
-              else raise(ArgumentError, "logger name must be a String") end
-
-            repo = ::Logging::Repository.instance
-            opts = args.last.instance_of?(Hash) ? args.pop : {}
-            _setup(name, opts.merge({:parent => repo.parent(name)}))
-          end
 
+            def logEvent(evt)
+              log_event evt
+            end
 
-          def logEvent(evt)
-            log_event evt
+            def get_trace
+              @trace
+            end
           end
 
-          def get_trace
-            @trace
+          class ::Logging::Layouts::Pattern
+            # Arguments to sprintf keyed to directive letters
+            verbose, $VERBOSE = $VERBOSE, nil
+            # noinspection RubyStringKeysInHashInspection,RubyExpressionInStringInspection
+            DIRECTIVE_TABLE = {
+                'C' => 'event.file != "" ? "(\e[38;5;25m#{event.file}::#{event.line}\e[0m)" : ""',
+                'c' => 'event.logger'.freeze,
+                'd' => 'format_date(event.time)'.freeze,
+                'F' => 'event.file'.freeze,
+                'f' => 'File.basename(event.file)'.freeze,
+                'g' => 'event.file != "" ? "(\e[38;5;25m#{File.join(File.dirname(event.file).split(File::SEPARATOR)[-2..-1],File.basename(event.file))}::#{event.line}\e[0m)" : ""',
+                'l' => '::Logging::LNAMES[event.level]'.freeze,
+                'L' => 'event.line'.freeze,
+                'M' => 'event.method'.freeze,
+                'm' => 'format_obj(event.data)'.freeze,
+                'p' => 'Process.pid'.freeze,
+                'r' => 'Integer((event.time-@created_at)*1000).to_s'.freeze,
+                't' => 'Thread.current.object_id.to_s'.freeze,
+                'T' => 'Thread.current[:name]'.freeze,
+                '%' => :placeholder
+            }.freeze
+
+            # Human name aliases for directives - used for colorization of tokens
+            # noinspection RubyStringKeysInHashInspection
+            COLOR_ALIAS_TABLE = {
+                'C' => :file_line,
+                'c' => :logger,
+                'd' => :date,
+                'F' => :file,
+                'f' => :file,
+                'g' => :file,
+                'L' => :line,
+                'l' => :logger,
+                'M' => :method,
+                'm' => :message,
+                'p' => :pid,
+                'r' => :time,
+                'T' => :thread,
+                't' => :thread_id,
+                'X' => :mdc,
+                'x' => :ndc,
+            }.freeze
+
+          ensure
+            $VERBOSE = verbose
           end
-        end
 
-        class ::Logging::Layouts::Pattern
-          # Arguments to sprintf keyed to directive letters
-          verbose, $VERBOSE = $VERBOSE, nil
-          # noinspection RubyStringKeysInHashInspection,RubyExpressionInStringInspection
-          DIRECTIVE_TABLE = {
-              'C' => 'event.file != "" ? "(\e[38;5;25m#{event.file}::#{event.line}\e[0m)" : ""',
-              'c' => 'event.logger'.freeze,
-              'd' => 'format_date(event.time)'.freeze,
-              'F' => 'event.file'.freeze,
-              'f' => 'File.basename(event.file)'.freeze,
-              'g' => 'event.file != "" ? "(\e[38;5;25m#{File.join(File.dirname(event.file).split(File::SEPARATOR)[-2..-1],File.basename(event.file))}::#{event.line}\e[0m)" : ""',
-              'l' => '::Logging::LNAMES[event.level]'.freeze,
-              'L' => 'event.line'.freeze,
-              'M' => 'event.method'.freeze,
-              'm' => 'format_obj(event.data)'.freeze,
-              'p' => 'Process.pid'.freeze,
-              'r' => 'Integer((event.time-@created_at)*1000).to_s'.freeze,
-              't' => 'Thread.current.object_id.to_s'.freeze,
-              'T' => 'Thread.current[:name]'.freeze,
-              '%' => :placeholder
-          }.freeze
-
-          # Human name aliases for directives - used for colorization of tokens
-          # noinspection RubyStringKeysInHashInspection
-          COLOR_ALIAS_TABLE = {
-              'C' => :file_line,
-              'c' => :logger,
-              'd' => :date,
-              'F' => :file,
-              'f' => :file,
-              'g' => :file,
-              'L' => :line,
-              'l' => :logger,
-              'M' => :method,
-              'm' => :message,
-              'p' => :pid,
-              'r' => :time,
-              'T' => :thread,
-              't' => :thread_id,
-              'X' => :mdc,
-              'x' => :ndc,
-          }.freeze
-
-        ensure
-          $VERBOSE = verbose
         end
 
         class FakeLogger

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

@@ -2,7 +2,7 @@ module Dldinternet
   module Mixlib
     module Logging
       # dldinternet-mixlib-logging version
-      VERSION = "0.4.0"
+      VERSION = '0.4.1'
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dldinternet-mixlib-logging
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors:
 - Christo De Lange
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-03 00:00:00.000000000 Z
+date: 2014-11-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: logging