pry-moves 0.1.10 → 1.0.1

data/playground/playground.rb

@@ -16,6 +16,23 @@ class Playground
     binding.pry # step_into stop
     something_inside # point to step inside
   end
+  
+  def skip_hidden_impl
+    binding.pry # skip_hidden_impl stop
+    hidden_self.something_inside # point to step inside
+  end
+
+  def hidden_self
+    hide_from_stack = true # hidden_self 1
+    self # hidden_self 2
+  end
+
+  def hidden_stop
+    hide_from_stack = true
+    binding.pry # hidden stop
+    dummy = :ok_next # hidden_stop for next
+    dummy = :ok_step # hidden_stop for step
+  end
 
   def continue
     binding.pry # first stop
@@ -39,6 +56,16 @@ class Playground
     step_by_name
     :after_step_by_name # after_step_by_name
   end
+  
+  def early_return_wrap
+    early_return
+    :after_return # after early return
+  end
+  
+  def early_return
+    return true if level_c # at early return
+    dummy = 1
+  end
 
   def level_a
     level_b # inside of level_a
@@ -52,7 +79,7 @@ class Playground
   def level_c(param = nil)
     binding.pry # stop in level_c
     self
-  end
+  end # exit from level_c
 
   def nested_block(early_return: false)
     binding.pry # stop in nested_block
@@ -62,7 +89,7 @@ class Playground
     end
     :after_block # after block
   end
-
+  
   def native_block(early_return: false)
     binding.pry # stop in native_block
     2.times do |i| # iterator line
@@ -72,25 +99,83 @@ class Playground
     :after_block # after block
   end
 
+  def one_line_in_block
+    binding.pry # stop in one_line_in_block
+    iterator do |i| # iterator line
+      dummy = 1 # inside block
+    end
+    :after_block # after block
+  end
+
+  def one_line_block
+    binding.pry # stop in one_line_block
+    iterator { |i| dummy = 1 } # iterator line
+    :after_block # after block
+  end
+  
+  def parentheses_in_loop
+    binding.pry # stop in parentheses_in_loop
+    i = 2
+    while (i = i - 1) > 0 # iterator line
+      dummy = 1 # inside block
+    end
+    :after_block # after block
+  end
+
   def zaloop(pass = :root)
     binding.pry if pass == :root # stop in zaloop
-    iterator do |i|
+    iterator do |i| # iterator line
       dummy = 1 # inside block
       zaloop i if pass == :root
+      return unless pass == :root # after sub-zaloop
     end
     :after_block # after block
-  end
+  end # exit from zaloop
 
   def method_with_redirection
-    debug_redirect = '=level_a' # at method_with_redirection
+    debug_redirect = :level_a # at method_with_redirection
     level_a
   end
 
+  def instant_redirection
+    debug_redirect = '=something_inside'
+    binding.pry # at instant_redirection
+    something_inside
+  end
+
   def redirection_host
     binding.pry # redirection host
     method_with_redirection
   end
 
+  def something_inside
+    :something # some internal line
+  end
+  
+  def method_with_breakpoints
+    binding.pry # method_with_breakpoints host
+    dummy = 1 # some internal line
+    debug_ # breakpoint
+    dummy = 1 # after breakpoint
+    dummy = 1 # after after breakpoint
+    debug_ # breakpoint 2
+    dummy = 1 # after breakpoint 2
+  end
+
+  def skip_test
+    binding.pry # stop in skip_test
+    skipped_method.not_skipped_method # next step
+  end
+
+  def skipped_method
+    pry_moves_skip = true # at skipped_method
+    self # at skipped_method
+  end
+
+  def not_skipped_method
+    :not_skipped_method # at not_skipped_method
+  end
+
   private
 
   def iterator
@@ -99,10 +184,10 @@ class Playground
       yield i
       :post_yield # post_yield
     end
-  end
-
-  def something_inside
-    :something # some internal line
+  end # exit from iterator
+  
+  def debug_
+    :something # inside of debug method
   end
 
 end

data/playground/sand.rb

@@ -1,24 +1,57 @@
 require 'pry-moves'
 require './tracer.rb'
-require './playground.rb'
 
 
-def debug?(something)
-  puts something
+def fi(param)
+  a = 2 + 1
+  puts param
 end
 
-def sentence
-  :opa
-end
+class A
+
+  def initialize
+    puts :xuilo
+  end
+
+  def aa
+    puts 'aa: step 1'
+    puts 'aa: step 2'
+  end
 
+  def bb
+    debug_redirect = :aa
+    hide_from_stack = true
+    puts 'bb: step 1'
+    puts 'bb: step 2'
+    aa
+  end
 
-def aaa
-  puts :ok
-  "rule#{1}"
-  binding.pry if debug? "rule#{1}"
-  puts :ok
+  def cc
+    koko = :love
+    binding.pry
+    bb
+    (2..4).each do |i|
+      puts i
+    end
+    puts :two
+  end
+  alias cc_al cc
 
 end
 
+puts :prepare
+
+A.new.cc_al
+A.new.cc_al
+
+
+bb = 1
+
+exit
+
+pp = 123 if debucher?
+binding.pry if debucher?
+
 binding.pry
-aaa
+
+puts :ok

data/playground/test.rb

@@ -2,4 +2,8 @@ require 'pry-moves'
 require_relative '../playground/playground.rb'
 
 i = Playground.new
-i.recursion
+if ARGV[0]
+  i.send ARGV[0]
+else
+  i.zaloop
+end

data/playground/test.sh

@@ -0,0 +1 @@
+bundle exec ruby playground/test.rb $@

data/pry-moves.gemspec

@@ -18,8 +18,9 @@ Gem::Specification.new do |gem|
   gem.require_paths = ["lib"]
 
   # Dependencies
-  gem.required_ruby_version = '>= 1.8.7'
-  gem.add_runtime_dependency 'pry', '>= 0.10.4', '< 0.12.0'
+  gem.required_ruby_version = '>= 1.8.7', '< 3'
+  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_development_dependency 'pry-remote', '~> 0.1.6'
 end

data/publish.sh

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

data/spec/backtrace_spec.rb

@@ -7,25 +7,23 @@ describe 'backtrace' do
       [nil, 'stop in level_c'],
       ['bt', lambda{|b, output|
         lines = output.split("\n").reverse
-        expect(lines[0]).to end_with 'level_c(param=?)'
-        expect(lines[1]).to end_with 'level_a()'
-        expect(lines[2]).to include 'Playground:'
-        expect(lines[3]).to end_with ':block'
-        expect(lines[4]).to include 'RSpec::ExampleGroups'
-        expect(lines.count).to be 5
+        expect(lines[0]).to end_with 'level_c(param=? nil)'
+        expect(lines[1]).to end_with 'frames hidden: 1'
+        expect(lines[2]).to end_with 'level_a()'
+        expect(lines[3]).to include 'Playground'
+        expect(lines[4]).to end_with ':block'
+        expect(lines[5]).to include 'RSpec::ExampleGroups'
+        expect(lines.count).to be 7
       }],
-      ['bt all', lambda{|b, output|
+      ['bt hidden', lambda{|b, output|
         lines = output.split("\n").reverse
         # show hidden frame
         expect(lines[1]).to end_with 'level_b()'
-        expect(lines.count).to be 6
+        expect(lines.count).to be 11
       }],
-      ['bt 2', lambda{|b, output|
+      ['up', lambda{|b, output|
         lines = output.split("\n").reverse
-        expect(lines[0]).to end_with 'level_c(param=?)'
-        expect(lines[1]).to end_with 'level_a()'
-        expect(lines[3]).to start_with 'Latest 2 lines'
-        expect(lines.count).to be 4
+        expect(lines[1]).to end_with 'level_b # inside of level_a'
       }],
     ]
     Playground.new.level_a

data/spec/blocks_spec.rb

@@ -5,7 +5,7 @@ describe 'blocks' do
   it 'should go next over blocks' do
     breakpoints [
       [nil, 'stop in zaloop'],
-      ['n', ''],
+      ['n', 'iterator line'],
       # repeat commands
       ['', 'inside block'],
       ['', nil],
@@ -15,11 +15,10 @@ describe 'blocks' do
       ['', 'inside block'],
       ['pass', {output: '=> 0'}],
 
-      ['f', 'after block'],
-      ['pass', {output: '=> 0'}],
+      ['f', 'iterator line'],
+      ['f', 'after sub-zaloop'],
+      ['pass', {output: '=> :root'}],
 
-      ['f', 'post_yield'], # Тут хорошо бы, чтобы сразу шёл на "after block",
-      # но пока и не понятно, как это угадать
       ['f', 'after block'],
       ['pass', {output: '=> :root'}],
     ]
@@ -39,7 +38,7 @@ describe 'blocks' do
   it 'should finish block with sub-calls' do
     breakpoints [
       [nil, 'stop in zaloop'],
-      ['n', ''],
+      ['n', 'iterator line'],
       ['', 'inside block'],
       ['f', 'after block'],
       ['pass', {output: '=> :root'}],
@@ -79,7 +78,7 @@ describe 'blocks' do
       ['n', 'iterator line'],
       ['n', 'inside block'],
       ['iterate', 'iterator line'],
-      ['n', 'exit'],
+      ['n', 'exit']
     ]
     Playground.new.native_block early_return: true
     :exit # exit
@@ -91,10 +90,44 @@ describe 'blocks' do
       ['n', 'iterator line'],
       ['n', 'inside block'],
       ['iterate', 'iterator line'],
-      ['n', 'exit'],
+      ['n', 'exit']
     ]
     Playground.new.nested_block early_return: true
     :exit # exit
   end
+
+  it 'should iterate over one-line in block' do
+    breakpoints [
+      [nil, 'stop in one_line_in_block'],
+      ['n', 'iterator line'],
+      ['n', 'inside block'],
+      ['i', {output: '=> 0'}],
+      ['n', 'inside block'],
+      ['i', {output: '=> 1'}],
+      ['n', 'after block'],
+    ]
+    Playground.new.one_line_in_block
+  end
+
+  it 'should skip one-line block' do
+    breakpoints [
+      [nil, 'stop in one_line_block'],
+      ['n', 'iterator line'],
+      ['n', 'after block']
+    ]
+    Playground.new.one_line_block
+  end
+
+  it 'should skip parentheses in loop' do
+    breakpoints [
+      [nil, 'stop in parentheses_in_loop'],
+      ['n', nil],
+      ['n', 'iterator line'],
+      ['n', 'inside block'],
+      ['n', 'iterator line'],
+      ['n', 'after block']
+    ]
+    Playground.new.parentheses_in_loop
+  end
   
 end

data/spec/commands_spec.rb

@@ -2,7 +2,7 @@ require_relative 'spec_helper'
 
 describe 'PryMoves commands' do
 
-  it 'should make one step next' do
+  it 'should make one move next' do
     breakpoints [
       [nil, 'basic next stop'],
       ['n', 'next step'],
@@ -10,7 +10,7 @@ describe 'PryMoves commands' do
     Playground.new.basic_next
   end
 
-  it 'should stop on second breakpoint' do
+  it 'should stop on second binding.pry' do
     breakpoints [
       [nil, 'first stop'],
       ['c', 'second stop'],
@@ -18,37 +18,19 @@ describe 'PryMoves commands' do
     Playground.new.continue
   end
 
-  it 'should step into func and walk over stack' do
+  it 'should walk over stack' do
     breakpoints [
       [nil, 'step_into stop'],
       ['s', 'point to step inside'],
       ['s', 'some internal line'],
       ['up', 'point to step inside'],
-      ['up', nil ],
-      ['up', {output_includes: 'top of stack'} ],
-      ['down', nil ],
+      ['up', 'spec example beginning' ],
+      #['up', {output_includes: 'top of stack'} ],
+      ['down', 'point to step inside'],
       ['down', 'some internal line'],
       ['down', {output_includes: 'bottom of stack'} ],
     ]
-    Playground.new.step_into
-  end
-
-  it 'should step into func by name' do
-    breakpoints [
-      [nil, 'stop in step_by_name'],
-      ['s level_c', 'stop in level_c'],
-      ['param', {output: '=> :target'}],
-      ['n', nil],
-    ]
-    Playground.new.step_by_name
-  end
-
-  it 'should stop after inability to step into func by name' do
-    breakpoints [
-      [nil, 'stop in step_by_name'],
-      ['s absent_function', 'after_step_by_name'],
-    ]
-    Playground.new.step_by_name_wrap
+    Playground.new.step_into # spec example beginning
   end
 
   it 'should go next over recursion calls' do
@@ -61,6 +43,15 @@ describe 'PryMoves commands' do
     Playground.new.recursion
   end
 
+  it 'should stop after finishing early return' do
+    breakpoints [
+      [nil, 'stop in level_c'],
+      ['f', 'at early return'],
+      ['f', 'after early return']
+    ]
+    Playground.new.early_return_wrap
+  end
+
   it 'should debug' do
     breakpoints [
       [nil, 'basic next stop'],
@@ -70,4 +61,14 @@ describe 'PryMoves commands' do
     Playground.new.basic_next
   end
 
+  it 'should next breakpoint' do
+    breakpoints [
+      [nil, 'method_with_breakpoints host'],
+      ['b', 'breakpoint'],
+      ['n', 'after breakpoint'],
+      ['b', 'breakpoint 2']
+    ]
+    Playground.new.method_with_breakpoints
+  end
+
 end

data/spec/pry_debugger.rb

@@ -24,13 +24,17 @@ module PryDebugger
 
     def compare(step, label, binding_, output)
       exp = step[:expected]
+      puts "\nSTEP #{step[:index]}:\n#{output}" if ENV['PRINT']
       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 exp[:output]
+          err = <<-TEXT
+[#{step[:index]}] #{step[:cmd]} expected output '#{exp[:output]}', got '#{output}'
+          TEXT
+          expect(output).to eq(exp[:output]), err
         end
       elsif not exp.nil?
         err = <<-TEXT

data/spec/redirection_spec.rb

@@ -31,4 +31,11 @@ describe 'redirection' do
     Playground.new.redirection_host
   end
 
+  it "instantly redirects binding.pry" do
+    breakpoints [
+      [nil, 'some internal line']
+    ]
+    Playground.new.instant_redirection
+  end
+
 end

data/spec/spec_helper.rb

@@ -1,3 +1,5 @@
+$VERBOSE = nil # Disable warnings for whole specs
+
 require 'pry'
 require_relative 'pry_debugger'
 require_relative '../playground/playground.rb'
@@ -14,7 +16,8 @@ RSpec.configure do |config|
 
   config.after(:example) do |example|
     unless example.exception
-      expect(PryDebugger.breakpoints.count).to be(0), "not all breakpoints launched: #{PryDebugger.breakpoints.count}"
+      expect(PryDebugger.breakpoints.count).to be(0),
+        "not all breakpoints launched: #{PryDebugger.breakpoints.count}"
     end
   end
 
@@ -34,9 +37,11 @@ RSpec::Core::BacktraceFormatter.class_eval do
 
   FILTER = /(\/gems\/|\/lib\/pry\/|spec\/pry_debugger\.rb)/
   def backtrace_line(line)
-    return if @lines == 3 and not ENV['TRACE']
-    #return if line.match FILTER
-    return unless line.include? '/playground.rb'
+    unless ENV['TRACE']
+      return if @lines == 3
+      #return if line.match FILTER
+      return unless line.include? '/playground.rb'
+    end
 
     result = native_backtrace_line(line)
     if result

data/spec/step_spec.rb

@@ -0,0 +1,51 @@
+require_relative 'spec_helper'
+
+describe 'step' do
+
+  it 'should step into func by name' do
+    breakpoints [
+      [nil, 'stop in step_by_name'],
+      ['s level_c', 'stop in level_c'],
+      ['param', {output: '=> :target'}],
+      ['n', nil],
+    ]
+    Playground.new.step_by_name
+  end
+
+  it 'should stop after inability to step into func by name' do
+    breakpoints [
+      [nil, 'stop in step_by_name'],
+      ['s absent_function', 'after_step_by_name'],
+    ]
+    Playground.new.step_by_name_wrap
+  end
+
+  it 'should skip hidden frames' do
+    breakpoints [
+      [nil, 'skip_hidden_impl stop'],
+      ['s', 'point to step inside'],
+      ['s', 'some internal line']
+    ]
+    Playground.new.skip_hidden_impl
+  end
+
+  it 'should step down to hidden frame and resume there' do
+    breakpoints [
+      [nil, 'at root'],
+      ['down', 'hidden stop'],
+      ['n', 'hidden_stop for next'],
+      ['s', 'hidden_stop for step']
+    ]
+    Playground.new.hidden_stop # at root
+  end
+
+  it 'should skip hidden method' do
+    breakpoints [
+      [nil, 'stop in skip_test'],
+      ['n', 'next step'],
+      ['s', 'at not_skipped_method']
+    ]
+    Playground.new.skip_test
+  end
+
+end