trace_tree 0.3.3 → 0.3.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8b4565cbbc8a5df459e5642434e57630d1b46272f47ae299f7160b58c0620043
-  data.tar.gz: 6fac4d967befe782304102938c64ca93d7f1401fd37c97fbc64bf843aeae1646
+  metadata.gz: bd2acac6d571e0747380b7a119f10ceae8b047677da86922aacf86d61f230e1e
+  data.tar.gz: 9f99a54c748d8e36b92e11dba833e7059da16ee5fa486412e5c70c35c2186ffc
 SHA512:
-  metadata.gz: 39599ff7ef3c18d530c70429143426ddd93f84bccaecb7fd6fbc0083c44f00721423830c15a896f0a9cbc75dd9ce8c362602aca07b583f06bcf5a95350afad92
-  data.tar.gz: 28ac1cd344dfd20ca7df7258c091a954538322ca03019f46de2a2bbbd858ac8f8f3537972f768f5eeac6f473dfa24ebbed522ff61abc17652a4f0fcc7beeaa7e
+  metadata.gz: 7597b9d86bf09817082dbdec9dd31a7a18f80afda328b437d7b7d023ff8e77983e09399e53e2d7f6e8026f13100aac29a48feecfd98ad1fc1319389ffeda7eb9
+  data.tar.gz: a69bef456553b83d05d749973c8e923080708bd27a3793b2639b13869f44932fbb85589a52c0695790ff9661043c7bfa55de9db0cc211521cebef7a7fbf6804a

data/README.md

@@ -58,7 +58,7 @@ end
 * `:warm => nil` by default. Set it something unique to the code block so that the code block will be traced only when it's called second time, in case we dump lots of code loading and initialization.
 * `:timer => nil` by default. Set it true if you want to know how much time spent in tracing and drawing tree. Notice the `file` should be appendable, otherwise the time will overwrite the tree.
 * `:debug => nil` by default. Give it `STDOUT`/`STDERR` or anything responds to `:puts` to output a whole list of TracePoints. Or give it a file name in the default tmp dir of your system.
-* `transcode => false` by default. Set it true to convert unknown character into `"?"` when you see `Encoding::UndefinedConversionError`.
+* `:transcode => false` by default. Set it true to convert unknown character into `"?"` when you see `Encoding::UndefinedConversionError`.
 
 ### Methods' return values
 
@@ -78,7 +78,12 @@ Try to remove a non-existing index:
 ArgumentError: Index name 'index_cars_on_online_at' on table 'cars' does not exist
 ```
 
-Then find the result HTML in tmp dir. Move your mouse on any method name, and press `f`/`u` to fold/unfold it's callee, press `p`/`n` to jump to it's previous/next sibling call, press `r` to print return value in console.
+Then find the result HTML in tmp dir. Move your mouse on any method name, and:
+
+- press `f`/`u` to fold/unfold it's callee
+- press `p`/`n` to jump to it's previous/next sibling call
+- press `r` to print return value in console
+- press `a` to print ascii tree in console
 
 You may type `group_by_file()` in console, to group callees defined in same file, under additional `li` tag. Type `group_by_file()` once again to switch  back.
 

data/lib/trace_tree/point/ccall_kernel_extend.rb

@@ -3,7 +3,7 @@ class TraceTree
     class CcallKernelExtend < Point
       def parameters
         first_callee = callees[0]
-        first_callee.respond_to?(:mixin) ? first_callee.mixin : first_callee.current.klass
+        first_callee.respond_to?(:mixin) ? first_callee.mixin : first_callee.class_name
       end
 
       def self.event_class_method

data/lib/trace_tree/point/ccall_module_include.rb

@@ -9,7 +9,7 @@ class TraceTree
       # first callee should be append_features(), check if it is native or custom
       def parameters
         first_callee = callees[0]
-        Module == first_callee.class_name ? first_callee.return_value : first_callee.current.klass
+        Module == first_callee.class_name ? first_callee.return_value : first_callee.class_name
       end
 
     end

data/lib/trace_tree/point/ccall_module_prepend.rb

@@ -8,7 +8,7 @@ class TraceTree
 
       def parameters
         first_callee = callees[0]
-        Module == first_callee.class_name ? first_callee.return_value : first_callee.current.klass
+        Module == first_callee.class_name ? first_callee.return_value : first_callee.class_name
       end
 
     end

data/lib/trace_tree/point.rb

@@ -7,7 +7,8 @@ class TraceTree
     include TreeGraphable
     include TreeHtmlable
 
-    attr_reader :current, :thread, :frame_env
+    attr_reader :thread, :frame_env
+    attr_reader :call_symbol, :class_name
     attr_accessor :terminal, :config
 
     Interfaces = [:event, :defined_class, :method_id, :path, :lineno]
@@ -73,24 +74,31 @@ EOM
 
       @return_value = trace_point.return_value if x_return?
       @thread = Thread.current
+      return if thread?
 
-      unless thread?
-        there = trace_point.binding.of_caller(3)
-        @current = BindingOfCallers::Revealed.new there
-        @frame_env = current.frame_env.to_sym
+      if event == :c_call || event == :c_return
+        @call_symbol = '#'
+        @frame_env = method_id
+        @class_name = defined_class
+        return
       end
+
+      there = trace_point.binding.of_caller(3)
+      current = BindingOfCallers::Revealed.new there
+      @call_symbol = current.call_symbol
+      @frame_env = current.frame_env.to_sym
+      @class_name = current.klass
     rescue => e
-      puts e
+      puts e.message
+      puts(Interfaces.each_with_object({}){|attr, h| h[attr] = send(attr)})
+      puts e.backtrace
+      raise e
     end
 
     def b_call?
       event == :b_call
     end
 
-    def c_call?
-      event == :c_call
-    end
-
     def class?
       event == :class
     end
@@ -157,22 +165,12 @@ EOM
       @km ||= "#{class_name}#{call_symbol}#{method_name}"
     end
 
-    def class_name
-      c_call? ? defined_class : current.klass
-    rescue
-      puts event
-    end
-
     def method_name
-      return method_id if c_call?
+      return method_id if event == :c_call
       return frame_env if b_call? || class?
       (method_id == frame_env) ? method_id : "#{method_id} -> #{frame_env}"
     end
 
-    def call_symbol
-      c_call? ? '#' : current.call_symbol
-    end
-
     def source_location
       "#{path}:#{lineno}"
     end
@@ -182,7 +180,6 @@ EOM
     end
 
     class Loader
-
       attr_reader :point_classes, :config
 
       def initialize *enhancement, config

data/lib/trace_tree/points_markdown_table.rb

@@ -0,0 +1,60 @@
+class TraceTree
+  class PointsMarkdownTable
+    HEADERS = [:event, :defined_class, :method_id, :frame_env, :path, :lineno, :thread, :return_value]
+    COL_SEPERATOR = '|'
+    HEADER_BOTTOM = '-'
+    NEWLINE = "\n"
+    RETURN = /return/
+
+    LT_RAW = /</
+    LT_ESC = '&lt;'
+    GT_RAW= />/
+    GT_ESC = '&gt;'
+    COL_RAW = '|'
+    COL_ESC = '&#124;'
+
+    def initialize(points)
+      @points = points
+    end
+
+    def to_s
+      @buffer = []
+      generate_headers
+      generate_rows
+      @buffer.join
+    end
+
+    def generate_headers
+      HEADERS.each{ |h| @buffer << COL_SEPERATOR << h }
+      @buffer << COL_SEPERATOR
+      @buffer << NEWLINE
+      HEADERS.each{ |h| @buffer << COL_SEPERATOR << HEADER_BOTTOM }
+      end_row
+    end
+
+    def generate_rows
+      @points.each do |point|
+        point_to_row(point.event)
+        point_to_row(point.defined_class)
+        point_to_row(point.method_id)
+        point_to_row(point.thread? ? nil : point.frame_env)
+        point_to_row(point.path)
+        point_to_row(point.lineno)
+        point_to_row(point.thread)
+        point_to_row(point.event =~ RETURN ? point.return_value : nil)
+        end_row
+      end
+    end
+
+    def end_row
+      @buffer << COL_SEPERATOR << NEWLINE
+    end
+
+    def point_to_row(info)
+      info = info.to_s.gsub(LT_RAW, LT_ESC)
+      info.gsub!(GT_RAW, GT_ESC)
+      info.gsub!(COL_RAW, COL_ESC)
+      @buffer << COL_SEPERATOR << info
+    end
+  end
+end

data/lib/trace_tree/version.rb

@@ -1,3 +1,3 @@
 class TraceTree
-  VERSION = "0.3.3"
+  VERSION = "0.3.5"
 end

data/lib/trace_tree.rb

@@ -9,8 +9,8 @@ require 'trace_tree/tmp_file'
 require 'trace_tree/timer'
 require 'trace_tree/config'
 require 'trace_tree/warm'
+require 'trace_tree/points_markdown_table'
 require 'thread'
-require 'terminal-tableofhashes'
 
 class Binding
   def trace_tree *log, **opt, &to_do
@@ -115,7 +115,7 @@ class TraceTree
   end
 
   def table_of_points
-    Terminal::Table.from_hashes trace_points_array.map(&:to_h)
+    PointsMarkdownTable.new(trace_points_array)
   rescue => e
     log.puts "#{__method__}", e.inspect, e.backtrace
   end

data/trace_tree.gemspec

@@ -27,7 +27,6 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency "binding_of_callers", "~> 0.2.3"
   spec.add_dependency "tree_graph", "~> 0.2.4"
-  spec.add_dependency "tree_html", "~> 0.1.9"
-  spec.add_dependency "terminal-tableofhashes", "~> 0.1.0"
+  spec.add_dependency "tree_html", "~> 0.1.10"
 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: trace_tree
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 0.3.5
 platform: ruby
 authors:
 - ken
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-06-23 00:00:00.000000000 Z
+date: 2023-01-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -100,28 +100,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.9
+        version: 0.1.10
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.9
-- !ruby/object:Gem::Dependency
-  name: terminal-tableofhashes
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.1.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.1.0
+        version: 0.1.10
 description: 
 email:
 - block24block@gmail.com
@@ -162,6 +148,7 @@ files:
 - lib/trace_tree/point/omit.rb
 - lib/trace_tree/point/threadbegin.rb
 - lib/trace_tree/point/threadend.rb
+- lib/trace_tree/points_markdown_table.rb
 - lib/trace_tree/return_value.rb
 - lib/trace_tree/short_gem_path.rb
 - lib/trace_tree/timer.rb