dldinternet-mixlib-logging 0.3.0 → 0.4.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MWVlYjUwZTM1OTJhM2VlZTI2MmJhMWNiZjRhOWRhOTdhMTQwNzBhNQ==
+    N2MwNTdkM2RmNmI2Mzc2YjA5NDRjYjBhMzk5NGE4ODYzOGI3OTZhYw==
   data.tar.gz: !binary |-
-    Yzc0Nzg1NGZlNWY4OTMyNjA0NTdkYmIxMjVjY2IwZjYwYzdhNWVmMQ==
+    ZGFiMmI5MzZjNWUxZWE3NmQwOTdjYzc5NTA3YTczMjFmMTc3NWJmOA==
 SHA512:
   metadata.gz: !binary |-
-    MjU5NjMzYmRmN2RhZmJhODJhNDBmMjM3OWY3N2I4NWE2YjIxYzk2ZjI1MWFl
-    Y2NiYWM0MTViNTljYmU5YWY4ZThlZjVhY2Y3MjAxOTM3MjM2MmNkYWQ4YzIw
-    NTgwYzdlZjNkMTA2NGRiN2I2YjUzNWQ1MzFmYmMzZDg3ZTdiMzU=
+    OGNiNzM2NGRhNTE5ZmQ4ZmRmM2M3Mzg2YjZlNzEwZmQ2MDE3ZmFkMDhhNzQx
+    NjgwMjhhYTBjMzIxMWQxZGE0ZTM3NWI2MGRkY2U5MGU3Mjk1N2Y0MzQzZTU5
+    MjUwMWVjYWQzZjZiZTMzMjhkMTkxYWVlNTI4ZjQ3YmM1NDI2MmQ=
   data.tar.gz: !binary |-
-    ZTcxZjQ3Mzg0YTBlNDhlNWFhMmQxYTgzNmEwYmI1ZmNhYzRiNGExZDI1MzQx
-    MDgyZjg0NDY5ZDU1N2QwNTI4NmQwZmFhMDUxN2E2N2IxNzA1NjFjODI1OTcz
-    ZjFiYTdkYmRlYWFjZjlmM2Y1YzQ0NWFlYjRkMmE4OTkzYzhhNDQ=
+    OGQ2NjQzYTVjNTk0NWYwN2I0YWI0OTRmZDk2M2VkMWM4OWNmMjc0NzQ5ZGQ0
+    NzgxZjI0NmVhNjMxNzJlMTBiYmMxZDc0ZTUxNWZmZThkYTA5ZWU2ODFlY2Vm
+    OTE4NGQ3M2Q4MjVkNWY2NDAxYTAwMWMwZjE5Y2MxZTYyYzg1ODI=

data/lib/dldinternet/mixlib/logging.rb

@@ -234,12 +234,16 @@ unless defined? ::DLDInternet::Mixlib::Logging::ClassMethods
           def logEvent(evt)
             log_event evt
           end
+
+          def get_trace
+            @trace
+          end
         end
 
         class ::Logging::Layouts::Pattern
           # Arguments to sprintf keyed to directive letters
           verbose, $VERBOSE = $VERBOSE, nil
-          # noinspection RubyStringKeysInHashInspection
+          # noinspection RubyStringKeysInHashInspection,RubyExpressionInStringInspection
           DIRECTIVE_TABLE = {
               'C' => 'event.file != "" ? "(\e[38;5;25m#{event.file}::#{event.line}\e[0m)" : ""',
               'c' => 'event.logger'.freeze,
@@ -325,11 +329,64 @@ unless defined? ::DLDInternet::Mixlib::Logging::ClassMethods
           end
         end
 
+        module ::Logging
+
+          # This class defines a logging event.
+          #
+          remove_const :LogEvent if defined? :LogEvent
+          LogEvent = Struct.new( :logger, :level, :data, :time, :file, :line, :method ) {
+            # :stopdoc:
+            class << self
+              attr_accessor :caller_index
+            end
+
+            # Regular expression used to parse out caller information
+            #
+            # * $1 == filename
+            # * $2 == line number
+            # * $3 == method name (might be nil)
+            # CALLER_RGXP = %r/([-\.\/\(\)\w]+):(\d+)(?::in `(\w+)')?/o
+            # CALLER_INDEX = ((defined? JRUBY_VERSION and JRUBY_VERSION > '1.6') or (defined? RUBY_ENGINE and RUBY_ENGINE[%r/^rbx/i])) ? 1 : 2
+            # :startdoc:
+
+            # call-seq:
+            #    LogEvent.new( logger, level, [data], trace )
+            #
+            # Creates a new log event with the given _logger_ name, numeric _level_,
+            # array of _data_ from the user to be logged, and boolean _trace_ flag.
+            # If the _trace_ flag is set to +true+ then Kernel::caller will be
+            # invoked to get the execution trace of the logging method.
+            #
+            def initialize( logger, level, data, trace )
+              f = l = m = ''
+
+              if trace
+                stack = Kernel.caller[::Logging::LogEvent.caller_index]
+                return if stack.nil?
+
+                match = CALLER_RGXP.match(stack)
+                f = match[1]
+                l = Integer(match[2])
+                m = match[3] unless match[3].nil?
+              end
+
+              super(logger, level, data, Time.now, f, l, m)
+            end
+          }
+          ::Logging::LogEvent.caller_index = CALLER_INDEX
+        end  # module Logging
+
         # -----------------------------------------------------------------------------
         def logStep(msg,cat='Step')
           logger = getLogger(@logger_args, 'logStep')
           if logger
+            if logger.get_trace
+              ::Logging::LogEvent.caller_index += 1
+            end
             logger.step "#{cat} #{@step+=1}: #{msg} ..."
+            if logger.get_trace
+              ::Logging::LogEvent.caller_index -= 1
+            end
           end
         end
 

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

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

metadata

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