loglevel 0.4.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 27d935b0bba808acac6f2dc481350410698cb44d
-  data.tar.gz: 1434b05ae0a081a45df1dfb0b62f7f3d10ce0100
+  metadata.gz: 9238768a01736d1fd62a8b68251194e02e0d6a54
+  data.tar.gz: e91ec147451f9139c91e46caabb29a13e4f4d670
 SHA512:
-  metadata.gz: 5000a19490bec0ecad39c9f1b9347b695118db51d077f5961b39a6425cc4da7c3053e9bc441335d446d3b162c9a74bab26b9e0f5a4f045e966167ddb378317db
-  data.tar.gz: 3e84eb62bbfb745a499ccedf45eb5e2bb2e1b76861602f74433de3401b309db4dc76e30061e06da30535d07e8fcc38bcc7a60959cf88ece4de7d135f6ae2727a
+  metadata.gz: 54ef918bd27faf39f28c0b32dc65f7df97e31ae54056636cb26794d5504b9342ac72e509c25fe06046d5ebff1acfd9e0a73a72e5a2b1b8746183de2b0cd0a097
+  data.tar.gz: 0a1f1ee68fda6d8a778098cabcc2e3237008870909a015680e83a2810a387c14a9ff10d58b78871b2cf3b52b4a4ba47620d67a7a47cc3d4032deb3ac511a239f

data/lib/loglevel/classes.rb

@@ -19,7 +19,7 @@ class Loglevel
     end
 
     def class_names
-      @class_names ||= passed_class_names | %w(Rails ActiveRecord::Base HttpLogger)
+      @class_names ||= passed_class_names | %w[Rails ActiveRecord::Base HttpLogger]
     end
 
     def passed_class_names

data/lib/loglevel/help.rb

@@ -3,7 +3,7 @@ class Loglevel
   module Help
     def help
       logger.info <<-HELP.gsub('        ', '')
-        Usage: DEBUG=SETTING,SETTING,SETTING rails server
+        Usage: LOGLEVEL=SETTING,SETTING,SETTING rails server
 
         Available settings are as follows:
         HELP      Show these options
@@ -27,11 +27,8 @@ class Loglevel
 
     def debug
       debug = classes.map do |klass|
-        l = klass.logger || Struct.new(:level).new(0)
-        d = l.instance_variable_get('@logdev') || Struct.new(:filename, :dev).new
-        f = d.filename || d.dev.inspect || 'nil'
-        v = l.level.is_a?(0.class) ? self.class::LOGLEVELS[l.level] : 'nil'
-        "#{klass}: logger=#{l.class}, device=#{f}, level=#{v}"
+        l = Loglevel::LoggerAnalyzer.new(klass)
+        "#{klass}: logger=#{l.logger_class}, device=#{l.device_name}, level=#{l.level_name}"
       end
 
       debug.join("\n")

data/lib/loglevel/logger_analyzer.rb

@@ -0,0 +1,40 @@
+# Analyses the logger method of a class
+class Loglevel
+  class LoggerAnalyzer
+    def level_name
+      @level_name ||= Loglevel::LOGLEVELS[level]
+    end
+
+    def level
+      @level ||= logger_level.is_a?(0.class) ? logger_level : 5
+    end
+
+    def logger_level
+      @logger_level ||= logger.level
+    end
+
+    def device_name
+      @device_name ||= logdev.filename || logdev.dev.inspect || 'nil'
+    end
+
+    def logdev
+      @logdev ||= logger.instance_variable_get('@logdev') || Struct.new(:filename, :dev).new
+    end
+
+    def logger_class
+      @logger_class ||= logger.class
+    end
+
+    def logger
+      @logger ||= klass.logger || Struct.new(:level).new(0)
+    end
+
+    private
+
+    attr_reader :klass
+
+    def initialize(klass)
+      @klass = klass
+    end
+  end
+end

data/lib/loglevel/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 class Loglevel
-  VERSION = '0.4.0'.freeze
+  VERSION = '0.4.1'.freeze
 end

data/lib/loglevel.rb

@@ -3,13 +3,14 @@ require 'loglevel/classes'
 require 'loglevel/active_record'
 require 'loglevel/http_logger'
 require 'loglevel/help'
+require 'loglevel/logger_analyzer'
 
 class Loglevel
   ENV_VAR_LEVEL   = 'LOGLEVEL'.freeze
   ENV_VAR_LOGGER  = 'LOGLEVEL_LOGGER'.freeze
   ENV_VAR_DEVICE  = 'LOGLEVEL_DEVICE'.freeze
   ENV_VAR_CLASSES = 'LOGLEVEL_CLASSES'.freeze
-  LOGLEVELS = %w(DEBUG INFO WARN ERROR FATAL UNKNOWN).freeze
+  LOGLEVELS = %w[DEBUG INFO WARN ERROR FATAL UNKNOWN].freeze
 
   class << self
     def setup
@@ -81,8 +82,8 @@ class Loglevel
 
   def logger_class
     Object.const_get logger_class_name
-  rescue NameError => e
-    fail Loglevel::Exception::BadLoggerClass, "Can't find logger class #{logger_class_name} - have you required it?"
+  rescue NameError
+    raise Loglevel::Exception::BadLoggerClass, "Can't find logger class #{logger_class_name} - have you required it?"
   end
 
   def logger_class_name
@@ -94,7 +95,7 @@ class Loglevel
   end
 
   def device
-    %w(STDOUT STDERR).include?(device_name) ? Object.const_get(device_name) : device_name
+    %w[STDOUT STDERR].include?(device_name) ? Object.const_get(device_name) : device_name
   end
 
   def device_name

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: loglevel
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors:
 - Dominic Sayers
@@ -37,6 +37,7 @@ files:
 - lib/loglevel/exception.rb
 - lib/loglevel/help.rb
 - lib/loglevel/http_logger.rb
+- lib/loglevel/logger_analyzer.rb
 - lib/loglevel/version.rb
 - loglevel.gemspec
 - script/console