logger-logging 0.9.1 → 0.9.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2715dddd09be9273911ce809178b1005e1316ebf
-  data.tar.gz: 3a986841694875c941e3fe3ce9e8704d6b21d604
+  metadata.gz: d3d9b850d7b6504436f37025a32e0cf5852c3199
+  data.tar.gz: 1ab5d3e62bd3263ff44a88dd15a000aa241c5366
 SHA512:
-  metadata.gz: 2a439dc9d9f2b1faba53c5deb3cc03b5868de5d76af9ff5c1d5ff7794699041ace356545bb8f4e38dc8317337c6641a52b6aff93a58559613e5fb3b6f2b60367
-  data.tar.gz: 6fedac0061944f7ed7cc5d00d70aed1d3c0e6d5af4dd8f52ca1adbd77a173b411946336bb62967bdc2ee18b2a6127215b456f9ced3b92a8ae77744e8d564b2bd
+  metadata.gz: 1e79502808ac4ea93020e1b1fe8aa5d7c076c1ce16fb7ff94e09fae03c3f4ea2587c8fd7eed66e0b23b3a4a9bc21158051c580de7a1b8eb9156bf35f259ec814
+  data.tar.gz: 7aa79aa2e311218e704d49924b7b664b9ba636681b50c4296a2eedcb7d62f63b1ed0707b63f05a418c3b39de51de87bc991cbb24fd7114ad17f27643db2d7ef3

data/lib/logger/logging.rb

@@ -3,17 +3,30 @@ require "logger"
 module Logger::Logging
   autoload :ColoredLogger, "logger/logging/colored_logger"
   autoload :ExtendedLogger, "logger/logging/extended_logger"
-  autoload :Resolver, "logger/logging/resolver"
+  autoload :Factory, "logger/logging/factory"
+
+  def self.configure receiver, env: nil
+    if env
+      receiver.logger = Factory.(env)
+    else
+      receiver.logger = instance
+    end
+    nil
+  end
+
+  def self.instance
+    @logger ||= Factory.()
+  end
 
   def logger= logger
     if logger
-      logger = Resolver.(logger)
-
       if self.is_a? Module
         logger.progname = "(#{self.name})"
       else
         logger.progname = "(#{self.class.name})"
       end
+
+      logger
     end
 
     @logger = logger

data/lib/logger/logging/extended_logger.rb

@@ -8,12 +8,28 @@ module Logger::Logging
       end
     end
 
-    def trace progname = nil, &block
-      add -1, nil, progname, &block
+    def trace message_or_progname = nil, &block
+      add -1, nil, message_or_progname, &block
     end
 
-    def data progname = nil, &block
-      add -2, nil, progname, &block
+    def data message_or_progname = nil, &block
+      if block_given?
+        progname = message_or_progname
+        message = yield
+      else
+        message = message_or_progname
+      end
+
+      message.each_line "\n" do |line|
+        if line == "\n"
+          line = "\\n"
+        else
+          line.gsub! "\r", "\\r"
+          line.chomp!
+        end
+
+        add -2, nil, line
+      end
     end
 
     def io

data/lib/logger/logging/factory.rb

@@ -0,0 +1,61 @@
+module Logger::Logging
+  class Factory
+    attr_reader :env
+
+    def initialize env
+      @env = env
+    end
+
+    def self.call env = nil
+      env ||= ENV
+      instance = new env
+      instance.()
+    end
+
+    def call
+      logger = logger_class.new device
+      logger.level = level
+      logger
+    end
+
+    def device
+      @device ||=
+        begin
+          path = env.fetch "LOG_DEVICE" do "/dev/stdout" end
+          if path.is_a? String then File.open path, "a" else path end
+        end
+    end
+
+    def level
+      @level ||=
+        begin
+          level_name = env.fetch "LOG_LEVEL" do "WARN" end
+          level_name = level_name.upcase
+
+          if Logger.const_defined? level_name
+            Logger.const_get level_name
+          else
+            {
+              "DATA" => -2,
+              "TRACE" => -1,
+            }.fetch level_name
+          end
+        end
+    end
+
+    def logger_class
+      if coloring? then ColoredLogger else ExtendedLogger end
+    end
+
+    def coloring?
+      return @coloring unless @coloring.nil?
+      @coloring =
+        begin
+          use_colors = env.fetch "LOG_COLOR" do
+            if device.tty? then "on" else "off" end
+          end
+          use_colors == "on"
+        end
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: logger-logging
 version: !ruby/object:Gem::Version
-  version: 0.9.1
+  version: 0.9.3
 platform: ruby
 authors:
 - Nathan Ladd
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-19 00:00:00.000000000 Z
+date: 2015-10-17 00:00:00.000000000 Z
 dependencies: []
 description: Logging module that adds colored logging to any class and puts the class
   name in the log output for easy grepping
@@ -20,7 +20,7 @@ files:
 - lib/logger/logging.rb
 - lib/logger/logging/colored_logger.rb
 - lib/logger/logging/extended_logger.rb
-- lib/logger/logging/resolver.rb
+- lib/logger/logging/factory.rb
 homepage: https://github.com/ntl/logger-logging
 licenses:
 - MIT

data/lib/logger/logging/resolver.rb

@@ -1,22 +0,0 @@
-module Logger::Logging
-  class Resolver
-    def self.call logger
-      if logger.is_a? ExtendedLogger
-        logger
-      elsif logger.is_a? Logger
-        logdev = logger.instance_variable_get :@logdev
-        device = logdev.dev
-        if device.tty?
-          new_logger = ColoredLogger.new device
-        else
-          new_logger = ExtendedLogger.new device
-        end
-        new_logger.level = logger.level
-        new_logger.progname = logger.progname
-        new_logger
-      else
-        raise ArgumentError, "could not resolve logger for #{logger.inspect}"
-      end
-    end
-  end
-end