extended-logger 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 04c42a1f441f494d24cd679dd976708be64aa427
-  data.tar.gz: 6df62ebef815689873aaeb6a06a0871fa3f08683
+  metadata.gz: 1f2713c515733dc13f51bf477ac74c0c9f0ca10b
+  data.tar.gz: c5e036c168e6f6fe60cf61aca39651622ff2c90c
 SHA512:
-  metadata.gz: 360523b782677d1ee1b9d047296dabad796437ef2323dc2c3c72647557b772d37937d504abfefde0be4e118875498098f14210b17b3d5d8351c7fb741e1a02cc
-  data.tar.gz: 84c9ec6267c63090142cf11be93e5470d8775222a30b7d7f4a0383220a1024226e27868c432c645186a05e8dd1382941ec2ace6514569ab09f4365c4e4f9563b
+  metadata.gz: 43e937e9ff1752630a29c230850da54a4a3596b9baf24bb472f9cc0c9fa2fce50c37b1fedbd73de6d315c37d174a40b3271d085f42bf60a4fcb0607eee1d3f67
+  data.tar.gz: 8057fe6a05cd17779e1d57e8b1060e7362746e8d2b46e317bd1e9208293fe8c79ed7b89a7f6d5624fd0219fde869de77491b4055c4e9b4258b5d068b0762bde8

data/lib/extended_logger.rb

@@ -3,4 +3,3 @@ require 'logger'
 require 'extended_logger/extended_logger'
 require 'extended_logger/factory'
 require 'extended_logger/formatter'
-require 'extended_logger/colored_formatter'

data/lib/extended_logger/extended_logger.rb

@@ -27,27 +27,34 @@ class ExtendedLogger < Logger
   end
 
   def self.levels
-    (-5..6)
+    @levels ||= {
+      -7 => 'OBSOLETE'.freeze,
+      -6 => 'DATA'.freeze,
+      -5 => 'TRACE'.freeze,
+      -4 => 'DEBUG'.freeze,
+      -3 => 'OPT_DATA'.freeze,
+      -2 => 'OPT_TRACE'.freeze,
+      -1 => 'OPT_DEBUG'.freeze,
+      0 => 'INFO'.freeze,
+      1 => 'PASS'.freeze,
+      2 => 'FAIL'.freeze,
+      3 => 'FOCUS'.freeze,
+      4 => 'WARN'.freeze,
+      5 => 'ERROR'.freeze,
+      6 => 'FATAL'.freeze,
+    }
   end
 
-  def data *arguments, &block
-    add -2, *arguments, &block
+  def self.level? level
+    levels.key? level
   end
 
   def format_severity severity
-    unless self.class.levels.include? severity
+    unless self.class.level? severity
       Kernel.warn "(extended-logger) Unknown log severity level #{severity.inspect}"
     end
 
-    case severity
-    when -5 then 'OBS_DATA'.freeze
-    when -4 then 'OBS_TRACE'.freeze
-    when -3 then 'OBS_DEBUG'.freeze
-    when -2 then 'DATA'.freeze
-    when -1 then 'TRACE'.freeze
-    when 6 then 'FOCUS'.freeze
-    else super
-    end
+    self.class.levels.fetch severity, 'ANY'.freeze
   end
 
   def io
@@ -55,23 +62,13 @@ class ExtendedLogger < Logger
     @logdev.dev
   end
 
-  def obs_data *arguments, &block
-    add -5, *arguments, &block
-  end
-
-  def obs_debug *arguments, &block
-    add -3, *arguments, &block
-  end
-
-  def obs_trace *arguments, &block
-    add -4, *arguments, &block
-  end
-
-  def trace *arguments, &block
-    add -1, *arguments, &block
+  def unknown *arguments, &block
+    add 7, *arguments, &block
   end
 
-  def focus *arguments, &block
-    add 6, *arguments, &block
+  levels.each do |level, name|
+    define_method name.downcase do |*arguments, &block|
+      add level, *arguments, &block
+    end
   end
 end

data/lib/extended_logger/factory.rb

@@ -19,20 +19,18 @@ class ExtendedLogger
     def call
       logger = ExtendedLogger.new device
 
-      if colors? logger.io
-        logger.formatter = ColoredFormatter.new
-      else
-        logger.formatter = Formatter.new
-      end
+      formatter = Formatter.new
+      formatter.palette = Formatter.default_palette if colors? logger.io
+      logger.formatter = formatter
 
       logger
     end
 
     def colors? io
       if io.tty?
-        ENV['LOGGER_COLORS'] != 'off'
+        ENV['LOGGER_COLOR'] != 'off'
       else
-        ENV['LOGGER_COLORS'] == 'on'
+        ENV['LOGGER_COLOR'] == 'on'
       end
     end
 

data/lib/extended_logger/formatter.rb

@@ -1,9 +1,21 @@
 class ExtendedLogger
   class Formatter
     attr_writer :logger_formatter
+    attr_writer :palette
 
-    def call *arguments
-      delegate *arguments
+    def call severity, *arguments
+      log_entry = delegate severity, *arguments
+      color log_entry, severity
+    end
+
+    def color log_entry, severity
+      colorizer = palette[severity]
+
+      if colorizer
+        log_entry = "#{colorizer}#{log_entry}\e[0m"
+      end
+
+      log_entry
     end
 
     def delegate *arguments, message
@@ -35,5 +47,43 @@ class ExtendedLogger
     def logger_formatter
       @logger_formatter ||= Logger::Formatter.new
     end
+
+    def palette
+      @palette ||= {}
+    end
+
+    def self.ansi_colors
+      @ansi_colors ||= %i(black red green yellow blue magenta cyan white)
+    end
+
+    def self.col fg, brightness, bg=nil
+      brightness = { :bright => 1, :normal => 0 }.fetch brightness
+      escape = "\e[#{brightness};3#{ansi_colors.index fg}m"
+
+      if bg
+        escape << "\e[4#{ansi_colors.index bg}m"
+      end
+
+      escape
+    end
+
+    def self.default_palette
+      @default_palette ||= {
+        'OBSOLETE' => col(:black, :normal),
+        'DATA' => col(:green, :normal),
+        'TRACE' => col(:cyan, :normal),
+        'DEBUG' => col(:blue, :normal),
+        'OPT_DATA' => col(:green, :normal, :white),
+        'OPT_TRACE' => col(:cyan, :normal, :white),
+        'OPT_DEBUG' => col(:blue, :normal, :white),
+        'PASS' => col(:white, :bright, :green),
+        'FAIL' => col(:white, :bright, :red),
+        'FOCUS' => col(:white, :bright, :blue),
+        'WARN' => col(:yellow, :normal),
+        'ERROR' => col(:red, :normal),
+        'FATAL' => col(:black, :bright, :red),
+        'ANY' => col(:white, :bright, :magenta),
+      }
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: extended-logger
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Nathan Ladd
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-18 00:00:00.000000000 Z
+date: 2015-12-19 00:00:00.000000000 Z
 dependencies: []
 description: |
   extended-logger provides a richer logger implementation than the built in ruby
@@ -21,7 +21,6 @@ extensions: []
 extra_rdoc_files: []
 files:
 - lib/extended_logger.rb
-- lib/extended_logger/colored_formatter.rb
 - lib/extended_logger/extended_logger.rb
 - lib/extended_logger/factory.rb
 - lib/extended_logger/formatter.rb

data/lib/extended_logger/colored_formatter.rb

@@ -1,51 +0,0 @@
-class ExtendedLogger
-  class ColoredFormatter < Formatter
-    ANSI_COLORS = %i(black red green yellow blue magenta cyan white)
-
-    attr_writer :palette
-
-    def bg *args
-      col :bg, *args
-    end
-
-    def call *arguments
-      log_entry = delegate *arguments
-
-      severity = arguments.fetch 0
-      colorizer = palette.fetch severity do
-        -> message { message }
-      end
-
-      instance_exec log_entry, &colorizer
-    end
-
-    def col fgbg, color_code, intensity_code, str
-      color_num = ANSI_COLORS.index color_code
-      intensity_num = { :normal => 0, :bright => 1 }.fetch intensity_code
-      fgbg_num = { :fg => 3, :bg => 4 }.fetch fgbg
-      "\e[#{intensity_num};#{fgbg_num}#{color_num}m#{str}\e[0m"
-    end
-
-    def fg *args
-      col :fg, *args
-    end
-
-    def default_palette
-      @@default_palette ||= {
-        'FOCUS' => -> msg { bg(:blue, :normal, fg(:white, :bright, msg)) },
-        'ANY' => -> msg { bg(:cyan, :normal, fg(:white, :bright, msg)) },
-        'FATAL' => -> msg { bg(:red, :bright, fg(:white, :bright, msg)) },
-        'ERROR' => -> msg { fg(:red, :bright, msg) },
-        'WARN' => -> msg { fg(:yellow, :normal, msg) },
-        'INFO' => -> msg { fg(:green, :normal, msg) },
-        'DEBUG' => -> msg { fg(:blue, :normal, msg) },
-        'TRACE' => -> msg { fg(:magenta, :bright, msg) },
-        'DATA' => -> msg { fg(:cyan, :normal, msg) }
-      }
-    end
-
-    def palette
-      @palette || default_palette
-    end
-  end
-end