legion-logging 1.1.2 → 1.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9b1efb3d106b47fa7884d216f0e819c43b34ea467fff711b8bbe36e3f1be4f94
-  data.tar.gz: 20dbffbebd7804d5ad1e7bd21fbc141fb486d99f1a06973acc1099d1e1e53b3c
+  metadata.gz: 2c23b52e80d98a8fe9dd57a6c035ae3a1dbf944c36df1dcb75e4a40579cc6877
+  data.tar.gz: f033aaa8333c5b732bf8d7fea044f3b1a763f93e1e6e6f505fd96bbe5c3fa9f3
 SHA512:
-  metadata.gz: 5f9bef85e2f2d2dd84989c57f7b210f17cb54d62bc9e82dfd19ac0bc8ab001e15716efd8391c3318b9dffde62c22d4218b454aa5c7024dd97bebaffbd771bece
-  data.tar.gz: bbb5b895500262914283b570dcd70ecfacb852bf35656e5bdffce7188e902204f3ee0312a19a24c57e38d630a1acda584959b69ad3de48fa9fc9c438236d44cc
+  metadata.gz: b41978935615219e45cdf4df3c3c519fd2a5bcce8a56b435f6b582e6d0ae7c54ec76ca31aa1da431f705909572c1afccfd59b91979e9d934559a5ac4180a8b2a
+  data.tar.gz: 2ab09da5cb65c19b11ea68501b96bf358ad2d3c1db6fe590460e5cdf242f63b6de0a9987a67c31e9bafbf0e6c9287f9255db273f180d12d8fb8cc7c6fb338db2

data/.rubocop.yml

@@ -6,6 +6,8 @@ Metrics/ClassLength:
   Max: 1500
 Metrics/BlockLength:
   Max: 75
+Metrics/CyclomaticComplexity:
+  Max: 10
 Layout/SpaceAroundEqualsInParameterDefault:
   EnforcedStyle: space
 Style/SymbolArray:

data/lib/legion/logging.rb

@@ -11,11 +11,7 @@ module Legion
     class << self
       include Legion::Logging::Methods
       include Legion::Logging::Builder
-      attr_reader :log, :color
-
-      def level
-        @log.level
-      end
+      attr_reader :color
 
       def setup(level: 'info', **options)
         output(options)

data/lib/legion/logging/builder.rb

@@ -1,7 +1,7 @@
 module Legion
   module Logging
     module Builder
-      def log_format(options = {}, log = @log) # rubocop:disable Metrics/AbcSize
+      def log_format(options = {}) # rubocop:disable Metrics/AbcSize
         log.formatter = proc do |severity, datetime, _progname, msg|
           options[:lex_name] = options.key?(:lex) ? "[lex-#{options[:lex]}]" : nil
           unless options[:lex_name].nil?
@@ -28,21 +28,41 @@ module Legion
         @log = ::Logger.new(options[:log_file]) unless options[:log_file].nil?
       end
 
-      def log_level(level = 'info', log = @log)
-        case level
-        when 'trace'
-          log.level = ::Logger::INFO
-        when 'debug'
-          log.level = ::Logger::DEBUG
-        when 'info'
-          log.level = ::Logger::INFO
-        when 'warn'
-          log.level = ::Logger::WARN
-        when 'error'
-          log.level = ::Logger::ERROR
-        when 'fatal'
-          log.level = ::Logger::FATAL
-        end
+      def log
+        @log ||= set_log
+      end
+
+      def set_log(logfile: nil, **)
+        @log = logfile.nil? ? ::Logger.new($stdout) : ::Logger.new(logfile)
+      end
+
+      def level
+        log.level
+      end
+
+      def log_level(level = 'info')
+        log.level = case level
+                    when 'trace'
+                      ::Logger::DEBUG
+                    when 'debug'
+                      ::Logger::DEBUG
+                    when 'info'
+                      ::Logger::INFO
+                    when 'warn'
+                      ::Logger::WARN
+                    when 'error'
+                      ::Logger::ERROR
+                    when 'fatal'
+                      ::Logger::FATAL
+                    when nil
+                      42
+                    else
+                      if level.is_a? Integer
+                        level
+                      else
+                        0
+                      end
+                    end
         @log = log
       end
     end

data/lib/legion/logging/logger.rb

@@ -10,7 +10,7 @@ module Legion
       include Legion::Logging::Builder
 
       def initialize(level: 'info', log_file: nil, lex: nil, trace: false, extended: false, trace_size: 4, **opts) # rubocop:disable Metrics/ParameterLists
-        output(logfile: log_file)
+        set_log(logfile: log_file)
         log_level(level)
         log_format(lex: lex, extended: extended, **opts)
         @color = opts[:color]

data/lib/legion/logging/methods.rb

@@ -1,7 +1,7 @@
 module Legion
   module Logging
     module Methods
-      def trace(raw_message = nil, log = @log, size: @trace_size, log_caller: true) # rubocop:disable  Metrics/AbcSize
+      def trace(raw_message = nil, size: @trace_size, log_caller: true) # rubocop:disable  Metrics/AbcSize
         return unless @trace_enabled
 
         raw_message = yield if raw_message.nil? && block_given?
@@ -15,7 +15,7 @@ module Legion
         log.unknown(message)
       end
 
-      def debug(message = nil, log = @log)
+      def debug(message = nil)
         return unless log.level < 1
 
         message = yield if message.nil? && block_given?
@@ -23,7 +23,7 @@ module Legion
         log.debug(message)
       end
 
-      def info(message = nil, log = @log)
+      def info(message = nil)
         return unless log.level < 2
 
         message = yield if message.nil? && block_given?
@@ -31,7 +31,7 @@ module Legion
         log.info(message)
       end
 
-      def warn(message = nil, log = @log)
+      def warn(message = nil)
         return unless log.level < 3
 
         message = yield if message.nil? && block_given?
@@ -39,7 +39,7 @@ module Legion
         log.warn(message)
       end
 
-      def error(message = nil, log = @log)
+      def error(message = nil)
         return unless log.level < 4
 
         message = yield if message.nil? && block_given?
@@ -47,7 +47,7 @@ module Legion
         log.error(message)
       end
 
-      def fatal(message = nil, log = @log)
+      def fatal(message = nil)
         return unless log.level < 5
 
         message = yield if message.nil? && block_given?
@@ -55,7 +55,7 @@ module Legion
         log.fatal(message)
       end
 
-      def unknown(message = nil, log = @log)
+      def unknown(message = nil)
         message = yield if message.nil? && block_given?
         message = Rainbow(message).purple if @color
         log.unknown(message)

data/lib/legion/logging/version.rb

@@ -1,5 +1,5 @@
 module Legion
   module Logging
-    VERSION = '1.1.2'.freeze
+    VERSION = '1.1.3'.freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: legion-logging
 version: !ruby/object:Gem::Version
-  version: 1.1.2
+  version: 1.1.3
 platform: ruby
 authors:
 - Esity
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-10-15 00:00:00.000000000 Z
+date: 2020-10-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler