logue 1.0.8 → 1.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a3d4405454050091913dfa971aeb278078d431b1
-  data.tar.gz: 8a07f226220c9829f09f62da75a3fad08ac12f0f
+  metadata.gz: 50c631370d89c9801cdd921d69062367afc6dcf4
+  data.tar.gz: e717280f09746f258be9bfce45429a0d16e085f5
 SHA512:
-  metadata.gz: db149d129f19bc569a6dce1cb945741821bdcc7ab5c89511463cd4f7f3cfcd8e55b135aa3f8c71a28341bd8af6f4fa319ce83c8970e35fb0f2287ea2848a0794
-  data.tar.gz: 50aeb6028db277427a7ae453205df31d61148bfcd0e5478cf126d65ab0d64f5e065294005fc196bf45f035df3702b6fadb5d59477cd5e34b4cb3e3306d7fdf28
+  metadata.gz: ffcaadb309d8bc25b31e8e0afb20794843ee14d06647dbfee7c40ef8cfcef4857ff8f03efb93ac3d49e12ed58529e07b9e7601d7b74c87409fffdfd996dc6ffa
+  data.tar.gz: 53e1c1d6f8aaf4ab8868bc4d4e30f52f4b826582363bf4062af4069460931886f1916d681e366519508215d58e7fcaeeede92e8603004de18cbc94122a9ad931

data/.gitignore

@@ -0,0 +1,8 @@
+/.bundle/
+/.yardoc
+/_yardoc/
+/coverage/
+/doc/
+/pkg/
+/spec/reports/
+/tmp/

data/.glarkrc

@@ -0,0 +1 @@
+skip-path: pkg

data/Gemfile

@@ -0,0 +1,6 @@
+source "https://rubygems.org"
+
+git_source(:github) {|repo_name| "https://github.com/#{repo_name}" }
+
+# Specify your gem's dependencies in logue.gemspec
+gemspec

data/Gemfile.lock

@@ -0,0 +1,28 @@
+PATH
+  remote: .
+  specs:
+    logue (1.0.9)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    paramesan (0.1.1)
+    power_assert (1.1.1)
+    rainbow (3.0.0)
+    rake (10.5.0)
+    test-unit (3.2.7)
+      power_assert
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  bundler (~> 1.16)
+  logue!
+  paramesan (~> 0.1.1)
+  rainbow (~> 3.0.0)
+  rake (~> 10.0)
+  test-unit (~> 3.1)
+
+BUNDLED WITH
+   1.16.1

data/LICENSE.txt

@@ -0,0 +1,21 @@
+The MIT License (MIT)
+
+Copyright (c) 2018 Jeff Pace
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.

data/Rakefile

@@ -0,0 +1,10 @@
+require "bundler/gem_tasks"
+require "rake/testtask"
+
+Rake::TestTask.new(:test) do |t|
+  t.libs << "test"
+  t.libs << "lib"
+  t.test_files = FileList["test/**/*_test.rb"]
+end
+
+task :default => :test

data/bin/console

@@ -0,0 +1,14 @@
+#!/usr/bin/env ruby
+
+require "bundler/setup"
+require "arbolobra"
+
+# You can add fixtures and/or initialization code here to make experimenting
+# with your gem easier. You can also use a different console, if you like.
+
+# (If you use this, don't forget to add pry to your Gemfile!)
+# require "pry"
+# Pry.start
+
+require "irb"
+IRB.start(__FILE__)

data/bin/setup

@@ -0,0 +1,8 @@
+#!/usr/bin/env bash
+set -euo pipefail
+IFS=$'\n\t'
+set -vx
+
+bundle install
+
+# Do any other automated setup that you need to do here

data/lib/logue/frame.rb

@@ -0,0 +1,28 @@
+#!/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 :function
+
+    def initialize args
+      if entry = args[: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] || ""
+      else
+        @path     = args[:path]
+        @line     = args[:line]
+        @function = args[:function]
+      end
+    end
+  end
+end

data/lib/logue/line.rb

@@ -0,0 +1,22 @@
+#!/usr/bin/ruby -w
+# -*- ruby -*-
+
+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
+
+  def format locformat
+    logmsg = @location.format locformat
+    logmsg + " " + @msg
+  end
+end

data/lib/logue/location.rb

@@ -0,0 +1,25 @@
+#!/usr/bin/ruby -w
+# -*- ruby -*-
+
+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
+
+  def format locformat
+    locformat.format @path, @lineno, @cls, @function
+  end
+end

data/lib/logue/location_format.rb

@@ -0,0 +1,47 @@
+#!/usr/bin/ruby -w
+# -*- ruby -*-
+
+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
+    end
+    
+    if trim
+      path = Logue::PathUtil.trim_right path, @file
+      func = Logue::PathUtil.trim_left  func, @function
+    end
+    
+    format = "[%#{file}s:%#{@line}d] {%#{function}s}"
+    sprintf format, path, line, func
+  end
+
+  def format_string
+    "[%#{file}s:%#{line}d] {%#{function}s}"
+  end
+end

data/lib/logue/logger.rb

@@ -10,10 +10,12 @@
 #
 
 require 'rainbow/x11_color_names'
+require 'rainbow/color'
 require 'pathname'
 require 'logue/severity'
-require 'logue/format'
+require 'logue/location_format'
 require 'logue/pathutil'
+require 'logue/frame'
 
 #
 # == Logger
@@ -30,9 +32,6 @@ module Logue
 end
 
 class Logue::Logger
-  $LOGGING_LEVEL = nil
-
-  attr_accessor :quiet
   attr_accessor :output
   attr_accessor :colorize_line
   attr_accessor :level
@@ -40,14 +39,12 @@ class Logue::Logger
   attr_accessor :ignored_methods
   attr_accessor :ignored_classes
   
-  attr_reader :trim
+  attr_accessor :format
 
   include Logue::Log::Severity
 
-  FRAME_RE = Regexp.new('(.*):(\d+)(?::in \`(.*)\')?')
-
   def initialize
-    set_defaults
+    reset
   end
   
   def verbose= v
@@ -61,46 +58,42 @@ class Logue::Logger
              end
   end
 
-  def set_defaults
-    $LOGGING_LEVEL   = @level = FATAL
+  def reset
+    @level           = FATAL
     @ignored_files   = Hash.new
     @ignored_methods = Hash.new
     @ignored_classes = Hash.new
     @output          = $stdout
     @colors          = Array.new
     @colorize_line   = false
-    @quiet           = false
-    @trim            = true
-
-    @format = Logue::Format.new
-
-    set_default_widths
+    @format          = Logue::LocationFormat.new
   end
 
   def trim= what
   end
 
+  def verbose
+    level <= DEBUG
+  end
+  
   def set_default_widths
-    set_widths Logue::FormatWidths::DEFAULT_FILENAME, Logue::FormatWidths::DEFAULT_LINENUM, Logue::FormatWidths::DEFAULT_FUNCTION
+    @format = Logue::LocationFormat.new
   end
 
   def verbose
     level <= DEBUG
   end
 
-  # Assigns output to a file with the given name. Returns the file; client
-  # is responsible for closing it.
+  # 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_width, line_width, func_width
-    @file_width = file_width
-    @line_width = line_width
-    @function_width = func_width
+  # 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
 
   def ignore_file fname
@@ -178,29 +171,16 @@ class Logue::Logger
   end
 
   def print_stack_frame frame, cname, msg, lvl, &blk
-    md = FRAME_RE.match frame
-    file, line, func = md[1], md[2], (md[3] || "")
-    # file.sub!(/.*\//, "")
-
-    # Ruby 1.9 expands the file name, but 1.8 doesn't:
-    pn = Pathname.new(file).expand_path
+    frm  = Logue::Frame.new entry: frame
+    func = cname ? cname + "#" + frm.function : frm.function
     
-    file = pn.to_s
-
-    if cname
-      func = cname + "#" + func
-    end
-    
-    if ignored_files[file] || (cname && ignored_classes[cname]) || ignored_methods[func]
-    # skip this one.
-    else
-      print_formatted(file, line, func, msg, lvl, &blk)
+    unless ignored_files[frm.path] || (cname && ignored_classes[cname]) || ignored_methods[func]
+      print_formatted(frm.path, frm.line, func, msg, lvl, &blk)
     end
   end
 
   def print_formatted file, line, func, msg, lvl, &blk
-    fmt = Logue::Format.new file_width: @file_width, line_width: @line_width, method_width: @function_width, trim: @trim
-    location = fmt.format file, line, nil, func
+    location = @format.format file, line, nil, func
     print location, msg, lvl, &blk
   end
   
@@ -245,7 +225,8 @@ class Logue::Logger
   end
 
   def respond_to? meth
-    validcolors = Rainbow::X11ColorNames::NAMES
+    # validcolors = Rainbow::X11ColorNames::NAMES
+    validcolors = Rainbow::Color::Named::NAMES
     validcolors.include?(meth) || super
   end
 

data/lib/logue/version.rb

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

data/lib/logue.rb

@@ -11,7 +11,3 @@ Pathname.glob(loguelibdir + '/logue/**/*.rb').each do |file|
   fname = file.sub(Regexp.new('^' + loguelibdir + '/'), '').sub(rbre, '')
   require fname
 end
-
-module Logue
-  VERSION = '1.0.8'
-end

data/logue.gemspec

@@ -0,0 +1,38 @@
+
+lib = File.expand_path("../lib", __FILE__)
+$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
+require "logue/version"
+
+Gem::Specification.new do |spec|
+  spec.name          = "logue"
+  spec.version       = Logue::VERSION
+  spec.authors       = ["Jeff Pace"]
+  spec.email         = ["jeugenepace@gmail.com"]
+
+  spec.summary       = %q{A minimalist logging module.}
+  spec.description   = %q{A module that adds logging/trace functionality.}
+  spec.homepage      = "https://www.github.com/jpace/logue"
+  spec.license       = "MIT"
+
+  # Prevent pushing this gem to RubyGems.org. To allow pushes either set the 'allowed_push_host'
+  # to allow pushing to a single host or delete this section to allow pushing to any host.
+  if spec.respond_to?(:metadata)
+    spec.metadata["allowed_push_host"] = "https://rubygems.org"
+  else
+    raise "RubyGems 2.0 or newer is required to protect against " \
+      "public gem pushes."
+  end
+
+  spec.files         = `git ls-files -z`.split("\x0").reject do |f|
+    f.match(%r{^(test|spec|features)/})
+  end
+  spec.bindir        = "exe"
+  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 "rainbow", "~> 3.0.0"
+  spec.add_development_dependency "rake", "~> 10.0"
+  spec.add_development_dependency "test-unit", "~> 3.1"
+  spec.add_development_dependency "paramesan", "~> 0.1.1"
+end

metadata

@@ -1,66 +1,119 @@
 --- !ruby/object:Gem::Specification
 name: logue
 version: !ruby/object:Gem::Version
-  version: 1.0.8
+  version: 1.0.9
 platform: ruby
 authors:
 - Jeff Pace
 autorequire: 
-bindir: bin
+bindir: exe
 cert_chain: []
-date: 2017-06-08 00:00:00.000000000 Z
+date: 2018-02-26 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'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.16'
 - !ruby/object:Gem::Dependency
   name: rainbow
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
-    - - ">="
+        version: 3.0.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.0.0
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.0
-  type: :runtime
+        version: '10.0'
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
-    - - ">="
+        version: '10.0'
+- !ruby/object:Gem::Dependency
+  name: test-unit
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.1'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: '3.1'
+- !ruby/object:Gem::Dependency
+  name: paramesan
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.1.1
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.1.1
 description: A module that adds logging/trace functionality.
-email: jpace317@gmail.com
+email:
+- jeugenepace@gmail.com
 executables: []
 extensions: []
-extra_rdoc_files:
-- README.md
+extra_rdoc_files: []
 files:
+- ".gitignore"
+- ".glarkrc"
+- Gemfile
+- Gemfile.lock
+- LICENSE.txt
 - README.md
+- Rakefile
+- bin/console
+- bin/setup
 - lib/logue.rb
 - lib/logue/colors.rb
-- lib/logue/format.rb
+- lib/logue/frame.rb
+- lib/logue/line.rb
+- lib/logue/location.rb
+- lib/logue/location_format.rb
 - lib/logue/log.rb
 - lib/logue/loggable.rb
 - lib/logue/logger.rb
 - lib/logue/pathutil.rb
 - lib/logue/severity.rb
-- lib/logue/writer.rb
-- test/logue/colors_test.rb
-- test/logue/format_test.rb
-- test/logue/log_test.rb
-- test/logue/loggable_test.rb
-- test/logue/logger_test.rb
-- test/logue/pathutil_test.rb
-- test/logue/testlog/log_stack_test.rb
-- test/logue/testlog/log_test.rb
-- test/logue/testlog/loggable_test.rb
-- test/logue/writer_test.rb
-homepage: http://jpace.github.com/logue
+- lib/logue/version.rb
+- logue.gemspec
+homepage: https://www.github.com/jpace/logue
 licenses:
 - MIT
-metadata: {}
+metadata:
+  allowed_push_host: https://rubygems.org
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -81,14 +134,4 @@ rubygems_version: 2.6.3
 signing_key: 
 specification_version: 4
 summary: A minimalist logging module.
-test_files:
-- test/logue/colors_test.rb
-- test/logue/format_test.rb
-- test/logue/log_test.rb
-- test/logue/loggable_test.rb
-- test/logue/logger_test.rb
-- test/logue/pathutil_test.rb
-- test/logue/testlog/log_stack_test.rb
-- test/logue/testlog/log_test.rb
-- test/logue/testlog/loggable_test.rb
-- test/logue/writer_test.rb
+test_files: []

data/lib/logue/format.rb

@@ -1,38 +0,0 @@
-#!/usr/bin/ruby -w
-# -*- ruby -*-
-
-require 'logue/pathutil'
-
-class Logue::FormatWidths
-  DEFAULT_FILENAME = -25
-  DEFAULT_LINENUM = 4
-  DEFAULT_FUNCTION = -20
-end    
-
-class Logue::Format
-  def initialize args = Hash.new
-    @file_width = args.fetch :file_width, Logue::FormatWidths::DEFAULT_FILENAME
-    @line_width = args.fetch :line_width, Logue::FormatWidths::DEFAULT_LINENUM
-    @method_width = args.fetch :method_width, Logue::FormatWidths::DEFAULT_FUNCTION
-    @trim = args.fetch :trim, true
-  end
-
-  def copy args
-    values = { file_width: @file_width, line_width: @line_width, method_width: @method_width, trim: @trim }
-    self.class.new values.merge(args)
-  end
-  
-  def format path, lineno, cls, func
-    if cls
-      func = cls.to_s + "#" + func
-    end
-    
-    if @trim
-      path = Logue::PathUtil.trim_right path, @file_width
-      func = Logue::PathUtil.trim_left  func, @method_width
-    end
-    
-    format = "[%#{@file_width}s:%#{@line_width}d] {%#{@method_width}s}"
-    sprintf format, path, lineno, func
-  end
-end

data/lib/logue/writer.rb

@@ -1,24 +0,0 @@
-#!/usr/bin/ruby -w
-# -*- ruby -*-
-
-require 'logue/format'
-
-module Logue
-end
-
-class Logue::Writer
-  attr_accessor :out
-  
-  def initialize out = $stdout
-    @out = out
-  end
-
-  def write fmt, stack, nframes, cls = nil
-    stack[0 ... nframes].each do |frame|
-      path = frame.absolute_path
-      lineno = frame.lineno
-      func = frame.label
-      @out.puts fmt.format path, lineno, cls, func
-    end
-  end
-end