pry-moves 0.1.13 → 1.0.2

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pry-moves
 version: !ruby/object:Gem::Version
-  version: 0.1.13
+  version: 1.0.2
 platform: ruby
 authors:
 - garmoshka-mo
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-08-16 00:00:00.000000000 Z
+date: 2022-05-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pry
@@ -19,7 +19,7 @@ dependencies:
         version: 0.10.4
     - - "<"
       - !ruby/object:Gem::Version
-        version: 0.12.0
+        version: '0.13'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -29,7 +29,7 @@ dependencies:
         version: 0.10.4
     - - "<"
       - !ruby/object:Gem::Version
-        version: 0.12.0
+        version: '0.13'
 - !ruby/object:Gem::Dependency
   name: binding_of_caller
   requirement: !ruby/object:Gem::Requirement
@@ -44,6 +44,34 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.7'
+- !ruby/object:Gem::Dependency
+  name: colorize
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.8'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !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
@@ -72,25 +100,38 @@ files:
 - README.md
 - Rakefile
 - dynamic_debug_experiments.rb
+- lib/commands/debug.rb
+- lib/commands/finish.rb
+- lib/commands/goto.rb
+- lib/commands/iterate.rb
+- lib/commands/next.rb
+- lib/commands/next_breakpoint.rb
+- lib/commands/step.rb
+- 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/bindings_stack.rb
 - lib/pry-moves/cli.rb
 - lib/pry-moves/commands.rb
-- lib/pry-moves/helpers.rb
+- lib/pry-moves/error_with_data.rb
+- lib/pry-moves/formatter.rb
 - lib/pry-moves/painter.rb
 - lib/pry-moves/pry_ext.rb
 - 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/recursion_tracker.rb
+- lib/pry-moves/restartable.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_helpers.rb
 - lib/pry-stack_explorer/frame_manager.rb
 - lib/pry-stack_explorer/pry-stack_explorer.rb
+- lib/pry-stack_explorer/stack_commands.rb
 - lib/pry-stack_explorer/when_started_hook.rb
 - playground/Gemfile
 - playground/Gemfile.lock
@@ -100,6 +141,7 @@ files:
 - playground/recursions.rb
 - playground/sand.rb
 - playground/test.rb
+- playground/test.sh
 - playground/threads.rb
 - playground/tracer.rb
 - pry-moves.gemspec
@@ -110,11 +152,12 @@ files:
 - spec/pry_debugger.rb
 - spec/redirection_spec.rb
 - spec/spec_helper.rb
+- spec/step_spec.rb
 homepage: https://github.com/garmoshka-mo/pry-moves
 licenses:
 - MIT
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -123,6 +166,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ">="
     - !ruby/object:Gem::Version
       version: 1.8.7
+  - - "<"
+    - !ruby/object:Gem::Version
+      version: '3'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -130,7 +176,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.1.2
-signing_key:
+signing_key: 
 specification_version: 4
 summary: Debugger for ruby
 test_files:
@@ -140,3 +186,4 @@ test_files:
 - spec/pry_debugger.rb
 - spec/redirection_spec.rb
 - spec/spec_helper.rb
+- spec/step_spec.rb

data/lib/pry-moves/helpers.rb

@@ -1,56 +0,0 @@
-module PryMoves::Helpers
-
-  extend self
-
-  # @return [String] Signature for the method object in Class#method format.
-  def method_signature_with_owner(binding)
-    meth = binding.eval('__method__')
-    meth_obj = meth ? Pry::Method.from_binding(binding) : nil
-    if !meth_obj
-      ""
-    elsif meth_obj.undefined?
-      "#{meth_obj.name_with_owner}(UNKNOWN) (undefined method)"
-    else
-      args = meth_obj.parameters.inject([]) do |arr, (type, name)|
-        name ||= (type == :block ? 'block' : "arg#{arr.size + 1}")
-        arr << case type
-                 when :req   then name.to_s
-                 when :opt   then "#{name}=?"
-                 when :rest  then "*#{name}"
-                 when :block then "&#{name}"
-                 else '?'
-               end
-      end
-      "#{meth_obj.name_with_owner}(#{args.join(', ')})"
-    end
-  end
-
-  def method_signature(binding)
-    meth = binding.eval('__method__')
-    meth_obj = meth ? Pry::Method.from_binding(binding) : nil
-    if !meth_obj
-      ""
-    elsif meth_obj.undefined?
-      "#{meth_obj.name}(UNKNOWN) (undefined method)"
-    else
-      args = meth_obj.parameters.inject([]) do |arr, (type, name)|
-        name ||= (type == :block ? 'block' : "arg#{arr.size + 1}")
-        arr << case type
-               when :req   then name.to_s
-               when :opt   then "#{name}=?"
-               when :rest  then "*#{name}"
-               when :block then "&#{name}"
-               else '?'
-               end
-      end
-      "#{meth_obj.name}(#{args.join(', ')})"
-    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/trace_commands.rb

@@ -1,109 +0,0 @@
-module PryMoves::TraceCommands
-
-  private
-
-  def trace_step(event, file, line, method, binding_)
-    return unless event == 'line'
-
-    if @step_in_everywhere
-      true
-    elsif @step_into_funcs
-
-      if @recursion_level < 0
-        pry_puts "⚠️  Unable to find function with name #{@step_into_funcs.join(',')}"
-        return true
-      end
-
-      method = binding_.eval('__callee__').to_s
-      return false unless method_matches?(method)
-
-      func_reached = (not @caller_digest or
-        # if we want to step-in only into straight descendant
-        @caller_digest == frame_digest(binding_.of_caller(3 + 1)))
-
-      if func_reached
-        @caller_digest = nil
-        not redirect_step_into? binding_
-      end
-
-    elsif redirect_step_into? binding_
-      false
-    else
-      not binding_.local_variable_defined? :hide_from_stack
-    end
-  end
-
-  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
-      set_traced_method binding_
-      throw :skip if event == 'call'
-    end
-
-    if @recursion_level == 0 and
-      within_current_method?(file, line)
-
-      if event == 'line'
-        if @stay_at_frame
-          return (
-            @stay_at_frame == frame_digest(binding_.of_caller(3)) or
-            @c_stack_level < 0
-          )
-        else
-          return true
-        end
-      end
-
-       exit_from_method if event == 'return' and
-         method != :to_s and before_end?(line)
-    end
-  end
-
-  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_)
-        @action = :step
-        return false
-      end
-      return true
-    end
-
-    # for finishing blocks inside current method
-    if @block_to_finish
-      @recursion_level == 0 and
-        within_current_method?(file, line) and
-        @block_to_finish != frame_digest(binding_.of_caller(3))
-    end
-  end
-
-  def trace_debug(event, file, line, method, binding_)
-    return unless event == 'line'
-    if @first_line_skipped
-      true
-    else
-      @first_line_skipped = true
-      false
-    end
-  end
-
-  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

@@ -1,61 +0,0 @@
-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