pry-moves 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2c08b34502f7649fecea8dbf09d8bbc04e917341a260c92bc1e1b50e70ad7fe3
-  data.tar.gz: 27be890e5b41dafdbdf58279c85618682ef8a3f24fa2a89094053ec8d5af9455
+  metadata.gz: 47c7a7529bee28ca664536458891b00f6a1bee574869106686cd2abef9b57adb
+  data.tar.gz: 13d671c5f8ed4005304da6d4201908c0857d19e8ee3fe85631d18cea5c109580
 SHA512:
-  metadata.gz: b3d5d0a64ab6d910529b3e228154d609b638892913e66ea66c0403e152aea5aa9dceb8e66a46e8515978142af942bb7f59801ec233e1abcb2be44c2338279bc2
-  data.tar.gz: f288273d0b30e3bde39ec975e3bd5cb360a7d1a2f747cf8ab95d17e9190ac4f38797c9b21a90a3398383fd5b384dbd4df675a250ad23723360e60ccaed8ebf75
+  metadata.gz: addaf61aa995184e49f3b655f1d4fa863fa0554d1fb00f022fce7a9e1d8671595c03056e37754fd394bf9a204e32c91b3005a00fac3287f2803bafb66273e2d6
+  data.tar.gz: 9ba407049732e75c27e8cc87936e25967a30798212098fce844e948e7986912874137088fc87ffc8d9ef48ca09a3c2445da545132109a58ed47d5c4577775db4

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    pry-moves (1.0.0)
+    pry-moves (1.0.1)
       binding_of_caller (~> 0.7)
       colorize (~> 0.8)
       pry (>= 0.10.4, < 0.13)
@@ -13,7 +13,7 @@ GEM
       debug_inspector (>= 0.0.1)
     coderay (1.1.2)
     colorize (0.8.1)
-    debug_inspector (0.0.3)
+    debug_inspector (1.1.0)
     diff-lcs (1.3)
     method_source (0.9.0)
     pry (0.11.3)

data/lib/pry-moves/add_suffix.rb

@@ -65,7 +65,6 @@ end
 
 SUFFIX_COMMANDS = [
   PryMoves::Method,
-  PryMoves::ArgumentCall,
   PryMoves::ArrayIndex,
   PryMoves::ArrayCall,
   PryMoves::HashKey

data/lib/pry-moves/backtrace.rb

@@ -2,10 +2,12 @@ require 'fileutils'
 
 class PryMoves::Backtrace
 
+  FILTERS = %w[/gems/ /rubygems/ /bin/ /lib/ruby/]
+
   class << self
 
     def filter
-      @filter || /(\/gems\/|\/rubygems\/|\/bin\/|\/lib\/ruby\/)/
+      @filter ||= Regexp.new FILTERS.join("|")
     end
     def filter=(f); @filter = f; end
 
@@ -49,11 +51,13 @@ class PryMoves::Backtrace
   end
 
   def build
-    show_vapid = %w(+ a all hidden vapid).include?(@filter)
     show_all = %w(a all).include?(@filter)
+    show_vapid = %w(+ hidden vapid).include?(@filter) || show_all
     result = []
     current_object, vapid_count = nil, 0
 
+    recursion = PryMoves::Recursion::Holder.new
+
     frame_manager.bindings.each_with_details do |binding, vapid|
       next if !show_all and binding.eval('__FILE__').match self.class::filter
 
@@ -74,16 +78,20 @@ class PryMoves::Backtrace
         current_object = obj
       end
 
-      result << build_line(binding)
+      file, line = binding.eval('[__FILE__, __LINE__]')
+      recursion.track file, line, result.count, binding.index unless show_vapid
+      result << build_line(binding, file, line)
     end
 
+    recursion.each { |t| t.apply result }
+
     result << "👽  frames hidden: #{vapid_count}" if vapid_count > 0
 
     result
   end
 
-  def build_line(binding)
-    file = @formatter.shorten_path "#{binding.eval('__FILE__')}"
+  def build_line(binding, file, line)
+    file = @formatter.shorten_path "#{file}"
 
     signature = @formatter.method_signature binding
     signature = ":#{binding.frame_type}" if !signature or signature.length < 1
@@ -97,7 +105,6 @@ class PryMoves::Backtrace
       '    '
     end
 
-    line = binding.eval('__LINE__')
     "#{indent}#{file}:#{line} #{signature}"
   end
 

data/lib/pry-moves/formatter.rb

@@ -45,6 +45,7 @@ class PryMoves::Formatter
   end
 
   def cut_string str
+    return str unless str
     str.length > 50 ? "#{str.first 50}..." : str
   end
 

data/lib/pry-moves/recursion_tracker.rb

@@ -0,0 +1,94 @@
+module PryMoves::Recursion
+
+  class Tracker
+
+    attr_reader :loops
+
+    def initialize
+      @history = []
+      @loops = 0
+      @missing = 0
+      @currently_missing = []
+      @missing_lines = []
+    end
+
+    def track file, line_num, bt_index, binding_index
+      line = "#{file}:#{line_num}"
+      if @last_index
+        check_recursion line, bt_index, binding_index
+      elsif (prev_index = @history.rindex line)
+        @loops += 1
+        @last_index = prev_index
+        @recursion_size = 1
+      else
+        @history << line
+        @last_index = nil
+      end
+
+      @repetitions_start ||= bt_index if @loops == 2
+    end
+
+    def check_recursion line, bt_index, binding_index
+      prev_index = @history.rindex line
+      if prev_index == @last_index
+        @loops += 1
+        @missing = 0
+        @recursion_size = 0
+        @missing_lines.concat @currently_missing
+        @repetitions_end = bt_index
+      elsif prev_index && prev_index > @last_index
+        @last_index = prev_index + 1
+        @recursion_size += 1
+        # todo: finish tracking and debug multi-line recursions
+      elsif @missing <= @recursion_size
+        @missing += 1
+        @currently_missing << binding_index
+        false
+      else
+        # @missing_lines = nil
+        # @last_index = nil
+        @is_finished = true
+        false
+      end
+    end
+
+    def finished?
+      @is_finished
+    end
+
+    def good?
+      @repetitions_start and @repetitions_end
+    end
+
+    def apply result
+      label = "♻️  recursion with #{@loops} loops"
+      label += " Ⓜ️  #{@missing} missing lines #{@missing_lines}" if @missing_lines.present?
+      label = "...(#{label})..."
+      # puts "#{@repetitions_start}..#{@repetitions_end}"
+      result[@repetitions_start..@repetitions_end] = [label]
+    end
+
+  end
+
+  class Holder < Array
+
+    def initialize(*args)
+      super
+      new_tracker
+    end
+
+    def new_tracker
+      @tracker = Tracker.new
+    end
+
+    def track *args
+      @tracker.track *args
+      if @tracker.finished?
+        self << @tracker if @tracker.good?
+        new_tracker
+      end
+    end
+
+  end
+
+end

data/lib/pry-moves/version.rb

@@ -1,3 +1,3 @@
 module PryMoves
-  VERSION = '1.0.0'
+  VERSION = '1.0.1'
 end

data/lib/pry-moves.rb

@@ -11,6 +11,7 @@ require 'pry-moves/backtrace'
 require 'pry-moves/watch'
 require 'pry-moves/painter'
 require 'pry-moves/restartable'
+require 'pry-moves/recursion_tracker'
 
 require 'commands/traced_method'
 require 'commands/trace_helpers'
@@ -48,8 +49,8 @@ module PryMoves
     pry_moves_stack_root = true
     PryMoves.re_execution
     if PryMoves.stop_on_breakpoints
+      self.debug_called_times += 1
       if at
-        self.debug_called_times += 1
         return unless self.debug_called_times == at
       end
       PryMoves.messages << message if message

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pry-moves
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - garmoshka-mo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-09-09 00:00:00.000000000 Z
+date: 2021-10-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pry
@@ -108,6 +108,7 @@ files:
 - lib/pry-moves/pry_ext.rb
 - lib/pry-moves/pry_remote_ext.rb
 - lib/pry-moves/pry_wrapper.rb
+- lib/pry-moves/recursion_tracker.rb
 - lib/pry-moves/restartable.rb
 - lib/pry-moves/version.rb
 - lib/pry-moves/watch.rb