trace_tree 0.3.4 → 0.3.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cc09963c20ff9fa2325a140cdba7f52a365a86e6345c91c0b73ed7e84954da88
-  data.tar.gz: b4fc0967633be32701de2ae30fffe7c5d96d010a061f3885cda766ea893db261
+  metadata.gz: 2e25619d4cd4911fa6248e38af2f84091885e7cd7d9093904bc2867ebabf9ddc
+  data.tar.gz: 0d86d05a65e21f29445a4592551fa4c796e2b05d080c51524323792be673e82b
 SHA512:
-  metadata.gz: 39a369877af219019c3bdf138733c265a69f20af06661c3c84fcc529b78e75e9e3007eac211755cbecd1c79eab33bfa2c32ec5d84cddc1f9c2d6d283c928b5eb
-  data.tar.gz: 7ecbd1ecc5e2ecc2fafadefa02a41482bbed8e44790fc6f41b6aa1ba72e01b9e79f8e75141824ff4a99d52d6c7168fe8918898b9626f87031912c065389f6eb5
+  metadata.gz: 3ca5976e6b6008403116961966cf257a36fcb8ff23bddbd240dbacd1096c39da42f5cdc4bb247d3cdc7c6468147b2bf010668de943f856e73e55f7305e48e8b9
+  data.tar.gz: f145a4f9bc64aa48c7d75ddc1f61178dbe548b5e14815fd460de4d113cd72ec182f0a067122893284049412a0f4f8d7fb9a3d9fcbb333d2205fbbcbc97d7c81c

data/.gitignore

@@ -1,6 +1,5 @@
 /.bundle/
 /.yardoc
-/Gemfile.lock
 /_yardoc/
 /coverage/
 /doc/
@@ -9,4 +8,5 @@
 /tmp/
 *.swp
 *.gem
+.ruby-version
 .tool-versions

data/Gemfile.lock

@@ -0,0 +1,39 @@
+PATH
+  remote: .
+  specs:
+    trace_tree (0.3.5)
+      binding_of_callers (~> 0.2.3)
+      tree_graph (~> 0.2.4)
+      tree_html (~> 0.1.10)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    binding_of_caller (1.0.0)
+      debug_inspector (>= 0.0.1)
+    binding_of_callers (0.2.3)
+      binding_of_caller (~> 1.0)
+      pry (>= 0.10.0)
+    coderay (1.1.3)
+    debug_inspector (1.1.0)
+    method_source (1.0.0)
+    minitest (5.17.0)
+    pry (0.14.2)
+      coderay (~> 1.1)
+      method_source (~> 1.0)
+    rake (13.0.6)
+    tree_graph (0.2.4)
+    tree_html (0.1.10)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  bundler (~> 2.4.0)
+  minitest (~> 5.0)
+  pry
+  rake (>= 12.3.3)
+  trace_tree!
+
+BUNDLED WITH
+   2.4.1

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/version.rb

@@ -1,3 +1,3 @@
 class TraceTree
-  VERSION = "0.3.4"
+  VERSION = "0.3.6"
 end

data/lib/trace_tree.rb

@@ -23,6 +23,7 @@ class Binding
 end
 
 class TraceTree
+  RB_VER = RUBY_VERSION.split('.')[0..1].join('.').to_f
 
   MainFile = __FILE__
 
@@ -215,9 +216,9 @@ class TraceTree
 
     # binding.pry
 
-    stacks[trace_points.first.thread][0].
-      callees[0].
-      callees[0]
+    thread_stack = stacks[trace_points.first.thread]
+    frame = thread_stack[0].callees[0].callees[0]
+    RB_VER >= 2.7 ? frame : frame.callees[0]
   end
 
   def trace_points_array

data/trace_tree.gemspec

@@ -20,7 +20,7 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_development_dependency "bundler", "> 1.14"
+  spec.add_development_dependency "bundler", "~> 2.4.0"
   spec.add_development_dependency "rake", ">= 12.3.3"
   spec.add_development_dependency "minitest", "~> 5.0"
   spec.add_development_dependency "pry"

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: trace_tree
 version: !ruby/object:Gem::Version
-  version: 0.3.4
+  version: 0.3.6
 platform: ruby
 authors:
 - ken
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-11-19 00:00:00.000000000 Z
+date: 2023-01-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.14'
+        version: 2.4.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.14'
+        version: 2.4.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -108,7 +108,7 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.1.10
-description: 
+description:
 email:
 - block24block@gmail.com
 executables: []
@@ -119,6 +119,7 @@ files:
 - ".travis.yml"
 - CODE_OF_CONDUCT.md
 - Gemfile
+- Gemfile.lock
 - LICENSE.txt
 - README.md
 - Rakefile
@@ -162,7 +163,7 @@ homepage: https://github.com/turnon/trace_tree
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -177,8 +178,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
-signing_key: 
+rubygems_version: 3.4.1
+signing_key:
 specification_version: 4
 summary: Print TracePoint(:b_call, :b_return, :c_call, :c_return, :call, :return,
   :class, :end, :thread_begin, :thread_end) in tree view, to console or html