pry-moves 0.1.7 → 0.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d6153285cad4b74e4f713aa6a39220ffccdba822
-  data.tar.gz: a71792935b64874e19544c929d550ee720df99ef
+  metadata.gz: aaa7e6d0742a28752f1a53e912f875e7e17f23c9
+  data.tar.gz: c1e6965e00da047cb46f923315bbf31f27a46e3e
 SHA512:
-  metadata.gz: 25310e06f4523f1b50a610e4ab896521d8747ce5fc775d80d38b9937c9c91665300cb82e671bc38f0da5aadd22acb3539037a07e72919d686eeb37a3890ab208
-  data.tar.gz: a00fc3b9880df6f65524cc804a677e2a209d0f0d5f9a207e1b06c0b1735bb731d68ffb3da5b706f43ae629d4bfe95352bd47de82d9b09d95a86ce16df80d0dda
+  metadata.gz: 1b0f21d7213ed5df54c332166a4d5fd6a200b017bdf9a757a75958bcbb4e9d6288436c1e44ececb194be14313f7d01f4fdf5150fb541cfcd3a3d0d3a2a2a1e0b
+  data.tar.gz: 78416e115156abcd6e5417ed1f8f0f648ae79db5173cd71b7933a35e05ec5ece09d817859cbf6ee5b465194a8304dee636fa9a6eca113937287520d522c95710

data/Gemfile.lock

@@ -1,14 +1,14 @@
 PATH
   remote: .
   specs:
-    pry-moves (0.1.6)
+    pry-moves (0.1.7)
       binding_of_caller (~> 0.7)
       pry (>= 0.9.10, < 0.11.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)
     debug_inspector (0.0.3)
@@ -46,4 +46,4 @@ DEPENDENCIES
   rspec
 
 BUNDLED WITH
-   1.14.5
+   1.16.6

data/README.md

@@ -15,6 +15,7 @@ _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**
 * `bt` - show latest 5 lines from backtrace
   * `bt 10` - latest 10 lines

data/lib/pry-moves/commands.rb

@@ -6,7 +6,7 @@ module PryMoves
       breakout_navigation :step, param
     end
 
-    block_command 'finish', 'Finish - xule tut neponyatnogo.' do |param|
+    block_command 'finish', 'Finish - xule tut neponyatnogo' do |param|
       breakout_navigation :finish, param
     end
 
@@ -14,15 +14,15 @@ module PryMoves
       breakout_navigation :next, param
     end
 
-    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 'continue', 'Continue program execution and end the Pry session' do
       check_file_context
       run 'exit-all'
     end

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

data/lib/pry-moves/trace_commands.rb

@@ -51,10 +51,7 @@ module PryMoves::TraceCommands
         )
       end
 
-      if event == 'return' and before_end?(line)
-        @pry_start_options[:exit_from_method] = true
-        true
-      end
+      exit_from_method if event == 'return' and before_end?(line)
     end
   end
 
@@ -86,11 +83,18 @@ 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, 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
 
 end

data/lib/pry-moves/tracer.rb

@@ -38,6 +38,9 @@ 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_)
     end
 
     start_tracing
@@ -152,5 +155,10 @@ class Tracer
     @command[:pry].output.puts text
   end
 
+  def exit_from_method
+    @pry_start_options[:exit_from_method] = true
+    true
+  end
+  
 end
 end

data/lib/pry-moves/version.rb

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

data/playground/Gemfile.lock

@@ -1,14 +1,14 @@
 PATH
   remote: ..
   specs:
-    pry-moves (0.1.6)
+    pry-moves (0.1.7)
       binding_of_caller (~> 0.7)
       pry (>= 0.9.10, < 0.11.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)
     debug_inspector (0.0.3)
@@ -26,4 +26,4 @@ DEPENDENCIES
   pry-moves!
 
 BUNDLED WITH
-   1.14.5
+   1.16.6

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,35 @@ class A
 
 end
 
-require './playground.rb'
-Playground.new.basic_next
+def fff
+  binding.pry # stop in native_block
+  #2.times do |i|
+  iterator do |i|
+    dummy = 1 # inside block
+    return
+    dummy = 2
+  end
+  puts :ss
+  :after_block # after block
+end
+
+def iterator
+  2.times do |i|
+    dummy = :pre_yield # pre_yield
+    yield i
+    :post_yield # post_yield
+  end
+end
+
+def ff
+  fff
+  puts :aaa
+end
+
+ff
 
 puts :prepare
 
-binding.pry
 A.new.cc_al
 A.new.cc_al
 

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.8
 platform: ruby
 authors:
 - garmoshka-mo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-09-09 00:00:00.000000000 Z
+date: 2018-10-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pry
@@ -126,7 +126,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 2.5.2.3
 signing_key: 
 specification_version: 4
 summary: Debugger for ruby