pry-moves 0.1.7 → 0.1.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: d6153285cad4b74e4f713aa6a39220ffccdba822
-  data.tar.gz: a71792935b64874e19544c929d550ee720df99ef
+SHA256:
+  metadata.gz: 8826581b1684b35099d08f56064e2f3b38ccf3e0d24e3bf40779de9da58151f1
+  data.tar.gz: d73a5a0b30ac023416e901a3a965d95b4d232bdef5c0f44ab49ec4dfc7708585
 SHA512:
-  metadata.gz: 25310e06f4523f1b50a610e4ab896521d8747ce5fc775d80d38b9937c9c91665300cb82e671bc38f0da5aadd22acb3539037a07e72919d686eeb37a3890ab208
-  data.tar.gz: a00fc3b9880df6f65524cc804a677e2a209d0f0d5f9a207e1b06c0b1735bb731d68ffb3da5b706f43ae629d4bfe95352bd47de82d9b09d95a86ce16df80d0dda
+  metadata.gz: 2ade46c2440bcd4e14a296b9f3785ce0fff501abe953670ce19c9851d0b52488795113179717dffab6b57221c81839317236417bd1ce76380ceed96c3ed4a596
+  data.tar.gz: b5b959011051e252cb8a65c1b049f0cdfd8dcd6056b47b7cc7ba87052bb84ec5e1fd767d641385ab2ac1c162f0230d6a7bc760f77ac2699bc5fdbd5d6e812a05

data/Gemfile.lock

@@ -1,39 +1,38 @@
 PATH
   remote: .
   specs:
-    pry-moves (0.1.6)
+    pry-moves (0.1.13)
       binding_of_caller (~> 0.7)
-      pry (>= 0.9.10, < 0.11.0)
+      pry (>= 0.10.4, < 0.12.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    binding_of_caller (0.7.2)
+    binding_of_caller (0.8.0)
       debug_inspector (>= 0.0.1)
-    coderay (1.1.1)
+    coderay (1.1.2)
     debug_inspector (0.0.3)
     diff-lcs (1.3)
-    method_source (0.8.2)
-    pry (0.10.4)
+    method_source (0.9.0)
+    pry (0.11.3)
       coderay (~> 1.1.0)
-      method_source (~> 0.8.1)
-      slop (~> 3.4)
+      method_source (~> 0.9.0)
     pry-remote (0.1.8)
       pry (~> 0.9)
       slop (~> 3.0)
-    rspec (3.6.0)
-      rspec-core (~> 3.6.0)
-      rspec-expectations (~> 3.6.0)
-      rspec-mocks (~> 3.6.0)
-    rspec-core (3.6.0)
-      rspec-support (~> 3.6.0)
-    rspec-expectations (3.6.0)
+    rspec (3.8.0)
+      rspec-core (~> 3.8.0)
+      rspec-expectations (~> 3.8.0)
+      rspec-mocks (~> 3.8.0)
+    rspec-core (3.8.0)
+      rspec-support (~> 3.8.0)
+    rspec-expectations (3.8.1)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.6.0)
-    rspec-mocks (3.6.0)
+      rspec-support (~> 3.8.0)
+    rspec-mocks (3.8.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.6.0)
-    rspec-support (3.6.0)
+      rspec-support (~> 3.8.0)
+    rspec-support (3.8.0)
     slop (3.6.0)
 
 PLATFORMS
@@ -46,4 +45,4 @@ DEPENDENCIES
   rspec
 
 BUNDLED WITH
-   1.14.5
+   2.1.1

data/README.md

@@ -15,15 +15,19 @@ _An execution control add-on for [Pry][pry]._
   * `s method_name` - step into method `method_name` (For example from `User.new.method_name`). Partial name match supported.
   * `s +` - step into function, including hidden frames
 * `f` - **finish** execution of current frame (block or method) and stop at next line on higher level
+* `iterate` - go to next iteration of current block
 * `c` - **continue**
+* `g 10` - **goto** line 10
 * `bt` - show latest 5 lines from backtrace
   * `bt 10` - latest 10 lines
-  * `bt all` - full backtrace
+  * `bt full` - full backtrace
+  * `bt +` - full backtrace with hidden frames. Aliases: `bt hidden` `bt vapid` `bt all`
   * `bt > foo` - write backtrace to file `log/backtrace_foo.log`
 * `up`/`down`/`top`/`bottom` - 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
 * `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
 * `!` - exit
 
@@ -69,6 +73,16 @@ PryMoves::Backtrace::filter =
 
 ## Threads, helpers
 
+To allow traveling to parent thread, use:
+
+```ruby
+pre_callers = binding.callers
+Thread.new do
+  Thread.current[:pre_callers] = pre_callers
+  #...
+end
+```
+
 `pry-moves` can't stop other threads on `binding.pry`, so they will continue to run.
 This makes `pry-moves` not always suitable for debugging of multi-thread projects.
 
@@ -110,6 +124,10 @@ Please note that debugging functionality is implemented through
 bundle exec rspec
 ```
 
+## ToDo
+
+* `iterate` - steps in into child sub-block - should skip
+
 ## Contributors
 
 * Gopal Patel ([@nixme](https://github.com/nixme))
@@ -120,7 +138,7 @@ bundle exec rspec
 * Ivo Anjo ([@ivoanjo](https://github.com/ivoanjo))
 
 Patches and bug reports are welcome. Just send a [pull request][pullrequests] or
-file an [issue][issues]. [Project changelog][changelog].
+file an [issue][issues]. 
 
 ## Acknowledgments
 

data/lib/pry-moves.rb

@@ -2,9 +2,11 @@ require 'pry' unless defined? Pry
 
 require 'pry-moves/version'
 require 'pry-moves/trace_commands'
+require 'pry-moves/traced_method'
 require 'pry-moves/tracer'
 require 'pry-moves/pry_ext'
 require 'pry-moves/commands'
+require 'pry-moves/traversing'
 require 'pry-moves/pry_wrapper'
 require 'pry-moves/backtrace'
 require 'pry-moves/watch'
@@ -34,6 +36,10 @@ module PryMoves
     @semaphore ||= Mutex.new
   end
 
+  def locked?
+    semaphore.locked?
+  end
+
   def lock
     semaphore.lock unless semaphore.locked?
   end
@@ -47,13 +53,10 @@ module PryMoves
   end
 
   def synchronize_threads
-    return if Thread.current[:pry_moves_debug]
+    return true if Thread.current[:pry_moves_debug]
 
-    semaphore.synchronize {}
-  rescue ThreadError => e
-    puts e.backtrace.reverse
-    puts e
-    raise e
+    semaphore.synchronize {} rescue return
+    true
   end
 
   # Reference to currently running pry-remote server. Used by the tracer.

data/lib/pry-moves/backtrace.rb

@@ -44,7 +44,7 @@ class PryMoves::Backtrace
 
   def build
     result = []
-    show_vapid = @lines_count == 'all'
+    show_vapid = %w(+ all hidden vapid).include? @lines_count
     stack = stack_bindings(show_vapid)
               .reverse.reject do |binding|
                 binding.eval('__FILE__').match self.class::filter
@@ -61,9 +61,10 @@ class PryMoves::Backtrace
   def build_result(stack, result)
     current_object = nil
     stack.each do |binding|
-      obj = binding.eval 'self'
-      if current_object != obj
-        result << "#{format_obj(obj)}:"
+      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 || format_obj(obj)}:"
         current_object = obj
       end
 
@@ -81,8 +82,7 @@ class PryMoves::Backtrace
   end
 
   def build_line(binding)
-    file = "#{binding.eval('__FILE__')}"
-    file.gsub!( /^#{Rails.root.to_s}/, '') if defined? Rails
+    file = PryMoves::Helpers.shorten_path "#{binding.eval('__FILE__')}"
 
     signature = PryMoves::Helpers.method_signature binding
     signature = ":#{binding.frame_type}" if !signature or signature.length < 1

data/lib/pry-moves/commands.rb

@@ -5,32 +5,36 @@ module PryMoves
     block_command 'step', 'Step execution into the next line or method.' do |param|
       breakout_navigation :step, param
     end
+    alias_command 's', 'step'
 
-    block_command 'finish', 'Finish - xule tut neponyatnogo.' do |param|
+    block_command 'finish', 'Finish - xule tut neponyatnogo' do |param|
       breakout_navigation :finish, param
     end
+    alias_command 'f', 'finish'
 
     block_command 'next', 'Execute the next line stepping into blocks' do |param|
       breakout_navigation :next, param
     end
+    alias_command 'n', 'next'
 
-    block_command 'nn', 'Execute the next line skipping blocks.' do |param|
+    block_command 'nn', 'Execute the next line skipping blocks' do |param|
       breakout_navigation :next, 'blockless'
     end
 
-    block_command 'iterate', 'Stop on next iteration of this method.' do |param|
+    block_command 'iterate', 'Go to next iteration of current block' do |param|
       breakout_navigation :iterate, param
     end
 
-    block_command 'continue', 'Continue program execution and end the Pry session.' do
+    block_command 'goto', 'goto line' do |param|
+      breakout_navigation :goto, param
+    end
+    alias_command 'g', 'goto'
+
+    block_command 'continue', 'Continue program execution and end the Pry session' do
       check_file_context
       run 'exit-all'
     end
-
     alias_command 'c', 'continue'
-    alias_command 's', 'step'
-    alias_command 'n', 'next'
-    alias_command 'f', 'finish'
 
     block_command 'watch', 'Display value of expression on every move' do |param|
       PryMoves::Watch.instance.process_cmd param, target
@@ -46,6 +50,7 @@ module PryMoves
     end
 
     block_command '!', 'exit' do
+      PryMoves.unlock
       Pry.config.exit_requested = true
       run '!!!'
     end

data/lib/pry-moves/helpers.rb

@@ -47,4 +47,10 @@ module PryMoves::Helpers
     end
   end
 
+  PATH_TRASH = defined?(Rails) ? Rails.root.to_s : Dir.pwd
+
+  def shorten_path(path)
+    path.gsub( /^#{PATH_TRASH}\//, '')
+  end
+
 end

data/lib/pry-moves/painter.rb

@@ -14,10 +14,14 @@ module PryMoves::Painter
 
   def self.colorize(obj)
     colored_str = Canvas.new
+    obj = obj.class if obj.inspect.start_with? "#<"
     catch (:cut) do
       Pry::ColorPrinter.pp obj, colored_str
     end
     colored_str.chomp
+  rescue => e
+    "Inspect error: #{e}\n" +
+      "#{e.backtrace.first(3).join("\n")}"
   end
 
 end

data/lib/pry-moves/pry_ext.rb

@@ -24,7 +24,8 @@ Binding.class_eval do
 
   def pry
     unless Pry.config.disable_breakpoints
-      PryMoves.synchronize_threads
+      PryMoves.synchronize_threads ||
+        return # Don't start binding.pry when semaphore locked by current thread
       pry_forced
     end
   end
@@ -56,7 +57,7 @@ Pry::Command::Whereami.class_eval do
 
   def build_output
     lines = []
-    lines << "#{text.bold('From:')} #{location}"
+    lines << "#{text.bold('From:')} #{PryMoves::Helpers.shorten_path location}"
     lines << PryMoves::Watch.instance.output(target) unless PryMoves::Watch.instance.empty?
     lines << ''
     lines << "#{code.with_line_numbers(use_line_numbers?).with_marker(marker).highlighted}"

data/lib/pry-moves/pry_wrapper.rb

@@ -10,7 +10,7 @@ class PryWrapper
   def run(&block)
     PryMoves.lock
 
-    Pry.config.marker = "⛔️ " if @pry_start_options[:exit_from_method]
+    Pry.config.marker = "⛔️" if @pry_start_options[:exit_from_method]
 
     return_value = nil
     PryMoves.is_open = true
@@ -58,7 +58,6 @@ class PryWrapper
       end
 
       Thread.current[:pry_moves_debug] = true
-      #@command[:binding].eval 'puts "###########"'
       tracer = start_tracing
       begin
         @command[:binding].eval @command[:param]

data/lib/pry-moves/trace_commands.rb

@@ -2,7 +2,7 @@ module PryMoves::TraceCommands
 
   private
 
-  def trace_step(event, file, line, binding_)
+  def trace_step(event, file, line, method, binding_)
     return unless event == 'line'
 
     if @step_in_everywhere
@@ -33,7 +33,7 @@ module PryMoves::TraceCommands
     end
   end
 
-  def trace_next(event, file, line, binding_)
+  def trace_next(event, file, line, method, binding_)
     traced_method_exit = (@recursion_level < 0 and %w(line call).include? event)
     if traced_method_exit
       # Set new traced method, because we left previous one
@@ -45,20 +45,22 @@ module PryMoves::TraceCommands
       within_current_method?(file, line)
 
       if event == 'line'
-        return (
-        not @stay_at_frame or
-          @stay_at_frame == frame_digest(binding_.of_caller(3))
-        )
+        if @stay_at_frame
+          return (
+            @stay_at_frame == frame_digest(binding_.of_caller(3)) or
+            @c_stack_level < 0
+          )
+        else
+          return true
+        end
       end
 
-      if event == 'return' and before_end?(line)
-        @pry_start_options[:exit_from_method] = true
-        true
-      end
+       exit_from_method if event == 'return' and
+         method != :to_s and before_end?(line)
     end
   end
 
-  def trace_finish(event, file, line, binding_)
+  def trace_finish(event, file, line, method, binding_)
     return unless event == 'line'
     if @recursion_level < 0 or @method_to_finish != @method
       if redirect_step_into?(binding_)
@@ -76,7 +78,7 @@ module PryMoves::TraceCommands
     end
   end
 
-  def trace_debug(event, file, line, binding_)
+  def trace_debug(event, file, line, method, binding_)
     return unless event == 'line'
     if @first_line_skipped
       true
@@ -86,11 +88,22 @@ module PryMoves::TraceCommands
     end
   end
 
-  def trace_iteration(event, file, line, binding_)
-    raise 'not implemented'
-    # implementation:
-    # 1) ставить метки там, где происходит сама итерация?
-    # 2) можно догадываться по имени методов в стеке вверху: each / each_with_index
+  def trace_iterate(event, file, line, method, binding_)
+    return exit_from_method if event == 'return' and
+      within_current_method?(file, line)
+
+    # промотка итерации -
+    # попасть на ту же или предыдущую строку или выйти из дайджеста
+    # будучи в том же методе
+    event == 'line' and @recursion_level == 0 and
+      within_current_method?(file, line) and
+      (line <= @iteration_start_line or
+        @caller_digest != frame_digest(binding_.of_caller(3))
+      )
+  end
+
+  def trace_goto(event, file, line, method, binding_)
+    event == 'line' && @goto_line == line and @method[:file] == file
   end
 
 end

data/lib/pry-moves/traced_method.rb

@@ -0,0 +1,61 @@
+module PryMoves::TracedMethod
+
+  private
+
+  def set_traced_method(binding)
+    @recursion_level = 0
+    @c_stack_level = 0
+    @stay_at_frame = nil # reset tracked digest
+
+    method = find_method_definition binding
+    if method
+      source = method.source_location
+      set_method({
+                   file: source[0],
+                   start: source[1],
+                   name: method.name,
+                   end: (source[1] + method.source.count("\n") - 1)
+                 })
+    else
+      set_method({file: binding.eval('__FILE__')})
+    end
+  end
+
+  def find_method_definition(binding)
+    method_name, obj, line, file =
+      binding.eval '[__method__, self, __LINE__, __FILE__]'
+    return unless method_name
+
+    method = obj.method(method_name)
+    return method if method.source_location[0] == file
+
+    # If found file was different - search definition at superclasses:
+    obj.class.ancestors.each do |cls|
+      if cls.instance_methods(false).include? method_name
+        method = cls.instance_method method_name
+        return method if method.source_location[0] == file
+      end
+    end
+
+    pry_puts "⚠️  Unable to find definition for method #{method_name} in #{obj}"
+
+    nil
+  end
+
+  def set_method(method)
+    #puts "set_traced_method #{method}"
+    @method = method
+  end
+
+  def within_current_method?(file, line)
+    @method[:file] == file and (
+    @method[:start].nil? or
+      line.between?(@method[:start], @method[:end])
+    )
+  end
+
+  def before_end?(line)
+    @method[:end] and line < @method[:end]
+  end
+
+end

data/lib/pry-moves/tracer.rb

@@ -1,9 +1,12 @@
+require 'digest'
+
 require 'pry' unless defined? Pry
 
 module PryMoves
 class Tracer
 
   include PryMoves::TraceCommands
+  include PryMoves::TracedMethod
 
   def initialize(command, pry_start_options)
     @command = command
@@ -38,6 +41,11 @@ class Tracer
       if @command[:param] == 'blockless'
         @stay_at_frame = frame_digest(binding_)
       end
+    when :iterate
+      @iteration_start_line = binding_.eval('__LINE__')
+      @caller_digest = frame_digest(binding_)
+    when :goto
+      @goto_line = @command[:param].to_i
     end
 
     start_tracing
@@ -66,41 +74,19 @@ class Tracer
         Thread.current : Kernel
   end
 
-  def set_traced_method(binding)
-    @recursion_level = 0
-
-    method = binding.eval 'method(__method__) if __method__'
-    if method
-      source = method.source_location
-      set_method({
-       file: source[0],
-       start: source[1],
-       name: method.name,
-       end: (source[1] + method.source.count("\n") - 1)
-     })
-    else
-      set_method({file: binding.eval('__FILE__')})
-    end
-  end
-
-  def set_method(method)
-    #puts "set_traced_method #{method}"
-    @method = method
-  end
-
   def frame_digest(binding_)
     #puts "frame_digest for: #{binding_.eval '__callee__'}"
     Digest::MD5.hexdigest binding_.instance_variable_get('@iseq').disasm
   end
 
   def tracing_func(event, file, line, id, binding_, klass)
-    #printf "#{trace_obj}: %8s %s:%-2d %10s %8s rec:#{@recursion_level}\n", event, file, line, id, klass
+    # printf ": %8s %s:%-2d %10s %8s rec:#{@recursion_level} st:#{@c_stack_level}\n", event, file, line, id, klass
 
     # Ignore traces inside pry-moves code
     return if file && TRACE_IGNORE_FILES.include?(File.expand_path(file))
 
     catch (:skip) do
-      if send "trace_#{@action}", event, file, line, binding_
+      if send "trace_#{@action}", event, file, line, id, binding_
         stop_tracing
         Pry.start(binding_, @pry_start_options)
 
@@ -110,6 +96,9 @@ class Tracer
         delta = event == 'call' ? 1 : -1
         #puts "recursion #{event}: #{delta}; changed: #{@recursion_level} => #{@recursion_level + delta}"
         @recursion_level += delta
+      elsif %w(c-call c-return).include?(event)
+        delta = event == 'c-call' ? 1 : -1
+        @c_stack_level += delta
       end
     end
   end
@@ -137,20 +126,15 @@ class Tracer
     puts "#{id} #{@method[:start]} > #{line} > #{@method[:end]}"
   end
 
-  def within_current_method?(file, line)
-    @method[:file] == file and (
-      @method[:start].nil? or
-      line.between?(@method[:start], @method[:end])
-    )
-  end
-
-  def before_end?(line)
-    @method[:end] and line < @method[:end]
-  end
 
   def pry_puts(text)
     @command[:pry].output.puts text
   end
 
+  def exit_from_method
+    @pry_start_options[:exit_from_method] = true
+    true
+  end
+
+end
 end
-end

data/lib/pry-moves/traversing.rb

@@ -0,0 +1,69 @@
+module PryMoves
+
+  class Traversing < Pry::ClassCommand
+
+    group 'Input and Output'
+    description "Continue traversing of last object in history."
+
+    banner <<-'BANNER'
+      Usage: .method | 123 | :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`
+    BANNER
+
+    def process(cmd)
+      last_cmd = Pry.history.to_a[-1]
+      cmd = "#{last_cmd}#{wrap_command(cmd)}"
+      _pry_.pager.page "    > #{cmd}\n"
+      _pry_.eval cmd
+    end
+
+    private
+
+
+  end
+
+  class Method < Traversing
+    match(/^\.(.+)$/)
+
+    def wrap_command(cmd)
+      ".#{cmd}"
+    end
+  end
+
+  class ArrayIndex < Traversing
+    match(/^(\d+)$/)
+
+    def wrap_command(cmd)
+      "[#{cmd}]"
+    end
+  end
+
+  class HashKey < Traversing
+    match(/^(:\w+)$/)
+
+    def wrap_command(cmd)
+      "[#{cmd}]"
+    end
+  end
+
+  Pry::Commands.add_command(PryMoves::Method)
+  Pry::Commands.add_command(PryMoves::ArrayIndex)
+  Pry::Commands.add_command(PryMoves::HashKey)
+
+end
+
+Pry::History.class_eval do
+
+  EXCLUDE = [PryMoves::Method, PryMoves::ArrayIndex, PryMoves::HashKey]
+
+  def <<(line)
+    return if EXCLUDE.any? do |cls|
+      line.match(cls.match)
+    end
+    push line
+  end
+
+end

data/lib/pry-moves/version.rb

@@ -1,3 +1,3 @@
 module PryMoves
-  VERSION = '0.1.7'
+  VERSION = '0.1.13'
 end

data/lib/pry-stack_explorer/VERSION

@@ -0,0 +1,2 @@
+Forked and modified copy of pry-stack_explorer v0.4.9.
+Latest upstream merged: v0.4.9.3

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

@@ -108,7 +108,7 @@ module PryStackExplorer
       (b1.eval('self').equal?(b2.eval('self'))) &&
         (b1.eval('__method__') == b2.eval('__method__')) &&
         (b1.eval('local_variables').map { |v| b1.eval("#{v}") }.equal?(
-         b2.eval('local_variables').map { |v| b2.eval("#{v}") }))
+        b2.eval('local_variables').map { |v| b2.eval("#{v}") }))
     end
   end
 end
@@ -117,6 +117,7 @@ Pry.config.hooks.add_hook(:after_session, :delete_frame_manager) do |_, _, _pry_
   PryStackExplorer.clear_frame_managers(_pry_)
 end
 
+# Can be moved to start_with_pry_nav to isolate from other use cases of Pry
 Pry.config.hooks.add_hook(:when_started, :save_caller_bindings, PryStackExplorer::WhenStartedHook.new)
 
 # Import the StackExplorer commands
@@ -124,14 +125,14 @@ Pry.config.commands.import PryStackExplorer::Commands
 
 # monkey-patch the whereami command to show some frame information,
 # useful for navigating stack.
-Pry.config.commands.before_command("whereami") do |num|
+Pry.config.hooks.add_hook(:before_whereami, :stack_explorer) do
   if PryStackExplorer.frame_manager(_pry_) && !internal_binding?(target)
     bindings      = PryStackExplorer.frame_manager(_pry_).bindings
     binding_index = PryStackExplorer.frame_manager(_pry_).binding_index
 
     info = "#{Pry::Helpers::Text.bold('Frame:')} "+
-        "#{binding_index}/#{bindings.size - 1} "+
-        "#{bindings[binding_index].frame_type}"
+      "#{binding_index}/#{bindings.size - 1} "+
+      "#{bindings[binding_index].frame_type}"
 
     output.puts "\n"
     output.puts info

data/lib/pry-stack_explorer/when_started_hook.rb

@@ -12,6 +12,11 @@ module PryStackExplorer
     end
 
     def call(target, options, _pry_)
+      start_from_console = target.eval('__callee__').nil? &&
+        target.eval('__FILE__') == '<main>' &&
+        target.eval('__LINE__') == 0
+      return if start_from_console
+
       target ||= _pry_.binding_stack.first if _pry_
       options = {
         :call_stack    => true,
@@ -23,14 +28,18 @@ module PryStackExplorer
       if options[:call_stack].is_a?(Array)
         bindings = options[:call_stack]
 
-        if !valid_call_stack?(bindings)
+        unless valid_call_stack?(bindings)
           raise ArgumentError, ":call_stack must be an array of bindings"
         end
       else
         bindings = caller_bindings(target)
+        initial_frame = bindings.find do |b|
+          not b.local_variable_defined?(:vapid_frame)
+        end
+        options[:initial_frame] = bindings.index initial_frame
       end
 
-      PryStackExplorer.create_and_push_frame_manager bindings, _pry_, :initial_frame => options[:initial_frame]
+      PryStackExplorer.create_and_push_frame_manager bindings, _pry_, initial_frame: options[:initial_frame]
     end
 
     private

data/playground/Gemfile.lock

@@ -1,23 +1,21 @@
 PATH
   remote: ..
   specs:
-    pry-moves (0.1.6)
+    pry-moves (0.1.11)
       binding_of_caller (~> 0.7)
-      pry (>= 0.9.10, < 0.11.0)
+      pry (>= 0.10.4, < 1)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    binding_of_caller (0.7.2)
+    binding_of_caller (0.8.0)
       debug_inspector (>= 0.0.1)
-    coderay (1.1.1)
+    coderay (1.1.2)
     debug_inspector (0.0.3)
-    method_source (0.8.2)
-    pry (0.10.4)
+    method_source (0.9.2)
+    pry (0.12.2)
       coderay (~> 1.1.0)
-      method_source (~> 0.8.1)
-      slop (~> 3.4)
-    slop (3.6.0)
+      method_source (~> 0.9.0)
 
 PLATFORMS
   ruby
@@ -26,4 +24,4 @@ DEPENDENCIES
   pry-moves!
 
 BUNDLED WITH
-   1.14.5
+   1.17.0

data/playground/playground.rb

@@ -54,11 +54,20 @@ class Playground
     self
   end
 
-  def with_simple_block
-    binding.pry # stop in with_simple_block
-    iterator do |i|
+  def nested_block(early_return: false)
+    binding.pry # stop in nested_block
+    iterator do |i| # iterator line
+      dummy = 1 # inside block
+      return if early_return
+    end
+    :after_block # after block
+  end
+
+  def native_block(early_return: false)
+    binding.pry # stop in native_block
+    2.times do |i| # iterator line
       dummy = 1 # inside block
-      dummy = 2
+      return if early_return
     end
     :after_block # after block
   end

data/playground/sand.rb

@@ -10,33 +10,25 @@ end
 class A
 
   def initialize
-    hide_from_stack = true
     puts :xuilo
   end
 
-  def kozi
-    puts 'aa2 1'
-    puts 'aa2 2'
-  end
-
   def aa
-    debug_redirect = :kozi
     puts 'aa: step 1'
     puts 'aa: step 2'
-    kozi
   end
 
   def bb
-    #debug_redirect = :aa
+    debug_redirect = :aa
+    hide_from_stack = true
     puts 'bb: step 1'
     puts 'bb: step 2'
     aa
   end
 
   def cc
-    #debug_redirect = :bb
-    hide_from_stack = true
     koko = :love
+    binding.pry
     bb
     (2..4).each do |i|
       puts i
@@ -47,12 +39,8 @@ class A
 
 end
 
-require './playground.rb'
-Playground.new.basic_next
-
 puts :prepare
 
-binding.pry
 A.new.cc_al
 A.new.cc_al
 

data/pry-moves.gemspec

@@ -19,7 +19,7 @@ Gem::Specification.new do |gem|
 
   # Dependencies
   gem.required_ruby_version = '>= 1.8.7'
-  gem.add_runtime_dependency 'pry', '>= 0.9.10', '< 0.11.0'
+  gem.add_runtime_dependency 'pry', '>= 0.10.4', '< 0.12.0'
   gem.add_runtime_dependency 'binding_of_caller', '~> 0.7'
   gem.add_development_dependency 'pry-remote', '~> 0.1.6'
 end

data/publish.sh

@@ -0,0 +1,2 @@
+gem build pry-moves.gemspec
+gem push pry-moves-`ruby -e 'require "./lib/pry-moves/version.rb"; puts PryMoves::VERSION'`.gem

data/spec/blocks_spec.rb

@@ -28,12 +28,12 @@ describe 'blocks' do
 
   it 'should finish simple block' do
     breakpoints [
-      [nil, 'stop in with_simple_block'],
-      ['n', ''],
+      [nil, 'stop in nested_block'],
+      ['n', 'iterator line'],
       ['', 'inside block'],
       ['f', 'after block']
     ]
-    Playground.new.with_simple_block
+    Playground.new.nested_block
   end
 
   it 'should finish block with sub-calls' do
@@ -47,5 +47,54 @@ describe 'blocks' do
     Playground.new.zaloop
   end
 
+  it 'should iterate over native block' do
+    breakpoints [
+      [nil, 'stop in native_block'],
+      ['n', 'iterator line'],
+      ['n', 'inside block'],
+      ['i', {output: '=> 0'}],
+      ['iterate', 'inside block'],
+      ['i', {output: '=> 1'}],
+      ['iterate', 'after block'],
+    ]
+    Playground.new.native_block
+  end
+
+  it 'should iterate over nested block' do
+    breakpoints [
+      [nil, 'stop in nested_block'],
+      ['n', 'iterator line'],
+      ['n', 'inside block'],
+      ['i', {output: '=> 0'}],
+      ['iterate', 'inside block'],
+      ['i', {output: '=> 1'}],
+      ['iterate', 'after block'],
+    ]
+    Playground.new.nested_block
+  end
 
+  it 'should return during iterating native block' do
+    breakpoints [
+      [nil, 'stop in native_block'],
+      ['n', 'iterator line'],
+      ['n', 'inside block'],
+      ['iterate', 'iterator line'],
+      ['n', 'exit'],
+    ]
+    Playground.new.native_block early_return: true
+    :exit # exit
+  end
+
+  it 'should return during iterating nested block' do
+    breakpoints [
+      [nil, 'stop in nested_block'],
+      ['n', 'iterator line'],
+      ['n', 'inside block'],
+      ['iterate', 'iterator line'],
+      ['n', 'exit'],
+    ]
+    Playground.new.nested_block early_return: true
+    :exit # exit
+  end
+  
 end

data/spec/pry_debugger.rb

@@ -2,31 +2,41 @@ module PryDebugger
 
   module Breakpoints
     def breakpoints(breakpoints)
+      steps = []
       breakpoints.each_with_index do |b, index|
         next_b = breakpoints[index+1]
-        b[0] = next_b ? next_b[0] : nil
+        steps << {
+          cmd: b[0],
+          expected: b[1],
+          next_cmd: next_b ? next_b[0] : nil,
+          index: index
+        }
       end
 
       PryDebugger.breakpoints =
-          breakpoints.map do |b|
+          steps.map do |step|
             Proc.new do |label, binding_, output|
-              compare(b[1], label, binding_, output)
-              b[0]
+              compare(step, label, binding_, output)
+              step[:next_cmd]
             end
           end
     end
 
-    def compare(subj, label, binding_, output)
-      if subj.is_a? Proc
-        subj.call binding_, output
-      elsif subj.is_a? Hash
-        if subj[:output_includes]
-          expect(output).to include subj[:output_includes]
+    def compare(step, label, binding_, output)
+      exp = step[:expected]
+      if exp.is_a? Proc
+        exp.call binding_, output
+      elsif exp.is_a? Hash
+        if exp[:output_includes]
+          expect(output).to include exp[:output_includes]
         else
-          expect(output).to eq subj[:output]
+          expect(output).to eq exp[:output]
         end
-      elsif not subj.nil?
-        expect(label).to eq subj
+      elsif not exp.nil?
+        err = <<-TEXT
+[#{step[:index]}] #{step[:cmd]} => '#{exp}', got '#{label}'
+        TEXT
+        expect(label).to eq(exp), err
       end
     end
   end
@@ -81,8 +91,8 @@ module PryDebugger
     raise 'Next breakpoint handler missing' if @breakpoints_procs.size == 0
     #puts (@breakpoint_call += 1)
     output = @output.take_away
-    output.match(/^ => .*#(.*)/)
-    label = ($1 || '').strip
+    output.match(/^ (=>|⛔️) .*#(.*)/)
+    label = ($2 || '').strip
     @breakpoints_procs.shift.call label, binding_, output.strip
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pry-moves
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.1.13
 platform: ruby
 authors:
 - garmoshka-mo
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2018-09-09 00:00:00.000000000 Z
+date: 2020-08-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pry
@@ -16,20 +16,20 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.9.10
+        version: 0.10.4
     - - "<"
       - !ruby/object:Gem::Version
-        version: 0.11.0
+        version: 0.12.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.9.10
+        version: 0.10.4
     - - "<"
       - !ruby/object:Gem::Version
-        version: 0.11.0
+        version: 0.12.0
 - !ruby/object:Gem::Dependency
   name: binding_of_caller
   requirement: !ruby/object:Gem::Requirement
@@ -82,9 +82,12 @@ files:
 - lib/pry-moves/pry_remote_ext.rb
 - lib/pry-moves/pry_wrapper.rb
 - lib/pry-moves/trace_commands.rb
+- lib/pry-moves/traced_method.rb
 - lib/pry-moves/tracer.rb
+- lib/pry-moves/traversing.rb
 - lib/pry-moves/version.rb
 - lib/pry-moves/watch.rb
+- lib/pry-stack_explorer/VERSION
 - lib/pry-stack_explorer/commands.rb
 - lib/pry-stack_explorer/frame_manager.rb
 - lib/pry-stack_explorer/pry-stack_explorer.rb
@@ -100,6 +103,7 @@ files:
 - playground/threads.rb
 - playground/tracer.rb
 - pry-moves.gemspec
+- publish.sh
 - spec/backtrace_spec.rb
 - spec/blocks_spec.rb
 - spec/commands_spec.rb
@@ -110,7 +114,7 @@ homepage: https://github.com/garmoshka-mo/pry-moves
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -125,9 +129,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.8
-signing_key: 
+rubygems_version: 3.1.2
+signing_key:
 specification_version: 4
 summary: Debugger for ruby
 test_files: