pry-moves 1.0.2 → 1.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a9dc991b1aed888cf23fd1e9a76b29d274ce56989119f802982e9fbdc46cc034
-  data.tar.gz: 25e331897d83de799b696e84d1de474166095d4e80853a7f9cde99ba64290432
+  metadata.gz: cf124819313d4f06ebe4b9d81d1b392cf06e96028ebef3ef67604642f9529c70
+  data.tar.gz: d07e5afae2c9bf9ce303a1731706af1921f79892496d188b9c5bf371f0160ed1
 SHA512:
-  metadata.gz: fbaa701da70c665fe7795de825db1540e5a1ab2d4f2021c41d4294c14bce3429b34b7e64d21949f51fd08dbbc24b6ffc047776bb7207b8c73834893e0e03ced7
-  data.tar.gz: 169ee4d3b3e40f8f63c7969c2b709c82dfc23881c994a335b25635fbf90b798ea21616bc33c08dd0bd44418a2c996f0b5eb6079732d769ff5c061757af35f5e7
+  metadata.gz: ea4608c426807fbc02121a5bc32dddb36fe35fdf988872d964fe97424f9ce0d14d1b8bf28dd96012610ffcfdbb7d2567ceb97589a37b12e49a835c40eddc8fbc
+  data.tar.gz: d1fca032e8f5c76bd10012b9a170849238c335238ea1b899577c0d2ccb2109b2578b6f171ebcd2f6465f3fdba247c05feef0c9e0a77f481452dfd4c3c270e591

data/Gemfile.lock

@@ -1,7 +1,8 @@
 PATH
   remote: .
   specs:
-    pry-moves (1.0.2)
+    pry-moves (1.0.3)
+      awesome_print (>= 1.8.0)
       binding_of_caller (~> 0.7)
       colorize (~> 0.8)
       diffy (~> 3.4.0)
@@ -10,13 +11,14 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
+    awesome_print (1.9.2)
     binding_of_caller (0.8.0)
       debug_inspector (>= 0.0.1)
     coderay (1.1.2)
     colorize (0.8.1)
     debug_inspector (1.1.0)
     diff-lcs (1.3)
-    diffy (3.4.0)
+    diffy (3.4.2)
     method_source (0.9.0)
     pry (0.11.3)
       coderay (~> 1.1.0)

data/README.md

@@ -18,16 +18,17 @@ Documentation for latest version. For [v0.1.12 see documentation here](https://g
   * `s +` - step into function, including hidden frames
 * `f` - **finish** execution of current frame (block or method) and stop at next line on higher level
 * `c` - **continue**
-* `b` - go to next breakpoint (breakpoints currently are methods which contain "debug" in their name)
-* `iterate` - go to next iteration of current block
+* `b` - go to next breakpoint (methods marked with `pry_breakpoint = :some_scope` variable)
+* `add-bp var_name [line_number]` - add to script in this place conditional breakpoint: `debug if var_name == <it's value>`
+* `ir` - **iterate**, go to next iteration of current block
 * `g 10` - **goto** line 10
 * `bt` - show backtrace, excluding hidden frames
   * `bt +` `bt hidden` - show backtrace including hidden frames
   * `bt a` `bt all` - full backtrace with system and hidden frames
   * `bt 10` - go to backtrace line 10
-  * `bt save` - save backtrace to memory
-  * `bt diff` - diff with saved backtrace
+  * `bt diff` - diff of backtraces (`bt save` for persistent save of 1st backtrace)
   * `bt > foo` - write backtrace to file `log/backtrace_foo.log`
+  * `bt ::ClassName` - list objects in backtrace which class name contains "ClassName"
 * `up`/`down`/`top`/`bottom` (`bm`) - move over call stack
   * `up +` - move up, including vapid frames (block callers, hidden frames)
   * `up pattern` - move up till first frame which method name or file position in format `folder/script.rb:12` matches regexp pattern
@@ -36,7 +37,8 @@ Documentation for latest version. For [v0.1.12 see documentation here](https://g
 * `debug some_method(some_param)` - call `some_method(some_param)` and interactively step into it. This way you can virtually "step back" by executing previous pieces of code from current method
 * `.method` or `123` or `:hash_key` - Continue traversing of last object in history. E.g. `orders` will list array, then `3` will enter `orders[3]`, then `.price` will enter `orders[3].price`
 * `watch variable` - display variable's value on each step
-* `@` - restart. Set config `PryMoves.reload_rake_tasks = true` to automatically reload rake tasks
+* `diff expression` - display difference between saved expression (on first run) and expression 2
+* `@` - restart and reload scripts (in app/ & spec/ by default), reload rake tasks. Configurable.
 * `#` - exit with code 3, can be wrapped in bash script to fully reload ruby scripts
 * `!` - exit
 
@@ -79,12 +81,22 @@ end
 ## Configuration
 
 Here is default configuration, you can reassign it:
-
 ```ruby
+PryMoves.reload_ruby_scripts = {
+  monitor: %w(app spec),
+  except: %w(app/assets app/views)
+}
+PryMoves.reload_rake_tasks = true
 PryMoves::Backtrace::filter =
   /(\/gems\/|\/rubygems\/|\/bin\/|\/lib\/ruby\/|\/pry-moves\/)/
 ```
 
+Turn off features with environment variables:
+```bash
+PRY_MOVES_DEBUG_MISSING=off
+PRY_MOVES_RELOADER=off
+```
+
 ## Threads, helpers
 
 To allow traveling to parent thread, use:
@@ -135,9 +147,10 @@ Please note that debugging functionality is implemented through
 ## Testing
 
 ```
-bundle exec rspec
+bin/rspec
+bin/rspec -f d # Output result of each spec example
 
-DEBUG=true bundle exec rspec -e 'backtrace should backtrace'
+DEBUG=true bin/rspec -e 'backtrace should backtrace'
 ```
 
 ## ToDo
@@ -168,7 +181,6 @@ file an [issue][issues].
 [set_trace_func]: http://www.ruby-doc.org/core-1.9.3/Kernel.html#method-i-set_trace_func
 [pullrequests]:   https://github.com/garmoshka-mo/pry-moves/pulls
 [issues]:         https://github.com/garmoshka-mo/pry-moves/issues
-[changelog]:      https://github.com/garmoshka-mo/pry-moves/blob/master/CHANGELOG.md
 [debug.rb]:       https://github.com/ruby/ruby/blob/trunk/lib/debug.rb
 [Mon-Ouie]:       https://github.com/Mon-Ouie
 [pry_debug]:      https://github.com/Mon-Ouie/pry_debug

data/bin/rspec

@@ -0,0 +1,30 @@
+#!/usr/bin/env ruby
+require 'bundler/setup'
+
+require 'rspec/core'
+
+RSpec::Core::Parser.class_eval do
+
+  alias original_parser parser
+
+  def parser(options)
+    parser = original_parser(options)
+    parser.on('-e', '--example STRING', "Run examples whose full nested names include STRING (may be",
+      "  used more than once)") do |str|
+
+      str = str.split(" ").reject do |piece|
+        if (m = piece.match(/(\w+)=(.*)/))
+          ENV[m[1]] = m[2]
+          true
+        end
+      end.join(" ")
+
+      r = Regexp.compile(Regexp.escape(str), Regexp::IGNORECASE)
+      (options[:full_description] ||= []) << r
+    end
+    parser
+  end
+
+end
+
+load Gem.bin_path('rspec-core', 'rspec')

data/lib/commands/iterate.rb

@@ -3,20 +3,25 @@ class PryMoves::Iterate < PryMoves::TraceCommand
   def init(binding_)
     @iteration_start_line = binding_.eval('__LINE__')
     @caller_digest = frame_digest(binding_)
+    @receiver = binding_.receiver
   end
 
   def trace(event, file, line, method, binding_)
     return true if event == 'return' and
-      @method.within?(file, line)
+      traced_method?(file, line, method, binding_)
 
     # промотка итерации -
     # попасть на ту же или предыдущую строку или выйти из дайджеста
     # будучи в том же методе
     event == 'line' and @call_depth == 0 and
-      @method.within?(file, line) and
+      traced_method?(file, line, method, binding_) and
       (line <= @iteration_start_line or
         @caller_digest != current_frame_digest
       )
   end
 
+  def traced_method?(file, line, method, binding_)
+    super and @receiver == binding_.receiver
+  end
+
 end

data/lib/commands/next.rb

@@ -2,6 +2,7 @@ class PryMoves::Next < PryMoves::TraceCommand
 
   def init(binding_)
     @start_line = binding_.eval('__LINE__')
+    @receiver = binding_.receiver
     @start_digest = frame_digest(binding_)
     if @command[:param] == 'blockless'
       @stay_at_frame = @start_digest
@@ -14,24 +15,28 @@ class PryMoves::Next < PryMoves::TraceCommand
 
     return true if @call_depth < 0
 
-    return unless @call_depth == 0 and @method.within?(file, line)
-
-      if event == 'line'
-        if @stay_at_frame
-          return (
-            @stay_at_frame == current_frame_digest or
-            @c_stack_level < 0
-          )
-        elsif @start_line != line or (
-            @events_traced > 1 and # чтобы не застревало на while (vx = shift)
-            @start_digest == current_frame_digest # for correct iterating over one_line_in_block
-          )
-          return true
-        end
+    return unless @call_depth == 0 and traced_method?(file, line, method, binding_)
+
+    if event == 'line'
+      if @stay_at_frame
+        return (
+          @stay_at_frame == current_frame_digest or
+          @c_stack_level < 0
+        )
+      elsif @start_line != line or (
+          @events_traced > 1 and # чтобы не застревало на while (vx = shift)
+          @start_digest == current_frame_digest # for correct iterating over one_line_in_block
+        )
+        return true
       end
+    end
+
+    true if event == 'return' and
+      method == @method[:name] and @method.before_end?(line)
+  end
 
-      true if event == 'return' and
-        method == @method[:name] and @method.before_end?(line)
+  def traced_method?(file, line, method, binding_)
+    super and @receiver == binding_.receiver
   end
 
 end

data/lib/commands/next_breakpoint.rb

@@ -1,22 +1,19 @@
 class PryMoves::NextBreakpoint < PryMoves::TraceCommand
 
   def init(binding_)
-    @reach_digest = frame_digest(binding_)
   end
 
   def trace(event, file, line, method, binding_)
-    if @reach_digest
-      if @reach_digest == current_frame_digest
-        @reach_digest = nil
-      else
-        return
-      end
-    end
-
-    if method.to_s.include? "debug"
-      @pry_start_options[:initial_frame] = 1
+    if binding_.local_variable_defined?(:pry_breakpoint) and
+        binding_.local_variable_get(:pry_breakpoint)
+      binding_.local_variable_set :pry_breakpoint, nil # reset breakpoint at visited method instance
       true
     end
+
+    # if method.to_s.include? "debug"
+    #   @pry_start_options[:initial_frame] = 1
+    #   true
+    # end
   end
 
 end

data/lib/commands/step.rb

@@ -7,7 +7,7 @@ class PryMoves::Step < PryMoves::TraceCommand
     func = @command[:param]
     redirect_step? binding_ # set @step_into_funcs from initial binding
     if func == '+'
-      @step_in_everywhere = true
+      PryMoves.step_in_everywhere = true
     elsif func
       @find_straight_descendant = true
       @step_into_funcs = [func]
@@ -18,6 +18,7 @@ class PryMoves::Step < PryMoves::TraceCommand
   def trace(event, file, line, method, binding_)
     if binding_.local_variable_defined? :pry_moves_skip
       finish_cmd = {binding: binding_}
+      stop_tracing
       PryMoves::Finish.new finish_cmd, @pry_start_options do |binding|
         start_tracing
       end
@@ -36,7 +37,7 @@ class PryMoves::Step < PryMoves::TraceCommand
 
     return unless event == 'line'
 
-    if @step_in_everywhere
+    if PryMoves.step_in_everywhere
       return true
     elsif @step_into_funcs
       if @call_depth < 0

data/lib/commands/trace_command.rb

@@ -22,7 +22,7 @@ class TraceCommand
 
     binding_ = @command[:binding] # =Command.target - more rich, contains required @iseq
     unless binding_.instance_variable_get('@iseq')
-      binding_ = PryMoves::BindingsStack.new.initial_frame
+      binding_ = PryMoves::BindingsStack.new(@pry_start_options).initial_frame
     end
     @method = PryMoves::TracedMethod.new binding_
 
@@ -57,14 +57,14 @@ class TraceCommand
       Thread.current : Kernel
   end
 
-  def tracing_func(event, file, line, id, binding_, klass)
+  def tracing_func(event, file, line, method, binding_, klass)
 
     # Ignore traces inside pry-moves code
     return if file && TRACE_IGNORE_FILES.include?(File.expand_path(file))
     return unless binding_ # ignore strange cases
 
     # for cases when currently traced method called more times recursively
-    if event == "call" and @method.within?(file, line, id)
+    if event == "call" and traced_method?(file, line, method, binding_)
       @call_depth += 1
     elsif %w(c-call c-return).include?(event)
       # todo: может быть, c-return тоже правильнее делать после trace
@@ -72,16 +72,20 @@ class TraceCommand
       @c_stack_level += delta
     end
 
-    printf "👟 %8s %s:%-2d %10s %8s dep:#{@call_depth} c_st:#{@c_stack_level}\n", event, file, line, id, klass if PryMoves.trace # TRACE_MOVES=1
+    printf "👟 %8s %s:%-2d %10s %8s dep:#{@call_depth} c_st:#{@c_stack_level}\n", event, file, line, method, klass if PryMoves.trace # TRACE_MOVES=1
 
-    if trace event, file, line, id, binding_
+    if trace event, file, line, method, binding_
       @pry_start_options[:exit_from_method] = true if event == 'return'
       stop_tracing
       @callback.call binding_
-    elsif event == "return" and @method.within?(file, line, id)
+    elsif event == "return" and traced_method?(file, line, method, binding_)
       @call_depth -= 1
     end
   end
 
+  def traced_method?(file, line, method, binding_)
+    @method.within?(file, line, method)
+  end
+
 end
 end

data/lib/pry-moves/backtrace.rb

@@ -3,8 +3,10 @@ require 'fileutils'
 class PryMoves::Backtrace
 
   FILTERS = %w[/gems/ /rubygems/ /bin/ /lib/ruby/]
+  @@backtrace = nil
 
   class << self
+    attr_accessor :trim_path
 
     def filter
       @filter ||= Regexp.new FILTERS.join("|")
@@ -25,21 +27,27 @@ class PryMoves::Backtrace
 
   def initialize(pry)
     @pry = pry
-    @formatter = PryMoves::Formatter.new
+    @builder = PryMoves::BacktraceBuilder.new frame_manager
   end
 
   def run_command(param, param2)
-    if param == 'save'
-      @filter = 'hidden'
-      @@backtrace = build_backtrace
+    if param == 'save' || param == 'diff' && @@backtrace.nil?
+      @@hard_saved = param == 'save'
+      @builder.filter = 'hidden'
+      @builder.lines_numbers = false
+      @@backtrace = @builder.build_backtrace
       @pry.output.puts "💾 Backtrace saved (#{@@backtrace.count} lines)"
     elsif param == 'diff'
-      @filter = 'hidden'
+      @builder.filter = 'hidden'
+      @builder.lines_numbers = false
       diff
+      @@backtrace = nil unless @@hard_saved
+    elsif param and (match = param.match /^::(\w*)/)
+      @builder.colorize = true
+      @pry.output.puts @builder.objects_of_class match[1]
     elsif param.is_a?(String) and (match = param.match /^>(.*)/)
       suffix = match[1].size > 0 ? match[1] : param2
-      @formatter.colorize = false
-      write_to_file build_backtrace, suffix
+      write_to_file @builder.build_backtrace, suffix
     elsif param and param.match /\d+/
       index = param.to_i
       frame_manager.goto_index index
@@ -51,68 +59,9 @@ class PryMoves::Backtrace
   private
 
   def print_backtrace filter
-    @colorize = true
-    @lines_numbers = true
-    @filter = filter if filter.is_a? String
-    @pry.output.puts build_backtrace
-  end
-
-  def build_backtrace
-    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.reverse.each do |binding|
-      next if !show_all and binding.eval('__FILE__').match self.class::filter
-
-      if !show_vapid and binding.hidden
-        vapid_count += 1
-        next
-      end
-
-      if vapid_count > 0
-        result << "👽  frames hidden: #{vapid_count}"
-        vapid_count = 0
-      end
-
-      obj, debug_snapshot = binding.eval '[self, (debug_snapshot rescue nil)]'
-      # Comparison of objects directly may raise exception
-      if current_object.object_id != obj.object_id
-        result << "#{debug_snapshot || @formatter.format_obj(obj)}"
-        current_object = obj
-      end
-
-      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, line)
-    file = @formatter.shorten_path "#{file}"
-
-    signature = @formatter.method_signature binding
-    signature = ":#{binding.frame_type}" if !signature or signature.length < 1
-
-    indent = if frame_manager.current_frame == binding
-      '==> '
-    elsif true #@lines_numbers
-      s = "#{binding.index}:".ljust(4, ' ')
-      @colorize ? "\e[2;49;90m#{s}\e[0m" : s
-    else
-      '    '
-    end
-
-    "#{indent}#{file}:#{line} #{signature}"
+    @builder.colorize = true
+    @builder.filter = filter if filter.is_a? String
+    @pry.output.puts @builder.build_backtrace
   end
 
   def frame_manager
@@ -135,9 +84,10 @@ class PryMoves::Backtrace
   def diff
     return STDERR.puts "No backtrace saved. Use `bt save` first".yellow unless defined? @@backtrace
 
-    diff = Diffy::Diff.new(@@backtrace.join("\n"), build_backtrace.join("\n")).to_s "color"
-    diff = 'Backtraces are equal' if diff.strip.empty?
-    @pry.output.puts diff
+    @pry.output.puts Diffy.diff(
+      @@backtrace.join("\n"),
+      @builder.build_backtrace.join("\n")
+    )
   end
 
 end
@@ -164,4 +114,5 @@ Pry.config.exception_handler = proc do |output, exception, _|
       end
     end
   end
+
 end

data/lib/pry-moves/backtrace_builder.rb

@@ -0,0 +1,92 @@
+class PryMoves::BacktraceBuilder
+
+  attr_writer :lines_numbers, :filter, :colorize
+
+  def initialize frame_manager
+    @frame_manager = frame_manager
+    @filter = nil
+    @colorize = false
+    @lines_numbers = true
+    @formatter = PryMoves::Formatter.new
+  end
+
+  def build_backtrace
+    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.reverse.each do |binding|
+      next if !show_all and binding.eval('__FILE__').match PryMoves::Backtrace::filter
+
+      if !show_vapid and binding.hidden
+        vapid_count += 1
+        next
+      end
+
+      if vapid_count > 0
+        result << "👽  frames hidden: #{vapid_count}"
+        vapid_count = 0
+      end
+
+      obj, debug_snapshot = binding.eval '[self, (debug_snapshot rescue nil)]'
+      # Comparison of objects directly may raise exception
+      if current_object.object_id != obj.object_id
+        result << "#{debug_snapshot || @formatter.format_obj(obj)}"
+        current_object = obj
+      end
+
+      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 objects_of_class class_pattern
+    result = []
+    last_object = nil
+    class_pattern.downcase!
+    @frame_manager.bindings.reverse.each do |binding|
+      obj = binding.eval 'self'
+      next if !obj.class.to_s.downcase.include?(class_pattern) ||
+        last_object.object_id == obj.object_id
+
+      result << "#{line_num binding}#{@formatter.format_obj(obj)}"
+      last_object = obj
+    end
+    result
+  end
+
+  private
+
+  def line_num binding
+    num = "#{binding.index}:".ljust(4, ' ')
+    @colorize ? "\e[2;49;90m#{num}\e[0m" : num
+  end
+
+  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
+
+    indent = if @frame_manager.current_frame == binding
+      '==> '
+    elsif @lines_numbers
+      line_num binding
+    else
+      '    '
+    end
+
+    "#{indent}#{file}:#{line} #{signature}"
+  end
+
+end

data/lib/pry-moves/bindings_stack.rb

@@ -14,16 +14,17 @@ class PryMoves::BindingsStack < Array
   def suggest_initial_frame_index
     m = PryMoves::TracedMethod.last
     return 0 if m and m.binding_inside?(first)
-    index {|b| for_for_initial_frame b} || 0
+    index {|b| fits_for_initial_frame b} || 0
   end
   def initial_frame
-    find {|b| for_for_initial_frame b}
+    find {|b| fits_for_initial_frame b}
   end
 
-  def for_for_initial_frame b
-    not b.hidden and (
-      @options[:is_error] or b.eval("__method__") != :initialize
-    )
+  def fits_for_initial_frame b
+    PryMoves.step_in_everywhere or
+      not b.hidden and (
+        @options[:is_error] or b.eval("__method__") != :initialize
+      )
   end
 
   private

data/lib/pry-moves/code_reloader.rb

@@ -0,0 +1,36 @@
+class CodeReloader
+
+  def initialize
+    @timestamps = {}
+    traverse_files do |path|
+      @timestamps[path] = File.mtime(path)
+    end
+  end
+
+  def reload
+    traverse_files do |path|
+      if @timestamps[path] != File.mtime(path)
+        @timestamps[path] = File.mtime(path)
+        load path
+        # Log.info "⚡️ file reloaded #{path}"
+      end
+    end
+  end
+
+  private
+
+  def traverse_files
+    paths = PryMoves.reload_ruby_scripts[:monitor]
+    except = PryMoves.reload_ruby_scripts[:except]
+    paths.each do |root|
+      files = Dir.glob("#{root}/**/*")
+      files.each do |path|
+        if path.end_with? '.rb' and
+            not except.any? {|_| path.start_with? _}
+          yield path
+        end
+      end
+    end
+  end
+
+end

data/lib/pry-moves/commands.rb

@@ -26,9 +26,15 @@ module PryMoves
     end
     alias_command 'b', 'next_breakpoint'
 
+    block_command 'add-bp', 'Add conditional breakpoint to script' do |var_name, line_number|
+      PryMoves::Tools.new(_pry_).add_breakpoint var_name, line_number&.to_i, target
+      run 'restart'
+    end
+
     block_command 'iterate', 'Go to next iteration of current block' do |param|
       breakout_navigation :iterate, param
     end
+    alias_command 'ir', 'iterate'
 
     block_command 'goto', 'goto line' do |param|
       breakout_navigation :goto, param
@@ -45,6 +51,11 @@ module PryMoves
       PryMoves::Watch.instance.process_cmd param, target
     end
 
+    block_command 'diff', 'Display difference' do
+      cmd = arg_string.gsub(/^diff/, '').strip
+      PryMoves::Diff.new(_pry_, target).run_command cmd
+    end
+
     block_command 'bt', 'Backtrace' do |param, param2|
       PryMoves::Backtrace.new(_pry_).run_command param, param2
     end

data/lib/pry-moves/diff.rb

@@ -0,0 +1,27 @@
+class PryMoves::Diff
+
+  @@saved_dump = nil
+
+  def initialize(pry, binding)
+    @pry = pry
+    @binding = binding
+  end
+
+  def run_command cmd
+    if !@@saved_dump
+      @@saved_dump = eval_cmd cmd
+      @pry.output.puts "💾 Saved for diff compare:\n".cyan + @@saved_dump
+    else
+      diff = Diffy.diff @@saved_dump, eval_cmd(cmd)
+      @pry.output.puts diff
+      @@saved_dump = nil
+    end
+  end
+
+  private
+
+  def eval_cmd cmd
+    "#{@binding.eval(cmd)}"
+  end
+
+end

data/lib/pry-moves/formatter.rb

@@ -56,7 +56,9 @@ class PryMoves::Formatter
   PATH_TRASH = defined?(Rails) ? Rails.root.to_s : Dir.pwd
 
   def shorten_path(path)
-    path.gsub( /^#{PATH_TRASH}\//, '')
+    path = path.gsub( /^#{PATH_TRASH}\//, '')
+    PryMoves::Backtrace.trim_path ?
+      File.basename(path, ".*") : path
   end
 
   def format_obj(obj)

data/lib/pry-moves/pry_ext.rb

@@ -86,7 +86,8 @@ Pry::Command::Whereami.class_eval do
 
     formatter = PryMoves::Formatter.new
     prefix = Thread.current[:pry_moves_debug] ? "👾 " : ""
-    lines << "#{prefix}#{formatter.shorten_path location}"
+    lines << "🦆 step_in_everywhere" if PryMoves.step_in_everywhere
+    lines << "#{prefix}#{formatter.shorten_path location}:#{@line} #{me}"
     lines << "   ." + formatter.method_signature(target)
     lines << ''
     lines << "#{code.with_line_numbers(use_line_numbers?).with_marker(marker).highlighted}"
@@ -99,11 +100,14 @@ Pry::Command::Whereami.class_eval do
     lines.join "\n"
   end
 
-  def location
+  def me
     me = target.eval 'self' rescue nil
     me = PryMoves::Painter.colorize me if me
-    file = defined?(Rails) ? @file.gsub(Rails.root.to_s, '') : @file
-    "#{file}:#{@line} #{me}"
+    me
+  end
+
+  def location
+    defined?(Rails) ? @file.gsub(Rails.root.to_s, '') : @file
   end
 end
 
@@ -123,7 +127,9 @@ Pry::Output.class_eval do
   alias pry_moves_origin_for_puts puts
 
   def puts *args
+    # <first> formatted by Pry.config.print = proc do |output, value|
     first = args[0]
+    # Kernel.puts  "Pry::Output.puts: #{first}"
     if first.is_a? String and first.start_with? "(pry) output error"
       first.slice! 400..-1
     end

data/lib/pry-moves/pry_wrapper.rb

@@ -12,7 +12,7 @@ class PryWrapper
     PryMoves.lock
 
     initial_frame = PryMoves::BindingsStack.new(@pry_start_options).initial_frame
-    if not @pry_start_options[:pry_moves_loop] and
+    if not @pry_start_options[:pry_moves_loop] and initial_frame and
         initial_frame.local_variable_defined? :debug_redirect
       debug_redirect = initial_frame.local_variable_get(:debug_redirect)
       PryMoves.messages << "⏩ redirected to #{debug_redirect}"

data/lib/pry-moves/restartable.rb

@@ -1,17 +1,21 @@
 module PryMoves::Restartable
 
   attr_accessor :restart_requested, :reload_requested,
+    :reload_ruby_scripts, :reloader,
     :reload_rake_tasks
 
   def restartable context
     trigger :each_new_run, context
-    yield
+    context[:retry] ||= 0
+    yield context
     re_execution
   rescue PryMoves::Restart
     puts "🔄️  Restarting execution"
     self.restart_requested = false
     PryMoves.reset
+    PryMoves.reloader&.reload
     trigger :restart, context
+    context[:retry] += 1
     retry
   rescue PryMoves::Reload
     puts "🔮  try to use @ with reload"

data/lib/pry-moves/tools.rb

@@ -0,0 +1,22 @@
+class PryMoves::Tools
+
+  def initialize pry
+    @pry = pry
+  end
+
+  def add_breakpoint var_name, line_number, binding
+    file, line = binding.eval('[__FILE__, __LINE__]')
+    line_number ||= line
+    lines = IO.readlines(file)
+
+    value = binding.eval(var_name)
+    value = value.to_json if value.is_a? String
+    lines.insert line_number-1, "debug if #{var_name} == #{value}"
+
+    File.open(file, 'w') do |file|
+      file.puts lines
+    end
+    @pry.output.puts "🔴 Breakpoint added to #{File.basename file}:#{line_number}"
+  end
+
+end

data/lib/pry-moves/version.rb

@@ -1,3 +1,3 @@
 module PryMoves
-  VERSION = '1.0.2'
+  VERSION = '1.0.3'
 end

data/lib/pry-moves.rb

@@ -1,37 +1,4 @@
-require 'pry' unless defined? Pry
-require 'colorize'
-require 'diffy'
-
-require 'pry-moves/version'
-require 'pry-moves/pry_ext'
-require 'pry-moves/commands'
-require 'pry-moves/add_suffix'
-require 'pry-moves/pry_wrapper'
-require 'pry-moves/bindings_stack'
-require 'pry-moves/formatter'
-require 'pry-moves/backtrace'
-require 'pry-moves/watch'
-require 'pry-moves/painter'
-require 'pry-moves/restartable'
-require 'pry-moves/recursion_tracker'
-require 'pry-moves/error_with_data'
-
-require 'commands/traced_method'
-require 'commands/trace_helpers'
-require 'commands/trace_command'
-require 'commands/debug'
-require 'commands/finish'
-require 'commands/goto'
-require 'commands/iterate'
-require 'commands/next'
-require 'commands/next_breakpoint'
-require 'commands/step'
-
-require 'pry-stack_explorer/pry-stack_explorer'
-require 'debug_sugar'
-
-# Optionally load pry-remote monkey patches
-require 'pry-moves/pry_remote_ext' if defined? PryRemote
+require 'requires.rb'
 
 module PryMoves
   TRACE_IGNORE_FILES = Dir[File.join(File.dirname(__FILE__), '**', '*.rb')].map { |f| File.expand_path(f) }
@@ -40,22 +7,34 @@ module PryMoves
   extend PryMoves::Restartable
 
   attr_accessor :is_open, :trace, :stack_tips,
-    :stop_on_breakpoints, :launched_specs_examples, :debug_called_times
+    :stop_on_breakpoints, :launched_specs_examples,
+    :debug_called_times, :step_in_everywhere
+
+  def init
+    reset
+    self.trace = true if ENV['TRACE_MOVES']
+    self.reload_ruby_scripts = {
+      monitor: %w(app spec),
+      except: %w(app/assets app/views)
+    }
+    self.reloader = CodeReloader.new unless ENV['PRY_MOVES_RELOADER'] == 'off'
+    self.reload_rake_tasks = true
+  end
 
   def reset
     self.launched_specs_examples = 0
     self.stop_on_breakpoints = true
     self.debug_called_times = 0
+    self.step_in_everywhere = false
   end
 
-  def debug(message = nil, at: nil, options: nil)
+  def debug(message = nil, at: nil, from: nil, options: nil)
     pry_moves_stack_end = true
     PryMoves.re_execution
     if PryMoves.stop_on_breakpoints
       self.debug_called_times += 1
-      if at
-        return unless self.debug_called_times == at
-      end
+      return if at and self.debug_called_times != at
+      return if from and self.debug_called_times < from
       if message
         PryMoves.messages << (message.is_a?(String) ? message : message.ai)
       end
@@ -64,7 +43,26 @@ module PryMoves
     end
   end
 
-  def error(message)
+  ROOT_DIR = File.expand_path(".")
+
+  def runtime_debug(instance)
+    do_debug = (
+      stop_on_breakpoints and
+        not open? and
+        caller[1].start_with?(ROOT_DIR) and
+        not [RubyVM::InstructionSequence].include?(instance)
+    )
+    if do_debug
+      hide_from_stack = true
+      err = yield
+      # HINT: when pry failed to start use: caller.reverse
+      PryMoves.debug_error err
+      true
+    end
+  end
+
+  def debug_error(message)
+    pry_moves_stack_end = true
     debug message, options: {is_error: true}
   end
 
@@ -123,7 +121,7 @@ module PryMoves
 
   TRIGGERS = [:each_new_run, :restart]
   def on(trigger, &block)
-    error "Invalid trigger, possible triggers: #{TRIGGERS}", trigger unless trigger.in? TRIGGERS
+    error "Invalid trigger, possible triggers: #{TRIGGERS}", trigger unless TRIGGERS.include? trigger
     triggers[trigger] << block
   end
 
@@ -131,5 +129,6 @@ module PryMoves
   attr_accessor :current_remote_server
 end
 
-PryMoves.reset
-PryMoves.trace = true if ENV['TRACE_MOVES']
+PryMoves.init
+
+require 'sugar/debug_of_missing' # After PryMoves loaded

data/lib/pry-stack_explorer/frame_helpers.rb

@@ -88,6 +88,7 @@ module PryStackExplorer::FrameHelpers
   end
 
   def find_frame_by_direction(dir, step_into_vapid: false)
+    PryMoves.step_in_everywhere = true if step_into_vapid
     frame_index = find_frame_by_block(dir) do |b|
       step_into_vapid or not b.hidden
     end

data/lib/requires.rb

@@ -0,0 +1,38 @@
+require 'pry' unless defined? Pry
+require 'colorize'
+require 'diffy'
+
+require 'pry-moves/version'
+require 'pry-moves/pry_ext'
+require 'pry-moves/commands'
+require 'pry-moves/add_suffix'
+require 'pry-moves/pry_wrapper'
+require 'pry-moves/bindings_stack'
+require 'pry-moves/code_reloader'
+require 'pry-moves/formatter'
+require 'pry-moves/backtrace'
+require 'pry-moves/backtrace_builder'
+require 'pry-moves/tools'
+require 'pry-moves/watch'
+require 'pry-moves/diff'
+require 'pry-moves/painter'
+require 'pry-moves/restartable'
+require 'pry-moves/recursion_tracker'
+require 'pry-moves/error_with_data'
+
+require 'commands/traced_method'
+require 'commands/trace_helpers'
+require 'commands/trace_command'
+require 'commands/debug'
+require 'commands/finish'
+require 'commands/goto'
+require 'commands/iterate'
+require 'commands/next'
+require 'commands/next_breakpoint'
+require 'commands/step'
+
+require 'pry-stack_explorer/pry-stack_explorer'
+require 'sugar/debug_sugar'
+
+# Optionally load pry-remote monkey patches
+require 'pry-moves/pry_remote_ext' if defined? PryRemote

data/lib/sugar/debug_of_missing.rb

@@ -0,0 +1,44 @@
+Object.class_eval do
+
+  def method_missing(method, *args)
+    pry_moves_stack_end = true
+    pry_cancel_debug = true
+
+    debug_missing_method = (
+      not ([:begin, :to_s, :to_str, :to_int, :to_ary, :to_io, :to_hash].include? method) and
+        not caller[0].match PryMoves::Backtrace::filter
+    )
+
+    PryMoves.runtime_debug(self) do
+      message = self.nil? ?
+        "\e[31mCalling \e[1m#{method}\e[0m\e[31m on nil\e[0m" :
+        "\e[31mMethod \e[1m#{method}\e[0m\e[31m missing\e[0m"
+      subject = self.ai rescue "#{self.class} #{self}"
+      "#{subject}\n" +
+        "😱  #{message}"
+    end if debug_missing_method
+
+    super
+  end
+
+  def should_be *classes
+    hide_from_stack = true
+    if self && !classes.some?{self.is_a?(_1)}
+      error("Expected class #{classes.join ", "}, got #{self.class.ai}", self)
+    end
+    self
+  end
+
+  def self.const_missing(name)
+    super
+  rescue => e
+    unless PryMoves.open?
+      hide_from_stack = true
+      message = "😱  \e[31m#{e.to_s}\e[0m"
+      PryMoves.debug_error message
+    end
+    raise
+  end unless defined?(Rails)
+
+end if ENV['PRY_MOVES_DEBUG_MISSING'] != 'off' and
+  not (defined?(Rails) and Rails.env.production?)

data/lib/{debug_sugar.rb → sugar/debug_sugar.rb}

@@ -1,4 +1,5 @@
 def debug *args
+  return binding.pry_forced if args.first == :forced
   pry_moves_stack_end = true
   PryMoves.debug *args
 end
@@ -10,7 +11,7 @@ def error(msg = "Error", debug_object = nil)
     if PryMoves.stop_on_breakpoints
       lines = [err.red]
       lines.prepend debug_object.ai if debug_object
-      PryMoves.error lines.join("\n")
+      PryMoves.debug_error lines.join("\n")
     else
       STDERR.puts debug_object.ai if debug_object
       STDERR.puts err.ljust(80, ' ').red
@@ -26,14 +27,18 @@ def shit!(err = 'Oh, shit!', debug_object = nil)
   raise err unless PryMoves.stop_on_breakpoints
   lines = [message.red]
   lines.prepend debug_object.ai if debug_object
-  PryMoves.error lines.join("\n")
+  PryMoves.debug_error lines.join("\n")
   nil
 end
 
-def required(var)
-  pry_moves_stack_end = true
-  error("required parameter is missing") if var.nil?
-  var
+Object.class_eval do
+
+  def required!
+    pry_moves_stack_end = true
+    error("required parameter is missing") if self.nil?
+    self
+  end
+
 end
 
 RSpec.configure do |config|
@@ -41,7 +46,7 @@ RSpec.configure do |config|
   config.before(:each) do
     PryMoves.launched_specs_examples += 1
     PryMoves.stop_on_breakpoints =
-      PryMoves.launched_specs_examples < 2
+      RSpec.configuration.world.example_count == 1
   end
 
   config.around(:each) do |example|
@@ -58,8 +63,8 @@ Rake::Task.class_eval do
 
   def execute(args=nil)
     args ||= EMPTY_TASK_ARGS
-    PryMoves.restartable(rake_args: args) do
-      reload_actions if PryMoves.reload_rake_tasks
+    PryMoves.restartable(rake_args: args) do |context|
+      reload_actions if PryMoves.reload_rake_tasks and context[:retry] > 0
       execute_origin_for_pry_moves args
     end
   end
@@ -71,3 +76,17 @@ Rake::Task.class_eval do
   end
 
 end if defined? Rake and defined? Rake::Task
+
+Diffy.module_eval do
+
+  class << self
+    def diff text1, text2
+      diff = Diffy::Diff.new(
+        text1 + "\n", text2 + "\n"
+      ).to_s "color"
+      diff = 'Outputs are equal' if diff.strip.empty?
+      diff
+    end
+  end
+
+end

data/playground/Gemfile.lock

@@ -1,10 +1,10 @@
 PATH
   remote: ..
   specs:
-    pry-moves (1.0.1)
+    pry-moves (1.0.2)
       binding_of_caller (~> 0.7)
       colorize (~> 0.8)
-      diffy
+      diffy (~> 3.4.0)
       pry (>= 0.10.4, < 0.13)
 
 GEM
@@ -15,7 +15,7 @@ GEM
     coderay (1.1.3)
     colorize (0.8.1)
     debug_inspector (1.1.0)
-    diffy (3.4.0)
+    diffy (3.4.2)
     method_source (0.9.2)
     pry (0.12.2)
       coderay (~> 1.1.0)

data/playground/playground.rb

@@ -155,13 +155,18 @@ class Playground
   def method_with_breakpoints
     binding.pry # method_with_breakpoints host
     dummy = 1 # some internal line
-    debug_ # breakpoint
+    method_with_breakpoint # breakpoint
     dummy = 1 # after breakpoint
     dummy = 1 # after after breakpoint
-    debug_ # breakpoint 2
+    method_with_breakpoint # breakpoint 2
     dummy = 1 # after breakpoint 2
   end
 
+  def method_with_breakpoint
+    pry_breakpoint = true
+    hide_from_stack = true
+  end
+
   def skip_test
     binding.pry # stop in skip_test
     skipped_method.not_skipped_method # next step

data/pry-moves.gemspec

@@ -22,6 +22,7 @@ Gem::Specification.new do |gem|
   gem.add_runtime_dependency 'pry', '>= 0.10.4', '< 0.13'
   gem.add_runtime_dependency 'binding_of_caller', '~> 0.7'
   gem.add_runtime_dependency 'colorize', '~> 0.8'
+  gem.add_runtime_dependency 'awesome_print', '>= 1.8.0'
   gem.add_runtime_dependency 'diffy', '~> 3.4.0'
   gem.add_development_dependency 'pry-remote', '~> 0.1.6'
 end

data/spec/backtrace_spec.rb

@@ -17,6 +17,9 @@ describe 'backtrace' do
       }],
       ['bt hidden', lambda{|b, output|
         lines = output.split("\n").reverse
+        2.times do
+          lines.pop if lines.last.end_with? "main" # remove tech frames from bin/rspec
+        end
         # show hidden frame
         expect(lines[1]).to end_with 'level_b()'
         expect(lines.count).to be 11

data/spec/commands_spec.rb

@@ -2,6 +2,8 @@ require_relative 'spec_helper'
 
 describe 'PryMoves commands' do
 
+  # todo: test sugars: method_missing, etc...
+
   it 'should make one move next' do
     breakpoints [
       [nil, 'basic next stop'],

data/spec/spec_helper.rb

@@ -12,12 +12,13 @@ RSpec.configure do |config|
 
   config.before(:example) do
     PryMoves.unlock if PryMoves.semaphore.locked?
+    PryMoves.step_in_everywhere = false
   end
 
   config.after(:example) do |example|
     unless example.exception
       expect(PryDebugger.breakpoints.count).to be(0),
-        "not all breakpoints launched: #{PryDebugger.breakpoints.count}"
+        "not all breakpoints launched, left to launch: #{PryDebugger.breakpoints.count}. All following specs may fail."
     end
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pry-moves
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.3
 platform: ruby
 authors:
 - garmoshka-mo
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-05-07 00:00:00.000000000 Z
+date: 2022-12-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pry
@@ -58,6 +58,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.8'
+- !ruby/object:Gem::Dependency
+  name: awesome_print
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.8.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.8.0
 - !ruby/object:Gem::Dependency
   name: diffy
   requirement: !ruby/object:Gem::Requirement
@@ -89,7 +103,8 @@ dependencies:
 description: Advanced debugger for ruby with natural `next` across blocks, debug of
   dynamic calls, stepping into function by name, etc..
 email: dan@coav.ru
-executables: []
+executables:
+- rspec
 extensions: []
 extra_rdoc_files: []
 files:
@@ -99,6 +114,7 @@ files:
 - LICENSE
 - README.md
 - Rakefile
+- bin/rspec
 - dynamic_debug_experiments.rb
 - lib/commands/debug.rb
 - lib/commands/finish.rb
@@ -110,13 +126,15 @@ files:
 - lib/commands/trace_command.rb
 - lib/commands/trace_helpers.rb
 - lib/commands/traced_method.rb
-- lib/debug_sugar.rb
 - lib/pry-moves.rb
 - lib/pry-moves/add_suffix.rb
 - lib/pry-moves/backtrace.rb
+- lib/pry-moves/backtrace_builder.rb
 - lib/pry-moves/bindings_stack.rb
 - lib/pry-moves/cli.rb
+- lib/pry-moves/code_reloader.rb
 - lib/pry-moves/commands.rb
+- lib/pry-moves/diff.rb
 - lib/pry-moves/error_with_data.rb
 - lib/pry-moves/formatter.rb
 - lib/pry-moves/painter.rb
@@ -125,6 +143,7 @@ files:
 - lib/pry-moves/pry_wrapper.rb
 - lib/pry-moves/recursion_tracker.rb
 - lib/pry-moves/restartable.rb
+- lib/pry-moves/tools.rb
 - lib/pry-moves/version.rb
 - lib/pry-moves/watch.rb
 - lib/pry-stack_explorer/VERSION
@@ -133,6 +152,9 @@ files:
 - lib/pry-stack_explorer/pry-stack_explorer.rb
 - lib/pry-stack_explorer/stack_commands.rb
 - lib/pry-stack_explorer/when_started_hook.rb
+- lib/requires.rb
+- lib/sugar/debug_of_missing.rb
+- lib/sugar/debug_sugar.rb
 - playground/Gemfile
 - playground/Gemfile.lock
 - playground/README.md
@@ -157,7 +179,7 @@ homepage: https://github.com/garmoshka-mo/pry-moves
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -175,8 +197,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
-signing_key: 
+rubygems_version: 3.1.6
+signing_key:
 specification_version: 4
 summary: Debugger for ruby
 test_files: