nub 0.0.32 → 0.0.33

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 42e447303c2f49120a5a2f17132d16d916b9cdd82dd88dc915eea10b236b69bd
-  data.tar.gz: 56492c14f5aa0b8c319239578516c631f3d5ecea89cf678bf34206681965c95a
+  metadata.gz: 1da6279157321d7fc37b92e29dbb5b6aadc736f773b1bb70ffa3b93a2c31edda
+  data.tar.gz: 8ba135845e4a368c3bbf738f01684d3ff91079d840f1d9f19f74265d88b30a42
 SHA512:
-  metadata.gz: 4bc7fc5addcbcd6b289e79e0f6120aacf1221df145490fb42df42a7aac05999e0bfc4555356aa8ee9eae69c9cadf86eb95824ad43b2c8c6d5cab957f50f2502d
-  data.tar.gz: 5972d809cda64253357facd5a14757598c27eb25618801130d2bdabfe6b9d0ef99436fb92306c800b883541a02272b93d73c7ca67d894235fc7553f115ce569a
+  metadata.gz: 7dbaab1dd5eab84e2f68b74f9174c7e5d94c0d451af66a8299bb5d19312727f65d328537f9fe62dbba543e80184581107fe92e202ac31315bee0a296c0a64c8f
+  data.tar.gz: 4ff7dde360e8f1af8892d8853bd26f1808fc540d57134aa68b6547807091eda2016c500ca116dfd30968afedc9dcec73dfcea912ec166c6ce7bb9b39bcc529f5

data/lib/nub/log.rb

@@ -25,19 +25,6 @@ require 'ostruct'
 require 'colorize'
 require_relative 'sys'
 
-ColorPair = Struct.new(:str, :color)
-ColorMap = {
-  "30" => "black",
-  "31" => "red",
-  "32" => "green",
-  "33" => "yellow",
-  "34" => "blue",
-  "35" => "magenta",
-  "36" => "cyan",
-  "37" => "white",
-  "39" => "gray88"   # default
-}
-
 LogLevel = OpenStruct.new({
   error: 0,
   warn: 1,
@@ -79,30 +66,33 @@ module Log
       @file = File.open(@path, 'a')
       @file.sync = true
     end
-
-    return nil
   end
 
   # Format the given string for use in log
   def format(str)
     @@_monitor.synchronize{
 
-      # Locate caller
-      stack = caller_locations(3,10)
+      # Skip first 3 on stack (i.e. 0 = block in format, 1 = synchronize, 2 = format) 
+      stack = caller_locations(3, 20)
+
+      # Skip past any calls in 'log.rb' or 'monitor.rb'
       i = -1
       while i += 1 do
         mod = File.basename(stack[i].path, '.rb')
         break if !['log', 'monitor'].include?(mod)
       end
 
-      # Save lineno from non log call but use method name rather than rescue or block
+      # Save lineno from original location
       lineno = stack[i].lineno
+
+      # Skip over block type functions to use method
       nested = ['rescue in', 'block in', 'each']
       while nested.any?{|x| stack[i].label.include?(x)} do
         i += 1
       end
-      loc = ":#{File.basename(stack[i].path, '.rb')}:#{stack[i].label}:#{lineno}"
 
+      # Construct stamp
+      loc = ":#{File.basename(stack[i].path, '.rb')}:#{stack[i].label}:#{lineno}"
       return "#{Time.now.utc.iso8601(3)}#{loc}:: #{str}"
     }
   end
@@ -155,8 +145,7 @@ module Log
   end
 
   def error(*args)
-    return puts(*args) if LogLevel.error <= @@_level
-    return true
+    return puts(*args)
   end
 
   def warn(*args)
@@ -181,7 +170,7 @@ module Log
   end
 
   # Remove an item from the queue, block until one exists
-  def pop()
+  def pop
     return @@_queue ? @@_queue.pop : nil
   end
 
@@ -189,48 +178,6 @@ module Log
   def empty?
     return @@_queue ? @@_queue.empty? : true
   end
-
-  # Tokenize the given colorized string
-  # @param str [String] string with ansi color codes
-  # @returns [Array] array of Token
-  def tokenize_colorize(str)
-    @@_monitor.synchronize{
-      tokens = []
-      matches = str.to_enum(:scan, /\e\[0;[39]\d;49m(.*?[\s]*)\e\[0m/).map{Regexp.last_match}
-
-      i, istart, iend = 0, 0, 0
-      match = matches[i]
-      while istart < str.size
-        color = "39"
-        iend = str.size
-        token = str[istart..iend]
-
-        # Current token is not a match
-        if match && match.begin(0) != istart
-          iend = match.begin(0)-1
-          token = str[istart..iend]
-          istart = iend + 1
-
-        # Current token is a match
-        elsif match && match.begin(0) == istart
-          iend = match.end(0)
-          token = match.captures.first
-          color = match.to_s[/\e\[0;(\d+);49m.*/, 1]
-          i += 1; match = matches[i]
-          istart = iend
-
-        # Ending
-        else
-          istart = iend
-        end
-
-        # Create token and advance
-        tokens << ColorPair.new(token, color)
-      end
-
-      return tokens
-    }
-  end
 end
 
 # vim: ft=ruby:ts=2:sw=2:sts=2

data/lib/nub/sys.rb

@@ -23,6 +23,19 @@ require 'io/console'
 require 'ostruct'
 require 'stringio'
 
+ColorPair = Struct.new(:str, :color_code, :color_name)
+ColorMap = {
+  30 => "black",
+  31 => "red",
+  32 => "green",
+  33 => "yellow",
+  34 => "blue",
+  35 => "magenta",
+  36 => "cyan",
+  37 => "white",
+  39 => "gray88"   # default
+}
+
 module Sys
 
   # Capture STDOUT to a string
@@ -47,7 +60,6 @@ module Sys
     ensure
       `stty #{state}`
     end
-
   end
 
   # Strip the ansi color codes from the given string
@@ -57,6 +69,46 @@ module Sys
     return str.gsub(/\e\[0;[39]\d;49m/, '').gsub(/\e\[0m/, '')
   end
 
+  # Tokenize the given colorized string
+  # @param str [String] string with ansi color codes
+  # @returns [Array] array of Token
+  def self.tokenize_colorize(str)
+    tokens = []
+    matches = str.to_enum(:scan, /\e\[0;[39]\d;49m(.*?[\s]*)\e\[0m/).map{Regexp.last_match}
+
+    i, istart, iend = 0, 0, 0
+    match = matches[i]
+    while istart < str.size
+      color = "39"
+      iend = str.size
+      token = str[istart..iend]
+
+      # Current token is not a match
+      if match && match.begin(0) != istart
+        iend = match.begin(0)-1
+        token = str[istart..iend]
+        istart = iend + 1
+
+      # Current token is a match
+      elsif match && match.begin(0) == istart
+        iend = match.end(0)
+        token = match.captures.first
+        color = match.to_s[/\e\[0;(\d+);49m.*/, 1]
+        i += 1; match = matches[i]
+        istart = iend
+
+      # Ending
+      else
+        istart = iend
+      end
+
+      # Create token and advance
+      tokens << ColorPair.new(token, color.to_i, ColorMap[color.to_i])
+    end
+
+    return tokens
+  end
+
 end
 
 # vim: ft=ruby:ts=2:sw=2:sts=2

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nub
 version: !ruby/object:Gem::Version
-  version: 0.0.32
+  version: 0.0.33
 platform: ruby
 authors:
 - Patrick Crummett
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-29 00:00:00.000000000 Z
+date: 2018-03-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colorize