unclekryon 0.4.9.pre.alpha → 0.4.12.pre.alpha

data/lib/unclekryon/log.rb

@@ -1,23 +1,11 @@
-#!/usr/bin/env ruby
 # encoding: UTF-8
 # frozen_string_literal: true
 
 #--
 # This file is part of UncleKryon-server.
-# Copyright (c) 2017-2019 Jonathan Bradley Whited (@esotericpig)
-# 
-# UncleKryon-server is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-# 
-# UncleKryon-server is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-# 
-# You should have received a copy of the GNU General Public License
-# along with UncleKryon-server.  If not, see <https://www.gnu.org/licenses/>.
+# Copyright (c) 2017-2021 Jonathan Bradley Whited
+#
+# SPDX-License-Identifier: GPL-3.0-or-later
 #++
 
 
@@ -27,83 +15,83 @@ require 'singleton'
 module UncleKryon
   class UncleKryonLogger < Logger
     def initialize
-      super(STDOUT)
-      
-      @progname = self.class.to_s()
+      super($stdout)
+
+      @progname = self.class.to_s
     end
-    
+
     def build_message(message,error: nil,**options)
       # Don't use mutable methods
-      message += error.backtrace().map(){|e| "\n  > " + e}.join('') if !error.nil?
-      
+      message += error.backtrace.map{|e| "\n  > " + e}.join('') if !error.nil?
+
       return message
     end
-    
+
     def error(message,error: nil,**options)
       super(build_message(message,error: error,**options))
     end
-    
+
     def fatal(message,error: nil,**options)
       super(build_message(message,error: error,**options))
     end
-    
+
     def unknown(message,error: nil,**options)
       super(build_message(message,error: error,**options))
     end
-    
+
     def warn(message,error: nil,**options)
       super(build_message(message,error: error,**options))
     end
   end
-  
+
   # Global for non-class use
   class Log < UncleKryonLogger
     include Singleton
-    
+
     # Do NOT define vars here; had problems with @dev/@test breaking this class
   end
-  
+
   # Mixin for class use
   module Logging
-    def init_log()
+    def init_log
     end
-    
-    def log()
+
+    def log
       if !@log
-        @log = UncleKryonLogger.new()
-        @log.progname = self.class.to_s()
-        
-        init_log()
+        @log = UncleKryonLogger.new
+        @log.progname = self.class.to_s
+
+        init_log
       end
       return @log
     end
   end
 end
 
-if $0 == __FILE__
+if $PROGRAM_NAME == __FILE__
   class Tester
     include UncleKryon::Logging
-    
-    def init_log()
-      @log.progname.prepend("[Risky]")
+
+    def init_log
+      @log.progname.prepend('[Risky]')
     end
-    
-    def take_risk()
+
+    def take_risk
       log.fatal('Risky! Risky! Risky!')
     end
   end
-  
+
   begin
-    t = Tester.new()
-    t.take_risk()
-    
+    t = Tester.new
+    t.take_risk
+
     raise 'Oops!'
   rescue StandardError => e
     UncleKryon::Log.instance.error(e.message,error: e)
     UncleKryon::Log.instance.fatal(e.message,error: e)
     UncleKryon::Log.instance.unknown(e.message,error: e)
     UncleKryon::Log.instance.warn(e.message,error: e)
-    
+
     UncleKryon::Log.instance.warn("Don't Worry") do
       'This still works'
     end