logue 1.0.14 → 1.0.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d93c0be8b98a96fa0f527a7fbf9ee887bc568152
-  data.tar.gz: e4e95e29c3e01b1a979c34abd12941508851435d
+  metadata.gz: a7c205466841c21db43c8dbf6082280cfcaed239
+  data.tar.gz: a685296b9efad06ea3cbb8bbb25b9ed29dfaca65
 SHA512:
-  metadata.gz: 610941e8a4c13e4a770fbc67ffa470091edf44ece9143bcce8bc0dc95c13e35571a16d87673194580755e57974933194a18665b52cd844c42dbfe150854b9ea1
-  data.tar.gz: 337d2cab1cedc557e65ddc9d2c7d7110dccbf0ba32382d2ae365c945dd67f5f446558ea7b71a8fbfa46d900cef844c2bc5a25e0e5cf47f5e14980c5c8451f545
+  metadata.gz: 125a0d83eb0bdf5a155e8be2147a93c57896a096455c0e3df70395e80a0e37bcdb10494015546a8a3fa97c9396dd701712b016172d966fe6c0a33dbc4fea299b
+  data.tar.gz: a2d6cd9e512b3782fe13d9e220ec6f643acebfa9edd416d75bbbf451196b7bb6b90cc01e4b469870a124bf5990706ef9154fecfae285178e5a6543dac89d2d47

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    logue (1.0.13)
+    logue (1.0.15)
 
 GEM
   remote: https://rubygems.org/

data/lib/logue/colorlog.rb

@@ -43,17 +43,22 @@ module Logue
     end
 
     def add_color_method color, code
-      meth = Array.new.tap do |a|
-        a << 'def ' + color.to_s + '(msg = "", lvl = Logue::Level::DEBUG, classname: nil, &blk)'
-        a << '  log("\e[' + code.to_s + 'm#{msg}\e[0m", level: lvl, classname: classname, &blk)'
-        a << 'end'
-      end
-      instance_eval meth.join "\n"
+      instance_eval ColorLog.color_method_source(color, code)
     end
 
     def valid_colors
       # Rainbow::X11ColorNames::NAMES
       Rainbow::Color::Named::NAMES
     end
+
+    class << self
+      def color_method_source color, code
+        Array.new.tap do |a|
+          a << 'def ' + color.to_s + '(msg = "", lvl = Logue::Level::DEBUG, classname: nil, &blk)'
+          a << '  log("\e[' + code.to_s + 'm#{msg}\e[0m", level: lvl, classname: classname, &blk)'
+          a << 'end'
+        end.join "\n"
+      end
+    end
   end
 end

data/lib/logue/element.rb

@@ -0,0 +1,16 @@
+#!/usr/bin/ruby -w
+# -*- ruby -*-
+
+module Logue
+  class Element
+    attr_reader :object
+    
+    def initialize object
+      @object = object
+    end
+
+    def write output = $stdout
+      output.print @object.to_s
+    end
+  end
+end

data/lib/logue/line.rb

@@ -2,6 +2,8 @@
 # -*- ruby -*-
 
 require 'logue/location_format'
+require 'logue/element'
+require 'stringio'
 
 module Logue
   class Line
@@ -25,9 +27,13 @@ module Logue
       if @block
         @block.call.to_s
       elsif @obj
-        "#{@msg}: #{@obj}"
+        elmt = Element.new @obj
+        io = StringIO.new
+        elmt.write io
+        io.close
+        @msg.to_s + ": " + io.string
       else
-        "#{@msg}"
+        @msg.to_s
       end
     end
 

data/lib/logue/location_format.rb

@@ -23,8 +23,8 @@ module Logue
     
     def format path, line, cls, methname
       name = cls ? cls.to_s + "#" + methname : methname
-      path = PathUtil.trim_right path.to_s, @file
-      name = PathUtil.trim_left  name,      @method
+      path = PathUtil.trim_right path.to_s, @file.abs
+      name = PathUtil.trim_left  name,      @method.abs
       sprintf format_string, path, line, name
     end
 

data/lib/logue/log.rb

@@ -5,7 +5,7 @@
 #
 # Logging Module
 #
-# Author:: Jeff Pace
+# Author:: Jeff Pace <jeugenepace@gmail.com>
 # Documentation:: Author
 #
 
@@ -27,21 +27,19 @@ require 'logue/logger'
 #
 # The most general usage is simply to call:
 #
-#  Log.log "some message"
+#  Logue::Log::info "some message"
 #
 #  That will simply log the given message.
 #
 #  class YourClass
-#    include Logue::Loggable
-#
-#    def some_method(...)
-#      log "my message"
+#    def some_method
+#      Logue::Log::debug "my message"
 # 
 #  That will log from the given class and method, showing the line number from
 #  which the logger was called.
 #
-#    def another_method(...)
-#      stack "my message"
+#    def another_method
+#      Logue::Log::stack "my message"
 # 
 #  That will produce a stack trace from the given location.
 # 

data/lib/logue/loggable.rb

@@ -11,6 +11,7 @@
 
 require 'logue/logger'
 require 'logue/log'
+require 'logue/colorlog'
 
 #
 # == Loggable
@@ -19,20 +20,20 @@ require 'logue/log'
 # 
 # == Examples
 #
-# See the unit tests in log_test.rb
+# See the unit tests in loggable_test.rb
 #
 # == Usage
 #
 #  class YourClass
 #    include Logue::Loggable
 #
-#    def some_method(...)
+#    def some_method
 #      log "my message"
 # 
 #  That will log from the given class and method, showing the line number from
 #  which the logger was called.
 #
-#    def another_method(...)
+#    def another_method
 #      stack "my message"
 # 
 #  That will produce a stack trace from the given location.
@@ -40,60 +41,41 @@ require 'logue/log'
 
 module Logue
   module Loggable
-    def logger
-      @@logger ||= Logger.new
-    end
-
-    def logger= logger
-      @@logger = logger
-    end
-
-    def respond_to_missing? *args
-      true
-    end
-
-    def methods all = true
-      methods_with_level + methods_without_level + super
-    end
+    class << self
+      def add_delegator with_level, methnames
+        methnames.each do |methname|
+          lines = Array.new.tap do |a|
+            if with_level
+              a << "def #{methname} msg = '', obj = nil, level = Level::DEBUG, &blk"
+              a << "  logger.send :#{methname}, msg, obj, level: level, classname: self.class.to_s, &blk"
+            else
+              a << "def #{methname} msg = '', obj = nil, &blk"
+              a << "  logger.send :#{methname}, msg, obj, classname: self.class.to_s, &blk"
+            end
+            a << "end"
+          end
+          
+          class_eval lines.join("\n")
+        end
+      end
 
-    def methods_with_level
-      [ :log, :stack ]
+      def add_color_methods colors
+        colors.each do |color, code|
+          class_eval ColorLog.color_method_source(color, code)
+        end
+      end
     end
 
-    def methods_without_level
-      [ :debug, :info, :error, :fatal, :write ] + logger.valid_colors.keys
+    def logger
+      @logger ||= Log.logger
     end
 
-    def warn msg = "", obj = nil, &blk
-      logger.warn msg, obj, classname: self.class.to_s, &blk
-    end
+    add_delegator true, [ :log, :stack ]
+    add_delegator false, [ :debug, :info, :warn, :error, :fatal, :write ]
+    add_color_methods Rainbow::Color::Named::NAMES
     
-    def method_missing methname, *args, &blk
-      # only handling foregrounds, not backgrounds
-      if methods_with_level.include? methname
-        add_delegator methname, true
-        send methname, *args, &blk
-      elsif methods_without_level.include? methname
-        add_delegator methname, false
-        send methname, *args, &blk
-      else
-        super
-      end
-    end
-
-    def add_delegator methname, with_level
-      lines = Array.new.tap do |a|
-        if with_level
-          a << "def #{methname} msg = '', obj = nil, level = Level::DEBUG, &blk"
-          a << "  logger.send :#{methname}, msg, obj, level: level, classname: self.class.to_s, &blk"
-        else
-          a << "def #{methname} msg = '', obj = nil, &blk"
-          a << "  logger.send :#{methname}, msg, obj, classname: self.class.to_s, &blk"
-        end
-        a << "end"
-      end
-      
-      instance_eval lines.join("\n")
+    def logger= logger
+      @logger = logger
     end
   end
 end

data/lib/logue/logger.rb

@@ -9,12 +9,10 @@
 # Documentation:: Author
 #
 
-require 'logue/level'
 require 'logue/colorlog'
 require 'logue/writer'
 require 'logue/filter'
 require 'logue/legacy_logger'
-require 'logue/location'
 require 'logue/stack'
 require 'logue/line'
 

data/lib/logue/pathutil.rb

@@ -5,13 +5,11 @@ module Logue
   class PathUtil
     class << self
       def trim_left str, maxlen
-        str[0 ... maxlen.to_i.abs]
+        str[0, maxlen] || ""
       end
 
       def trim_right str, maxlen
-        mxln = maxlen.abs
-
-        if str.length > mxln
+        if str.length > maxlen
           trim_path_right str, maxlen
         else
           str
@@ -19,17 +17,16 @@ module Logue
       end
 
       def trim_path_right path, maxlen
-        mxln = maxlen.abs
-        
+        return "" if maxlen < 0
         comps = path.split "/"
         str = comps.pop
         comps.reverse.each do |comp|
           newstr = comp + "/" + str
-          if newstr.length + 4 <= mxln
+          if newstr.length + 4 <= maxlen
             str = newstr
           else
-            newstr = "..." + "/" + str
-            if newstr.length <= mxln
+            newstr = ".../" + str
+            if newstr.length <= maxlen
               str = newstr
             end
             break

data/lib/logue/version.rb

@@ -2,5 +2,5 @@
 # -*- ruby -*-
 
 module Logue
-  VERSION = '1.0.14'
+  VERSION = '1.0.15'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: logue
 version: !ruby/object:Gem::Version
-  version: 1.0.14
+  version: 1.0.15
 platform: ruby
 authors:
 - Jeff Pace
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-08-20 00:00:00.000000000 Z
+date: 2018-08-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -98,6 +98,7 @@ files:
 - bin/setup
 - lib/logue.rb
 - lib/logue/colorlog.rb
+- lib/logue/element.rb
 - lib/logue/filter.rb
 - lib/logue/frame.rb
 - lib/logue/legacy_logger.rb
@@ -134,7 +135,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2.1
+rubygems_version: 2.6.3
 signing_key: 
 specification_version: 4
 summary: A minimalist logging module.