logue 1.0.11 → 1.0.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: be0ec7812a60a739464699d8c086904cfd5e4b80
-  data.tar.gz: 1fc954e903970d9c00b5a5a5750f3c6919d04d86
+  metadata.gz: 27c5cf726353cfb91ce2c443c8cd02f5a8c0e272
+  data.tar.gz: 02125714a6032756c58acff5522fe104748bd270
 SHA512:
-  metadata.gz: c78f24d2d9627010644a85b84f358cb96b09fb8f14cdbe2f3fa818e7550e0c818c760a31791c81a11c7629791a50557cd4e737965c2d96c6f7036958a1a0a816
-  data.tar.gz: 632c4304e9c77de1b879b44f85df1d916ad6a196a7931464e83171a8475d72639979ae06c6041bcfd23b0c5a33ee4156b687102cbb16e21d3883920d43ab5d34
+  metadata.gz: 43947a643388fa154feb99be7c02a3a33dcc701e75e256738f97911bdd982ecb23a236922e8db4bd4693b43eb46a28b56e14313221da001bbeb95b79da67d4a5
+  data.tar.gz: f3aa71bcd285189271ec1a5d48463c79c247d2b57ee58fece9ae4f483ae9f7f69621e103ef5f803d639a7678f3014179d82038067f78649d7cecc89b11799636

data/.gitignore

@@ -6,3 +6,4 @@
 /pkg/
 /spec/reports/
 /tmp/
+*~

data/Gemfile.lock

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

data/README.md

@@ -1,9 +1,8 @@
 logue
 =====
 
-A Ruby gem for generating logging and debugging output. Logging statements
-include the file, line, class and method from which the logging method was
-called.
+A Ruby gem for generating logging and debugging output. Logging statements include the file, line,
+class and method from which the logging method was called.
 
 ## EXAMPLES
 

data/lib/logue/colorlog.rb

@@ -0,0 +1,54 @@
+#!/usr/bin/ruby -w
+# -*- ruby -*-
+#
+# = colorlog.rb
+#
+# Logging Module
+#
+# Author:: Jeff Pace <jeugenepace@gmail.com>
+# Documentation:: Author
+#
+
+require 'rainbow/x11_color_names'
+require 'rainbow/color'
+require 'logue/level'
+
+#
+# == ColorLog
+#
+# This class logs messages using terminal colors, forwarding them to a log method.
+#
+# == Examples
+#
+# See the unit tests in colorlog_test.rb
+# 
+
+module Logue
+  module ColorLog
+    def method_missing meth, *args, &blk
+      # validcolors = Rainbow::X11ColorNames::NAMES
+      validcolors = Rainbow::Color::Named::NAMES
+      if code = validcolors[meth]
+        add_color_method meth.to_s, code + 30
+        send meth, *args, &blk
+      else
+        super
+      end
+    end
+
+    def respond_to? meth
+      # validcolors = Rainbow::X11ColorNames::NAMES
+      validcolors = Rainbow::Color::Named::NAMES
+      validcolors.include?(meth) || super
+    end
+
+    def add_color_method color, code
+      instmeth = Array.new.tap do |a|
+        a << 'def ' + color.to_s + '(msg = "", lvl = Logue::Level::DEBUG, cname = nil, &blk)'
+        a << '  log("\e[' + code.to_s + 'm#{msg}\e[0m", lvl, cname, &blk)'
+        a << 'end'
+      end
+      instance_eval instmeth.join "\n"
+    end
+  end
+end

data/lib/logue/filter.rb

@@ -0,0 +1,60 @@
+#!/usr/bin/ruby -w
+# -*- ruby -*-
+
+require 'pathname'
+
+module Logue
+  class Filter
+    include Comparable
+    
+    attr_reader :ignored_files
+    attr_reader :ignored_methods
+    attr_reader :ignored_classes
+
+    def initialize ignored_files: Array.new, ignored_methods: Array.new, ignored_classes: Array.new
+      @ignored_files   = ignored_files
+      @ignored_methods = ignored_methods
+      @ignored_classes = ignored_classes
+    end
+
+    def ignore_file file
+      @ignored_files << file
+    end
+
+    def log_file file
+      @ignored_files.delete file
+    end      
+
+    def ignore_class cls
+      @ignored_classes << cls
+    end
+
+    def log_class cls
+      @ignored_classes.delete cls
+    end      
+
+    def ignore_method meth
+      @ignored_methods << meth
+    end
+
+    def log_method meth
+      @ignored_methods.delete meth
+    end
+
+    def log? file, cls, meth
+      !@ignored_files.include?(file) && !@ignored_classes.include?(cls) && !@ignored_methods.include?(meth)
+    end
+
+    def compare_fields
+       [ :ignored_files, :ignored_methods, :ignored_classes ]
+    end
+
+    def <=> other
+      compare_fields.each do |field|
+        cmp = send(field) <=> other.send(field)
+        return cmp if cmp.nonzero?
+      end
+      0
+    end
+  end
+end

data/lib/logue/frame.rb

@@ -9,20 +9,29 @@ module Logue
     
     attr_reader :path
     attr_reader :line
-    attr_reader :function
+    attr_reader :method
 
-    def initialize args
-      if entry = args[:entry]
+    def initialize entry: nil, path: nil, line: nil, method: nil
+      # entry if called from "caller(x)" elements, path/line/method if called from
+      # "caller_location(x)" elements.
+      if entry
         md = FRAME_RE.match entry
-        # Ruby 1.9 expands the file name, but 1.8 doesn't:
-        @path     = Pathname.new(md[1]).expand_path.to_s
-        @line     = md[2].to_i
-        @function = md[3] || ""
+        @path   = md[1]
+        @line   = md[2].to_i
+        @method = md[3] || ""
       else
-        @path     = args[:path]
-        @line     = args[:line]
-        @function = args[:function]
+        @path   = path
+        @line   = line
+        @method = method
       end
     end
+
+    def to_s
+      [ :path, :line, :method ].collect { |field| "#{field}: " + send(field).to_s }.join ", "
+    end
+
+    def formatted format, cname
+      format.format @path, @line, cname, @method
+    end
   end
 end

data/lib/logue/legacy_logger.rb

@@ -0,0 +1,69 @@
+#!/usr/bin/ruby -w
+# -*- ruby -*-
+#
+# = legacy_logger.rb
+#
+# Logging Module
+#
+# Author:: Jeff Pace <jeugenepace@gmail.com>
+# Documentation:: Author
+#
+
+require 'logue/filter'
+require 'logue/location_format'
+
+module Logue
+  module LegacyLogger
+    def trim= what
+      $stderr.puts "Logger#trim is deprecated, and ignored"
+    end
+
+    def ignore_file fname
+      filter.ignore_file fname
+    end
+    
+    def ignore_method methname
+      filter.ignore_method methname
+    end
+    
+    def ignore_class classname
+      filter.ignore_class classname
+    end
+
+    def log_file fname
+      filter.log_file fname
+    end
+    
+    def log_method methname
+      filter.log_method methname
+    end
+    
+    def log_class classname
+      filter.log_class classname
+    end
+
+    def output
+      writer.output
+    end
+
+    def output= obj
+      writer.output = obj
+    end
+
+    def colorize_line
+      writer.colorize_line
+    end
+
+    def colorize_line= b
+      writer.colorize_line = b
+    end
+
+    def set_default_widths
+      self.format = LocationFormat.new
+    end
+    
+    def set_color lvl, color
+      writer.colors[lvl] = color
+    end
+  end
+end

data/lib/logue/level.rb

@@ -0,0 +1,20 @@
+#!/usr/bin/ruby -w
+# -*- ruby -*-
+#
+# = severity.rb
+#
+# Logging Module
+#
+# Author:: Jeff Pace <jeugenepace@gmail.com>
+# Documentation:: Author
+#
+
+module Logue
+  module Level
+    DEBUG = 0
+    INFO  = 1
+    WARN  = 2
+    ERROR = 3
+    FATAL = 4
+  end
+end

data/lib/logue/line.rb

@@ -4,19 +4,18 @@
 require 'logue/location_format'
 
 module Logue
-end
-
-class Logue::Line
-  attr_reader :location
-  attr_reader :msg
-  
-  def initialize location, msg
-    @location = location
-    @msg = msg
-  end
+  class Line
+    attr_reader :location
+    attr_reader :msg
+    
+    def initialize location, msg
+      @location = location
+      @msg = msg
+    end
 
-  def format locformat
-    logmsg = @location.format locformat
-    logmsg + " " + @msg
+    def format locformat
+      logmsg = @location.format locformat
+      logmsg + " " + @msg
+    end
   end
 end

data/lib/logue/location.rb

@@ -4,22 +4,21 @@
 require 'logue/location_format'
 
 module Logue
-end
-
-class Logue::Location
-  attr_reader :path
-  attr_reader :lineno
-  attr_reader :cls
-  attr_reader :function
-  
-  def initialize path, lineno, cls, function
-    @path = path
-    @lineno = lineno
-    @cls = cls
-    @function = function
-  end
+  class Location
+    attr_reader :path
+    attr_reader :lineno
+    attr_reader :cls
+    attr_reader :method
+    
+    def initialize path, lineno, cls, method
+      @path   = path
+      @lineno = lineno
+      @cls    = cls
+      @method = method
+    end
 
-  def format locformat
-    locformat.format @path, @lineno, @cls, @function
+    def format locformat
+      locformat.format @path, @lineno, @cls, @method
+    end
   end
 end

data/lib/logue/location_format.rb

@@ -3,45 +3,46 @@
 
 require 'logue/pathutil'
 
-class Logue::LocationFormatWidths
-  DEFAULT_FILENAME = -25
-  DEFAULT_LINE  = 4
-  DEFAULT_FUNCTION = -20
-end    
-
-class Logue::LocationFormat
-  attr_accessor :file
-  attr_accessor :line
-  attr_accessor :function
-  attr_accessor :trim
-  
-  def initialize args = Hash.new
-    @file     = args.fetch :file,     Logue::LocationFormatWidths::DEFAULT_FILENAME
-    @line     = args.fetch :line,     Logue::LocationFormatWidths::DEFAULT_LINE
-    @function = args.fetch :function, Logue::LocationFormatWidths::DEFAULT_FUNCTION
-    @trim     = args.fetch :trim,     true
-  end
-
-  def copy args
-    values = { file: @file, line: @line, function: @function, trim: @trim }
-    self.class.new values.merge(args)
-  end
-  
-  def format path, line, cls, func
-    if cls
-      func = cls.to_s + "#" + func
+module Logue
+  class LocationFormat
+    module Defaults
+      FILENAME = -25
+      LINE     =   4
+      METHOD   = -20
     end
     
-    if trim
-      path = Logue::PathUtil.trim_right path, @file
-      func = Logue::PathUtil.trim_left  func, @function
+    attr_accessor :file
+    attr_accessor :line
+    attr_accessor :method
+    attr_accessor :trim
+    
+    def initialize  file: Defaults::FILENAME, line: Defaults::LINE, method: Defaults::METHOD, trim: true
+      @file   = file
+      @line   = line
+      @method = method
+      @trim   = trim
+    end
+
+    def copy args
+      values = { file: @file, line: @line, method: @method, trim: @trim }
+      self.class.new values.merge(args)
     end
     
-    format = "[%#{file}s:%#{@line}d] {%#{function}s}"
-    sprintf format, path, line, func
-  end
+    def format path, line, cls, func
+      if cls
+        func = cls.to_s + "#" + func
+      end
+      
+      if trim
+        path = PathUtil.trim_right path.to_s, @file
+        func = PathUtil.trim_left  func,      @method
+      end
+      
+      sprintf format_string, path, line, func
+    end
 
-  def format_string
-    "[%#{file}s:%#{line}d] {%#{function}s}"
+    def format_string
+      "[%#{@file}s:%#{@line}d] {%#{@method}s}"
+    end
   end
 end

data/lib/logue/log.rb

@@ -10,7 +10,7 @@
 #
 
 require 'logue/logger'
-require 'logue/severity'
+require 'logue/level'
 require 'logue/colors'
 
 #
@@ -54,7 +54,7 @@ module Logue
   class Log
     $LOGGING_LEVEL = nil
 
-    include Log::Severity
+    include Level
 
     # by default, class methods delegate to a single app-wide log.
 
@@ -115,8 +115,8 @@ module Logue
 
     def self.add_color_method color, code
       instmeth = Array.new
-      instmeth << "def #{color} msg = \"\", lvl = Log::DEBUG, depth = 1, cname = nil, &blk"
-      instmeth << "  logger.#{color} (\"\\e[#{code}m\#{msg\}\\e[0m\", lvl, depth + 1, cname, &blk)"
+      instmeth << "def #{color} msg = \"\", lvl = Log::DEBUG, cname = nil, &blk"
+      instmeth << "  logger.#{color} (\"\\e[#{code}m\#{msg\}\\e[0m\", lvl, cname, &blk)"
       instmeth << "end"
       
       # an instance, but on the class object, not the log instance:
@@ -128,45 +128,45 @@ module Logue
       logger.set_widths file_width, line_width, func_width
     end
     
-    def self.debug msg = "", depth = 1, cname = nil, &blk
-      logger.debug msg, depth + 1, cname, &blk
+    def self.debug msg = "", cname = nil, &blk
+      logger.debug msg, cname, &blk
     end
 
-    def self.info msg = "", depth = 1, cname = nil, &blk
-      logger.info msg, depth + 1, cname, &blk
+    def self.info msg = "", cname = nil, &blk
+      logger.info msg, cname, &blk
     end
 
-    def self.fatal msg = "", depth = 1, cname = nil, &blk
-      logger.fatal msg, depth + 1, cname, &blk
+    def self.fatal msg = "", cname = nil, &blk
+      logger.fatal msg, cname, &blk
     end
 
-    def self.log msg = "", lvl = DEBUG, depth = 1, cname = nil, &blk
-      logger.log msg, lvl, depth + 1, cname, &blk
+    def self.log msg = "", lvl = DEBUG, cname = nil, &blk
+      logger.log msg, lvl, cname, &blk
     end
 
-    def self.stack msg = "", lvl = DEBUG, depth = 1, cname = nil, &blk
-      logger.stack msg, lvl, depth + 1, cname, &blk
+    def self.stack msg = "", lvl = DEBUG, cname = nil, &blk
+      logger.stack msg, lvl, cname, &blk
     end
 
-    def self.warn msg = "", depth = 1, cname = nil, &blk
+    def self.warn msg = "", cname = nil, &blk
       if verbose
-        logger.log msg, WARN, depth + 1, cname, &blk
+        logger.log msg, WARN, cname, &blk
       else
         $stderr.puts "WARNING: " + msg
       end
     end
 
-    def self.error msg = "", depth = 1, cname = nil, &blk
+    def self.error msg = "", cname = nil, &blk
       if verbose
-        logger.log msg, ERROR, depth + 1, cname, &blk
+        logger.log msg, ERROR, cname, &blk
       else
         $stderr.puts "ERROR: " + msg
       end
     end
 
-    def self.write msg, depth = 1, cname = nil, &blk
+    def self.write msg, cname = nil, &blk
       if verbose
-        stack msg, Log::WARN, depth + 1, cname, &blk
+        stack msg, Log::WARN, cname, &blk
       elsif quiet
         # nothing
       else

data/lib/logue/loggable.rb

@@ -41,36 +41,36 @@ require 'logue/colors'
 module Logue
   module Loggable
     # Logs the given message, including the class whence invoked.
-    def log msg = "", lvl = Log::DEBUG, depth = 1, &blk
-      delegate_log_class.log msg, lvl, depth + 1, self.class.to_s, &blk
+    def log msg = "", lvl = Log::DEBUG, &blk
+      delegate_log_class.log msg, lvl, self.class.to_s, &blk
     end
 
-    def debug msg = "", depth = 1, &blk
-      delegate_log_class.debug msg, depth + 1, self.class.to_s, &blk
+    def debug msg = "", &blk
+      delegate_log_class.debug msg, self.class.to_s, &blk
     end
 
-    def info msg = "", depth = 1, &blk
-      delegate_log_class.info msg, depth + 1, self.class.to_s, &blk
+    def info msg = "", &blk
+      delegate_log_class.info msg, self.class.to_s, &blk
     end
 
-    def warn msg = "", depth = 1, &blk
-      delegate_log_class.warn msg, depth + 1, self.class.to_s, &blk
+    def warn msg = "", &blk
+      delegate_log_class.warn msg, self.class.to_s, &blk
     end
 
-    def error msg = "", depth = 1, &blk
-      delegate_log_class.error msg, depth + 1, self.class.to_s, &blk
+    def error msg = "", &blk
+      delegate_log_class.error msg, self.class.to_s, &blk
     end
 
-    def fatal msg = "", depth = 1, &blk
-      delegate_log_class.fatal msg, depth + 1, self.class.to_s, &blk
+    def fatal msg = "", &blk
+      delegate_log_class.fatal msg, self.class.to_s, &blk
     end
 
-    def stack msg = "", lvl = Log::DEBUG, depth = 1, &blk
-      delegate_log_class.stack msg, lvl, depth + 1, self.class.to_s, &blk
+    def stack msg = "", lvl = Log::DEBUG, &blk
+      delegate_log_class.stack msg, lvl, self.class.to_s, &blk
     end
 
-    def write msg = "", depth = 1, &blk
-      delegate_log_class.write msg, depth + 1, self.class.to_s, &blk
+    def write msg = "", &blk
+      delegate_log_class.write msg, self.class.to_s, &blk
     end
 
     def method_missing meth, *args, &blk
@@ -89,8 +89,8 @@ module Logue
 
     def add_color_method color, code
       meth = Array.new
-      meth << "def #{color}(msg = \"\", lvl = Log::DEBUG, depth = 1, cname = nil, &blk)"
-      meth << "  Log.#{color} msg, lvl, depth + 1, self.class.to_s, &blk"
+      meth << "def #{color}(msg = \"\", lvl = Log::DEBUG, cname = nil, &blk)"
+      meth << "  Log.#{color} msg, lvl, self.class.to_s, &blk"
       meth << "end"
       self.class.module_eval meth.join("\n")
     end

data/lib/logue/logger.rb

@@ -9,13 +9,12 @@
 # Documentation:: Author
 #
 
-require 'rainbow/x11_color_names'
-require 'rainbow/color'
-require 'pathname'
-require 'logue/severity'
-require 'logue/location_format'
-require 'logue/pathutil'
-require 'logue/frame'
+require 'logue/level'
+require 'logue/colorlog'
+require 'logue/writer'
+require 'logue/filter'
+require 'logue/legacy_logger'
+require 'logue/stack'
 
 #
 # == Logger
@@ -29,220 +28,114 @@ require 'logue/frame'
 # 
 
 module Logue
-end
-
-class Logue::Logger
-  attr_accessor :output
-  attr_accessor :colorize_line
-  attr_accessor :level
-  attr_accessor :ignored_files
-  attr_accessor :ignored_methods
-  attr_accessor :ignored_classes
-  
-  attr_accessor :format
-
-  include Logue::Log::Severity
-
-  def initialize
-    reset
-  end
-  
-  def verbose= v
-    @level = case v
-             when TrueClass 
-               DEBUG
-             when FalseClass 
-               FATAL
-             when Integer
-               v
-             end
-  end
-
-  def reset
-    @level           = FATAL
-    @ignored_files   = Hash.new
-    @ignored_methods = Hash.new
-    @ignored_classes = Hash.new
-    @output          = $stdout
-    @colors          = Array.new
-    @colorize_line   = false
-    @format          = Logue::LocationFormat.new
-  end
-
-  def trim= what
-  end
-
-  def verbose
-    level <= DEBUG
-  end
-  
-  def set_default_widths
-    @format = Logue::LocationFormat.new
-  end
-
-  def verbose
-    level <= DEBUG
-  end
-
-  def quiet
-    level >= WARN
-  end
-
-  def quiet= b
-    level = b ? WARN : DEBUG
-  end
-
-  # Assigns output to a file with the given name. Returns the file; the client is responsible for
-  # closing it.
-  def outfile= f
-    @output = f.kind_of?(IO) ? f : File.new(f, "w")
-  end
-
-  # Creates a printf format for the given widths, for aligning output. To lead lines with zeros
-  # (e.g., "00317") the line_width argument must be a string, not an integer.
-  def set_widths file, line, function
-    @format = Logue::LocationFormat.new file: file, line: line, function: function
-  end
+  class Logger
+    include LegacyLogger
+    include ColorLog
+    
+    attr_accessor :level
+    attr_accessor :format
+    attr_accessor :filter
+    attr_accessor :writer
+    
+    include Level
 
-  def ignore_file fname
-    ignored_files[fname] = true
-  end
-  
-  def ignore_method methname
-    ignored_methods[methname] = true
-  end
-  
-  def ignore_class classname
-    ignored_classes[classname] = true
-  end
+    def initialize format: LocationFormat.new, level: WARN, filter: Filter.new, writer: Writer.new
+      reset format: format, level: level, filter: filter, writer: writer
+    end
+    
+    def verbose= v
+      @level = case v
+               when TrueClass 
+                 DEBUG
+               when FalseClass 
+                 FATAL
+               when Integer
+                 v
+               end
+    end
 
-  def log_file fname
-    ignored_files.delete fname
-  end
-  
-  def log_method methname
-    ignored_methods.delete methname
-  end
-  
-  def log_class classname
-    ignored_classes.delete classname
-  end
+    def verbose
+      @level <= DEBUG
+    end
 
-  def debug msg = "", depth = 1, cname = nil, &blk
-    log msg, DEBUG, depth + 1, cname, &blk
-  end
+    def reset format: LocationFormat.new, level: FATAL, filter: Filter.new, writer: Writer.new
+      @level  = level
+      @filter = filter
+      @format = format
+      @writer = writer
+    end
+    
+    def quiet
+      @level >= WARN
+    end
 
-  def info msg = "", depth = 1, cname = nil, &blk
-    log msg, INFO, depth + 1, cname, &blk
-  end
+    def quiet= b
+      @level = b ? WARN : DEBUG
+    end
 
-  def warn msg = "", depth = 1, cname = nil, &blk
-    log msg, WARN, depth + 1, cname, &blk
-  end
+    # Assigns output to a file with the given name. Returns the file; the client is responsible for
+    # closing it.
+    def outfile= f
+      io = f.kind_of?(IO) ? f : File.new(f, "w")
+      @writer.output = io
+    end
 
-  def error msg = "", depth = 1, cname = nil, &blk
-    log msg, ERROR, depth + 1, cname, &blk
-  end
+    # Creates a printf format for the given widths, for aligning output. To lead lines with zeros
+    # (e.g., "00317") the line argument must be a string, with leading zeros, not an integer.
+    def set_widths file, line, method
+      @format = LocationFormat.new file: file, line: line, method: method
+    end
 
-  def fatal msg = "", depth = 1, cname = nil, &blk
-    log msg, FATAL, depth + 1, cname, &blk
-  end
+    def debug msg = "", cname = nil, &blk
+      log msg, DEBUG, cname, &blk
+    end
 
-  # Logs the given message.
-  def log msg = "", lvl = DEBUG, depth = 1, cname = nil, &blk
-    if lvl >= level
-      frame = nil
-
-      stk = caller 0
-      stk.reverse.each_with_index do |frm, idx|
-        if frm.index(%r{logue/log.*:\d+:in\b})
-          break
-        else
-          frame = frm
-        end
-      end
+    def info msg = "", cname = nil, &blk
+      log msg, INFO, cname, &blk
+    end
 
-      print_stack_frame frame, cname, msg, lvl, &blk
+    def warn msg = "", cname = nil, &blk
+      log msg, WARN, cname, &blk
     end
-  end
 
-  # Shows the current stack.
-  def stack msg = "", lvl = DEBUG, depth = 1, cname = nil, &blk
-    if lvl >= level
-      stk = caller depth
-      stk.each do |frame|
-        print_stack_frame frame, cname, msg, lvl, &blk
-        cname = nil
-        msg = ""
-      end
+    def error msg = "", cname = nil, &blk
+      log msg, ERROR, cname, &blk
     end
-  end
 
-  def print_stack_frame frame, cname, msg, lvl, &blk
-    frm  = Logue::Frame.new entry: frame
-    func = cname ? cname + "#" + frm.function : frm.function
-    
-    unless ignored_files[frm.path] || (cname && ignored_classes[cname]) || ignored_methods[func]
-      print_formatted(frm.path, frm.line, func, msg, lvl, &blk)
+    def fatal msg = "", cname = nil, &blk
+      log msg, FATAL, cname, &blk
     end
-  end
 
-  def print_formatted file, line, func, msg, lvl, &blk
-    location = @format.format file, line, nil, func
-    print location, msg, lvl, &blk
-  end
-  
-  def print hdr, msg, lvl, &blk
-    if blk
-      x = blk.call
-      if x.kind_of? String
-        msg = x
-      else
-        return
-      end
+    # Logs the given message.
+    def log msg = "", lvl = DEBUG, cname = nil, &blk
+      log_frames cname, msg, lvl, 0, &blk
     end
 
-    msg = msg.to_s.chomp
+    # Shows the current stack.
+    def stack msg = "", lvl = DEBUG, cname = nil, &blk
+      log_frames cname, msg, lvl, -1, &blk
+    end
 
-    if lvlcol = @colors[lvl]
-      if colorize_line
-        line = hdr + " " + msg
-        @output.puts line.color(lvlcol)
-      else
-        @output.puts hdr + " " + msg.color(lvlcol)
+    def log_frames cname, msg, lvl, num, &blk
+      if lvl >= level
+        stack = Stack.new
+        stack.filtered[0 .. num].each do |frame|
+          log_frame frame, cname, msg, lvl, &blk
+          cname = nil
+          msg   = ""
+        end
       end
-    else
-      @output.puts hdr + " " + msg
-    end      
-  end
-
-  def set_color lvl, color
-    @colors[lvl] = color
-  end
+    end    
 
-  def method_missing meth, *args, &blk
-    # validcolors = Rainbow::X11ColorNames::NAMES
-    validcolors = Rainbow::Color::Named::NAMES
-    # only handling foregrounds, not backgrounds
-    if code = validcolors[meth]
-      add_color_method meth.to_s, code + 30
-      send meth, *args, &blk
-    else
-      super
+    def log_frame frame, cname, msg, lvl, &blk
+      if @filter.log? frame.path, cname, frame.method
+        print_formatted frame, cname, msg, lvl, &blk
+      end
     end
-  end
-
-  def respond_to? meth
-    # validcolors = Rainbow::X11ColorNames::NAMES
-    validcolors = Rainbow::Color::Named::NAMES
-    validcolors.include?(meth) || super
-  end
 
-  def add_color_method color, code
-    instmeth = Array.new
-    instmeth << "def #{color}(msg = \"\", lvl = DEBUG, depth = 1, cname = nil, &blk)"
-    instmeth << "  log(\"\\e[#{code}m\#{msg\}\\e[0m\", lvl, depth + 1, cname, &blk)"
-    instmeth << "end"
-    instance_eval instmeth.join("\n")
+    def print_formatted frame, cname, msg, lvl, &blk
+      location = frame.formatted @format, cname
+      @writer.print location, msg, level, &blk
+    end
   end
 end

data/lib/logue/pathutil.rb

@@ -2,42 +2,41 @@
 # -*- ruby -*-
 
 module Logue
-end
-
-class Logue::PathUtil
-  class << self
-    def trim_left str, maxlen
-      str[0 ... maxlen.to_i.abs]
-    end
+  class PathUtil
+    class << self
+      def trim_left str, maxlen
+        str[0 ... maxlen.to_i.abs]
+      end
 
-    def trim_right str, maxlen
-      mxln = maxlen.abs
+      def trim_right str, maxlen
+        mxln = maxlen.abs
 
-      if str.length > mxln
-        trim_path_right str, maxlen
-      else
-        str
+        if str.length > mxln
+          trim_path_right str, maxlen
+        else
+          str
+        end
       end
-    end
 
-    def trim_path_right path, maxlen
-      mxln = maxlen.abs
-      
-      comps = path.split "/"
-      str = comps.pop
-      comps.reverse.each do |comp|
-        newstr = comp + "/" + str
-        if newstr.length + 4 <= mxln
-          str = newstr
-        else
-          newstr = "..." + "/" + str
-          if newstr.length <= mxln
+      def trim_path_right path, maxlen
+        mxln = maxlen.abs
+        
+        comps = path.split "/"
+        str = comps.pop
+        comps.reverse.each do |comp|
+          newstr = comp + "/" + str
+          if newstr.length + 4 <= mxln
             str = newstr
+          else
+            newstr = "..." + "/" + str
+            if newstr.length <= mxln
+              str = newstr
+            end
+            break
           end
-          break
         end
-      end
-      str
-    end    
+        str
+      end    
+    end
   end
 end

data/lib/logue/severity.rb

@@ -1,7 +1,7 @@
 #!/usr/bin/ruby -w
 # -*- ruby -*-
 #
-# = severity.rb
+# = level.rb
 #
 # Logging Module
 #
@@ -9,14 +9,13 @@
 # Documentation:: Author
 #
 
+require 'logue/level'
+
 module Logue
   class Log
+    # legacy module that is replaced by Logue::Level
     module Severity
-      DEBUG = 0
-      INFO  = 1
-      WARN  = 2
-      ERROR = 3
-      FATAL = 4
+      include Logue::Level
     end
   end
 end

data/lib/logue/stack.rb

@@ -0,0 +1,24 @@
+#!/usr/bin/ruby -w
+# -*- ruby -*-
+
+require 'logue/frame'
+
+module Logue
+  class Stack
+    attr_reader :frames
+    
+    def initialize depth: 2
+      # caller_locations requires Ruby 2.0+
+      locations = caller_locations depth
+      @frames = locations.collect do |loc|
+        # no absolute_path from "(eval)"
+        Frame.new path: loc.absolute_path || loc.path, line: loc.lineno, method: loc.label
+      end
+    end
+
+    def filtered
+      logframe = @frames.rindex { |frm| frm.path.include? "logue/lib/logue" }
+      @frames[logframe + 1 .. -1]
+    end
+  end
+end

data/lib/logue/version.rb

@@ -2,5 +2,5 @@
 # -*- ruby -*-
 
 module Logue
-  VERSION = '1.0.11'
+  VERSION = '1.0.13'
 end

data/lib/logue/writer.rb

@@ -0,0 +1,44 @@
+#!/usr/bin/ruby -w
+# -*- ruby -*-
+
+module Logue
+  class Writer
+    attr_accessor :output
+    attr_accessor :colors
+    attr_accessor :colorize_line
+    
+    def initialize output: $stdout, colors: Array.new, colorize_line: false
+      @output        = output
+      @colors        = colors
+      @colorize_line = colorize_line
+    end
+
+    def print location, msg, lvl, &blk
+      if blk
+        x = blk.call
+        if x.kind_of? String
+          msg = x
+        else
+          return
+        end
+      end
+
+      msg = msg.to_s.chomp
+      line = line location, msg, lvl
+      @output.puts line
+    end
+
+    def line location, msg, lvl
+      if lvlcol = @colors[lvl]
+        if @colorize_line
+          line = location + " " + msg
+          line.color lvlcol
+        else
+          location + " " + msg.color(lvlcol)
+        end
+      else
+        location + " " + msg
+      end
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: logue
 version: !ruby/object:Gem::Version
-  version: 1.0.11
+  version: 1.0.13
 platform: ruby
 authors:
 - Jeff Pace
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-02-26 00:00:00.000000000 Z
+date: 2018-03-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -97,8 +97,12 @@ files:
 - bin/console
 - bin/setup
 - lib/logue.rb
+- lib/logue/colorlog.rb
 - lib/logue/colors.rb
+- lib/logue/filter.rb
 - lib/logue/frame.rb
+- lib/logue/legacy_logger.rb
+- lib/logue/level.rb
 - lib/logue/line.rb
 - lib/logue/location.rb
 - lib/logue/location_format.rb
@@ -107,7 +111,9 @@ files:
 - lib/logue/logger.rb
 - lib/logue/pathutil.rb
 - lib/logue/severity.rb
+- lib/logue/stack.rb
 - lib/logue/version.rb
+- lib/logue/writer.rb
 - logue.gemspec
 homepage: https://www.github.com/jpace/logue
 licenses: