debugtrace 0.1.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a9dbd0ded97b4a2115a8f5b86cbac05a7db29da09cefae334091cfbe8652ad1b
-  data.tar.gz: 7e121c90bbeecf411b3c7079bf900ac646998a3ec08a3a3f71c11faa56e6fc0d
+  metadata.gz: 45808a8d698423fb10b4b53bf1a0152b747a85a2ae32bab2ac42aff32a5252ed
+  data.tar.gz: 6a0aeb4db13f194c971b974110ee03b21e8dbb2baab8840a5c9a820142d4e05c
 SHA512:
-  metadata.gz: ec993125ba921db2f15a4079c57a23735a49a820566b6100e79a3387c9b111a711c4d143eb4350a06913397c3d3a589a5290e4e36bd71bcb352fa16ad591d0ff
-  data.tar.gz: 32f7121dfb3f6c8fc125a775db3c60eecf53590925df24ef1cbfb0d73327f3c9d830063d1c1058cc1718b561f4ed3f2a332ad25c5dc0c2c36c4e93179cbfacdd
+  metadata.gz: 79b136be33532e002ab16bf327519d13567e50d49ab4d4fecfc3dfb588b207ae70cc55cf6fc89b4a51649e100dcb38f808f648326882487813ea01d9779dc735
+  data.tar.gz: 27e016acdd8748683c8afc0639be04b9efa2dffe593a9a8a714c849bfdcfeb86dbd7e9c1d0e133b72687636812b02730dadf2ff651fb53d6b592001b443e1cb9

data/lib/debugtrace/common.rb

@@ -1,5 +1,5 @@
 # common.rb
-# (C) 2023 Masato Kokubo
+# (C) 2025 Masato Kokubo
 module Common
   def self.check_type(value_name, value, type)
     if !(value_name.is_a? String); raise "Argument value_name (=#{value_name}) must be a String"; end

data/lib/debugtrace/config.rb

@@ -1,11 +1,11 @@
 # config.rb
-# (C) 2023 Masato Kokubo
+# (C) 2025 Masato Kokubo
 require 'yaml'
 require_relative 'common'
 
 class Config
   def initialize(config_path)
-    @config_path = Common::check_type('config_path', config_path, String)
+    @config_path = Common.check_type('config_path', config_path, String)
     if File.exist?(@config_path)
       @config = YAML.load_file(@config_path)
     else
@@ -16,9 +16,9 @@ class Config
     @logging_destination       = _get_config_value 'logging_destination'       , 'STDERR'
     @logging_format            = _get_config_value 'logging_format'            , "%2$s %1$s %4$s\n"
     @logging_datetime_format   = _get_config_value 'logging_datetime_format'   , '%Y-%m-%d %H:%M:%S.%L%:z'
-    @enabled                   = _get_config_value 'enabled?'                  , true
+    @enabled                   = _get_config_value 'enabled'                   , true
     @enter_format              = _get_config_value 'enter_format'              , 'Enter %1$s (%2$s:%3$d) <- %4$s (%5$s:%6$d)'
-    @leave_format              = _get_config_value 'leave_format'              , 'Leave %1$s (%2$s:%3$d) duration: %4$s'
+    @leave_format              = _get_config_value 'leave_format'              , 'Leave %1$s (%2$s:%3$d) duration: %4$.3f ms'
     @thread_boundary_format    = _get_config_value 'thread_boundary_format'    , '______________________________ %1$s #%2$s ______________________________'
     @maximum_indents           = _get_config_value 'maximum_indents'           , 32
     @indent_string             = _get_config_value 'indent_string'             , '| '
@@ -38,37 +38,18 @@ class Config
     @collection_limit          = _get_config_value 'collection_limit'          , 128
     @bytes_limit               = _get_config_value 'bytes_limit'               , 256
     @string_limit              = _get_config_value 'string_limit'              , 256
-    @reflection_nest_limit     = _get_config_value 'reflection_nest_limit'     , 4
+    @reflection_limit          = _get_config_value 'reflection_limit'          , 4
   end
 
-  def config_path              ; @config_path              ; end
-  def logger_name              ; @logger_name              ; end
-  def logging_destination      ; @logging_destination      ; end
-  def logging_format           ; @logging_format           ; end
-  def logging_datetime_format  ; @logging_datetime_format  ; end
-  def enabled?                 ; @enabled                  ; end
-  def enter_format             ; @enter_format             ; end
-  def leave_format             ; @leave_format             ; end
-  def thread_boundary_format   ; @thread_boundary_format   ; end
-  def maximum_indents          ; @maximum_indents          ; end
-  def indent_string            ; @indent_string            ; end
-  def data_indent_string       ; @data_indent_string       ; end
-  def limit_string             ; @limit_string             ; end
-  def non_output_string        ; @non_output_string        ; end
-  def cyclic_reference_string  ; @cyclic_reference_string  ; end
-  def varname_value_separator  ; @varname_value_separator  ; end
-  def key_value_separator      ; @key_value_separator      ; end
-  def print_suffix_format      ; @print_suffix_format      ; end
-  def count_format             ; @count_format             ; end
-  def minimum_output_count     ; @minimum_output_count     ; end
-  def length_format            ; @length_format            ; end
-  def minimum_output_length    ; @minimum_output_length    ; end
-  def maximum_data_output_width; @maximum_data_output_width; end
-  def bytes_count_in_line      ; @bytes_count_in_line      ; end
-  def collection_limit         ; @collection_limit         ; end
-  def bytes_limit              ; @bytes_limit              ; end
-  def string_limit             ; @string_limit             ; end
-  def reflection_nest_limit    ; @reflection_nest_limit    ; end
+  attr_reader :config_path, :logger_name, :logging_destination, :logging_format, :logging_datetime_format,
+              :enter_format, :leave_format, :thread_boundary_format, :maximum_indents,
+              :indent_string, :data_indent_string, :limit_string, :non_output_string,
+              :cyclic_reference_string, :varname_value_separator, :key_value_separator,
+              :print_suffix_format, :count_format, :minimum_output_count, :length_format,
+              :minimum_output_length, :maximum_data_output_width, :bytes_count_in_line,
+              :collection_limit, :bytes_limit, :string_limit, :reflection_limit
+
+  def enabled? = @enabled
 
   private
 
@@ -77,14 +58,14 @@ class Config
   # @param defalut_value (Object): Value to return when the value related the key is undefined
   # @return  Object: Value related the key
   def _get_config_value(key, defalut_value)
-    Common::check_type('key', key, String)
+    Common.check_type('key', key, String)
     value = defalut_value
-    if @config != nil
+    unless @config.nil?
       value = @config[key]
-      if value == nil
+      if value.nil?
         value = defalut_value
       else
-        Common::check_type("config[#{key}]", value, defalut_value.class)
+        Common.check_type("config[#{key}]", value, defalut_value.class)
       end
     end
     value

data/lib/debugtrace/log_buffer.rb

@@ -1,5 +1,5 @@
 # log_buffer.rb
-# (C) 2023 Masato Kokubo
+# (C) 2025 Masato Kokubo
 require_relative 'common'
 
 # Buffers logs.
@@ -11,14 +11,8 @@ class LogBuffer
       @log = Common.check_type('log', log, String)
     end
 
-    def nest_level
-      @nest_level
-    end
+    attr_reader :nest_level, :log
 
-    def log
-      @log
-    end
-    
     def to_s
       "(LogBuffer.LevelAndLog){nest_level: #{@nest_level}, log: \"#{@log}\"}"
     end
@@ -34,12 +28,12 @@ class LogBuffer
     @lines = []
 
     # buffer for a line of logs
-    @last_line = ""
+    @last_line = ''
   end
 
   # Breaks the current line.
   def line_feed
-    @lines << LevelAndLog.new(@nest_level + @append_nest_level, @last_line.rstrip())
+    @lines << LevelAndLog.new(@nest_level + @append_nest_level, @last_line.rstrip)
     @append_nest_level = 0
     @last_line = ''
   end
@@ -63,11 +57,9 @@ class LogBuffer
   def append(value, nest_level = 0, no_break = false)
     Common.check_type('nest_level', nest_level, Integer)
     Common.check_type('no_break', no_break, TrueClass)
-    if value != nil
+    unless value.nil?
       string = value.to_s
-      if !no_break && length > 0 && length + string.length > @maximum_data_output_width
-        line_feed()
-      end
+      line_feed if !no_break && length > 0 && length + string.length > @maximum_data_output_width
       @append_nest_level = nest_level
       @last_line += string
     end
@@ -83,22 +75,18 @@ class LogBuffer
   end
 
   # Appends lines of another LogBuffer.
-  # @param 
-  # @param separator (String): The separator string to append if not ""
+  # @param
+  # @param separator (String): The separator string to append if not ''
   # @param buff (LogBuffer): Another LogBuffer
   # @returns LogBuffer: This object
   def append_buffer(separator, buff)
     Common.check_type('separator', separator, String)
     Common.check_type('buff', buff, LogBuffer)
-    if separator != ""
-      append(separator, 0, true)
-    end
+    append(separator, 0, true) if separator != ''
     index = 0
     for line in buff.lines
-      if index > 0
-        line_feed()
-      end
-      append(line.nest_level, line.log, index == 0 && separator != "")
+      line_feed if index > 0
+      append(line.log, line.nest_level, index == 0 && separator != '')
       index += 1
     end
     self
@@ -117,9 +105,7 @@ class LogBuffer
   # A list of tuple of data indentation level && log string.
   def lines
     lines = @lines.dup
-    if length > 0
-      lines << LevelAndLog.new(@nest_level, @last_line)
-    end
+    lines << LevelAndLog.new(@nest_level, @last_line) if length > 0
     lines
   end
 end

data/lib/debugtrace/state.rb

@@ -1,5 +1,5 @@
 # state.rb
-# (C) 2023 Masato Kokubo
+# (C) 2025 Masato Kokubo
 require_relative 'common'
 
 # Have the trace state for a thread

data/lib/debugtrace/version.rb

@@ -1,5 +1,6 @@
+# (C) 2025 Masato Kokubo
 # frozen_string_literal: true
 
 module DebugTrace
-  VERSION = '0.1.0'
+  VERSION = '0.2.1'
 end

data/lib/debugtrace.rb

@@ -1,6 +1,5 @@
-# main.rb
+# debugtrace.rb
 # (C) 2025 Masato Kokubo
-require 'thread'
 require 'logger'
 
 # Require necessary files
@@ -9,19 +8,14 @@ require_relative 'debugtrace/common'
 require_relative 'debugtrace/config'
 require_relative 'debugtrace/log_buffer'
 require_relative 'debugtrace/loggers'
-require_relative 'debugtrace/print_options'
 require_relative 'debugtrace/state'
 
 module DebugTrace
-# class Error < StandardError; end
-  @@AUTHOR = 'Masato Kokubo <masatokokubo@gmail.com>'
-# @@VERSION = '1.0.0 dev 1'
-
   # Configuration values
   @@config = nil
 
   def self.config
-    return @@config
+    @@config
   end
 
   # A Mutex for thread safety
@@ -61,38 +55,35 @@ module DebugTrace
       Pr._print("debugtrace: (#{@@config.config_path}) logger = #{@@config.logger_name} is unknown", STDERR)
     end
 
-    if @@config.enabled?
-      ruby_version = RUBY_VERSION
-      @@logger.print("DebugTrace-rb #{DebugTrace::VERSION} on Ruby #{ruby_version}")
-      @@logger.print("  config file path: #{@@config.config_path}")
-      @@logger.print("  logger: #{@@logger}")
-    end
+    return unless @@config.enabled?
+
+    ruby_version = RUBY_VERSION
+    @@logger.print("DebugTrace-rb #{DebugTrace::VERSION} on Ruby #{ruby_version}")
+    @@logger.print("  config file path: #{@@config.config_path}")
+    @@logger.print("  logger: #{@@logger}")
   end
 
   class PrintOptions
-    attr_reader :force_reflection, :output_private, :output_method, :minimum_output_count, :minimum_output_length,
-                :collection_limit, :bytes_limit, :string_limit, :reflection_nest_limit
+    attr_reader :reflection,
+                :minimum_output_count, :minimum_output_length,
+                :collection_limit, :bytes_limit, :string_limit, :reflection_limit
 
     def initialize(
-      force_reflection,
-      output_private,
-      output_method,
+      reflection,
       minimum_output_count,
       minimum_output_length,
       collection_limit,
       bytes_limit,
       string_limit,
-      reflection_nest_limit
+      reflection_limit
     )
-      @force_reflection = force_reflection
-      @output_private = output_private
-      @output_method = output_method
+      @reflection = reflection
       @minimum_output_count = minimum_output_count == -1 ? DebugTrace.config.minimum_output_count : minimum_output_count
       @minimum_output_length = minimum_output_length == -1 ? DebugTrace.config.minimum_output_length : minimum_output_length
       @collection_limit = collection_limit == -1 ? DebugTrace.config.collection_limit : collection_limit
       @bytes_limit = bytes_limit == -1 ? DebugTrace.config.bytes_limit : bytes_limit
       @string_limit = string_limit == -1 ? DebugTrace.config.string_limit : string_limit
-      @reflection_nest_limit = reflection_nest_limit == -1 ? DebugTrace.config.reflection_nest_limit : reflection_nest_limit
+      @reflection_limit = reflection_limit == -1 ? DebugTrace.config.reflection_limit : reflection_limit
     end
   end
 
@@ -117,7 +108,7 @@ module DebugTrace
 
   def self.to_string(name, value, print_options)
     buff = LogBuffer.new(@@config.maximum_data_output_width)
-    
+
     separator = ''
     unless name.empty?
       buff.append(name)
@@ -126,38 +117,34 @@ module DebugTrace
 
     case value
     when nil
-      # None
       buff.no_break_append(separator).append('nil')
+    when FalseClass, TrueClass, Integer, Float
+      buff.no_break_append(separator).append(value.to_s)
     when String
-      # String
       value_buff = to_string_str(value, print_options)
       buff.append_buffer(separator, value_buff)
-    when Integer, Float, Date, Time, DateTime
-      # int, float, Date, Time, DateTime
-      buff.no_break_append(separator).append(value.to_s)
+    when DateTime
+      buff.no_break_append(separator).append(value.strftime('%Y-%m-%d %H:%M-%S.%L%:z'))
+    when Date
+      buff.no_break_append(separator).append(value.strftime('%Y-%m-%d'))
+    when Time
+      buff.no_break_append(separator).append(value.strftime('%H:%M-%S.%L%:z'))
     when Array, Set, Hash
-      # list, set, tuple, dict
-      value_buff = to_string_iterable(value, print_options)
+      value_buff = to_string_enumerable(value, print_options)
       buff.append_buffer(separator, value_buff)
     else
-      has_str, has_repr = has_str_repr_method(value)
       value_buff = LogBuffer.new(@@config.maximum_data_output_width)
-      if !print_options.force_reflection && (has_str || has_repr)
+      if !print_options.reflection && has_to_s_method?(value)
         # has to_s or inspect method
-        if has_repr
-          value_buff.append('inspect(): ')
-          value_buff.no_break_append(value.inspect)
-        else
-          value_buff.append('to_s(): ')
-          value_buff.no_break_append(value.to_s)
-        end
+        value_buff.append('to_s: ')
+        value_buff.no_break_append(value.to_s)
         buff.append_buffer(separator, value_buff)
       else
         # use reflection
         if @@reflected_objects.any? { |obj| value.equal?(obj) }
           # cyclic reference
           value_buff.no_break_append(@@config.cyclic_reference_string)
-        elsif @@reflected_objects.length > print_options.reflection_nest_limit
+        elsif @@reflected_objects.length > print_options.reflection_limit
           # over reflection level limitation
           value_buff.no_break_append(@@config.limit_string)
         else
@@ -168,7 +155,7 @@ module DebugTrace
         buff.append_buffer(separator, value_buff)
       end
     end
-    
+
     buff
   end
 
@@ -177,19 +164,19 @@ module DebugTrace
     has_double_quote = false
     single_quote_buff = LogBuffer.new(@@config.maximum_data_output_width)
     double_quote_buff = LogBuffer.new(@@config.maximum_data_output_width)
-    
+
     if value.length >= @@config.minimum_output_length
-      single_quote_buff.no_break_append("(")
-      single_quote_buff.no_break_append(sprintf(@@config.length_format, value.length))
-      single_quote_buff.no_break_append(")")
-      double_quote_buff.no_break_append("(")
-      double_quote_buff.no_break_append(sprintf(@@config.length_format, value.length))
-      double_quote_buff.no_break_append(")")
+      single_quote_buff.no_break_append('(')
+      single_quote_buff.no_break_append(format(@@config.length_format, value.length))
+      single_quote_buff.no_break_append(')')
+      double_quote_buff.no_break_append('(')
+      double_quote_buff.no_break_append(format(@@config.length_format, value.length))
+      double_quote_buff.no_break_append(')')
     end
-    
+
     single_quote_buff.no_break_append("'")
     double_quote_buff.no_break_append('"')
-    
+
     count = 1
     value.each_char do |char|
       if count > print_options.string_limit
@@ -206,33 +193,37 @@ module DebugTrace
         single_quote_buff.no_break_append(char)
         double_quote_buff.no_break_append("\\\"")
         has_double_quote = true
-      when '\\'
-        single_quote_buff.no_break_append('\\\\')
-        double_quote_buff.no_break_append('\\\\')
-      when '\n'
-        single_quote_buff.no_break_append('\\n')
-        double_quote_buff.no_break_append('\\n')
-      when '\r'
-        single_quote_buff.no_break_append('\\r')
-        double_quote_buff.no_break_append('\\r')
-      when '\t'
-        single_quote_buff.no_break_append('\\t')
-        double_quote_buff.no_break_append('\\t')
-      when ("\0".."\37").include?(char)
-        num_str = format('%02X', char.ord)
-        single_quote_buff.no_break_append("\\x" + num_str)
-        double_quote_buff.no_break_append("\\x" + num_str)
+      when "\\"
+        single_quote_buff.no_break_append("\\\\")
+        double_quote_buff.no_break_append("\\\\")
+      when "\n"
+        single_quote_buff.no_break_append("\\n")
+        double_quote_buff.no_break_append("\\n")
+      when "\r"
+        single_quote_buff.no_break_append("\\r")
+        double_quote_buff.no_break_append("\\r")
+      when "\t"
+        single_quote_buff.no_break_append("\\t")
+        double_quote_buff.no_break_append("\\t")
       else
-        single_quote_buff.no_break_append(char)
-        double_quote_buff.no_break_append(char)
+        char_ord = char.ord
+        if char_ord >= 0x00 && char_ord <= 0x1F || char_ord == 0x7F
+          num_str = format('%02X', char_ord)
+          single_quote_buff.no_break_append("\\x" + num_str)
+          double_quote_buff.no_break_append("\\x" + num_str)
+        else
+          single_quote_buff.no_break_append(char)
+          double_quote_buff.no_break_append(char)
+        end
       end
       count += 1
     end
-    
+
     double_quote_buff.no_break_append('"')
     single_quote_buff.no_break_append("'")
-    
+
     return double_quote_buff if has_single_quote && !has_double_quote
+
     single_quote_buff
   end
 
@@ -240,7 +231,7 @@ module DebugTrace
     bytes_length = value.length
     buff = LogBuffer.new(@@config.maximum_data_output_width)
     buff.no_break_append('(')
-    
+
     if value.is_a?(String)
       buff.no_break_append('bytes')
     elsif value.is_a?(Array)
@@ -249,7 +240,7 @@ module DebugTrace
 
     if bytes_length >= @@config.minimum_output_length
       buff.no_break_append(' ')
-      buff.no_break_append(sprintf(@@config.length_format, bytes_length))
+      buff.no_break_append(format(@@config.length_format, bytes_length))
     end
 
     buff.no_break_append(') [')
@@ -264,20 +255,18 @@ module DebugTrace
     chars = ''
     count = 0
     value.each_byte do |element|
-      if count != 0 && count % @@config.bytes_count_in_line == 0
-        if multi_lines
-          buff.no_break_append('| ')
-          buff.no_break_append(chars)
-          buff.line_feed
-          chars = ''
-        end
+      if count != 0 && count % @@config.bytes_count_in_line == 0 && multi_lines
+        buff.no_break_append('| ')
+        buff.no_break_append(chars)
+        buff.line_feed
+        chars = ''
       end
       if count >= print_options.bytes_limit
         buff.no_break_append(@@config.limit_string)
         break
       end
-      buff.no_break_append(sprintf('%02X ', element))
-      chars += (element >= 0x20 && element <= 0x7E) ? element.chr : '.'
+      buff.no_break_append(format('%02X ', element))
+      chars += element >= 0x20 && element <= 0x7E ? element.chr : '.'
       count += 1
     end
 
@@ -297,13 +286,13 @@ module DebugTrace
     end
     buff.no_break_append(']')
 
-    return buff
+    buff
   end
 
   def self.to_string_reflection(value, print_options)
     buff = LogBuffer.new(@@config.maximum_data_output_width)
 
-    buff.append(_get_type_name(value))
+    buff.append(get_type_name(value))
 
     body_buff = to_string_reflection_body(value, print_options)
 
@@ -323,72 +312,52 @@ module DebugTrace
     end
     buff.no_break_append('}')
 
-    return buff
+    buff
   end
 
   def self.to_string_reflection_body(value, print_options)
     buff = LogBuffer.new(@@config.maximum_data_output_width)
 
-    members = []
-    begin
-      base_members = value.methods(false).map { |m| [m, value.send(m)] }
-      members = base_members.select do |m|
-        name, _ = m
-        !name.start_with?('__') || !name.end_with?('__') && 
-        (print_options.output_method || !value.method(name).owner.nil?) && 
-        (print_options.output_private || !name.start_with?('_'))
-      end
-    rescue => ex
-      buff.append(ex.to_s)
-      return buff
-    end
+    variables = value.instance_variables
 
     multi_lines = false
     index = 0
-    members.each do |member|
-      if index > 0
-        buff.no_break_append(', ')
-      end
+    variables.each do |variable|
+      buff.no_break_append(', ') if index > 0
 
-      name, value = member
+      var_value = value.instance_variable_get(variable)
       member_buff = LogBuffer.new(@@config.maximum_data_output_width)
-      member_buff.append(name)
-      member_buff.append_buffer(@@config.key_value_separator, to_string('', value, print_options))
-      if index > 0 && (multi_lines || member_buff.multi_lines?)
-        buff.line_feed
-      end
+      member_buff.append(variable)
+      member_buff.append_buffer(@@config.key_value_separator, to_string('', var_value, print_options))
+      buff.line_feed if index > 0 && (multi_lines || member_buff.multi_lines?)
       buff.append_buffer('', member_buff)
 
       multi_lines = member_buff.multi_lines?
       index += 1
     end
 
-    return buff
+    buff
   end
 
-  def self.to_string_iterable(values, print_options)
-    open_char = '{'  # set, frozenset, dict
-    close_char = '}'
-
-    if values.is_a?(Array)
-      # list
-      open_char = '['
+  def self.to_string_enumerable(values, print_options)
+    open_char = '[' # Array 
+    close_char = ']'
+
+    if values.is_a?(Hash)
+      # Array
+      open_char = '{'
+      close_char = '}'
+    elsif values.is_a?(Set)
+      # Sete
+      open_char = 'Set['
       close_char = ']'
-    elsif values.is_a?(Tuple)
-      # tuple
-      open_char = '('
-      close_char = ')'
     end
 
     buff = LogBuffer.new(@@config.maximum_data_output_width)
-    buff.append(_get_type_name(values, values.length))
+    buff.append(get_type_name(values, values.length))
     buff.no_break_append(open_char)
 
-    body_buff = to_string_iterable_body(values, print_options)
-    if open_char == '(' && values.length == 1
-      # A tuple with 1 element
-      body_buff.no_break_append(',')
-    end
+    body_buff = to_string_enumerable_body(values, print_options)
 
     multi_lines = body_buff.multi_lines? || buff.length + body_buff.length > @@config.maximum_data_output_width
 
@@ -406,48 +375,41 @@ module DebugTrace
 
     buff.no_break_append(close_char)
 
-    return buff
+    buff
   end
 
-  def self.to_string_iterable_body(values, print_options)
+  def self.to_string_enumerable_body(values, print_options)
     buff = LogBuffer.new(@@config.maximum_data_output_width)
 
     multi_lines = false
     index = 0
 
     values.each do |element|
-      if index > 0
-        buff.no_break_append(', ')
-      end
+      buff.no_break_append(', ') if index > 0
 
       if index >= print_options.collection_limit
         buff.append(@@config.limit_string)
         break
       end
 
-      element_buff = LogBuffer.new(@@config.maximum_data_output_width)
-      if values.is_a?(Hash)
-        # dictionary
-        element_buff = to_string_key_value(element, values[element], print_options)
-      else
-        # list, set, frozenset, or tuple
-        element_buff = to_string('', element, print_options)
-      end
+      element_buff = if values.is_a?(Hash)
+          # Hash
+          to_string_key_value(element[0], element[1], print_options)
+        else
+          # Array
+          to_string('', element, print_options)
+        end
 
-      if index > 0 && (multi_lines || element_buff.multi_lines?)
-        buff.line_feed
-      end
+      buff.line_feed if index > 0 && (multi_lines || element_buff.multi_lines?)
       buff.append_buffer('', element_buff)
 
       multi_lines = element_buff.multi_lines?
       index += 1
     end
 
-    if values.is_a?(Hash) && values.empty?
-      buff.no_break_append(':')
-    end
+    buff.no_break_append(':') if values.is_a?(Hash) && values.empty?
 
-    return buff
+    buff
   end
 
   def self.to_string_key_value(key, value, print_options)
@@ -455,94 +417,58 @@ module DebugTrace
     key_buff = to_string('', key, print_options)
     value_buff = to_string('', value, print_options)
     buff.append_buffer('', key_buff).append_buffer(@@config.key_value_separator, value_buff)
-    return buff
+    buff
   end
 
   def self.get_type_name(value, count = -1)
-    value_type = value.class
-    type_name = get_simple_type_name(value.class, 0)
-    if ['Array', 'Hash', 'Set', 'Tuple'].include?(type_name)
-      type_name = ''
-    end
+    type_name = value.class.to_s
+    type_name = '' if %w[Array Hash Set].include?(type_name)
 
     if count >= @@config.minimum_output_count
       type_name += ' ' unless type_name.empty?
       type_name += @@config.count_format % count
     end
 
-    if !type_name.empty?
-      type_name = "(#{type_name})"
-    end
-    return type_name
+    type_name
   end
 
-  def self.get_simple_type_name(value_type, nest)
-    type_name = nest == 0 ? value_type.to_s : value_type.name
-    if type_name.start_with?("<Class '")
-      type_name = type_name[8..-1]
-    elsif type_name.start_with?("<Enum '")
-      type_name = 'enum ' + type_name[7..-1]
-    end
-    if type_name.end_with?("'>")
-      type_name = type_name[0..-3]
-    end
-
-    base_names = value_type.ancestors.reject { |base| base == Object }
-    base_names = base_names.map { |base| get_simple_type_name(base, nest + 1) }
-
-    if base_names.any?
-      type_name += '(' + base_names.join(', ') + ')'
-    end
-
-    return type_name
-  end
-
-  def self.has_str_repr_method(value)
+  def self.has_to_s_method?(value)
     begin
-      members = value.methods
-      has_str = members.include?(:to_s)
-      has_repr = members.include?(:inspect)
-      return has_str, has_repr
+      value.public_method('to_s')
     rescue
-      return false, false
+      return false
     end
+    return true
   end
 
-# def self.get_frame_summary(limit)
-#   begin
-#     raise 'RuntimeError'
-#   rescue => e
-#     return caller_locations(limit: limit).first
-#   end
-#   return nil
-# end
-
   @@before_thread_id = nil
 
   def self.print_start
+    if @@before_thread_id == nil
+      DebugTrace.initialize
+      return unless @@config.enabled?
+    end
+
     thread = Thread.current
     thread_id = thread.object_id
-    if thread_id != @@before_thread_id
-      # Thread changing
-      @@logger.print('')
-      @@logger.print(@@config.thread_boundary_format % [thread.name, thread.object_id])
-      @@logger.print('')
-      @@before_thread_id = thread_id
-    end
+    return unless thread_id != @@before_thread_id
+
+    # Thread changing
+    @@logger.print('')
+    @@logger.print(format(@@config.thread_boundary_format, thread.name, thread_id))
+    @@logger.print('')
+    @@before_thread_id = thread_id
   end
 
   @@DO_NOT_OUTPUT = 'Do not output'
 
-  def self.print(name, value = @@DO_NOT_OUTPUT, force_reflection: false,
-            output_private: false, output_method: false,
-            minimum_output_count: -1, minimum_output_length: -1,
-            collection_limit: -1, bytes_limit: -1,
-            string_limit: -1, reflection_nest_limit: -1)
-
-    return value unless @@config.enabled?
-
-    Mutex.new.synchronize do
+  def self.print(name, value = @@DO_NOT_OUTPUT, reflection: false,
+      minimum_output_count: -1, minimum_output_length: -1,
+      collection_limit: -1, bytes_limit: -1,
+      string_limit: -1, reflection_limit: -1)
+    @@thread_mutex.synchronize do
       print_start
+      return value unless @@config.enabled?
 
       state = current_state
       @@reflected_objects.clear
@@ -556,22 +482,22 @@ module DebugTrace
       else
         # with value
         print_options = PrintOptions.new(
-          force_reflection, output_private, output_method,
+          reflection,
           minimum_output_count, minimum_output_length,
-          collection_limit, bytes_limit, string_limit, reflection_nest_limit
+          collection_limit, bytes_limit,
+          string_limit, reflection_limit
         )
         @@last_log_buff = to_string(name, value, print_options)
       end
 
       # append print suffix
-    # frame_summary = get_frame_summary(3)
       location = caller_locations(3, 3)[0]
-      name     = location != nil ? location.base_label : ''
-      filename = location != nil ? File.basename(location.absolute_path) : ''
-      lineno   = location != nil ? location.lineno : 0
+      name     = !location.nil? ? location.base_label : ''
+      filename = !location.nil? ? File.basename(location.absolute_path) : ''
+      lineno   = !location.nil? ? location.lineno : 0
 
       @@last_log_buff.no_break_append(
-        @@config.print_suffix_format % [name, filename, lineno]
+        format(@@config.print_suffix_format, name, filename, lineno)
       )
 
       @@last_log_buff.line_feed
@@ -585,28 +511,25 @@ module DebugTrace
       end
     end
 
-    return value
+    value
   end
 
-
   def self.enter
-    return unless @@config.enabled?
-    Mutex.new.synchronize do
+    @@thread_mutex.synchronize do
       print_start
+      return unless @@config.enabled?
 
       state = current_state
 
-    # frame_summary = get_frame_summary(4)
       location = caller_locations(3, 3)[0]
-      name     = location != nil ? location.base_label : ''
-      filename = location != nil ? File.basename(location.absolute_path) : ''
-      lineno   = location != nil ? location.lineno : 0
+      name     = !location.nil? ? location.base_label : ''
+      filename = !location.nil? ? File.basename(location.absolute_path) : ''
+      lineno   = !location.nil? ? location.lineno : 0
 
-    # parent_frame_summary = get_frame_summary(5)
       parent_location = caller_locations(4, 4)[0]
-      parent_name     = parent_location != nil ? parent_location.base_label : ''
-      parent_filename = parent_location != nil ? File.basename(parent_location.absolute_path) : ''
-      parent_lineno   = parent_location != nil ? parent_location.lineno : 0
+      parent_name     = !parent_location.nil? ? parent_location.base_label : ''
+      parent_filename = !parent_location.nil? ? File.basename(parent_location.absolute_path) : ''
+      parent_lineno   = !parent_location.nil? ? parent_location.lineno : 0
 
       indent_string = get_indent_string(state.nest_level, 0)
       if state.nest_level < state.previous_nest_level || @@last_log_buff.multi_lines?
@@ -615,7 +538,7 @@ module DebugTrace
 
       @@last_log_buff = LogBuffer.new(@@config.maximum_data_output_width)
       @@last_log_buff.no_break_append(
-        @@config.enter_format % [name, filename, lineno, parent_name, parent_filename, parent_lineno]
+        format(@@config.enter_format, name, filename, lineno, parent_name, parent_filename, parent_lineno)
       )
       @@last_log_buff.line_feed
       @@logger.print(indent_string + @@last_log_buff.lines[0].log)
@@ -625,10 +548,9 @@ module DebugTrace
   end
 
   def self.leave
-    return unless @@config.enabled?
-    
-    Mutex.new.synchronize do
+    @@thread_mutex.synchronize do
       print_start
+      return unless @@config.enabled?
 
       state = current_state
 
@@ -641,11 +563,11 @@ module DebugTrace
         @@logger.print(get_indent_string(state.nest_level, 0)) # Empty Line
       end
 
-      time = Time.now.utc - state.down_nest
+      time = (Time.now.utc - state.down_nest) * 1000 # milliseconds <- seconds
 
       @@last_log_buff = LogBuffer.new(@@config.maximum_data_output_width)
       @@last_log_buff.no_break_append(
-        @@config.leave_format % [name, filename, lineno, time]
+        format(@@config.leave_format, name, filename, lineno, time)
       )
       @@last_log_buff.line_feed
       @@logger.print(get_indent_string(state.nest_level, 0) + @@last_log_buff.lines[0].log)
@@ -657,13 +579,10 @@ module DebugTrace
     buff_string = lines.map { |line| _config.data_indent_string * line[0] + line[1] }.join("\n")
 
     state = nil
-    Mutex.new.synchronize do
+    @@thread_mutex.synchronize do
       state = current_state
     end
 
     "#{get_indent_string(state.nest_level, 0)}#{buff_string}"
   end
 end
-
-DebugTrace.initialize
-

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: debugtrace
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Masato Kokubo
 bindir: exe
 cert_chain: []
-date: 2025-04-13 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies: []
 description: Insert DebugTrace.enter and Debug.leave at the beginning and end of the
   function you want to debug, and Debug.print('foo', foo) if there are any variables
@@ -28,10 +28,8 @@ files:
 - lib/debugtrace/config.rb
 - lib/debugtrace/log_buffer.rb
 - lib/debugtrace/loggers.rb
-- lib/debugtrace/print_options.rb
 - lib/debugtrace/state.rb
 - lib/debugtrace/version.rb
-- lib/temp.rb
 - sig/debugtrace.rbs
 homepage: https://github.com/MasatoKokubo/DebugTrace-rb
 licenses:
@@ -54,7 +52,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.6
+rubygems_version: 3.6.8
 specification_version: 4
 summary: DebugTrace-rb is a library that helps debug ruby programs.
 test_files: []

data/lib/debugtrace/print_options.rb

@@ -1,24 +0,0 @@
-# print_options.rb
-# (C) 2023 Masato Kokubo
-# Hold output option values.
-class PrintOptions
-  # Initializes this object.
-  # @param force_reflection (bool): If true, outputs using reflection even if it has a @_str__or @_repr__ method
-  # @param output_private (bool): If true, also outputs private members when using reflection
-  # @param output_method (bool): If true, also outputs method members when using reflection
-  # @param collection_limit (Integer): Output limit of collection elements (overrides debugtarace.ini value)
-  # @param string_limit (Integer): Output limit of string characters (overrides debugtarace.ini value)
-  # @param bytes_limit (Integer): Output limit of byte array elements (overrides debugtarace.ini value)
-  # @param reflection_nest_limit (Integer): Nest limits when using reflection (overrides debugtarace.ini value)
-  def initialize(
-    force_reflection, output_private, output_method,
-    collection_limit, string_limit, bytes_limit, reflection_nest_limit)
-    @force_reflection      = force_reflection
-    @output_private        = output_private
-    @output_method         = output_method
-    @collection_limit      = collection_limit      == -1 ? @config.collection_limit      : collection_limit   
-    @string_limit          = string_limit          == -1 ? @config.string_limit          : string_limit     
-    @bytes_limit           = bytes_limit           == -1 ? @config.bytes_limit           : bytes_limit      
-    @reflection_nest_limit = reflection_nest_limit == -1 ? @config.reflection_nest_limit : reflection_nest_limit
-  end
-end

data/lib/temp.rb

@@ -1,74 +0,0 @@
-  class DebugTrace
-    # Outputs an entering log when initializing and outputs a leaving log when deleting.
-    # 
-    # 初期化時に進入ログを出力し、削除時に退出ログを出力します。
-
-    attr_accessor :name, :filename, :lineno
-
-    def initialize(invoker)
-      return unless @@config.is_enabled
-
-      Mutex.new.synchronize do
-        print_start
-
-        state = current_state
-        if invoker.nil?
-          @name = ''
-        else
-          @name = invoker.class.name
-          if @name == 'Class'
-            @name = invoker.to_s
-          end
-          @name += '.'
-        end
-
-      # frame_summary = get_frame_summary(4)
-        location = caller_locations(1, 1)[0]
-        @name += location.base_label
-        @filename = File.basename(location.absolute_path)
-        @lineno = location.lineno
-
-      # parent_frame_summary = get_frame_summary(5)
-        parent_location = caller_locations(2, 2)[0]
-        parent_filename = File.basename(parent_location.absolute_path)
-        parent_lineno = parent_location.lineno
-
-        indent_string = get_indent_string(state.nest_level, 0)
-        if state.nest_level < state.previous_nest_level || _last_print_buff.is_multi_lines
-          _logger.print(indent_string) # Empty Line
-        end
-
-        _last_print_buff = LogBuffer.new(@@config.maximum_data_output_width)
-        _last_print_buff.no_break_append(
-          @@config.enter_format % [@name, @filename, @lineno, parent_filename, parent_lineno]
-        )
-        _last_print_buff.line_feed
-        _logger.print(indent_string + _last_print_buff.lines[0][1])
-
-        state.up_nest
-      end
-    end
-
-    def finalize
-      return unless @@config.is_enabled
-
-      Mutex.new.synchronize do
-        print_start
-
-        state = current_state
-
-        if _last_print_buff.is_multi_lines
-          _logger.print(get_indent_string(state.nest_level, 0)) # Empty Line
-        end
-
-        time = Time.now.utc - state.down_nest
-
-        _last_print_buff = LogBuffer.new(@@config.maximum_data_output_width)
-        _last_print_buff.no_break_append(
-          @@config.leave_format % [@name, @filename, @lineno, time]
-        )
-        _last_print_buff.line_feed
-        _logger.print(get_indent_string(state.nest_level, 0) + _last_print_buff.lines[0][1])
-      end
-    end
-  end