nub 0.0.36 → 0.0.37

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 20dfa82087dac3fc6f2aca133219ffff8f13614017c6a0ce78c07b28ab63ccb1
-  data.tar.gz: 4874238d59fab76c44734625345372ab8d18e465fb1c9d4c04399e57f2a3b936
+  metadata.gz: e811c301a7788614805f286b752b1f4d69f126ed694c27c1bfad8420396d8b33
+  data.tar.gz: 702005c8d194fccfe6cf410ccdd31fe86e87ee5f161dc4e5fc4775c9079df55c
 SHA512:
-  metadata.gz: 02fc00dd683da7166068c94209cd154db09747c9adde25e5f397de7aefda175864cd3b35bbe3003cd3c75d4b3c3159fe6d1ff518feb577258cfbee3586c3f2f9
-  data.tar.gz: 4dfcd93cacdd01224bad1872523f9e9d8473e07eac6d645fd70c56d00e8c98fd5b5b22301ff57c529de8b14c66e2e1974685f693c3edf6ef4a807f380b82a35f
+  metadata.gz: 4ece535ae79f6bbd0ae0e3c539b508f0df3b80e496db9be23459dfecec5f3f888c8c2689b729667f3971fdc9b575347ecf1c294a13cdf619aecb2abd92b082f9
+  data.tar.gz: 7a71e5cdcfa4f8fcc1c82757fe514a537a138737ce5c01b59a6fd2906b71b10b5182770c2134a062dd2cdcdf57c78ac6655f6447cd4b5cc88954ed3531fc08a3

data/lib/nub/log.rb

@@ -68,13 +68,12 @@ module Log
     end
   end
 
-  # Format the given string for use in log
-  def format(str)
+  # Get timestamp and location of call
+  def call_details
     @@_monitor.synchronize{
 
-      # Skip first 3 on stack (i.e. 0 = block in format, 1 = synchronize, 2 = format) 
+      # Skip first 3 on stack (i.e. 0 = block in call_details, 1 = synchronize, 2 = call_detail) 
       stack = caller_locations(3, 10)
-      #stack.each{|x| $stdout.puts(x.label)}
 
       # Skip past any calls in 'log.rb' or 'monitor.rb'
       i = -1
@@ -100,8 +99,8 @@ module Log
       label = stack[i].label if label.empty?
 
       # Construct stamp
-      loc = ":#{File.basename(stack[i].path, '.rb')}:#{label}:#{lineno}"
-      return "#{Time.now.utc.iso8601(3)}#{loc}:: #{str}"
+      location = ":#{File.basename(stack[i].path, '.rb')}:#{label}:#{lineno}"
+      return Time.now.utc.iso8601(3), location
     }
   end
 
@@ -109,16 +108,19 @@ module Log
     @@_monitor.synchronize{
       str = !args.first.is_a?(Hash) ? args.first.to_s : ''
 
-      # Determine if stamp should be used
-      stamp = true
+      # Format message
       opts = args.find{|x| x.is_a?(Hash)}
-      if opts and opts.key?(:stamp)
-        stamp = opts[:stamp]
+      loc = (opts && opts.key?(:loc)) ? opts[:loc] : false
+      type = (opts && opts.key?(:type)) ? opts[:type] : ""
+      stamp = (opts && opts.key?(:stamp)) ? opts[:stamp] : true
+      if stamp or loc
+        timestamp, location = call_details
+        location = loc ? location : ""
+        type = ":#{type}" if !type.empty?
+        str = "#{timestamp}#{location}#{type}:: #{str}"
       end
 
-      # Format message
-      str = format(str) if stamp
-
+      # Handle output
       if !str.empty?
         @file << Sys.strip_colorize(str) if @path
         @@_queue << str if @@_queue
@@ -133,16 +135,18 @@ module Log
     @@_monitor.synchronize{
       str = !args.first.is_a?(Hash) ? args.first.to_s : ''
 
-      # Determine if stamp should be used
-      stamp = true
+      # Format message
       opts = args.find{|x| x.is_a?(Hash)}
-      if opts and opts.key?(:stamp)
-        stamp = opts[:stamp]
+      loc = (opts && opts.key?(:loc)) ? opts[:loc] : false
+      type = (opts && opts.key?(:type)) ? opts[:type] : ""
+      stamp = (opts && opts.key?(:stamp)) ? opts[:stamp] : true
+      if stamp or loc
+        timestamp, location = call_details
+        location = loc ? location : ""
+        type = ":#{type}" if !type.empty?
+        str = "#{timestamp}#{location}#{type}:: #{str}"
       end
 
-      # Format message
-      str = format(str) if stamp
-
       # Handle output
       @file.puts(Sys.strip_colorize(str)) if @path
       @@_queue << "#{str}\n" if @@_queue
@@ -153,28 +157,47 @@ module Log
   end
 
   def error(*args)
+    opts = args.find{|x| x.is_a?(Hash)}
+    opts[:loc] = true and opts[:type] = 'E' if opts
+    args << {:loc => true, :type => 'E'} if !opts
+
     return puts(*args)
   end
 
   def warn(*args)
-    return puts(*args) if LogLevel.warn <= @@_level
+    if LogLevel.warn <= @@_level
+      opts = args.find{|x| x.is_a?(Hash)}
+      opts[:type] = 'W' if opts
+      args << {:type => 'W'} if !opts
+      return puts(*args)
+    end
     return true
   end
 
   def info(*args)
-    return puts(*args) if LogLevel.info <= @@_level
+    if LogLevel.info <= @@_level
+      opts = args.find{|x| x.is_a?(Hash)}
+      opts[:type] = 'I' if opts
+      args << {:type => 'I'} if !opts
+      return puts(*args)
+    end
     return true
   end
 
   def debug(*args)
-    return puts(*args) if LogLevel.debug <= @@_level
+    if LogLevel.debug <= @@_level
+      opts = args.find{|x| x.is_a?(Hash)}
+      opts[:type] = 'D' if opts
+      args << {:type => 'D'} if !opts
+      return puts(*args)
+    end
     return true
   end
 
   # Log the given message in red and exit
   # @param msg [String] message to log
   def die(msg)
-    puts(msg.colorize(:red)) and exit
+    puts(msg.colorize(:red), loc:true, type:'DIE') and exit
   end
 
   # Remove an item from the queue, block until one exists

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: nub
 version: !ruby/object:Gem::Version
-  version: 0.0.36
+  version: 0.0.37
 platform: ruby
 authors:
 - Patrick Crummett