trace_location 0.9.1 → 0.9.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2194441a9de2b0331c15d48e202e61e05d208703821e62b7d53db4b0baf1e958
-  data.tar.gz: 87e55afcd03311a0735fecd7a2d6f37865c2bd06df25f60805e57aec0b0f16e4
+  metadata.gz: 17ca486d486f5139ac8b32b55092baa1d9ff2d3c8845c3021d9a9314d7d5a177
+  data.tar.gz: f1f5ccba6018672a27d52d5927f73fb6ce9f63a32a14d2075e1fc96da7f158ee
 SHA512:
-  metadata.gz: eabe3716b3a56ff70aa15a25887cbbfd056953ace2eb1e4c7e532041ca245b160d7d8c5b6e52ad8ff294747d6937c3841fa911d82150770ff45d22d7efa2bc54
-  data.tar.gz: 631ee8e05dbbf7aeb65c35ec955f8cd56e6f1931fa34e979109f9c4d90dcb5e11b0755f5cc6495df42271dcc0ef047b29040adc57e8a142ec9486a4343a07b6f
+  metadata.gz: 92af182afecc84fa9c3f41bcee7ed928e5a90e2427397dd1aaf7786d67c29e98baf203f615bcddcf6e8a17bb3a0ffe04495c20bfcfbcb7f402c17ee0edede6fe
+  data.tar.gz: 65153552b73e1ed496f660707344488a1179a2018cae5c41b73d6847d227b7a19ce9acf9a9f907edd4503f5a669ba6e704237a906b9e25f1bcb37223b7024ac4

data/Gemfile.lock

@@ -1,9 +1,8 @@
 PATH
   remote: .
   specs:
-    trace_location (0.9.1)
+    trace_location (0.9.2)
       binding_of_caller
-      pry
 
 GEM
   remote: https://rubygems.org/
@@ -11,17 +10,12 @@ GEM
     ast (2.4.0)
     binding_of_caller (0.8.0)
       debug_inspector (>= 0.0.1)
-    coderay (1.1.2)
     debug_inspector (0.0.3)
     diff-lcs (1.3)
     jaro_winkler (1.5.2)
-    method_source (0.9.2)
     parallel (1.17.0)
     parser (2.6.3.0)
       ast (~> 2.4.0)
-    pry (0.12.2)
-      coderay (~> 1.1.0)
-      method_source (~> 0.9.0)
     rainbow (3.0.0)
     rake (12.3.2)
     rspec (3.8.0)

data/lib/trace_location/collector.rb

@@ -7,55 +7,78 @@ module TraceLocation
     require_relative 'event'
     Result = Struct.new(:events, :return_value)
 
-    def self.collect(match:, ignore:, &block)
-      events = []
-      hierarchy = 0
-      id = 0
-      cache = {}
-
-      tracer = TracePoint.new(:call, :return) do |trace_point|
-        next if match && !trace_point.path.to_s.match?(/#{match}/)
-        next if ignore && trace_point.path.to_s.match?(/#{ignore}/)
-
-        id += 1
-        caller_path, caller_lineno = trace_point.binding.of_caller(2).source_location
-        location_cache_key = "#{caller_path}:#{caller_lineno}"
-
-        case trace_point.event
-        when :call
-          cache[location_cache_key] = hierarchy
-
-          events << Event.new(
-            id: id,
-            event: trace_point.event,
-            path: trace_point.path,
-            lineno: trace_point.lineno,
-            caller_path: caller_path,
-            caller_lineno: caller_lineno,
-            method_id: trace_point.method_id,
-            defined_class: trace_point.defined_class,
-            hierarchy: hierarchy
-          )
-
-          hierarchy += 1
-        when :return
-          hierarchy = cache[location_cache_key] || hierarchy
-
-          events << Event.new(
-            id: id,
-            event: trace_point.event,
-            path: trace_point.path,
-            lineno: trace_point.lineno,
-            caller_path: caller_path,
-            caller_lineno: caller_lineno,
-            method_id: trace_point.method_id,
-            defined_class: trace_point.defined_class,
-            hierarchy: hierarchy
-          )
+    class << self
+      def collect(match:, ignore:, &block)
+        events = []
+        hierarchy = 0
+        id = 0
+        cache = {}
+
+        tracer = TracePoint.new(:call, :return) do |trace_point|
+          next if match && !trace_point.path.to_s.match?(/#{match}/)
+          next if ignore && trace_point.path.to_s.match?(/#{ignore}/)
+
+          id += 1
+          caller_path, caller_lineno = trace_point.binding.of_caller(2).source_location
+          location_cache_key = "#{caller_path}:#{caller_lineno}"
+
+          mes = extract_method_from(trace_point)
+
+          case trace_point.event
+          when :call
+            cache[location_cache_key] = hierarchy
+
+            events << Event.new(
+              id: id,
+              event: trace_point.event,
+              path: trace_point.path,
+              lineno: trace_point.lineno,
+              caller_path: caller_path,
+              caller_lineno: caller_lineno,
+              owner: mes.owner,
+              name: mes.name,
+              source: remove_indent(mes.source),
+              hierarchy: hierarchy,
+              is_module: trace_point.self.is_a?(Module)
+            )
+
+            hierarchy += 1
+          when :return
+            hierarchy = cache[location_cache_key] || hierarchy
+
+            events << Event.new(
+              id: id,
+              event: trace_point.event,
+              path: trace_point.path,
+              lineno: trace_point.lineno,
+              caller_path: caller_path,
+              caller_lineno: caller_lineno,
+              owner: mes.owner,
+              name: mes.name,
+              source: remove_indent(mes.source),
+              hierarchy: hierarchy,
+              is_module: trace_point.self.is_a?(Module)
+            )
+          end
         end
+        return_value = tracer.enable { block.call }
+        Result.new(events, return_value)
+      end
+
+      private
+
+      def extract_method_from(trace_point)
+        if trace_point.self.is_a?(Module)
+          ::Module.instance_method(:method).bind(trace_point.self).call(trace_point.method_id)
+        else
+          ::Kernel.instance_method(:method).bind(trace_point.self).call(trace_point.method_id)
+        end
+      end
+
+      def remove_indent(source)
+        indent = source.split("\n").first.match(/\A(\s+).+\z/)[1]
+        source.split("\n").map { |line| line.gsub(/\A#{indent}/, '') }.join("\n")
       end
-      return_value = tracer.enable { block.call }
-      Result.new(events, return_value)
     end
   end
 end

data/lib/trace_location/event.rb

@@ -3,18 +3,20 @@
 module TraceLocation
   class Event # :nodoc:
     CLASS_FORMAT = /\A#<(?:Class|refinement)\:([A-Za-z0-9\:]+).*>\z/.freeze
-    attr_reader :id, :event, :path, :lineno, :caller_path, :caller_lineno, :method_id, :defined_class, :hierarchy
+    attr_reader :id, :event, :path, :lineno, :caller_path, :caller_lineno, :owner, :name, :source, :hierarchy, :is_module
 
-    def initialize(id:, event:, path:, lineno:, caller_path:, caller_lineno:, method_id:, defined_class:, hierarchy:)
+    def initialize(id:, event:, path:, lineno:, caller_path:, caller_lineno:, owner:, name:, source:, hierarchy:, is_module:)
       @id = id
       @event = event
       @path = path
       @lineno = lineno
       @caller_path = caller_path
       @caller_lineno = caller_lineno
-      @method_id = method_id
-      @defined_class = defined_class
+      @owner = owner
+      @name = name
+      @source = source
       @hierarchy = hierarchy.to_i
+      @is_module = is_module
     end
 
     def valid?
@@ -33,14 +35,10 @@ module TraceLocation
       event == :return
     end
 
-    def method_str
-      match = defined_class.to_s.match(CLASS_FORMAT)
-
-      if match
-        "#{match[1]}.#{method_id}"
-      else
-        "#{defined_class}##{method_id}"
-      end
+    def owner_with_name
+      match = owner.to_s.match(CLASS_FORMAT)
+      separator = is_module ? '.' : '#'
+      match ? "#{match[1]}#{separator}#{name}" : "#{owner}#{separator}#{name}"
     end
   end
 end

data/lib/trace_location/generator/csv.rb

@@ -5,7 +5,7 @@ require 'csv'
 module TraceLocation
   module Generator
     class Csv < Base # :nodoc:
-      ATTRIBUTES = %w[id event path lineno caller_path caller_lineno method_str hierarchy].freeze
+      ATTRIBUTES = %w[id event path lineno caller_path caller_lineno owner_with_name hierarchy].freeze
 
       def initialize(events, return_value, options)
         super

data/lib/trace_location/generator/log.rb

@@ -51,7 +51,7 @@ module TraceLocation
           event = EVENTS[e.event]
           path = e.path.to_s.gsub(%r{#{gems_dir}/}, '')
 
-          %(#{indent}#{event} #{path}:#{e.lineno} [#{e.method_str}])
+          %(#{indent}#{event} #{path}:#{e.lineno} [#{e.owner_with_name}])
         end
       end
 

data/lib/trace_location/generator/markdown.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require 'pry'
-
 module TraceLocation
   module Generator
     class Markdown < Base # :nodoc:
@@ -36,25 +34,20 @@ module TraceLocation
           MARKDOWN
 
           events.select(&:call?).each do |e|
-            pm = Pry::Method.from_str(e.method_str)
-            next if pm.nil?
-
             path = e.path.to_s.gsub(%r{#{gems_dir}/}, '')
             caller_path = e.caller_path.to_s.gsub(%r{#{gems_dir}/}, '')
             io.write <<~MARKDOWN
               <details open>
               <summary>#{path}:#{e.lineno}</summary>
 
-              ##### #{pm.name_with_owner}
+              ##### #{e.owner_with_name}
 
-              ```#{pm.source_type}
-              #{pm.source.chomp}
+              ```ruby
+              #{e.source}
               # called from #{caller_path}:#{e.caller_lineno}
               ```
               </details>
             MARKDOWN
-          rescue StandardError
-            next
           end
         end
       end

data/lib/trace_location/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module TraceLocation
-  VERSION = '0.9.1'
+  VERSION = '0.9.2'
 end

data/trace_location.gemspec

@@ -24,7 +24,6 @@ Gem::Specification.new do |s|
   s.required_ruby_version = '>= 2.5.0'
 
   s.add_dependency 'binding_of_caller'
-  s.add_dependency 'pry'
 
   s.add_development_dependency 'bundler'
   s.add_development_dependency 'rake'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: trace_location
 version: !ruby/object:Gem::Version
-  version: 0.9.1
+  version: 0.9.2
 platform: ruby
 authors:
 - Yoshiyuki Hirano
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-06-04 00:00:00.000000000 Z
+date: 2019-06-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: binding_of_caller
@@ -24,20 +24,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: pry
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement