call_graph 1.4.3 → 2.0.0.pre

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4e23fffc3451464c540fae79d3fd0f7225cddabb6a5e24f6dbe65d3a89fec77c
-  data.tar.gz: c3049da23574bca206ad15829ed9698422c98a1cd53c2f0f818479035b00e563
+  metadata.gz: 1cd7595348f729124dcfb2f6539fa64a07cf9252a95f064db16f213a2d4eb5d9
+  data.tar.gz: 0363b8ea3eac72bddf9333e2b13b4719a877d0a81356df724413f8db616f40b9
 SHA512:
-  metadata.gz: c4d62a6850b0a0b4b04f6e88f1f37ca69945d41db3b234540504e38b4b087409f52a1cf321e1350ff5af8ea0e1e48de40fb168e4b63ece09f5de73a9276568da
-  data.tar.gz: 0b359aaf33665363b7fbacf32600d98dee01518036afcd48aea8579400ef7178d13f8f2574db91c12b002d1a90d40df8dc98da018b54474a1986df37703cf690
+  metadata.gz: 65e02be5c6814108da3345da3f004c17b53a4fb3d8266f060db92be498fad222f7c558633119adfcfeb433af3b68ea823e61a047b6c71f193fb68d3160b1ad2f
+  data.tar.gz: 5e4fbc1daa3ca4dc6d2e03bd8f9bc2e09d976efc589e7e1e945ff94b7b5e90b63c3b80ad491573e0e41c8b0d60cf232047d698b871ad3e86c3c2a6d44faafb3d

data/README.md

@@ -41,9 +41,9 @@ CallGraph.config do |config|
   config.file_path = "examples/call-graph"
 end
 
-CallGraph.start
-A.x
-CallGraph.stop
+CallGraph.trace do
+  A.x
+end
 ```
 
 Print the captured execution with the provided rake tasks.
@@ -68,9 +68,6 @@ rake call_graph:printer:png  # write png file from dot file
 ```ruby
 CallGraph.config do |config|
   config.file_path = "examples/call-graph"
-  config.ignore_paths.clear
-  config.ignore_methods << "stop"
-  config.path(:png)
 end
 ```
 

data/examples/foobar.rb

@@ -34,6 +34,6 @@ end
   `rm -f #{path}`
 end
 
-CallGraph.start
-A.x
-CallGraph.stop
+CallGraph.trace do
+  A.x
+end

data/lib/call_graph/instrument.rb

@@ -1,14 +1,14 @@
 require 'set'
 require 'binding_of_caller'
 
+INTROSPECT = "(self.class == Class ? self.name : self.class.name) + ' ' + (self.class == Class ? '(Class)' : '(Instance)')"
+
 module CallGraph
   class Instrument
-    attr_accessor :file_path, :ignore_paths, :ignore_methods, :set
+    attr_accessor :file_path, :set
 
-    def initialize(file_path: default_file_path, ignore_paths: default_ignore_paths, ignore_methods: default_ignore_methods)
+    def initialize(file_path: default_file_path)
       @file_path      = file_path
-      @ignore_paths   = ignore_paths
-      @ignore_methods = ignore_methods
       @set            = Set.new
     end
 
@@ -17,72 +17,38 @@ module CallGraph
     end
 
     def default_file_path
-      'call_graph'
-    end
-
-    def default_ignore_paths
-      [
-        /#{RUBY_VERSION}/,
-        /\(eval\)/,
-        /bundle\/gems/,
-        /spec/,
-        /test/
-      ]
+      'call-graph'
     end
 
-    def default_ignore_methods
-      [
-        :require,
-        :set_encoding,
-        :initialize,
-        :new,
-        :attr_reader,
-        :method_added,
-        :private,
-        :inherited,
-        :singleton_method_added,
-        :set_trace_func,
-        :call
-      ]
-    end
+    def trace(&block)
+      trace_point.enable
+      yield
+      trace_point.disable
 
-    def start
-      # :nocov:
-      set_trace_func ->(event, file, _line, id, receiver_binding, classname) do
-        return if ignore_paths.any? { |path| file && file[path] }
-
-        case event
-        when 'call', 'c-call'
-          caller_binding = receiver_binding.of_caller(2)
+      File.open(path(:tmp), 'w') { |fd| fd.write set.to_a.compact.join("\n") }
 
-          caller_class = caller_binding.eval('self.class == Class ? self.name : self.class.name')
-          caller_class = caller_binding.frame_description unless caller_class
-          caller_class = caller_class + ' ' + caller_binding.eval("self.class == Class ? '(Class)' : '(Instance)'")
+      set.clear
+    end
 
+    private
 
-          receiver_class = receiver_binding.eval('self.class == Class ? self.name : self.class.name')
-          receiver_class = caller_binding.frame_description if receiver_class.nil?
-          receiver_class = receiver_class + ' ' + receiver_binding.eval("self.class == Class ? '(Class)' : '(Instance)'")
+    def trace_point
+      @trace_point ||= begin
+        TracePoint.new(:call) do |trace|
+          next if trace.defined_class == self.class
 
-          return if classname == CallGraph
-          return if classname == CallGraph::Instrument
-          return if caller_class == receiver_class
-          return if ignore_methods.include?(id)
+          case trace.event
+          when :call
+            id       = trace.method_id
+            caller   = trace.binding.of_caller(2).eval(INTROSPECT)
+            receiver = trace.binding.eval(INTROSPECT)
 
-          set.add("#{caller_class},#{receiver_class},#{id}")
+            next if caller == receiver
+          
+            set.add("#{caller},#{receiver},#{id}")
+          end
         end
-      rescue Exception => e
-        puts e.message
       end
-      #:nocov:
-    end
-
-    def stop
-      set_trace_func nil
-
-      File.open(path(:tmp), 'w') { |fd| fd.write set.to_a.compact.join("\n") }
-
-      set.clear
     end
   end
 end

data/lib/call_graph/version.rb

@@ -1,3 +1,3 @@
 module CallGraph
-  VERSION = '1.4.3'.freeze
+  VERSION = '2.0.0.pre'.freeze
 end

data/lib/call_graph.rb

@@ -4,8 +4,8 @@ require 'call_graph/printers/dot'
 require 'call_graph/printers/png'
 
 module CallGraph
-  def self.start
-    instrument.start
+  def self.trace(&block)
+    instrument.trace(&block)
   end
 
   def self.config
@@ -16,10 +16,6 @@ module CallGraph
     end
   end
 
-  def self.stop
-    instrument.stop
-  end
-
   private
 
   def self.instrument

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: call_graph
 version: !ruby/object:Gem::Version
-  version: 1.4.3
+  version: 2.0.0.pre
 platform: ruby
 authors:
 - James Moriarty
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-03-02 00:00:00.000000000 Z
+date: 2019-03-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: binding_of_caller
@@ -109,9 +109,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubygems_version: 3.0.1
 signing_key: