logue 1.0.17 → 1.1.0

data/lib/logue/logger.rb

@@ -9,13 +9,14 @@
 # Documentation:: Author
 #
 
-require 'logue/colorlog'
+require 'logue/colorable'
 require 'logue/writer'
 require 'logue/filter'
 require 'logue/legacy_logger'
-require 'logue/stack'
-require 'logue/line'
-require 'logue/location'
+require 'logue/locations/stack'
+require 'logue/locations/location'
+require 'logue/core/object_util'
+require 'logue/levels/level_logger'
 
 #
 # == Logger
@@ -29,47 +30,23 @@ require 'logue/location'
 # 
 
 module Logue
-  class Logger
+  class Logger < LevelLogger
     include LegacyLogger
-    include ColorLog
-    
-    attr_accessor :level
+    include Colorable
+
     attr_accessor :format
     attr_accessor :filter
     attr_accessor :writer
 
-    def initialize format: LocationFormat.new, level: Level::WARN, filter: Filter.new, writer: Writer.new
+    def initialize format: LocationFormat.new, level: Level::WARN, filter: Filter.new, writer: ElementsWriter.new
       reset format: format, level: level, filter: filter, writer: writer
     end
-    
-    def verbose= v
-      @level = case v
-               when TrueClass 
-                 Level::DEBUG
-               when FalseClass 
-                 Level::FATAL
-               when Integer
-                 v
-               end
-    end
-
-    def verbose
-      @level <= Level::DEBUG
-    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 >= Level::WARN
-    end
-
-    def quiet= b
-      @level = b ? Level::WARN : Level::DEBUG
+      self.level = level
     end
 
     # Assigns output to a file with the given name. Returns the file; the client is responsible for
@@ -85,51 +62,16 @@ module Logue
       @format = LocationFormat.new file: file, line: line, method: method
     end
 
-    def debug msg = "", obj = nil, classname: nil, &blk
-      log msg, obj, level: Level::DEBUG, classname: classname, &blk
-    end
-
-    def info msg = "", obj = nil, classname: nil, &blk
-      log msg, obj, level: Level::INFO, classname: classname, &blk
-    end
-
-    def warn msg = "", obj = nil, classname: nil, &blk
-      log msg, obj, level: Level::WARN, classname: classname, &blk
-    end
-
-    def error msg = "", obj = nil, classname: nil, &blk
-      log msg, obj, level: Level::ERROR, classname: classname, &blk
-    end
-
-    def fatal msg = "", obj = nil, classname: nil, &blk
-      log msg, obj, level: Level::FATAL, classname: classname, &blk
-    end
-
-    def write msg = "", obj = nil, classname: nil, &blk
-      log msg, obj, level: Level::WARN, classname: classname, &blk
-    end
-
-    # Logs the given message.
-    def log msg = "", obj = nil, level: Level::DEBUG, classname: nil, &blk
-      log_frames msg, obj, classname: classname, level: level, nframes: 0, &blk
-    end
-
-    # Shows the current stack.
-    def stack msg = "", obj = nil, level: Level::DEBUG, classname: nil, &blk
-      log_frames msg, obj, classname: classname, level: level, nframes: -1, &blk
-    end
-
-    def log_frames msg, obj = nil, classname: nil, level: nil, nframes: -1, &blk
-      if level >= @level
-        stack = Stack.new
-        stack.filtered[0 .. nframes].each do |frame|
-          log_frame frame, msg, obj, classname: classname, level: level, &blk
-          classname = nil
-          msg = ""
-          obj = nil
-        end
+    def log_frames msg, obj = ObjectUtil::NONE, classname: nil, level: nil, nframes: -1, &blk
+      return if level < self.level
+      stack = Stack.new
+      stack.filtered[0..nframes].each do |frame|
+        log_frame frame, msg, obj, classname: classname, level: level, &blk
+        classname = nil
+        msg = ""
+        obj = nil
       end
-    end    
+    end
 
     def log_frame frame, msg, obj, classname: nil, level: nil, &blk
       if @filter.log? frame.path, classname, frame.method
@@ -138,10 +80,15 @@ module Logue
     end
 
     def print_frame frame, msg, obj, classname: nil, level: nil, &blk
-      loc  = Location.new frame.path, frame.line, classname, frame.method
-      line = Line.new loc, msg, obj, &blk
-      lstr = line.format @format
-      @writer.print lstr, level
+      location = Location.new frame.path, frame.line, classname, frame.method
+      locstr = @format.format_location location
+      if msg == ObjectUtil::NONE && blk
+        @writer.write_block locstr, level, &blk
+      elsif blk
+        @writer.write_msg_blk locstr, msg, level, &blk
+      else
+        @writer.write_msg_obj locstr, msg, obj, level
+      end
     end
   end
 end

data/lib/logue/version.rb

@@ -1,6 +1,3 @@
-#!/usr/bin/ruby -w
-# -*- ruby -*-
-
 module Logue
-  VERSION = '1.0.17'
+  VERSION = '1.1.0'
 end

data/lib/logue/writer.rb

@@ -1,34 +1,5 @@
-#!/usr/bin/ruby -w
-# -*- ruby -*-
+require 'logue/lines/lines_writer'
 
 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 lstr, lvl
-      str = lvlcol = @colors[lvl] ? lstr.color(lvlcol) : lstr
-      @output.puts str
-    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
+  Writer = LinesWriter
 end

data/lib/logue/writer2.rb

@@ -0,0 +1,5 @@
+require 'logue/elements/elements_writer'
+
+module Logue
+  Writer2 = ElementsWriter
+end

data/lib/logue.rb

@@ -1,13 +1,13 @@
-loguelibdir = File.dirname(__FILE__)
+loguelibdir = File.dirname __FILE__
 
 $:.unshift(loguelibdir) unless
   $:.include?(loguelibdir) || $:.include?(File.expand_path(loguelibdir))
 
 require 'pathname'
 
-rbre = Regexp.new('\.rb$')
+rbre = Regexp.new '\.rb$'
 
 Pathname.glob(loguelibdir + '/logue/**/*.rb').each do |file|
-  fname = file.sub(Regexp.new('^' + loguelibdir + '/'), '').sub(rbre, '')
+  fname = file.to_s.sub(Regexp.new('^' + loguelibdir + '/'), '').sub(rbre, '')
   require fname
 end

data/logue.gemspec

@@ -30,9 +30,9 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_development_dependency "bundler", "~> 1.16"
+  spec.add_development_dependency "bundler", ">= 2.0"
   spec.add_development_dependency "rainbow", "~> 3.0.0"
-  spec.add_development_dependency "rake", "~> 10.0"
-  spec.add_development_dependency "test-unit", "~> 3.1"
+  spec.add_development_dependency "rake", "~> 13.0.1"
+  spec.add_development_dependency "test-unit", "3.6.1"
   spec.add_development_dependency "paramesan", "~> 0.1.1"
 end

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: logue
 version: !ruby/object:Gem::Version
-  version: 1.0.17
+  version: 1.1.0
 platform: ruby
 authors:
 - Jeff Pace
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-05-06 00:00:00.000000000 Z
+date: 2026-01-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.16'
+        version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.16'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: rainbow
   requirement: !ruby/object:Gem::Requirement
@@ -44,28 +44,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: 13.0.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: 13.0.1
 - !ruby/object:Gem::Dependency
   name: test-unit
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: 3.6.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: 3.6.1
 - !ruby/object:Gem::Dependency
   name: paramesan
   requirement: !ruby/object:Gem::Requirement
@@ -89,6 +89,16 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".glarkrc"
+- ".idea/.gitignore"
+- ".idea/aws.xml"
+- ".idea/codeStyles/Project.xml"
+- ".idea/codeStyles/codeStyleConfig.xml"
+- ".idea/inspectionProfiles/Project_Default.xml"
+- ".idea/libraries/pkg.xml"
+- ".idea/logue.iml"
+- ".idea/misc.xml"
+- ".idea/modules.xml"
+- ".idea/vcs.xml"
 - Gemfile
 - Gemfile.lock
 - LICENSE.txt
@@ -97,22 +107,49 @@ files:
 - bin/console
 - bin/setup
 - lib/logue.rb
-- lib/logue/colorlog.rb
-- lib/logue/element.rb
+- lib/logue/colorable.rb
+- lib/logue/core/applog.rb
+- lib/logue/core/base_loggable.rb
+- lib/logue/core/base_writer.rb
+- lib/logue/core/dynamic.rb
+- lib/logue/core/object_util.rb
+- lib/logue/elements/base_element.rb
+- lib/logue/elements/block_element.rb
+- lib/logue/elements/element.rb
+- lib/logue/elements/element_factory.rb
+- lib/logue/elements/element_lines.rb
+- lib/logue/elements/elements_log.rb
+- lib/logue/elements/elements_loggable.rb
+- lib/logue/elements/elements_writer.rb
+- lib/logue/elements/enum_element.rb
+- lib/logue/elements/hash_element.rb
+- lib/logue/elements/indexed_element.rb
+- lib/logue/elements/msg_element.rb
+- lib/logue/elements/msg_obj_element.rb
+- lib/logue/elements/struct_element.rb
+- lib/logue/elements/verbose_element.rb
 - lib/logue/filter.rb
-- lib/logue/frame.rb
+- lib/logue/format/location_format.rb
+- lib/logue/format/pathutil.rb
 - lib/logue/legacy_logger.rb
 - lib/logue/level.rb
-- lib/logue/line.rb
-- lib/logue/location.rb
-- lib/logue/location_format.rb
+- lib/logue/levels/level_logger.rb
+- lib/logue/lines/line_base.rb
+- lib/logue/lines/line_block.rb
+- lib/logue/lines/line_msg_block.rb
+- lib/logue/lines/line_msg_obj.rb
+- lib/logue/lines/lines_factory.rb
+- lib/logue/lines/lines_writer.rb
+- lib/logue/locations/frame.rb
+- lib/logue/locations/location.rb
+- lib/logue/locations/location_writer.rb
+- lib/logue/locations/stack.rb
 - lib/logue/log.rb
 - lib/logue/loggable.rb
 - lib/logue/logger.rb
-- lib/logue/pathutil.rb
-- lib/logue/stack.rb
 - lib/logue/version.rb
 - lib/logue/writer.rb
+- lib/logue/writer2.rb
 - logue.gemspec
 homepage: https://www.github.com/jpace/logue
 licenses:
@@ -134,8 +171,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.3
+rubygems_version: 3.2.3
 signing_key: 
 specification_version: 4
 summary: A minimalist logging module.

data/lib/logue/element.rb

@@ -1,16 +0,0 @@
-#!/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/frame.rb

@@ -1,37 +0,0 @@
-#!/usr/bin/ruby -w
-# -*- ruby -*-
-
-require 'pathname'
-
-module Logue
-  class Frame
-    FRAME_RE = Regexp.new '(.*):(\d+)(?::in \`(.*)\')?'
-    
-    attr_reader :path
-    attr_reader :line
-    attr_reader :method
-
-    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
-        @path   = md[1]
-        @line   = md[2].to_i
-        @method = md[3] || ""
-      else
-        @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/line.rb

@@ -1,44 +0,0 @@
-#!/usr/bin/ruby -w
-# -*- ruby -*-
-
-require 'logue/location_format'
-require 'logue/element'
-require 'stringio'
-
-module Logue
-  class Line
-    attr_reader :location
-    attr_reader :msg
-    attr_reader :obj
-    attr_reader :block
-    
-    def initialize location, msg, obj = nil, &blk
-      @location = location
-      @msg = msg
-      @obj = obj
-      @block = blk
-    end
-
-    def location_string locformat
-      @location.format locformat
-    end
-
-    def message_string
-      if @block
-        @block.call.to_s
-      elsif @obj
-        elmt = Element.new @obj
-        io = StringIO.new
-        elmt.write io
-        io.close
-        @msg.to_s + ": " + io.string
-      else
-        @msg.to_s
-      end
-    end
-
-    def format locformat
-      location_string(locformat) + " " + message_string
-    end
-  end
-end

data/lib/logue/location.rb

@@ -1,24 +0,0 @@
-#!/usr/bin/ruby -w
-# -*- ruby -*-
-
-require 'logue/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
-
-    def format locformat
-      locformat.format @path, @line, @cls, @method
-    end
-  end
-end

data/lib/logue/pathutil.rb

@@ -1,39 +0,0 @@
-#!/usr/bin/ruby -w
-# -*- ruby -*-
-
-module Logue
-  class PathUtil
-    class << 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
-end