loggerx 0.1.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 219b8c59ad0049727c7e48f9f584b3bb11ac921be02321cfff210fbe9e0deb6e
-  data.tar.gz: 39aef55cc7d8974ceb884c230931786cfcaa55c9348b7a77b7492da9788d0e90
+  metadata.gz: ef752536a65e45147353b942c929a06694dbe744ab5482ad9eb51eed26e9a739
+  data.tar.gz: 53f9e598326aa28f1ab8abdd06434c1f268863d9e77d7096c1552fdcb5138b87
 SHA512:
-  metadata.gz: 7446cd0e041c013939338ccfa3d673a323a5dab2118b46a6071d62a8f73310e1867fcb12bb6619ad82d3b82a7e75765d3a2c20fc88febe3726bc55c94881a484
-  data.tar.gz: f49d1ca3e640f7e35116c51f64539136cef6efef0a5af9ae699bb872cd0489c9271b38b6f8865165e710e87facd33d755186110d3ab78c64af126b64689280fa
+  metadata.gz: b6655835b8695913f29fd84e94fcf1700dba61951a24fb32e2d0cb567ff20c340068f0e4f0a56957ce7a1ba697fcace8878a31af69c4c2e3402f0765960ed4ad
+  data.tar.gz: 4e445fa4b53d19d360325da3e09f190c2959e867d74ed912598bec47aa48dc114b4159eba4f3b8a702a124fa65b091ffbeaea9dc0bfee1cddd693e3f56993535

data/.rubocop.yml

@@ -0,0 +1,36 @@
+inherit_from: .rubocop_todo.yml
+
+require: 
+  - rubocop-rspec
+  - rubocop-rake
+
+AllCops:
+  NewCops: enable
+  TargetRubyVersion: 3.1
+
+Style/StringLiterals:
+  Enabled: true
+  EnforcedStyle: double_quotes
+
+Style/StringLiteralsInInterpolation:
+  Enabled: true
+  EnforcedStyle: double_quotes
+
+Layout/LineLength:
+  Max: 120
+
+#追加
+Style/FrozenStringLiteralComment:
+  Enabled: false
+
+Style/Documentation:
+  Enabled: false
+Style/ClassAndModuleChildren:
+  Enabled: false
+Style/GuardClause:
+  Enabled: false
+Style/IfUnlessModifier: 
+  Enabled: false
+
+Metrics/ClassLength:
+  Enabled: false

data/lib/loggerx/loggerx.rb

@@ -6,19 +6,19 @@ module Loggerx
     require "fileutils"
     require "stringio"
 
-    LOG_FILENAME_BASE = "#{Time.now.strftime("%Y%m%d-%H%M%S")}.log"
+    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+")
-    #@limit_of_num_of_files ||= 3
 
     attr_reader :error_count
 
     def initialize(prefix, fname, log_dir, stdout_flag, level = :info)
       return if @log_file
 
-      @error_count = 0
+      @error_access_count = 0
+      @error_stderror_count = 0
       level_hs = {
         debug: Logger::DEBUG,
         info: Logger::INFO,
@@ -39,12 +39,14 @@ module Loggerx
       fname = prefix + LOG_FILENAME_BASE if fname == :default
       @log_file = setup_logger_file(log_dir, fname) if fname
 
-      obj = proc do |_, _, _, msg| "#{msg}\n" end
+      obj = proc do |_, _, _, msg|
+        "#{msg}\n"
+      end
       register_log_format(obj)
       register_log_level(level_hs[level])
     end
 
-    def get_logger_stdout
+    def logger_stdout
       @log_stdout
     end
 
@@ -56,11 +58,12 @@ module Loggerx
 
     def setup_logger_stdout(log_stdout)
       return log_stdout unless log_stdout.nil?
+
       begin
         # log_stdout = Logger.new($stdout)
-        log_stdout = Logger.new(STDOUT)
-      rescue
-        @error_count += 1
+        log_stdout = Logger.new($stdout)
+      rescue StandardError
+        @error_stderror_count += 1
       end
       log_stdout
     end
@@ -71,9 +74,9 @@ module Loggerx
       begin
         log_file = Logger.new(filepath)
       rescue Errno::EACCES
-        @error_count += 1
-      rescue
-        @error_count += 1
+        @error_access_count += 1
+      rescue StandardError
+        @error_stderror_count += 1
       end
       log_file
     end
@@ -86,7 +89,6 @@ module Loggerx
     def register_log_level(level)
       @log_file&.level = level
       @log_stdout&.level = level
-      #
       # Log4r互換インターフェイス
       # DEBUG < INFO < WARN < ERROR < FATAL < UNKNOWN
     end
@@ -110,7 +112,7 @@ module Loggerx
       puts(value)
       str = error_sub(value)
       # puts(str) unless @log_stdout
-      puts(str) #unless @log_stdout
+      puts(str) # unless @log_stdout
       true
     end
 
@@ -167,32 +169,29 @@ module Loggerx
 
       def hash_to_args(hash)
         prefix = hash["prefix"]
-
         log_dir_pn = Pathname.new(hash["log_dir"])
-        #log_dir_pn = Pathname.new( obj[:log_dir] )
-        # log_dir_pn = Pathname.new( obj[0] )
 
         stdout_flag_str = hash["stdout_flag"]
-        if stdout_flag_str.instance_of?(String)
-          case stdout_flag_str
-          when "true"
-            stdout_flag = true
+        stdout_flag = if stdout_flag_str.instance_of?(String)
+            case stdout_flag_str
+            when "true"
+              true
+            else
+              false
+            end
           else
-            stdout_flag = false
+            stdout_flag_str
           end
-        else
-          stdout_flag = stdout_flag_str
-        end
 
         fname_str = hash["fname"]
-        case fname_str
-        when "default"
-          fname = fname_str.to_sym
-        when "false"
-          fname = false
-        else
-          fname = fname_str
-        end
+        fname = case fname_str
+          when "default"
+            fname_str.to_sym
+          when "false"
+            false
+          else
+            fname_str
+          end
 
         level = hash["level"].to_sym
 
@@ -211,6 +210,7 @@ module Loggerx
 
       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
 

data/lib/loggerx/loggerxcm.rb

@@ -0,0 +1,170 @@
+# frozen_string_literal: true
+
+require "pathname"
+
+module Loggerx
+  class Loggerxcm0
+    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+")
+    # @limit_of_num_of_files ||= 3
+
+    class << self
+      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 init(prefix, fname, log_dir, stdout_flag, level = :info)
+        return if @log_file
+
+        @error_count = 0
+        level_hs = {
+          debug: Logger::DEBUG,
+          info: Logger::INFO,
+          warn: Logger::WARN,
+          error: Logger::ERROR,
+          fatal: Logger::FATAL,
+          unknown: Logger::UNKNOWN,
+        }
+        @log_dir_pn = Pathname.new(log_dir)
+
+        @limit_of_num_of_files ||= 5
+
+        ensure_quantum_log_files(@log_dir_pn, @limit_of_num_of_files, prefix)
+
+        @log_stdout = setup_logger_stdout(@log_stdout) if stdout_flag
+
+        fname = nil if fname == false
+        fname = prefix + LOG_FILENAME_BASE if fname == :default
+        @log_file = setup_logger_file(@log_file, log_dir, fname) if fname
+
+        obj = proc do |_, _, _, msg|
+          "#{msg}\n"
+        end
+        register_log_format(obj)
+        register_log_level(level_hs[level])
+      end
+
+      def valid?
+        !@log_file.nil?
+      end
+
+      def setup_logger_stdout(log_stdout)
+        return log_stdout unless log_stdout.nil?
+
+        begin
+          log_stdout = Logger.new($stdout)
+        rescue StandardError
+          @error_count += 1
+        end
+        log_stdout
+      end
+
+      def setup_logger_file(log_file, log_dir, fname)
+        filepath = Pathname.new(log_dir).join(fname)
+        if log_file.nil?
+          begin
+            log_file = Logger.new(filepath)
+          rescue Errno::EACCES
+            @error_count += 1
+          rescue StandardError
+            @error_count += 1
+          end
+        end
+        log_file
+      end
+
+      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
+        #
+        # Log4r互換インターフェイス
+        # DEBUG < INFO < WARN < ERROR < FATAL < UNKNOWN
+      end
+
+      def to_string(value)
+        if value.instance_of?(Array)
+          @stdout_backup ||= $stdout
+          @stringio ||= StringIO.new(+"", "w+")
+          $stdout = @stringio
+          $stdout = @stdout_backup
+          @stringio.rewind
+          str = @stringio.read
+          @stringio.truncate(0)
+          str
+        else
+          value
+        end
+      end
+
+      def show(value)
+        puts(value)
+        str = error_sub(value)
+        # puts(str) unless @log_stdout
+        puts(str) # unless @log_stdout
+        true
+      end
+
+      def error_sub(value)
+        str = to_string(value)
+        @log_file&.error(str)
+        @log_stdout&.error(str)
+        str
+      end
+
+      def error(value)
+        error_sub(value)
+        true
+      end
+
+      def debug(value)
+        str = to_string(value)
+        @log_file&.debug(str)
+        @log_stdout&.debug(str)
+        true
+      end
+
+      def info(value)
+        str = to_string(value)
+        @log_file&.info(str)
+        @log_stdout&.info(str)
+        true
+      end
+
+      def warn(value)
+        str = to_string(value)
+        @log_file&.warn(str)
+        @log_stdout&.warn(str)
+        true
+      end
+
+      def fatal(value)
+        str = to_string(value)
+        @log_file&.fatal(str)
+        @log_stdout&.fatal(str)
+        true
+      end
+
+      def close
+        @log_file&.close
+        # @log_stdout&.close
+      end
+    end
+  end
+
+  class Loggerxcm < Loggerxcm0
+  end
+end

data/lib/loggerx/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Loggerx
-  VERSION = "0.1.1"
+  VERSION = "0.2.0"
 end

data/lib/loggerx.rb

@@ -2,8 +2,10 @@
 
 require_relative "loggerx/version"
 require_relative "loggerx/loggerx"
+require_relative "loggerx/loggerxcm"
 
 module Loggerx
   class Error < StandardError; end
+
   # Your code goes here...
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: loggerx
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors:
 - ykominami
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-07-28 00:00:00.000000000 Z
+date: 2023-12-17 00:00:00.000000000 Z
 dependencies: []
 description: Utility class for Logging.
 email:
@@ -18,6 +18,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".rspec"
+- ".rubocop.yml"
 - ".tool-versions"
 - CHANGELOG.md
 - CODE_OF_CONDUCT.md
@@ -26,6 +27,7 @@ files:
 - Rakefile
 - lib/loggerx.rb
 - lib/loggerx/loggerx.rb
+- lib/loggerx/loggerxcm.rb
 - lib/loggerx/version.rb
 - loggerx.code-workspace
 - sig/loggerx.rbs
@@ -35,6 +37,7 @@ licenses:
 metadata:
   source_code_uri: https://github.com/ykominami/loggerx
   changelog_uri: https://github.com/ykominami/loggerx/blob/main/CHANGELOG.md
+  rubygems_mfa_required: 'true'
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -43,7 +46,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 3.2.0
+      version: 3.1.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="