pry-moves 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 47c7a7529bee28ca664536458891b00f6a1bee574869106686cd2abef9b57adb
-  data.tar.gz: 13d671c5f8ed4005304da6d4201908c0857d19e8ee3fe85631d18cea5c109580
+  metadata.gz: a9dc991b1aed888cf23fd1e9a76b29d274ce56989119f802982e9fbdc46cc034
+  data.tar.gz: 25e331897d83de799b696e84d1de474166095d4e80853a7f9cde99ba64290432
 SHA512:
-  metadata.gz: addaf61aa995184e49f3b655f1d4fa863fa0554d1fb00f022fce7a9e1d8671595c03056e37754fd394bf9a204e32c91b3005a00fac3287f2803bafb66273e2d6
-  data.tar.gz: 9ba407049732e75c27e8cc87936e25967a30798212098fce844e948e7986912874137088fc87ffc8d9ef48ca09a3c2445da545132109a58ed47d5c4577775db4
+  metadata.gz: fbaa701da70c665fe7795de825db1540e5a1ab2d4f2021c41d4294c14bce3429b34b7e64d21949f51fd08dbbc24b6ffc047776bb7207b8c73834893e0e03ced7
+  data.tar.gz: 169ee4d3b3e40f8f63c7969c2b709c82dfc23881c994a335b25635fbf90b798ea21616bc33c08dd0bd44418a2c996f0b5eb6079732d769ff5c061757af35f5e7

data/Gemfile.lock

@@ -1,9 +1,10 @@
 PATH
   remote: .
   specs:
-    pry-moves (1.0.1)
+    pry-moves (1.0.2)
       binding_of_caller (~> 0.7)
       colorize (~> 0.8)
+      diffy (~> 3.4.0)
       pry (>= 0.10.4, < 0.13)
 
 GEM
@@ -15,6 +16,7 @@ GEM
     colorize (0.8.1)
     debug_inspector (1.1.0)
     diff-lcs (1.3)
+    diffy (3.4.0)
     method_source (0.9.0)
     pry (0.11.3)
       coderay (~> 1.1.0)

data/README.md

@@ -25,10 +25,14 @@ Documentation for latest version. For [v0.1.12 see documentation here](https://g
   * `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 > foo` - write backtrace to file `log/backtrace_foo.log`
-* `up`/`down`/`top`/`bottom` - move over call stack
+* `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
+* `%` - print current frame of call stack (alias to `whereami`)
+* `$` - fully print current function without line numbers
 * `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
@@ -58,7 +62,7 @@ _Demo class source [here](https://github.com/garmoshka-mo/pry-moves/issues/1)_
 
 ## Backtrace and call stack
 
-You can explicitly hide frames from backtrace and call stack by defining `hide_from_stack` variable:
+You can explicitly hide frames from call stack by defining variables like this:
 
 ```ruby
 def insignificant_method
@@ -68,6 +72,10 @@ def insignificant_method
 end
 ```
 
+* `hide_from_stack` - hide this function from stack
+* `pry_moves_stack_tip` -  stop on first frame above this function  
+* `pry_moves_stack_end` - limits stack from bottom, not possible to step below this frame  
+
 ## Configuration
 
 Here is default configuration, you can reassign it:

data/lib/commands/debug.rb

@@ -5,8 +5,12 @@ class PryMoves::Debug < PryMoves::TraceCommand
   end
 
   def trace(event, file, line, method, binding_)
-    return unless event == 'line'
+    return if event != 'line' or @cancel_debug
     if @first_line_skipped
+      if binding_.local_variable_defined?(:pry_cancel_debug)
+        @cancel_debug = true
+        return
+      end
       true
     else
       @first_line_skipped = true

data/lib/debug_sugar.rb

@@ -1,36 +1,37 @@
 def debug *args
-  pry_moves_stack_root = true
+  pry_moves_stack_end = true
   PryMoves.debug *args
 end
 
-def error(msg, debug_object = nil)
-  pry_moves_stack_root = true
+def error(msg = "Error", debug_object = nil)
+  pry_moves_stack_end = true
   err = "😱  #{msg}"
   unless PryMoves.open?
     if PryMoves.stop_on_breakpoints
       lines = [err.red]
       lines.prepend debug_object.ai if debug_object
-      PryMoves.debug lines.join("\n")
+      PryMoves.error lines.join("\n")
     else
       STDERR.puts debug_object.ai if debug_object
       STDERR.puts err.ljust(80, ' ').red
     end
   end
-  raise msg
+  raise PryMoves::ErrorWithData.new(msg, debug_object)
 end
 
 def shit!(err = 'Oh, shit!', debug_object = nil)
-  pry_moves_stack_root = true
+  return if ENV['NO_SHIT']
+  pry_moves_stack_end = true
   message = "💩  #{err.is_a?(String) ? err : err.message}"
   raise err unless PryMoves.stop_on_breakpoints
   lines = [message.red]
   lines.prepend debug_object.ai if debug_object
-  PryMoves.debug lines.join("\n")
+  PryMoves.error lines.join("\n")
   nil
 end
 
 def required(var)
-  pry_moves_stack_root = true
+  pry_moves_stack_end = true
   error("required parameter is missing") if var.nil?
   var
 end
@@ -44,7 +45,7 @@ RSpec.configure do |config|
   end
 
   config.around(:each) do |example|
-    PryMoves.restartable do
+    PryMoves.restartable(rspec_example: example) do
       example.run
     end
   end
@@ -57,7 +58,7 @@ Rake::Task.class_eval do
 
   def execute(args=nil)
     args ||= EMPTY_TASK_ARGS
-    PryMoves.restartable do
+    PryMoves.restartable(rake_args: args) do
       reload_actions if PryMoves.reload_rake_tasks
       execute_origin_for_pry_moves args
     end

data/lib/pry-moves/backtrace.rb

@@ -29,10 +29,17 @@ class PryMoves::Backtrace
   end
 
   def run_command(param, param2)
-    if param.is_a?(String) and (match = param.match /^>(.*)/)
+    if param == 'save'
+      @filter = 'hidden'
+      @@backtrace = build_backtrace
+      @pry.output.puts "💾 Backtrace saved (#{@@backtrace.count} lines)"
+    elsif param == 'diff'
+      @filter = 'hidden'
+      diff
+    elsif param.is_a?(String) and (match = param.match /^>(.*)/)
       suffix = match[1].size > 0 ? match[1] : param2
       @formatter.colorize = false
-      write_to_file build, suffix
+      write_to_file build_backtrace, suffix
     elsif param and param.match /\d+/
       index = param.to_i
       frame_manager.goto_index index
@@ -47,10 +54,10 @@ class PryMoves::Backtrace
     @colorize = true
     @lines_numbers = true
     @filter = filter if filter.is_a? String
-    @pry.output.puts build
+    @pry.output.puts build_backtrace
   end
 
-  def build
+  def build_backtrace
     show_all = %w(a all).include?(@filter)
     show_vapid = %w(+ hidden vapid).include?(@filter) || show_all
     result = []
@@ -58,10 +65,10 @@ class PryMoves::Backtrace
 
     recursion = PryMoves::Recursion::Holder.new
 
-    frame_manager.bindings.each_with_details do |binding, vapid|
+    frame_manager.bindings.reverse.each do |binding|
       next if !show_all and binding.eval('__FILE__').match self.class::filter
 
-      if !show_vapid and vapid
+      if !show_vapid and binding.hidden
         vapid_count += 1
         next
       end
@@ -83,7 +90,7 @@ class PryMoves::Backtrace
       result << build_line(binding, file, line)
     end
 
-    recursion.each { |t| t.apply result }
+    # recursion.each { |t| t.apply result }
 
     result << "👽  frames hidden: #{vapid_count}" if vapid_count > 0
 
@@ -125,23 +132,34 @@ class PryMoves::Backtrace
     "#{root}/backtrace_#{file_suffix}.log"
   end
 
+  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
+  end
+
 end
 
 Pry.config.exception_handler = proc do |output, exception, _|
+
+  def print_error message, exception, output
+    output.puts message.red
+    exception.backtrace.reject! {|l| l.match /sugar\.rb/}
+    exception.backtrace.first(3).each { output.puts _1.white }
+  end
+
   if Pry::UserError === exception && SyntaxError === exception
     output.puts "SyntaxError: #{exception.message.sub(/.*syntax error, */m, '')}"
   else
 
-    output.puts "#{exception.class}: #{exception.message}"
-    exception.backtrace.reject! {|l| l.match /sugar\.rb/}
-    output.puts "from #{exception.backtrace.first}"
+    print_error "#{exception.class}: #{exception.message}", exception, output
 
     if exception.respond_to? :cause
       cause = exception.cause
       while cause
-        output.puts "Caused by #{cause.class}: #{cause}\n"
-        cause.backtrace.reject! {|l| l.match /sugar\.rb/}
-        output.puts "from #{cause.backtrace.first}"
+        print_error "Caused by #{cause.class}: #{cause}\n", exception, output
         cause = cause.cause
       end
     end

data/lib/pry-moves/bindings_stack.rb

@@ -1,7 +1,7 @@
 class PryMoves::BindingsStack < Array
 
-  def initialize
-    @vapid_bindings = []
+  def initialize options
+    @options = options
     bindings = binding.callers # binding_of_caller has bug and always returns callers of current binding,
       # no matter at which binding method is called. So no need to pass here binding
     pre_callers = Thread.current[:pre_callers]
@@ -14,20 +14,16 @@ class PryMoves::BindingsStack < Array
   def suggest_initial_frame_index
     m = PryMoves::TracedMethod.last
     return 0 if m and m.binding_inside?(first)
-    index{|b| not vapid? b} || 0
+    index {|b| for_for_initial_frame b} || 0
   end
   def initial_frame
-    find{|b| not vapid? b}
+    find {|b| for_for_initial_frame b}
   end
 
-  def each_with_details
-    self.reverse.each do |binding|
-      yield binding, vapid?(binding)
-    end
-  end
-
-  def vapid?(binding)
-    @vapid_bindings.include? binding
+  def for_for_initial_frame b
+    not b.hidden and (
+      @options[:is_error] or b.eval("__method__") != :initialize
+    )
   end
 
   private
@@ -47,25 +43,35 @@ class PryMoves::BindingsStack < Array
       file, method, obj = binding.eval("[__FILE__, __method__, self]")
 
       if file.match PryMoves::Backtrace::filter
-        @vapid_bindings << binding
+        binding.hidden = true
       elsif stepped_out
         if actual_file == file and actual_method == method or
             binding.local_variable_defined? :pry_moves_deferred_call
           stepped_out = false
         else
-          @vapid_bindings << binding
+          binding.hidden = true
         end
       elsif binding.frame_type == :block
         stepped_out = true
         actual_file = file
         actual_method = method
       elsif obj and method and obj.method(method).source.strip.match /^delegate\s/
-        @vapid_bindings << binding
+        binding.hidden = true
       end
 
       if binding.local_variable_defined? :hide_from_stack
-        @vapid_bindings << binding
+        binding.hidden = true
+      end
+    end
+
+    stack_tip_met = false
+    stack_tips = PryMoves.stack_tips || []
+    reverse.each do |binding|
+      if binding.local_variable_defined?(:pry_moves_stack_tip) ||
+          stack_tips.include?(binding.eval("__method__"))
+        stack_tip_met = true
       end
+      binding.hidden = true if stack_tip_met
     end
   end
 
@@ -82,14 +88,17 @@ class PryMoves::BindingsStack < Array
   end
 
   def top_internal_frame_index(bindings)
+    pry_moves_debug = Thread.current[:pry_moves_debug]
     bindings.rindex do |b|
-      if b.frame_type == :method
-        method, self_ = b.eval("[__method__, self]")
+      if not pry_moves_debug and b.frame_type == :eval
+        true
+      elsif b.frame_type == :method
+        method, self_ = b.eval("[__method__, self, __FILE__]")
 
         self_.equal?(Pry) && method == :start ||
           self_.class == Binding && method == :pry ||
           self_.is_a?(PryMoves::TraceCommand) && method == :tracing_func ||
-          b.local_variable_defined?(:pry_moves_stack_root)
+          b.local_variable_defined?(:pry_moves_stack_end)
       end
     end
   end

data/lib/pry-moves/error_with_data.rb

@@ -0,0 +1,10 @@
+class PryMoves::ErrorWithData < StandardError
+
+  attr_reader :metadata
+
+  def initialize(msg, metadata)
+    super msg
+    @metadata = metadata
+  end
+
+end

data/lib/pry-moves/formatter.rb

@@ -6,6 +6,7 @@ class PryMoves::Formatter
     @colorize = colorize
   end
 
+  MAX_PARAMS = 5
   def method_signature(binding)
     meth = binding.eval('__method__')
     meth_obj = meth ? Pry::Method.from_binding(binding) : nil
@@ -31,6 +32,9 @@ class PryMoves::Formatter
         end
         show_value ? "#{name} #{value}" : name
       end
+      if args.count > MAX_PARAMS
+        args = args.first(MAX_PARAMS) + ["(#{args.count - MAX_PARAMS} more params)…"]
+      end
       "#{meth_obj.name}(#{args.join(', ')})"
     end
   end

data/lib/pry-moves/pry_ext.rb

@@ -18,15 +18,15 @@ end
 
 Binding.class_eval do
 
-  attr_accessor :index
+  attr_accessor :index, :hidden
 
   alias pry_forced pry
 
-  def pry
+  def pry options = nil
     if !Pry.config.disable_breakpoints and
         # Don't start binding.pry when semaphore locked by current thread
         PryMoves.synchronize_threads
-      pry_forced
+      pry_forced options
     end
   end
 

data/lib/pry-moves/pry_wrapper.rb

@@ -11,7 +11,7 @@ class PryWrapper
   def run
     PryMoves.lock
 
-    initial_frame = PryMoves::BindingsStack.new.initial_frame
+    initial_frame = PryMoves::BindingsStack.new(@pry_start_options).initial_frame
     if not @pry_start_options[:pry_moves_loop] and
         initial_frame.local_variable_defined? :debug_redirect
       debug_redirect = initial_frame.local_variable_get(:debug_redirect)
@@ -76,7 +76,7 @@ class PryWrapper
         @command[:binding].eval @command[:param]
       rescue StandardError, SyntaxError => e
         Thread.current.set_trace_func nil
-        puts "❌️ #{e}"
+        puts "❌️ Error during #{"debug".yellow} execution: #{e}"
       end
       tracer.stop_tracing
     end.join

data/lib/pry-moves/restartable.rb

@@ -3,14 +3,15 @@ module PryMoves::Restartable
   attr_accessor :restart_requested, :reload_requested,
     :reload_rake_tasks
 
-  def restartable
-    trigger :new_run
+  def restartable context
+    trigger :each_new_run, context
     yield
     re_execution
   rescue PryMoves::Restart
+    puts "🔄️  Restarting execution"
     self.restart_requested = false
     PryMoves.reset
-    trigger :restart
+    trigger :restart, context
     retry
   rescue PryMoves::Reload
     puts "🔮  try to use @ with reload"

data/lib/pry-moves/version.rb

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

data/lib/pry-moves.rb

@@ -1,4 +1,6 @@
 require 'pry' unless defined? Pry
+require 'colorize'
+require 'diffy'
 
 require 'pry-moves/version'
 require 'pry-moves/pry_ext'
@@ -12,6 +14,7 @@ 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'
@@ -36,7 +39,7 @@ module PryMoves
   extend self
   extend PryMoves::Restartable
 
-  attr_accessor :is_open, :trace,
+  attr_accessor :is_open, :trace, :stack_tips,
     :stop_on_breakpoints, :launched_specs_examples, :debug_called_times
 
   def reset
@@ -45,20 +48,26 @@ module PryMoves
     self.debug_called_times = 0
   end
 
-  def debug(message = nil, at: nil)
-    pry_moves_stack_root = true
+  def debug(message = nil, at: 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
-      PryMoves.messages << message if message
-      binding.pry
+      if message
+        PryMoves.messages << (message.is_a?(String) ? message : message.ai)
+      end
+      binding.pry options
       PryMoves.re_execution
     end
   end
 
+  def error(message)
+    debug message, options: {is_error: true}
+  end
+
   # Checks that a binding is in a local file context. Extracted from
   # https://github.com/pry/pry/blob/master/lib/pry/default_commands/context.rb
   def check_file_context(target)
@@ -102,8 +111,8 @@ module PryMoves
     true
   end
 
-  def trigger(event)
-    triggers[event].each &:call
+  def trigger(event, context)
+    triggers[event].each {|t| t.call context}
   end
 
   def triggers
@@ -112,7 +121,9 @@ module PryMoves
     end
   end
 
+  TRIGGERS = [:each_new_run, :restart]
   def on(trigger, &block)
+    error "Invalid trigger, possible triggers: #{TRIGGERS}", trigger unless trigger.in? TRIGGERS
     triggers[trigger] << block
   end
 

data/lib/pry-stack_explorer/frame_helpers.rb

@@ -0,0 +1,114 @@
+module PryStackExplorer; end
+module PryStackExplorer::FrameHelpers
+  private
+
+  # @return [PryStackExplorer::FrameManager] The active frame manager for
+  #   the current `Pry` instance.
+  def frame_manager
+    PryStackExplorer.frame_manager(_pry_)
+  end
+
+  # @return [Array<PryStackExplorer::FrameManager>] All the frame
+  #   managers for the current `Pry` instance.
+  def frame_managers
+    PryStackExplorer.frame_managers(_pry_)
+  end
+
+  # @return [Boolean] Whether there is a context to return to once
+  #   the current `frame_manager` is popped.
+  def prior_context_exists?
+    frame_managers.count > 1 || frame_manager.prior_binding
+  end
+
+  # Return a description of the frame (binding).
+  # This is only useful for regular old bindings that have not been
+  # enhanced by `#of_caller`.
+  # @param [Binding] b The binding.
+  # @return [String] A description of the frame (binding).
+  def frame_description(b)
+    b_self = b.eval('self')
+    b_method = b.eval('__method__')
+
+    if b_method && b_method != :__binding__ && b_method != :__binding_impl__
+      b_method.to_s
+    elsif b_self.instance_of?(Module)
+      "<module:#{b_self}>"
+    elsif b_self.instance_of?(Class)
+      "<class:#{b_self}>"
+    else
+      "<main>"
+    end
+  end
+
+  # Return a description of the passed binding object. Accepts an
+  # optional `verbose` parameter.
+  # @param [Binding] b The binding.
+  # @param [Boolean] verbose Whether to generate a verbose description.
+  # @return [String] The description of the binding.
+  def frame_info(b, verbose = false)
+    b_self = b.eval('self')
+    type = b.frame_type ? "[#{b.frame_type}]".ljust(9) : ""
+    desc = b.frame_description ? "#{b.frame_description}" : "#{frame_description(b)}"
+    sig = PryMoves::Formatter.new.method_signature b
+
+    self_clipped = "#{Pry.view_clip(b_self)}"
+    path = "@ #{b.eval('__FILE__')}:#{b.eval('__LINE__')}"
+
+    if !verbose
+      "#{type} #{desc} #{sig}"
+    else
+      "#{type} #{desc} #{sig}\n      in #{self_clipped} #{path}"
+    end
+  end
+
+  def find_frame_by_regex(regex, up_or_down)
+    frame_index = find_frame_by_block(up_or_down) do |b|
+      (b.eval('"#{__FILE__}:#{__LINE__}"') =~ regex) or
+        (b.eval("__method__").to_s =~ regex)
+    end
+
+    frame_index || raise(Pry::CommandError, "No frame that matches #{regex.source} found")
+  end
+
+  def find_frame_by_block(up_or_down)
+    start_index = frame_manager.binding_index
+
+    if up_or_down == :down
+      enum = start_index == 0 ? [].each :
+        frame_manager.bindings[0..start_index - 1].reverse_each
+    else
+      enum = frame_manager.bindings[start_index + 1..-1]
+    end
+
+    new_frame = enum.find do |b|
+      yield(b)
+    end
+
+    frame_manager.bindings.index(new_frame)
+  end
+
+  def find_frame_by_direction(dir, step_into_vapid: false)
+    frame_index = find_frame_by_block(dir) do |b|
+      step_into_vapid or not b.hidden
+    end
+
+    if !frame_index and !step_into_vapid
+      frame_index = find_frame_by_block(dir) {true}
+    end
+
+    frame_index ||
+      raise(Pry::CommandError, "At #{dir == :up ? 'top' : 'bottom'} of stack, cannot go further")
+  end
+
+  def move(direction, param)
+    raise Pry::CommandError, "Nowhere to go" unless frame_manager
+
+    if param == '+' or param.nil?
+      index = find_frame_by_direction direction, step_into_vapid: param == '+'
+      frame_manager.change_frame_to index
+    else
+      index = find_frame_by_regex(Regexp.new(param), direction)
+      frame_manager.change_frame_to index
+    end
+  end
+end

data/lib/pry-stack_explorer/pry-stack_explorer.rb

@@ -121,5 +121,5 @@ end
 Pry.config.hooks.add_hook(:when_started, :save_caller_bindings, PryStackExplorer::WhenStartedHook.new)
 
 # Import the StackExplorer commands
-Pry.config.commands.import PryStackExplorer::Commands
+Pry.config.commands.import PryStackExplorer::COMMANDS
 

data/lib/pry-stack_explorer/stack_commands.rb

@@ -1,121 +1,13 @@
-module PryStackExplorer
-  module FrameHelpers
-    private
-
-    # @return [PryStackExplorer::FrameManager] The active frame manager for
-    #   the current `Pry` instance.
-    def frame_manager
-      PryStackExplorer.frame_manager(_pry_)
-    end
-
-    # @return [Array<PryStackExplorer::FrameManager>] All the frame
-    #   managers for the current `Pry` instance.
-    def frame_managers
-      PryStackExplorer.frame_managers(_pry_)
-    end
-
-    # @return [Boolean] Whether there is a context to return to once
-    #   the current `frame_manager` is popped.
-    def prior_context_exists?
-      frame_managers.count > 1 || frame_manager.prior_binding
-    end
-
-    # Return a description of the frame (binding).
-    # This is only useful for regular old bindings that have not been
-    # enhanced by `#of_caller`.
-    # @param [Binding] b The binding.
-    # @return [String] A description of the frame (binding).
-    def frame_description(b)
-      b_self = b.eval('self')
-      b_method = b.eval('__method__')
-
-      if b_method && b_method != :__binding__ && b_method != :__binding_impl__
-        b_method.to_s
-      elsif b_self.instance_of?(Module)
-        "<module:#{b_self}>"
-      elsif b_self.instance_of?(Class)
-        "<class:#{b_self}>"
-      else
-        "<main>"
-      end
-    end
-
-    # Return a description of the passed binding object. Accepts an
-    # optional `verbose` parameter.
-    # @param [Binding] b The binding.
-    # @param [Boolean] verbose Whether to generate a verbose description.
-    # @return [String] The description of the binding.
-    def frame_info(b, verbose = false)
-      b_self = b.eval('self')
-      type = b.frame_type ? "[#{b.frame_type}]".ljust(9) : ""
-      desc = b.frame_description ? "#{b.frame_description}" : "#{frame_description(b)}"
-      sig = PryMoves::Formatter.new.method_signature b
-
-      self_clipped = "#{Pry.view_clip(b_self)}"
-      path = "@ #{b.eval('__FILE__')}:#{b.eval('__LINE__')}"
-
-      if !verbose
-        "#{type} #{desc} #{sig}"
-      else
-        "#{type} #{desc} #{sig}\n      in #{self_clipped} #{path}"
-      end
-    end
-
-    def find_frame_by_regex(regex, up_or_down)
-      frame_index = find_frame_by_block(up_or_down) do |b|
-        (b.eval('"#{__FILE__}:#{__LINE__}"') =~ regex) or
-          (b.eval("__method__").to_s =~ regex)
-      end
-
-      frame_index || raise(Pry::CommandError, "No frame that matches #{regex.source} found")
-    end
+require_relative 'frame_helpers.rb'
 
-    def find_frame_by_block(up_or_down)
-      start_index = frame_manager.binding_index
-
-      if up_or_down == :down
-        enum = start_index == 0 ? [].each :
-            frame_manager.bindings[0..start_index - 1].reverse_each
-      else
-        enum = frame_manager.bindings[start_index + 1..-1]
-      end
-
-      new_frame = enum.find do |b|
-        yield(b)
-      end
-
-      frame_manager.bindings.index(new_frame)
-    end
-
-    def find_frame_by_direction(dir, step_into_vapid: false)
-      frame_index = find_frame_by_block(dir) do |b|
-        step_into_vapid or
-            not frame_manager.bindings.vapid?(b)
-        end
-
-      if !frame_index and !step_into_vapid
-        frame_index = find_frame_by_block(dir) {true}
-      end
-
-      frame_index ||
-        raise(Pry::CommandError, "At #{dir == :up ? 'top' : 'bottom'} of stack, cannot go further")
-    end
+module PryStackExplorer
 
-    def move(direction, param)
-      raise Pry::CommandError, "Nowhere to go" unless frame_manager
+  COMMANDS = Pry::CommandSet.new do
 
-      if param == '+' or param.nil?
-        index = find_frame_by_direction direction, step_into_vapid: param == '+'
-        frame_manager.change_frame_to index
-      else
-        index = find_frame_by_regex(Regexp.new(param), direction)
-        frame_manager.change_frame_to index
-      end
+    block_command '%', 'Print current stack frame' do
+      run 'whereami'
     end
-  end
-
 
-  Commands = Pry::CommandSet.new do
     create_command "up", "Go up to the caller's context." do
       include FrameHelpers
 
@@ -163,6 +55,7 @@ module PryStackExplorer
         frame_manager.change_frame_to 0
       end
     end
+    alias_command 'bm', 'bottom'
 
     create_command "frame", "Switch to a particular frame." do
       include FrameHelpers

data/lib/pry-stack_explorer/when_started_hook.rb

@@ -22,7 +22,7 @@ module PryStackExplorer
           raise ArgumentError, ":call_stack must be an array of bindings"
         end
       else
-        bindings = PryMoves::BindingsStack.new
+        bindings = PryMoves::BindingsStack.new options
         initial_frame ||= bindings.suggest_initial_frame_index
         # if Thread.current[:pry_moves_debug] and initial_frame > 0
         if initial_frame > 0

data/playground/Gemfile.lock

@@ -1,9 +1,10 @@
 PATH
   remote: ..
   specs:
-    pry-moves (1.0.0)
+    pry-moves (1.0.1)
       binding_of_caller (~> 0.7)
       colorize (~> 0.8)
+      diffy
       pry (>= 0.10.4, < 0.13)
 
 GEM
@@ -13,7 +14,8 @@ GEM
       debug_inspector (>= 0.0.1)
     coderay (1.1.3)
     colorize (0.8.1)
-    debug_inspector (0.0.3)
+    debug_inspector (1.1.0)
+    diffy (3.4.0)
     method_source (0.9.2)
     pry (0.12.2)
       coderay (~> 1.1.0)

data/playground/sand.rb

@@ -1,3 +1,6 @@
+# cd playground
+# be ruby sand.rb
+
 require 'pry-moves'
 require './tracer.rb'
 
@@ -7,42 +10,41 @@ def fi(param)
   puts param
 end
 
-class A
+class Sand
 
   def initialize
     puts :xuilo
   end
 
-  def aa
+  def some_logic
     puts 'aa: step 1'
     puts 'aa: step 2'
   end
 
-  def bb
+  def method_with_hidden_stack
     debug_redirect = :aa
     hide_from_stack = true
     puts 'bb: step 1'
     puts 'bb: step 2'
-    aa
+    some_logic
   end
 
-  def cc
+  def debugged_method
     koko = :love
-    binding.pry
-    bb
+    debug
+    method_with_hidden_stack
     (2..4).each do |i|
       puts i
     end
     puts :two
   end
-  alias cc_al cc
+  alias debugged_method_alias debugged_method
 
 end
 
 puts :prepare
 
-A.new.cc_al
-A.new.cc_al
+Sand.new.method_with_hidden_stack
 
 
 bb = 1

data/pry-moves.gemspec

@@ -22,5 +22,6 @@ 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 'diffy', '~> 3.4.0'
   gem.add_development_dependency 'pry-remote', '~> 0.1.6'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pry-moves
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - garmoshka-mo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-10-01 00:00:00.000000000 Z
+date: 2022-05-07 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: diffy
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.4.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.4.0
 - !ruby/object:Gem::Dependency
   name: pry-remote
   requirement: !ruby/object:Gem::Requirement
@@ -103,6 +117,7 @@ files:
 - lib/pry-moves/bindings_stack.rb
 - lib/pry-moves/cli.rb
 - lib/pry-moves/commands.rb
+- lib/pry-moves/error_with_data.rb
 - lib/pry-moves/formatter.rb
 - lib/pry-moves/painter.rb
 - lib/pry-moves/pry_ext.rb
@@ -113,6 +128,7 @@ files:
 - lib/pry-moves/version.rb
 - lib/pry-moves/watch.rb
 - lib/pry-stack_explorer/VERSION
+- lib/pry-stack_explorer/frame_helpers.rb
 - lib/pry-stack_explorer/frame_manager.rb
 - lib/pry-stack_explorer/pry-stack_explorer.rb
 - lib/pry-stack_explorer/stack_commands.rb