trace_tree 0.2.18 → 0.2.23

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 0e3749fd5cfe77879935127aff043e0f0e1dd824
-  data.tar.gz: f198631aa1b43c03471a8ad64726b18360399f86
+SHA256:
+  metadata.gz: bd5d8139275c2476c088b09d3206025594e2b90a19862fbfc547068104b1b35f
+  data.tar.gz: 8a98934c3db1b3c889bd7ae37e694f0bc75d2ea5cc2e499b21927d761023881c
 SHA512:
-  metadata.gz: aa48ccce8ea838085360474808485d59ce3e1f3db4251084f8d9b3c7a6615803db01228805bb87ef2d680adefdaad28a7730fed432463ff67dd451b0f54e98aa
-  data.tar.gz: d5b83842c96349de9bb0f1c8a1237dfefd0f82461be4fbcfa400a7c2c49c2096d9942852e3568da2d5b2519f23aaa9d445673c89d16b60d5deb5e23665a4144e
+  metadata.gz: 76792e80cfd88a73e3af890b6c1c8cb3de8ce2dde25e537914b9ffce13c15157692722f6618d4b99dfb5cddfb22230a5e78676ff41de25d4ea1d647b065229f5
+  data.tar.gz: acbcb32253763eacaa73771a2b8bac61f4092d0525f3610437852ed19f56bc4113aeb6cd7728b21ff4b6d99dbeb7f8fc2ac58ccf1825b2888ee665f3ad7b9d16

data/README.md

@@ -58,7 +58,8 @@ end
 * `:no_methods => nil` by default. Give it regexp(s) to hide stack under matching methods. Useful when you want to dump stack of a rack middleware but lower middlewares.
 * `: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 somthing like what for `:tmp` to output a whole list of TracePoints in file for debug.
+* `: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`.
 
 ### Example 1: Output to HTML
 

data/bin/console

@@ -10,5 +10,5 @@ require "trace_tree"
 # require "pry"
 # Pry.start
 
-require "irb"
-IRB.start(__FILE__)
+require "pry"
+pry

data/lib/trace_tree.rb

@@ -42,7 +42,7 @@ class TraceTree
   def generate *log, **opt, &to_do
     @opt = opt
     @log = dump_location *log
-    @debug = TmpFile.new opt[:debug] if opt[:debug]
+    @debug = debug_location
     enhance_point
     @build_command = (opt[:html] || opt[:htmp]) ? :tree_html_full : :tree_graph
     make_filter
@@ -66,9 +66,16 @@ class TraceTree
 
   attr_reader :bi, :trace_points, :log, :build_command, :timer, :opt, :point_loader, :config
 
+  def debug_location
+    loc = opt[:debug]
+    return nil unless loc
+    return loc if loc.respond_to? :puts
+    TmpFile.new loc, transcode: opt[:transcode]
+  end
+
   def dump_location *log
-    return TmpFile.new opt[:tmp] if opt[:tmp]
-    return TmpFile.new(opt[:htmp] + '.html') if opt[:htmp]
+    return TmpFile.new(opt[:tmp], transcode: opt[:transcode]) if opt[:tmp]
+    return TmpFile.new((opt[:htmp] + '.html'), transcode: opt[:transcode]) if opt[:htmp]
     log.empty? ? STDOUT : log[0]
   end
 
@@ -89,7 +96,7 @@ class TraceTree
     timer[:tree]
     tree = sort(trace_points_array).send build_command
     timer[:tree]
-    @debug.puts table_of_points if defined? @debug
+    @debug.puts table_of_points if @debug
     log.puts tree
     log.puts timer.to_s if opt[:timer]
   rescue => e
@@ -105,7 +112,7 @@ class TraceTree
       if (@no_methods = Array(opt[:no_methods])).empty?
         nil
       else
-        stack_filter = 'return false unless outside_hidden_stack?(point)'
+        'return false unless outside_hidden_stack?(point)'
       end
 
     path_filter =
@@ -124,8 +131,8 @@ class TraceTree
     filter_method = <<-EOM
       def wanted? point
         return false if point.end_of_trace?
-        return true if native?(point) || point.thread_relative?
         #{stack_filter}
+        return true if native?(point) || point.thread_relative?
         return true if point.method_defined_by_define_method?
         #{path_filter}
         true
@@ -144,14 +151,25 @@ class TraceTree
     stack = (point.thread[:trace_tree_no_methods_stack] ||= [])
     empty = stack.empty?
 
-    if @no_methods.any?{ |pattern| pattern =~ point.method_name }
+    if point.event == :b_call || point.event == :b_return
+      return true if empty
+      if point.terminate?(stack.last)
+        stack.pop
+      else
+        stack << point
+      end
+      return false
+    end
+
+    if @no_methods.any?{ |pattern| pattern =~ point.method_id }
       if !empty && point.terminate?(stack.last)
         stack.pop
+        return stack.empty?
       else
         stack << point
         point << Point::Omitted.new
+        return empty
       end
-      return true
     end
 
     empty
@@ -187,6 +205,8 @@ class TraceTree
       point.thread_begin = began_threads[thread]
     end
 
+    stacks.keys.each{ |thread| thread[:trace_tree_no_methods_stack] = nil }
+
     #binding.pry
 
     stacks[trace_points.first.thread][0].

data/lib/trace_tree/point.rb

@@ -18,10 +18,6 @@ class TraceTree
         bases << base
       end
 
-      def classes
-        @classes ||= bases.each_with_object(Hash.new{|h| h[:common]}){|c, h| h[c.event_class_method] = c}
-      end
-
       def bases
         @bases ||= []
       end
@@ -77,14 +73,12 @@ EOM
       end
 
       @return_value = trace_point.return_value if x_return?
+      @thread = Thread.current
 
-      if thread?
-        @thread = trace_point.self
-      else
+      unless thread?
         there = trace_point.binding.of_caller(3)
         @current = BindingOfCallers::Revealed.new there
         @frame_env = current.frame_env.to_sym
-        @thread = current.send(:eval, 'Thread.current')
       end
     rescue => e
       puts e
@@ -194,14 +188,36 @@ EOM
 
       def initialize *enhancement, config
         @config = config
-        return @point_classes = Point.classes if enhancement.empty?
-        @point_classes = Point.classes.each_with_object(Point.classes.dup) do |entry, hash|
-          hash[entry[0]] = entry[1].clone.prepend *enhancement
+        @bases = Point.bases
+        @bases = @bases.map{ |b| b = b.clone; b.prepend *enhancement; b } unless enhancement.empty?
+        sort_bases
+      end
+
+      def sort_bases
+        @methods = {}
+
+        @bases.each do |b|
+          event, klass, method = b.event_class_method
+          events = (@methods[method] ||= {})
+          klasses = (events[event] ||= {})
+          klasses[klass] = b
         end
+
+        @common = @methods[nil][:common][nil]
       end
 
       def create point
-        point_klass = point_classes[[point.event, point.defined_class, point.method_id]]
+        point_klass =
+          if events = @methods[point.method_id]
+            if klasses = events[point.event]
+              klasses[point.defined_class] || @common
+            else
+              @common
+            end
+          else
+            @common
+          end
+
         poi = point_klass.new point
         poi.config = config
         poi

data/lib/trace_tree/point/ccall_kernel_extend.rb

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

data/lib/trace_tree/point/ccall_module_include.rb

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

data/lib/trace_tree/point/ccall_module_prepend.rb

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

data/lib/trace_tree/tmp_file.rb

@@ -12,12 +12,15 @@ class TraceTree
 
     DefaultName = 'trace_tree.html'
 
-    def initialize path
+    def initialize path, transcode: false
       path = recognize_dir path
       @tmp = custom path
+      @transcode = transcode
     end
 
     def puts *content
+      content = content.map{ |c| c.to_s.encode('UTF-8', invalid: :replace, undef: :replace, replace: '?') } if @transcode
+
       File.open @tmp, 'a' do |f|
         f.puts *content
       end

data/lib/trace_tree/version.rb

@@ -1,3 +1,3 @@
 class TraceTree
-  VERSION = "0.2.18"
+  VERSION = "0.2.23"
 end

data/trace_tree.gemspec

@@ -20,14 +20,14 @@ 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", "> 1.14"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "minitest", "~> 5.0"
+  spec.add_development_dependency "pry"
 
   spec.add_dependency "binding_of_callers", "~> 0.1.5"
   spec.add_dependency "tree_graph", "~> 0.2.0"
   spec.add_dependency "tree_html", "~> 0.1.7"
   spec.add_dependency "terminal-tableofhashes", "~> 0.1.0"
 
-  spec.extensions << "ext/mkrf_conf.rb"
 end

metadata

@@ -1,27 +1,27 @@
 --- !ruby/object:Gem::Specification
 name: trace_tree
 version: !ruby/object:Gem::Version
-  version: 0.2.18
+  version: 0.2.23
 platform: ruby
 authors:
 - ken
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-10-23 00:00:00.000000000 Z
+date: 2020-09-10 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'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">"
       - !ruby/object:Gem::Version
         version: '1.14'
 - !ruby/object:Gem::Dependency
@@ -52,6 +52,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '5.0'
+- !ruby/object:Gem::Dependency
+  name: pry
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: binding_of_callers
   requirement: !ruby/object:Gem::Requirement
@@ -112,8 +126,7 @@ description:
 email:
 - block24block@gmail.com
 executables: []
-extensions:
-- ext/mkrf_conf.rb
+extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
@@ -125,7 +138,6 @@ files:
 - Rakefile
 - bin/console
 - bin/setup
-- ext/mkrf_conf.rb
 - lib/trace_tree.rb
 - lib/trace_tree/args.rb
 - lib/trace_tree/color.rb
@@ -136,22 +148,16 @@ files:
 - lib/trace_tree/group_by_file.js
 - lib/trace_tree/native_console.js
 - lib/trace_tree/point.rb
-- lib/trace_tree/point/call_activesupportconcern_appendfeatures.rb
-- lib/trace_tree/point/call_modulemutexm_extendobject.rb
 - lib/trace_tree/point/ccall_classthread_new.rb
 - lib/trace_tree/point/ccall_kernel_extend.rb
 - lib/trace_tree/point/ccall_kernel_raise.rb
-- lib/trace_tree/point/ccall_module_appendfeatures.rb
 - lib/trace_tree/point/ccall_module_extendobject.rb
 - lib/trace_tree/point/ccall_module_include.rb
 - lib/trace_tree/point/ccall_module_prepend.rb
-- lib/trace_tree/point/ccall_module_prependfeatures.rb
 - lib/trace_tree/point/ccall_thread_initialize.rb
 - lib/trace_tree/point/common.rb
 - lib/trace_tree/point/creturn_classthread_new.rb
-- lib/trace_tree/point/creturn_module_appendfeatures.rb
 - lib/trace_tree/point/creturn_module_extendobject.rb
-- lib/trace_tree/point/creturn_module_prependfeatures.rb
 - lib/trace_tree/point/creturn_thread_initialize.rb
 - lib/trace_tree/point/omit.rb
 - lib/trace_tree/point/threadbegin.rb
@@ -185,7 +191,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2.3
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Print TracePoint(:b_call, :b_return, :c_call, :c_return, :call, :return,

data/ext/mkrf_conf.rb

@@ -1,32 +0,0 @@
-#This file needs to be named mkrf_conf.rb
-#so that rubygems will recognize it as a ruby extension
-#file and not think it is a C extension file
-
-require 'rubygems/dependency_installer'
-
-#Load up the rubygem's dependency installer to
-#installer the gems we want based on the version
-#of Ruby the user has installed
-installer = Gem::DependencyInstaller.new
-
-begin
-  if RUBY_VERSION < "2.2.2"
-    installer.install "activesupport", "< 5.0.0"
-  elsif RUBY_VERSION < "2.5.0"
-    installer.install "activesupport", "< 6.0.0"
-  else
-    installer.install "activesupport"
-  end
-
-rescue => e
-  puts e.message, e.backtrace
-  #Exit with a non-zero value to let rubygems something went wrong
-  exit(1)
-end
-
-#If this was C, rubygems would attempt to run make
-#Since this is Ruby, rubygems will attempt to run rake
-#If it doesn't find and successfully run a rakefile, it errors out
-f = File.open(File.join(File.dirname(__FILE__), "Rakefile"), "w")
-f.write("task :default\n")
-f.close

data/lib/trace_tree/point/call_activesupportconcern_appendfeatures.rb

@@ -1,17 +0,0 @@
-require 'active_support/concern'
-
-class TraceTree
-  class Point
-    class CallActivesupportconcernAppendfeatures < Point
-
-      def self.event_class_method
-        [:call, ActiveSupport::Concern, :append_features]
-      end
-
-      def parameters
-        current.lv.values.first
-      end
-
-    end
-  end
-end

data/lib/trace_tree/point/call_modulemutexm_extendobject.rb

@@ -1,17 +0,0 @@
-require 'mutex_m'
-
-class TraceTree
-  class Point
-    class CallModuleMutexmExtendobject < Point
-
-      def mixin
-        Mutex_m
-      end
-
-      def self.event_class_method
-        [:call, Mutex_m.singleton_class, :extend_object]
-      end
-
-    end
-  end
-end

data/lib/trace_tree/point/ccall_module_appendfeatures.rb

@@ -1,15 +0,0 @@
-class TraceTree
-  class Point
-    class CcallModuleAppendfeatures < Point
-
-      def self.event_class_method
-        [:c_call, Module, :append_features]
-      end
-
-      def parameters
-        terminal.return_value
-      end
-
-    end
-  end
-end

data/lib/trace_tree/point/ccall_module_prependfeatures.rb

@@ -1,15 +0,0 @@
-class TraceTree
-  class Point
-    class CcallModulePrependfeatures < Point
-
-      def self.event_class_method
-        [:c_call, Module, :prepend_features]
-      end
-
-      def parameters
-        terminal.return_value
-      end
-
-    end
-  end
-end

data/lib/trace_tree/point/creturn_module_appendfeatures.rb

@@ -1,11 +0,0 @@
-class TraceTree
-  class Point
-    class CreturnModuleAppendfeatures < Point
-
-      def self.event_class_method
-        [:c_return, Module, :append_features]
-      end
-
-    end
-  end
-end

data/lib/trace_tree/point/creturn_module_prependfeatures.rb

@@ -1,11 +0,0 @@
-class TraceTree
-  class Point
-    class CreturnModulePrependfeatures < Point
-
-      def self.event_class_method
-        [:c_return, Module, :prepend_features]
-      end
-
-    end
-  end
-end