logue 1.0.17 → 1.1.0

data/lib/logue/elements/msg_obj_element.rb

@@ -0,0 +1,13 @@
+require 'logue/elements/element'
+
+module Logue
+  class MsgObjElement < Element
+    def write_element
+      if @msg == ObjectUtil::NONE
+        write_line @object.to_s
+      else
+        write_line "#{@msg}: #{@object}"
+      end
+    end
+  end
+end

data/lib/logue/elements/struct_element.rb

@@ -0,0 +1,9 @@
+require 'logue/elements/enum_element'
+
+module Logue
+  class StructElement < EnumerableElement
+    def write_element
+      write_enumerator @object.each_pair
+    end
+  end
+end

data/lib/logue/elements/verbose_element.rb

@@ -0,0 +1,18 @@
+require 'logue/elements/element'
+
+module Logue
+  class VerboseElement < Element
+    def write_element
+      obj = @object
+      write_msg_object @msg, "verbose"
+      write_msg_object @msg + ".class", obj.class
+      write_msg_object @msg + ".id", obj.object_id
+      write_msg_object @msg, obj
+      vars = obj.instance_variables
+      vars.each do |v|
+        value = obj.instance_variable_get v
+        write_msg_object @msg + "." + v.to_s, value
+      end
+    end
+  end
+end

data/lib/logue/filter.rb

@@ -1,60 +1,19 @@
-#!/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      
+    attr_reader :files
+    attr_reader :methods
+    attr_reader :classes
 
-    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
+    def initialize files: Array.new, methods: Array.new, classes: Array.new
+      @files = files
+      @methods = methods
+      @classes = classes
     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
+      !@files.include?(file) && !@classes.include?(cls) && !@methods.include?(meth)
     end
   end
 end

data/lib/logue/{location_format.rb → format/location_format.rb}

@@ -1,26 +1,23 @@
-#!/usr/bin/ruby -w
-# -*- ruby -*-
-
-require 'logue/pathutil'
+require 'logue/format/pathutil'
 
 module Logue
   class LocationFormat
     module Defaults
       FILENAME = -25
-      LINE     =   4
-      METHOD   = -20
+      LINE = 4
+      METHOD = -20
     end
-    
+
     attr_accessor :file
     attr_accessor :line
     attr_accessor :method
-    
+
     def initialize file: Defaults::FILENAME, line: Defaults::LINE, method: Defaults::METHOD
-      @file   = file
-      @line   = line
+      @file = file
+      @line = line
       @method = method
     end
-    
+
     def format path, line, cls, methname
       name = cls ? cls.to_s + "#" + methname : methname
       path = PathUtil.trim_right path.to_s, @file.abs
@@ -28,8 +25,16 @@ module Logue
       sprintf format_string, path, line, name
     end
 
+    def format_location location
+      format location.path, location.line, location.cls, location.method
+    end
+
     def format_string
       "[%#{@file}s:%#{@line}d] {%#{@method}s}"
     end
+
+    def to_s
+      inspect
+    end
   end
 end

data/lib/logue/format/pathutil.rb

@@ -0,0 +1,36 @@
+module Logue
+  module PathUtil
+    extend self
+
+    def trim_left str, maxlen
+      str[0, maxlen] || ""
+    end
+
+    def trim_right str, maxlen
+      if str.length > maxlen
+        trim_path_right str, maxlen
+      else
+        str
+      end
+    end
+
+    def trim_path_right path, maxlen
+      return "" if maxlen < 0
+      comps = path.split "/"
+      str = comps.pop
+      comps.reverse.each do |comp|
+        newstr = comp + "/" + str
+        if newstr.length + 4 <= maxlen
+          str = newstr
+        else
+          newstr = ".../" + str
+          if newstr.length <= maxlen
+            str = newstr
+          end
+          break
+        end
+      end
+      str
+    end
+  end
+end

data/lib/logue/legacy_logger.rb

@@ -1,16 +1,5 @@
-#!/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'
+require 'logue/format/location_format'
 
 module Logue
   module LegacyLogger
@@ -19,27 +8,27 @@ module Logue
     end
 
     def ignore_file fname
-      filter.ignore_file fname
+      filter.files << fname
     end
     
     def ignore_method methname
-      filter.ignore_method methname
+      filter.methods << methname
     end
     
     def ignore_class classname
-      filter.ignore_class classname
+      filter.classes << classname
     end
 
     def log_file fname
-      filter.log_file fname
+      filter.files.delete fname
     end
     
     def log_method methname
-      filter.log_method methname
+      filter.methods.delete methname
     end
     
     def log_class classname
-      filter.log_class classname
+      filter.classes.delete classname
     end
 
     def output

data/lib/logue/level.rb

@@ -1,14 +1,3 @@
-#!/usr/bin/ruby -w
-# -*- ruby -*-
-#
-# = level.rb
-#
-# Logging Module
-#
-# Author:: Jeff Pace <jeugenepace@gmail.com>
-# Documentation:: Author
-#
-
 module Logue
   class Level
     DEBUG = 0

data/lib/logue/levels/level_logger.rb

@@ -0,0 +1,55 @@
+require 'logue/level'
+require 'logue/core/object_util'
+
+module Logue
+  class LevelLogger
+    attr_accessor :level
+
+    def initialize level: Level::WARN
+      @level = level
+    end
+
+    def verbose= v
+      @level = case v
+               when TrueClass
+                 Level::DEBUG
+               when FalseClass
+                 Level::FATAL
+               else
+                 v
+               end
+    end
+
+    def verbose
+      @level <= Level::DEBUG
+    end
+
+    def quiet?
+      @level >= Level::WARN
+    end
+
+    def quiet= b
+      @level = b ? Level::WARN : Level::DEBUG
+    end
+
+    { :debug => Level::DEBUG, :info => Level::INFO, :warn => Level::WARN, :error => Level::ERROR, :fatal => Level::FATAL, :write => Level::WARN }.each do |methname, level|
+      define_method methname do |msg = ObjectUtil::NONE, obj = nil, classname: nil, &blk|
+        log msg, obj, level: level, classname: classname, &blk
+      end
+    end
+
+    # Logs the given message.
+    def log msg = ObjectUtil::NONE, obj = ObjectUtil::NONE, level: Level::DEBUG, classname: nil, &blk
+      log_frames msg, obj, classname: classname, level: level, nframes: 0, &blk
+    end
+
+    # Writes the current stack, from where this method was invoked.
+    def stack msg = ObjectUtil::NONE, obj = ObjectUtil::NONE, level: Level::DEBUG, classname: nil, &blk
+      log_frames msg, obj, classname: classname, level: level, nframes: -1, &blk
+    end
+
+    def log_frames msg, obj = ObjectUtil::NONE, classname: nil, level: nil, nframes: -1, &blk
+      raise "not implemented for LevelLogger"
+    end
+  end
+end

data/lib/logue/lines/line_base.rb

@@ -0,0 +1,4 @@
+module Logue
+  class LineBase
+  end
+end

data/lib/logue/lines/line_block.rb

@@ -0,0 +1,11 @@
+module Logue
+  class LineBlock
+    def initialize blk
+      @blk = blk
+    end
+
+    def message_string
+      @blk.call.to_s
+    end
+  end
+end

data/lib/logue/lines/line_msg_block.rb

@@ -0,0 +1,12 @@
+module Logue
+  class LineMsgBlock
+    def initialize msg, blk
+      @msg = msg
+      @blk = blk
+    end
+
+    def message_string
+      @msg.to_s + ": " + @blk.call.to_s
+    end
+  end
+end

data/lib/logue/lines/line_msg_obj.rb

@@ -0,0 +1,19 @@
+module Logue
+  class LineMsgObj
+    attr_reader :msg
+    attr_reader :obj
+
+    def initialize msg, obj = nil
+      @msg = msg
+      @obj = obj
+    end
+
+    def message_string
+      if @obj
+        @msg.to_s + ": " + @obj.to_s
+      else
+        @msg.to_s
+      end
+    end
+  end
+end

data/lib/logue/lines/lines_factory.rb

@@ -0,0 +1,19 @@
+require 'logue/lines/line_msg_block'
+require 'logue/lines/line_msg_obj'
+require 'logue/lines/line_block'
+
+module Logue
+  class LineFactory
+    def create msg, obj, &blk
+      if blk
+        if msg
+          LineMsgBlock.new msg, blk
+        else
+          LineBlock.new blk
+        end
+      else
+        LineMsgObj.new msg, obj
+      end
+    end
+  end
+end

data/lib/logue/lines/lines_writer.rb

@@ -0,0 +1,29 @@
+require 'logue/lines/line_msg_block'
+require 'logue/lines/line_block'
+require 'logue/lines/line_msg_obj'
+require 'logue/core/base_writer'
+
+module Logue
+  class LinesWriter < BaseWriter
+    def write_msg_obj location, msg, obj, level
+      line = LineMsgObj.new msg, obj
+      write_line location, line, level
+    end
+
+    def write_msg_blk location, msg, level, &blk
+      line = LineMsgBlock msg, &blk
+      write_line location, line, level
+    end
+
+    def write_block location, level, &blk
+      line = LineBlock.new blk
+      write_line location, line, level
+    end
+
+    def write_line location, line, level
+      linestr = line.message_string
+      lstr = location + " " + linestr
+      print lstr, level
+    end
+  end
+end

data/lib/logue/locations/frame.rb

@@ -0,0 +1,19 @@
+require 'pathname'
+
+module Logue
+  class Frame
+    FRAME_RE = Regexp.new '(.*):(\d+)(?::in \`(.*)\')?'
+
+    attr_reader :path, :line, :method
+
+    def initialize entry: nil, path: nil, line: nil, method: nil
+      @path = path
+      @line = line
+      @method = method
+    end
+
+    def to_s
+      [:path, :line, :method].collect { |field| "#{field}: " + send(field).to_s }.join ", "
+    end
+  end
+end

data/lib/logue/locations/location.rb

@@ -0,0 +1,17 @@
+require 'logue/format/location_format'
+
+module Logue
+  class Location
+    attr_reader :path
+    attr_reader :line
+    attr_reader :cls
+    attr_reader :method
+    
+    def initialize path, line, cls, method
+      @path = path
+      @line = line
+      @cls = cls
+      @method = method
+    end
+  end
+end

data/lib/logue/locations/location_writer.rb

@@ -0,0 +1,13 @@
+require 'logue/locations/location'
+
+module Logue
+  class LocationWriter
+    def initialize format
+      @format = format
+    end
+
+    def to_string location
+      @format.format_location location
+    end
+  end
+end

data/lib/logue/{stack.rb → locations/stack.rb}

@@ -1,24 +1,22 @@
-#!/usr/bin/ruby -w
-# -*- ruby -*-
-
-require 'logue/frame'
+require 'logue/locations/frame'
 
 module Logue
   class Stack
+    FILTER_RE = Regexp.new 'logue.*/lib/logue'
+
     attr_reader :frames
     
     def initialize depth: 2
       # caller_locations requires Ruby 2.0+
       locations = caller_locations depth
-      @frames = locations.collect do |loc|
+      @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
-      re = Regexp.new 'logue.*/lib/logue'
-      logframe = @frames.rindex { |frm| frm.path.index re }
+      logframe = @frames.rindex { |frm| frm.path.index FILTER_RE }
       @frames[logframe + 1 .. -1]
     end
   end

data/lib/logue/log.rb

@@ -10,6 +10,7 @@
 #
 
 require 'logue/logger'
+require 'logue/writer'
 
 #
 # == Log
@@ -46,91 +47,57 @@ require 'logue/logger'
 
 module Logue
   class Log
-    # by default, class methods delegate to a single app-wide log.
+    extend Dynamic
+
+    def self.reset
+      @logger = Logger.new writer: Writer.new
+    end
 
-    @logger = Logger.new
+    reset
+
+    # by default, class methods delegate to a single app-wide log.
 
     # Returns the app-wide logger of the log.
     def self.logger
       @logger
     end
 
-    def self.accessors methname
-      [ methname.to_sym, (methname.to_s + "=").to_sym ]
-    end
-
-    def self.logger_methods
-      @logger_delegated ||= Array.new.tap do |ary|
-        acc_methods = [
-          :colorize_line,
-          :format,
-          :level,
-          :outfile,
-          :output,
-          :quiet,
-          :verbose,
-        ]
-        ary.concat acc_methods.inject(Array.new) { |a, m| a.concat accessors(m) }
-        read_methods = [
-          :ignore_class,
-          :ignore_file,
-          :ignore_method,
-          :log_class,
-          :log_file,
-          :log_method,
-          :set_color,
-          :set_default_widths,
-          :set_widths,
-        ]
-        ary.concat read_methods
-        logging_methods = [
-          :debug,
-          :error,
-          :fatal,
-          :info,
-          :log,
-          :stack,
-          :warn,
-          :write,
-        ]
-        ary.concat logging_methods
-      end
-    end
-    
-    def self.logger_delegated? meth
-      self.logger_methods.include? meth
+    def self.logger= logger
+      @logger = logger
     end
 
     def self.methods all = true
-      super + self.logger_methods + colors
-    end
-
-    def self.has_color? color
-      colors.include? color
+      super + logger.methods + colors
     end
 
     def self.colors
       logger.valid_colors.keys
     end
 
-    def self.delegated? meth
-      logger_delegated?(meth) || has_color?(meth)
-    end
-    
     def self.method_missing meth, *args, &blk
-      if delegated? meth
-        logger.send meth, *args, &blk
+      if logger.respond_to? meth
+        if blk
+          add_class_method meth do |*args1, &blk1|
+            @logger.send meth, *args1, blk1
+          end
+          @logger.send meth, *args, &blk
+        else
+          add_class_method meth do |*args1|
+            @logger.send meth, *args1
+          end
+          @logger.send meth, *args
+        end
       else
         super
       end
     end
 
     def self.respond_to? meth
-      methods.include? meth
+      super || methods.include?(meth)
     end
 
-    def self.respond_to_missing? *args
-      methods.include? args.first
+    def self.respond_to_missing? * args
+      super || methods.include?(args.first)
     end
   end
 end

data/lib/logue/loggable.rb

@@ -11,7 +11,8 @@
 
 require 'logue/logger'
 require 'logue/log'
-require 'logue/colorlog'
+require 'logue/core/object_util'
+require 'logue/core/base_loggable'
 
 #
 # == Loggable
@@ -37,43 +38,16 @@ require 'logue/colorlog'
 #      stack "my message"
 # 
 #  That will produce a stack trace from the given location.
-# 
+#
 
 module Logue
   module Loggable
-    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 add_color_methods colors
-        colors.each do |color, code|
-          class_eval ColorLog.color_method_source(color, code)
-        end
-      end
-    end
+    include BaseLoggable
 
     def logger
       @logger ||= Log.logger
     end
 
-    add_delegator true, [ :log, :stack ]
-    add_delegator false, [ :debug, :info, :warn, :error, :fatal, :write ]
-    add_color_methods Rainbow::Color::Named::NAMES
-    
     def logger= logger
       @logger = logger
     end