loggerx 0.3.2 → 0.3.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b94fc11a31ed8efbf76e939a7765325fc226339bdea71edb61c026a16f2dad67
-  data.tar.gz: 48b1a9cca11d4610bdfc1146d5a83076827e8be5b045e3d9c7501b39608734e9
+  metadata.gz: 29aa9e7ab752a0153a70eb61c1bc171f459a8bf617a8e38e7a949ea524aa2c56
+  data.tar.gz: 3e6acd787505a13975d7d81b21309808dc340302cfeae2cf07590ca55ee4dfaf
 SHA512:
-  metadata.gz: 73b6239ea4cbc60897f3017a7ed10b56d2a1de0abbb9aa5a21ef58d5217a88dda7444253d7c4e6b472f96d6e5b3064e41addb76eeb6f3d3d669623373714cefa
-  data.tar.gz: 73d856baf3ab5a92e6415bac098bba6915aaf6a789ea136c5d4a11e015cb0f5337baf70d3ce231903f11f8b1e8cbd4845c530f989c931d0afa0ea3f887c59775
+  metadata.gz: 4efaeecbfd9d0e01617362ddf5dfd734b7cdc4f213ac923e3537b67b2f2b879c6e82e7beef9f0bace475ea8964c201c693906032a104f2ba2adf91c801e75724
+  data.tar.gz: e930573db06a8d9a1524178322a57f173b4212c0f235a4a34dc9c84024853b788db22345a61e4ac3dea7b213e0e3b5dc149c203a8751d931fc335212d90d49e4

data/lib/loggerx/loggerx.rb

@@ -2,31 +2,37 @@
 
 module Loggerx
   class Loggerx
+    # Implementation omitted
     require 'logger'
     require 'fileutils'
     require 'stringio'
 
-    LOG_FILENAME_BASE = "#{Time.now.strftime("%Y%m%d-%H%M%S")}.log".freeze
     @log_file = nil
     @log_stdout = nil
     @stdout_backup = $stdout
     @stringio = StringIO.new(+'', 'w+')
 
-    attr_reader :error_count
+    @valid = false
 
-    def initialize(prefix, fname, log_dir, stdout_flag, level = :info)
+    def ensure_quantum_log_files(log_dir_pn, limit_of_num_of_files, prefix)
+      list = log_dir_pn.children.select { |item| item.basename.to_s.match?("^#{prefix}") }.sort_by(&:mtime)
+      latest_index = list.size - limit_of_num_of_files
+      list[0, latest_index].map(&:unlink) if latest_index.positive?
+    end
+
+    def initialize(prefix, fname, log_dir, stdout_flag, level: :info)
       return if @log_file
 
-      @error_access_count = 0
-      @error_stderror_count = 0
-      level_hs = {
+      @error_count = 0
+      @level_hs = {
         debug: Logger::DEBUG,
         info: Logger::INFO,
         warn: Logger::WARN,
         error: Logger::ERROR,
         fatal: Logger::FATAL,
-        unknown: Logger::UNKNOWN,
+        unknown: Logger::UNKNOWN
       }
+      @log_level = @level_hs[level]
       @log_dir_pn = Pathname.new(log_dir)
 
       @limit_of_num_of_files ||= 5
@@ -37,72 +43,60 @@ module Loggerx
 
       fname = nil if fname == false
       fname = prefix + LOG_FILENAME_BASE if fname == :default
-      @log_file = setup_logger_file(log_dir, fname) if fname
-      # register_log_format(obj)
-      # register_log_level(level_hs[level])
-      level_hs[level]
-    end
+      @log_file = setup_logger_file(@log_file, log_dir, fname) if fname
 
-    def formatter
-      @log_file&.formatter
-      # @log_stdout&.formatter
-    end
-
-    def formatter=(obj)
-      @log_file&.formatter = obj
-      @log_stdout&.formatter = obj
-    end
+      obj = proc do |_, _, _, msg|
+        "#{msg}\n"
+      end
+      register_log_format(obj)
+      register_log_level(@log_level)
 
-    def logger_stdout
-      @log_stdout
-    end
+      @valid = true
 
-    def ensure_quantum_log_files(log_dir_pn, limit_of_num_of_files, prefix)
-      list = log_dir_pn.children.select { |item| item.basename.to_s.match?("^#{prefix}") }.sort_by(&:mtime)
-      latest_index = list.size - limit_of_num_of_files
-      list[0, latest_index].map(&:unlink) if latest_index.positive?
+      Loggerxcm.fatal('fatal')
+      Loggerxcm.debug('debug')
+      Loggerxcm.info('info')
+      Loggerxcm.warn('warn')
+      Loggerxcm.error('error')
+      #        Loggerxcm.unknown("unknown")
     end
 
     def setup_logger_stdout(log_stdout)
       return log_stdout unless log_stdout.nil?
 
       begin
-        log ||= ActiveSupport::TaggedLogging.new($stdout)
-      rescue StandardError
-        @error_stderror_count += 1
+        log_stdout = Logger.new($stdout)
+      rescue StandardError => exc
+        pust exc.message
+        @error_count += 1
       end
-      log
+      log_stdout
     end
 
-    def setup_logger_file(log_dir, fname)
+    def setup_logger_file(log_file, log_dir, fname)
       filepath = Pathname.new(log_dir).join(fname)
-      begin
-        log ||= ActiveSupport::TaggedLogging.new(filepath)
-      rescue Errno::EACCES
-        @error_access_count += 1
-      rescue StandardError
-        @error_stderror_count += 1
+      if log_file.nil?
+        begin
+          log_file = Logger.new(filepath.to_s)
+        rescue Errno::EACCES
+          @error_count += 1
+        rescue StandardError => exc
+          puts exc
+          @error_count += 1
+        end
       end
-      log
-    end
-
-    def level
-      @log_file&.level
-      # @log_stdout&.level
-      # Log4r互換インターフェイス
-      # DEBUG < INFO < WARN < ERROR < FATAL < UNKNOWN
+      log_file
     end
 
-    def level=(value)
-      @log_file&.level = value
-      @log_stdout&.level = value
-      # Log4r互換インターフェイス
-      # DEBUG < INFO < WARN < ERROR < FATAL < UNKNOWN
+    def register_log_format(obj)
+      @log_file&.formatter = obj
+      @log_stdout&.formatter = obj
     end
 
-    def register_log_level(level)
-      @log_file&.level = level
-      @log_stdout&.level = level
+    def register_log_level(log_level)
+      @log_file.level = log_level
+      @log_stdout.level = log_level
+      #
       # Log4r互換インターフェイス
       # DEBUG < INFO < WARN < ERROR < FATAL < UNKNOWN
     end
@@ -112,10 +106,10 @@ module Loggerx
         @stdout_backup ||= $stdout
         @stringio ||= StringIO.new(+'', 'w+')
         $stdout = @stringio
-        $stdout = @stdout_backup
         @stringio.rewind
         str = @stringio.read
         @stringio.truncate(0)
+        $stdout = @stdout_backup
         str
       else
         value
@@ -123,17 +117,27 @@ module Loggerx
     end
 
     def show(value)
-      puts(value)
-      str = error_sub(value)
-      # puts(str) unless @log_stdout
-      puts(str) # unless @log_stdout
+      if @valid
+        if value.instance_of?(Array)
+          value.map do |v|
+            str = v.to_s
+            Util.puts_valid_str(str)
+          end
+        else
+          Util.puts_valid_str(str)
+        end
+        str = error_sub(value)
+        Util.puts_valid_str(str)
+      end
       true
     end
 
     def error_sub(value)
       str = to_string(value)
-      @log_file&.error(str)
-      @log_stdout&.error(str)
+      if @valid
+        @log_file&.error(str)
+        @log_stdout&.error(str)
+      end
       str
     end
 
@@ -144,140 +148,50 @@ module Loggerx
 
     def debug(value)
       str = to_string(value)
-      @log_file&.debug(str)
-      @log_stdout&.debug(str)
+      if @valid
+        @log_file&.debug(str)
+        @log_stdout&.debug(str)
+      end
+
       true
     end
 
     def info(value)
       str = to_string(value)
-      @log_file&.info(str)
-      @log_stdout&.info(str)
+      if @valid
+        @log_file&.info(str)
+        @log_stdout&.info(str)
+      end
       true
     end
 
     def warn(value)
       str = to_string(value)
-      @log_file&.warn(str)
-      @log_stdout&.warn(str)
+      if @valid
+        @log_file&.warn(str)
+        @log_stdout&.warn(str)
+      end
       true
     end
 
     def fatal(value)
       str = to_string(value)
-      @log_file&.fatal(str)
-      @log_stdout&.fatal(str)
+      if @valid
+        @log_file&.fatal(str)
+        @log_stdout&.fatal(str)
+      end
       true
     end
 
     def close
-      @log_file&.close
-      # @log_stdout&.close
-    end
-
-    class << self
-      def ensure_quantum_log_files(log_dir_pn, limit_of_num_of_files, prefix)
-        @log_file.ensure_quantum_log_files(log_dir_pn, limit_of_num_of_files, prefix)
-      end
-
-      def hash_to_args(hash)
-        prefix = hash['prefix']
-        log_dir_pn = Pathname.new(hash['log_dir'])
-
-        stdout_flag_str = hash['stdout_flag']
-        stdout_flag = if stdout_flag_str.instance_of?(String)
-                        case stdout_flag_str
-                        when 'true'
-                          true
-                        else
-                          false
-                        end
-                      else
-                        stdout_flag_str
-                      end
-
-        fname_str = hash['fname']
-        fname = case fname_str
-                when 'default'
-                  fname_str.to_sym
-                when 'false'
-                  false
-                else
-                  fname_str
-                end
-
-        level = hash['level'].to_sym
-
-        [prefix, fname, log_dir_pn, stdout_flag, level]
-      end
-
-      def create_by_hash(hash)
-        prefix, fname, log_dir_pn, stdout_flag, level = hash_to_args(hash)
-        Loggerx.new(prefix, fname, log_dir_pn, stdout_flag, level)
-      end
-
-      def init_by_hash(hash)
-        prefix, fname, log_dir_pn, stdout_flag, level = hash_to_args(hash)
-        init(prefix, fname, log_dir_pn, stdout_flag, level)
-      end
-
-      def init(prefix, fname, log_dir, stdout_flag, level = :info)
-        return if @log_file
-
-        @log_file = new(prefix, fname, log_dir, stdout_flag, level)
-      end
-
-      def setup_logger_stdout(log_stdout)
-        @log_file.setup_logger_stdout(log_stdout)
-      end
-
-      def setup_logger_file(log_dir, fname)
-        @log_file.setup_logger_file(log_dir, fname)
-      end
-
-      def register_log_format(obj)
-        @log_file.register_log_format(obj)
-      end
+      retrun unless @valid
 
-      def register_log_level(level)
-        @log_file.register_log_level(level)
-      end
-
-      def to_string(value)
-        @log_file.to_string(value)
-      end
-
-      def show(value)
-        @log_file.show(value)
-      end
-
-      def error_sub(value)
-        @log_file.error_sub(value)
-      end
-
-      def error(value)
-        @log_file.error(value)
-      end
-
-      def debug(value)
-        @log_file.debug(value)
-      end
-
-      def info(value)
-        @log_file.info(value)
-      end
-
-      def warn(value)
-        @log_file.warn(value)
-      end
-
-      def fatal(value)
-        @log_file.fatal(value)
-      end
+      @log_file&.close
+      @log_file = nil
+      @log_stdout = nil
 
-      def close
-        @log_file&.close
-      end
+      @valid = false
+      # @log_stdout&.close
     end
   end
-end
+end 

data/lib/loggerx/loggerxcm.rb

@@ -23,15 +23,19 @@ module Loggerx
     require 'fileutils'
     require 'stringio'
 
-    LOG_FILENAME_BASE = "#{Time.now.strftime('%Y%m%d-%H%M%S')}.log".freeze
+    # LOG_FILENAME_BASE = "#{Time.now.strftime('%Y%m%d-%H%M%S')}.log".freeze
     @log_file = nil
     @log_stdout = nil
     @stdout_backup = $stdout
-    @stringio = StringIO.new(+"", 'w+')
+    @stringio = StringIO.new(+'', 'w+')
 
     @valid = false
 
     class << self
+      def valid?
+        @valid
+      end
+
       def ensure_quantum_log_files(log_dir_pn, limit_of_num_of_files, prefix)
         list = log_dir_pn.children.select { |item| item.basename.to_s.match?("^#{prefix}") }.sort_by(&:mtime)
         latest_index = list.size - limit_of_num_of_files
@@ -50,6 +54,7 @@ module Loggerx
           fatal: Logger::FATAL,
           unknown: Logger::UNKNOWN
         }
+        @log_level = level_hs[level]
         @log_dir_pn = Pathname.new(log_dir)
 
         @limit_of_num_of_files ||= 5
@@ -66,15 +71,15 @@ module Loggerx
           "#{msg}\n"
         end
         register_log_format(obj)
-        register_log_level(level_hs[level])
+        register_log_level(@log_level)
 
         @valid = true
 
-        Loggerxcm.fatal("fatal")
-        Loggerxcm.debug("debug")
-        Loggerxcm.info("info")
-        Loggerxcm.warn("warn")
-        Loggerxcm.error("error")
+        Loggerxcm.fatal('fatal')
+        Loggerxcm.debug('debug')
+        Loggerxcm.info('info')
+        Loggerxcm.warn('warn')
+        Loggerxcm.error('error')
         #        Loggerxcm.unknown("unknown")
       end
 
@@ -110,10 +115,9 @@ module Loggerx
         @log_stdout&.formatter = obj
       end
 
-      def register_log_level(level)
-        puts "============ Loggerxcm.register_log_level level=#{level} ==========="
-        @log_file&.level = level
-        @log_stdout&.level = level
+      def register_log_level(log_level)
+        # @log_file&.level = log_level
+        # @log_stdout&.level = log_level
         #
         # Log4r互換インターフェイス
         # DEBUG < INFO < WARN < ERROR < FATAL < UNKNOWN
@@ -122,7 +126,7 @@ module Loggerx
       def to_string(value)
         if value.instance_of?(Array)
           @stdout_backup ||= $stdout
-          @stringio ||= StringIO.new(+"", 'w+')
+          @stringio ||= StringIO.new(+'', 'w+')
           $stdout = @stringio
           @stringio.rewind
           str = @stringio.read

data/lib/loggerx/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Loggerx
-  VERSION = '0.3.2'
+  VERSION = '0.3.5'
 end

data/lib/loggerx.rb

@@ -8,4 +8,5 @@ module Loggerx
   class Error < StandardError; end
 
   # Your code goes here...
+  LOG_FILENAME_BASE = "#{Time.now.strftime('%Y%m%d-%H%M%S')}.log".freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: loggerx
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.3.5
 platform: ruby
 authors:
 - ykominami
@@ -27,7 +27,6 @@ files:
 - Rakefile
 - SECURITY.md
 - lib/loggerx.rb
-- lib/loggerx/loggerx.code-workspace
 - lib/loggerx/loggerx.rb
 - lib/loggerx/loggerxcm.rb
 - lib/loggerx/version.rb

data/lib/loggerx/loggerx.code-workspace

@@ -1,8 +0,0 @@
-{
-	"folders": [
-		{
-			"path": "../.."
-		}
-	],
-	"settings": {}
-}