trace_tree 0.2.19 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 62deca45905349bd526ed97929de96a290b0bc72444d4142ddddadb8724f063b
-  data.tar.gz: 2e34e08a382e0cd249184a5ee92fbac613e06dce30806c6e8d521eee779764ca
+  metadata.gz: 4b6b20be57ccf2e78b519c7168b1ce03539983ca90edee377df0ef46df1e6efb
+  data.tar.gz: 48f2555a86a10a878ec48dbd2eb9d5b5cdea614d9c8d64e1a96a750eaa9d0543
 SHA512:
-  metadata.gz: 53a7bcc1fcfba7bccb113c777022c98ad6bc38fe14b5b6c88985a4d26f3ab452e8d541301fa259274f26807d9d666d65593fb0746998e8bc557a98be4f5d4879
-  data.tar.gz: b8bad2dea2b574bee4f0a1c82241587bcc708a2d2b042cbcf2fa18cedde6726d80b257b21b6c4a74f5795a754ebfbfa82c41b6894a76203872b1e3baf0be7801
+  metadata.gz: 66ab836be3474f70a2be81130dd1c502a6eb84b6eab030978c826358197a8b2bf31b28a88d3f4bbe60907dba775342eed4937c4cda14a3c08f5675fc2719fc7f
+  data.tar.gz: dfbec33b0177a877f11d3360e1bd5d94e62f3f967bd44217c3599025397ceadec68545dec21ac8c486d7cbd586886554a7130d5a8cf158b3cc9115b003da3234

data/README.md

@@ -54,11 +54,11 @@ end
 * `:htmp => nil` by default. It is combination of `:html` and `:tmp`.
 * `:return => true` by default. It stores return values of functions in generated html. Hover function call and press `r` to print return value in console.
 * `:args => false` by default. Set it true to puts arguments of `:call` functions into html. Since arguments are always return values of other functions, so this option is not necessary.
-* `:in => //, :out => nil` by default. Give them regexp(s) to include/exclude methods defined in files match that regexp(s). Notice thread-calls and methods defined by `define_method` are always included. Also, once you set any of these two options, the code to trace should not be in same line with `binding.trace_tree() do`.
 * `: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 `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/lib/trace_tree.rb

@@ -18,7 +18,7 @@ class Binding
       return yield
     end
 
-    TraceTree.new(self).generate *log, **opt, &to_do
+    TraceTree.new(self).generate(*log, **opt, &to_do)
   end
 end
 
@@ -41,19 +41,21 @@ class TraceTree
 
   def generate *log, **opt, &to_do
     @opt = opt
-    @log = dump_location *log
+    @log = dump_location(*log)
     @debug = debug_location
     enhance_point
     @build_command = (opt[:html] || opt[:htmp]) ? :tree_html_full : :tree_graph
     make_filter
     @__file__, @__line__, there = bi.eval('[__FILE__, __LINE__, self]')
 
+    dry_run
+
     #start_trace
     timer[:trace]
-    @tp = TracePoint.new *Events, &@deal
+    @tp = TracePoint.new(*Events, &@deal)
     @tp.enable
 
-    there.instance_eval &to_do
+    there.instance_eval(&to_do)
   ensure
     #stop_trace
     return unless @tp
@@ -66,16 +68,23 @@ class TraceTree
 
   attr_reader :bi, :trace_points, :log, :build_command, :timer, :opt, :point_loader, :config
 
+  def dry_run
+    tp = TracePoint.new{}
+    tp.enable
+  ensure
+    tp.disable
+  end
+
   def debug_location
     loc = opt[:debug]
     return nil unless loc
     return loc if loc.respond_to? :puts
-    TmpFile.new loc
+    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 +98,7 @@ class TraceTree
       enhancement << TraceTree::LuxuryReturnValue
     end
     enhancement << TraceTree::Args if opt[:args] == true
-    @point_loader = Point::Loader.new *enhancement, config
+    @point_loader = Point::Loader.new(*enhancement, config)
   end
 
   def dump_trace_tree
@@ -112,17 +121,10 @@ 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 =
-      if opt.key?(:in) || opt.key?(:out)
-        @in = Array(opt[:in] || //)
-        @out = Array(opt[:out])
-        'return false unless @in.any?{ |pattern| pattern =~ point.path } && @out.all?{ |pattern| pattern !~ point.path }'
-      else
-        nil
-      end
+    path_filter = nil
 
     if stack_filter.nil? && path_filter.nil?
       return @deal = -> point { trace_points << point_loader.create(point) }
@@ -131,8 +133,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
@@ -151,14 +153,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
@@ -194,7 +207,9 @@ class TraceTree
       point.thread_begin = began_threads[thread]
     end
 
-    #binding.pry
+    stacks.keys.each{ |thread| thread[:trace_tree_no_methods_stack] = nil }
+
+    # binding.pry
 
     stacks[trace_points.first.thread][0].
       callees[0].

data/lib/trace_tree/config.rb

@@ -11,7 +11,7 @@ class TraceTree
     def self.load
       config = DEFAULT
       custom = File.join ENV['HOME'], '.trace_tree_config'
-      if File.exists?(custom) && (hash = YAML.load File.read custom)
+      if File.exist?(custom) && (hash = YAML.load File.read custom)
         hash.select!{ |k, v| config.include? k }
         config = config.merge hash
       end

data/lib/trace_tree/point.rb

@@ -11,7 +11,7 @@ class TraceTree
     attr_accessor :terminal, :config
 
     Interfaces = [:event, :defined_class, :method_id, :path, :lineno]
-    attr_reader *Interfaces
+    attr_reader(*Interfaces)
 
     class << self
       def inherited base
@@ -73,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
@@ -162,7 +160,7 @@ EOM
 
     def class_name
       c_call? ? defined_class : current.klass
-    rescue => e
+    rescue
       puts event
     end
 
@@ -191,7 +189,7 @@ EOM
       def initialize *enhancement, config
         @config = config
         @bases = Point.bases
-        @bases = @bases.map{ |b| b = b.clone; b.prepend *enhancement; b } unless enhancement.empty?
+        @bases = @bases.map{ |b| b = b.clone; b.prepend(*enhancement); b } unless enhancement.empty?
         sort_bases
       end
 

data/lib/trace_tree/return_value.rb

@@ -6,7 +6,7 @@ class TraceTree
     BLANK = ''.freeze
 
     NEED_PP = (
-      if File.exists? (pp_config = File.join(ENV['HOME'], '.trace_tree_pp'))
+      if File.exist? (pp_config = File.join(ENV['HOME'], '.trace_tree_pp'))
         IO.readlines(pp_config).map &:strip
       else
         []

data/lib/trace_tree/tmp_file.rb

@@ -12,14 +12,17 @@ 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
+        f.puts(*content)
       end
     end
 
@@ -45,7 +48,7 @@ class TraceTree
       path[-1] = time + path[-1]
       path = [Dir.tmpdir] + path
       ensure_parent path
-      File.join *path
+      File.join(*path)
     end
 
     def time
@@ -54,7 +57,7 @@ class TraceTree
 
     def ensure_parent path_arr
       dir = path_arr[0..-2]
-      FileUtils.mkdir_p File.join *dir
+      FileUtils.mkdir_p File.join(*dir)
     end
   end
 end

data/lib/trace_tree/version.rb

@@ -1,3 +1,3 @@
 class TraceTree
-  VERSION = "0.2.19"
+  VERSION = "0.3.0"
 end

data/trace_tree.gemspec

@@ -20,12 +20,12 @@ 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 "binding_of_callers", "~> 0.2.0"
   spec.add_dependency "tree_graph", "~> 0.2.0"
   spec.add_dependency "tree_html", "~> 0.1.7"
   spec.add_dependency "terminal-tableofhashes", "~> 0.1.0"

metadata

@@ -1,27 +1,27 @@
 --- !ruby/object:Gem::Specification
 name: trace_tree
 version: !ruby/object:Gem::Version
-  version: 0.2.19
+  version: 0.3.0
 platform: ruby
 authors:
 - ken
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-12-22 00:00:00.000000000 Z
+date: 2021-02-16 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
@@ -72,14 +72,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.5
+        version: 0.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.5
+        version: 0.2.0
 - !ruby/object:Gem::Dependency
   name: tree_graph
   requirement: !ruby/object:Gem::Requirement
@@ -190,8 +190,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.2.3
 signing_key: 
 specification_version: 4
 summary: Print TracePoint(:b_call, :b_return, :c_call, :c_return, :call, :return,