pry-moves 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 23288b1d287b42591da2676415691400c9d6120b
-  data.tar.gz: ad7ba33a0ec981169e22684620d0f0f9bc01442e
+  metadata.gz: c2844477b6ebf360fce390c440ac602b73dc287c
+  data.tar.gz: 102a4fee351cb6dcbc078b2d22fe6b6829ba314d
 SHA512:
-  metadata.gz: 840e5a61835382777aa7635ab4ef786f5546d2f1efa735d2f744991380e7efea1d08276825850cbbf016083e7c373f92ac3f686e9538f2509cc3c86fb7a39ae0
-  data.tar.gz: d0278d40a279fbcb7b18efa1f53fed7cf9509166159feac899ef4b457a8022e1eda6863d80f25c761c56f8fbbc03553afde1348293fc2fdf7207ad444b4dbab2
+  metadata.gz: aa98bf11ad2de420aa25795cc53cab6be2d8ff13401a2d0dad69c96932ea613002b04f0f64303c1b6e520ddabd897d3d095791a52dba021319745435e4ffa0af
+  data.tar.gz: fcabf21cb1742f44406cbd9d5391959d4a24eca3ff99e745b9298ba76dd7d98282992aaa9674f0963845c01b6059663e981797655b4cee203232d0658b0dd151

data/.gitignore

@@ -3,7 +3,6 @@
 .bundle
 .config
 .yardoc
-Gemfile.lock
 InstalledFiles
 _yardoc
 coverage

data/Gemfile

@@ -2,3 +2,8 @@ source 'https://rubygems.org'
 
 # Specify your gem's dependencies in pry-moves.gemspec
 gemspec
+
+group :development, :test do
+  gem 'pry', path: '../pry'
+  gem 'rspec'
+end

data/Gemfile.lock

@@ -0,0 +1,52 @@
+PATH
+  remote: ../pry
+  specs:
+    pry (0.10.4)
+      coderay (~> 1.1.0)
+      method_source (~> 0.8.1)
+
+PATH
+  remote: .
+  specs:
+    pry-moves (0.1.5)
+      binding_of_caller (~> 0.7)
+      pry (>= 0.9.10, < 0.11.0)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    binding_of_caller (0.7.2)
+      debug_inspector (>= 0.0.1)
+    coderay (1.1.1)
+    debug_inspector (0.0.3)
+    diff-lcs (1.3)
+    method_source (0.8.2)
+    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)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.6.0)
+    rspec-mocks (3.6.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.6.0)
+    rspec-support (3.6.0)
+    slop (3.6.0)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  pry!
+  pry-moves!
+  pry-remote (~> 0.1.6)
+  rspec
+
+BUNDLED WITH
+   1.14.5

data/README.md

@@ -1,5 +1,3 @@
-### Using [**pry-byebug**][pry-byebug] and not happy with commands behavior? We recommend this project instead
-
 # pry-moves
 
 _An execution control add-on for [Pry][pry]._
@@ -17,11 +15,12 @@ _An execution control add-on for [Pry][pry]._
 * `bt` - show latest 5 lines from backtrace
   * `bt 10` - latest 10 lines
   * `bt all` - full backtrace
-  * `bt >foo` - write backtrace to file `log/backtrace_foo.log`
+  * `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(param, param2)` - call `some_method(param, param2)` and interactively step into it
+* `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
+* `watch variable` - display variable's value on each step
 * `!` - exit
 
 
@@ -96,7 +95,16 @@ gem 'pry-moves'
 ## Performance
 
 Please note that debugging functionality is implemented through
-[`set_trace_func`][set_trace_func], which imposes certain performance penalty.
+[`set_trace_func`][set_trace_func], which imposes heavy performance penalty while tracing
+(while running code within `next`/`step`/`finish` commands).
+
+# Development
+
+## Testing
+
+```
+bundle exec rspec
+```
 
 ## Contributors
 

data/lib/pry-moves/backtrace.rb

@@ -7,7 +7,7 @@ class PryMoves::Backtrace
     def lines_count=(f); @lines_count = f; end
 
     def filter
-      @filter || /(\/gems\/|\/rubygems\/|\/bin\/|\/lib\/ruby\/|\/pry-moves\/)/
+      @filter || /(\/gems\/|\/rubygems\/|\/bin\/|\/lib\/ruby\/)/
     end
     def filter=(f); @filter = f; end
 
@@ -26,43 +26,44 @@ class PryMoves::Backtrace
      @binding, @pry = binding, pry
   end
 
-  def build(lines_count = nil)
+  def run_command(param, param2)
+    if param.is_a?(String) and (match = param.match /^>(.*)/)
+      suffix = match[1].size > 0 ? match[1] : param2
+      write_to_file build, suffix
+    else
+      @colorize = true
+      if param.is_a? String and param.match /\d+/
+        param = param.to_i
+      end
+      @lines_count = param || PryMoves::Backtrace::lines_count
+      @pry.output.puts build
+    end
+  end
+
+  private
+
+  def build
     result = []
-    show_vapid = lines_count == 'all'
+    show_vapid = @lines_count == 'all'
     stack = stack_bindings(show_vapid)
               .reverse.reject do |binding|
                 binding.eval('__FILE__').match self.class::filter
               end
 
-    if lines_count.is_a? String and lines_count.match /\d+/
-      lines_count = lines_count.to_i
-    end
-    if lines_count.is_a?(Numeric) and stack.count > lines_count
-      result << "Latest #{lines_count} lines: (`bt all` for full tracing)"
-      stack = stack.last(lines_count)
+    if @lines_count.is_a?(Numeric) and stack.count > @lines_count
+      result << "Latest #{@lines_count} lines: (`bt all` for full tracing)"
+      stack = stack.last(@lines_count)
     end
 
     build_result stack, result
   end
 
-  def run_command(param)
-    if param.is_a?(String) and (match = param.match /^>(.*)/)
-      write_to_file build, match[1]
-    else
-      puts build(param || PryMoves::Backtrace::lines_count)
-    end
-  end
-
-  private
-
   def build_result(stack, result)
     current_object = nil
     stack.each do |binding|
       obj = binding.eval 'self'
       if current_object != obj
-        colored_obj = ""
-        Pry::ColorPrinter.pp obj, colored_obj
-        result << "#{colored_obj.chomp}:"
+        result << "#{format_obj(obj)}:"
         current_object = obj
       end
 
@@ -71,17 +72,26 @@ class PryMoves::Backtrace
     result
   end
 
+  def format_obj(obj)
+    if @colorize
+      PryMoves::Painter.colorize obj
+    else
+      obj.inspect
+    end
+  end
+
   def build_line(binding)
     file = "#{binding.eval('__FILE__')}"
     file.gsub!( /^#{Rails.root.to_s}/, '') if defined? Rails
 
-    signature = PryMoves::Helpers.method_signature_with_owner binding
+    signature = PryMoves::Helpers.method_signature binding
+    signature = signature.presence || ":#{binding.frame_type}"
 
     indent = frame_manager.current_frame == binding ?
         ' => ': '    '
 
-    "#{indent}#{file}:#{binding.eval('__LINE__')} "+
-      " #{signature} :#{binding.frame_type}"
+    line = binding.eval('__LINE__')
+    "#{indent}#{file}:#{line} #{signature}"
   end
 
   def frame_manager
@@ -94,9 +104,7 @@ class PryMoves::Backtrace
 
   def write_to_file(lines, file_suffix)
     log_path = log_path file_suffix
-    File.open(log_path, "w") do |f|
-      f.puts lines
-    end
+    File.write log_path, lines
     puts "Backtrace logged to #{log_path}"
   end
 

data/lib/pry-moves/commands.rb

@@ -31,8 +31,8 @@ module PryMoves
       PryMoves::Watch.instance.process_cmd param, target
     end
 
-    block_command 'bt', 'Backtrace' do |param|
-      PryMoves::Backtrace.new(target, _pry_).run_command param
+    block_command 'bt', 'Backtrace' do |param, param2|
+      PryMoves::Backtrace.new(target, _pry_).run_command param, param2
     end
 
     block_command 'debug', '' do
@@ -53,9 +53,10 @@ module PryMoves
       def breakout_navigation(action, param)
         _pry_.binding_stack.clear     # Clear the binding stack.
         throw :breakout_nav, {        # Break out of the REPL loop and
-          :action => action,          #   signal the tracer.
-          :param =>  param,
-          :binding => target
+          action: action,          #   signal the tracer.
+          param:  param,
+          binding: target,
+          pry: _pry_
         }
       end
 

data/lib/pry-moves/helpers.rb

@@ -25,4 +25,26 @@ module PryMoves::Helpers
     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
+
 end

data/lib/pry-moves/painter.rb

@@ -0,0 +1,23 @@
+module PryMoves::Painter
+
+  class Canvas < String
+
+    def <<(text)
+      if length > 2000
+        super("... (cut)")
+        throw :cut
+      end
+      super
+    end
+
+  end
+
+  def self.colorize(obj)
+    colored_str = Canvas.new
+    catch (:cut) do
+      Pry::ColorPrinter.pp obj, colored_str
+    end
+    colored_str.chomp
+  end
+
+end

data/lib/pry-moves/pry_ext.rb

@@ -69,12 +69,19 @@ Pry::Command::Whereami.class_eval do
 
   def location
     me = target.eval 'self' rescue nil
-    if me
-      colored_str = ''
-      Pry::ColorPrinter.pp me, colored_str
-      me = colored_str.chomp
-    end
+    me = PryMoves::Painter.colorize me if me
     file = defined?(Rails) ? @file.gsub(Rails.root.to_s, '') : @file
     "#{file}:#{@line} #{me}"
   end
 end
+
+Pry.config.marker = "=>"
+Pry::Code::LOC.class_eval do
+
+  def add_marker(marker_lineno)
+    marker = lineno == marker_lineno ?
+       Pry.config.marker : "  "
+    tuple[0] = " #{marker} #{ line }"
+  end
+
+end

data/lib/pry-moves/pry_wrapper.rb

@@ -10,6 +10,8 @@ class PryWrapper
   def run(&block)
     PryMoves.lock
 
+    Pry.config.marker = "⛔️ " if @pry_start_options[:exit_from_method]
+
     return_value = nil
     PryMoves.is_open = true
     @command = catch(:breakout_nav) do      # Coordinates with PryMoves::Commands
@@ -17,6 +19,7 @@ class PryWrapper
       nil    # Nothing thrown == no navigational command
     end
     PryMoves.is_open = false
+    Pry.config.marker = "=>"
 
     if @command
       trace_command
@@ -44,7 +47,16 @@ class PryWrapper
     #puts "##wrap debug"
     #puts "CALLER:\n#{caller.join "\n"}\n"
     #      Thread.abort_on_exception=true
+    parent_thread = Thread.current
     Thread.new do
+
+      # copy non-pry thread's properties
+      parent_thread.keys.select do |k|
+        !k.to_s.include?('pry')
+      end.each do |k|
+        Thread.current[k] = parent_thread[k]
+      end
+
       Thread.current[:pry_moves_debug] = true
       #@command[:binding].eval 'puts "###########"'
       start_tracing

data/lib/pry-moves/tracer.rb

@@ -10,15 +10,19 @@ class Tracer
 
   def trace
     @action = @command[:action]
+    #puts "COMMAND: #{@action}"
     binding_ = @command[:binding]
     set_traced_method binding_
 
+    @recursion_level -= 1 if @pry_start_options.delete :exit_from_method
+
     case @action
     when :step
       @step_info_funcs = nil
       if (func = @command[:param])
         @step_info_funcs = [func]
         @step_info_funcs << 'initialize' if func == 'new'
+        @caller_digest = frame_digest(binding_)
       end
     when :finish
       @method_to_finish = @method
@@ -62,6 +66,7 @@ class Tracer
       set_method({
        file: source[0],
        start: source[1],
+       name: method.name,
        end: (source[1] + method.source.count("\n") - 1)
      })
     else
@@ -91,8 +96,11 @@ class Tracer
         Pry.start(binding_, @pry_start_options)
 
       # for cases when currently traced method called more times recursively
-      elsif %w(call return).include?(event) and within_current_method?(file, line)
-        @recursion_level += event == 'call' ? 1 : -1
+      elsif %w(call return).include?(event) and within_current_method?(file, line) and
+          @method[:name] == id # fix for bug in traced_method: return for dynamic methods has line number inside of caller
+        delta = event == 'call' ? 1 : -1
+        #puts "recursion #{event}: #{delta}; changed: #{@recursion_level} => #{@recursion_level + delta}"
+        @recursion_level += delta
       end
     end
   end
@@ -100,8 +108,13 @@ class Tracer
   def trace_step(event, file, line, binding_)
     return unless event == 'line'
     if @step_info_funcs
+      if @recursion_level < 0
+        pry_puts "⚠️  Unable to find function with name #{@step_info_funcs.join(',')}"
+        return true
+      end
       method = binding_.eval('__callee__').to_s
-      @step_info_funcs.any? {|pattern| method.include? pattern}
+      @step_info_funcs.any? {|pattern| method.include? pattern} and
+        @caller_digest == frame_digest(binding_.of_caller(3 + 1))
     else
       true
     end
@@ -115,9 +128,16 @@ class Tracer
       throw :skip if event == 'call'
     end
 
-    event == 'line' and
-      @recursion_level == 0 and
+    if @recursion_level == 0 and
       within_current_method?(file, line)
+
+      return true if event == 'line'
+
+      if event == 'return' and before_end?(line)
+        @pry_start_options[:exit_from_method] = true
+        true
+      end
+    end
   end
 
   def trace_finish(event, file, line, binding_)
@@ -126,8 +146,9 @@ class Tracer
 
     # for finishing blocks inside current method
     if @block_to_finish
-      within_current_method?(file, line) and
-          @block_to_finish != frame_digest(binding_.of_caller(3))
+      @recursion_level == 0 and
+        within_current_method?(file, line) and
+        @block_to_finish != frame_digest(binding_.of_caller(3))
     end
   end
 
@@ -153,5 +174,13 @@ class Tracer
     )
   end
 
+  def before_end?(line)
+    @method[:end] and line < @method[:end]
+  end
+
+  def pry_puts(text)
+    @command[:pry].output.puts text
+  end
+
 end
 end

data/lib/pry-moves/version.rb

@@ -1,3 +1,3 @@
 module PryMoves
-  VERSION = '0.1.4'
+  VERSION = '0.1.5'
 end

data/lib/pry-moves.rb

@@ -6,6 +6,7 @@ require 'pry-moves/tracer'
 require 'pry-moves/backtrace'
 require 'pry-moves/watch'
 require 'pry-moves/helpers'
+require 'pry-moves/painter'
 
 require 'pry-stack_explorer/pry-stack_explorer'
 
@@ -43,7 +44,13 @@ module PryMoves
   end
 
   def synchronize_threads
-    semaphore.synchronize {} unless Thread.current[:pry_moves_debug]
+    return if Thread.current[:pry_moves_debug]
+
+    semaphore.synchronize {}
+  rescue ThreadError => e
+    puts e.backtrace.reverse
+    puts e
+    raise e
   end
 
   # Reference to currently running pry-remote server. Used by the tracer.

data/lib/pry-stack_explorer/when_started_hook.rb

@@ -4,13 +4,10 @@ module PryStackExplorer
 
     def caller_bindings(target)
       bindings = binding.callers
-
+      pre_callers = Thread.current[:pre_callers]
+      bindings = bindings + pre_callers if pre_callers
       bindings = remove_internal_frames(bindings)
-      bindings = remove_debugger_frames(bindings)
-      bindings = bindings.drop(1) if pry_method_frame?(bindings.first)
-
       mark_vapid_frames(bindings)
-
       bindings
     end
 
@@ -63,44 +60,24 @@ module PryStackExplorer
 
     # remove internal frames related to setting up the session
     def remove_internal_frames(bindings)
-      start_frames = internal_frames_with_indices(bindings)
-      start_frame_index = start_frames.first.last
-
-      if start_frames.size >= 2
-        # god knows what's going on in here
-        idx1, idx2 = start_frames.take(2).map(&:last)
-        start_frame_index = idx2 if !nested_session?(bindings[idx1..idx2])
-      end
-
-      bindings.drop(start_frame_index + 1)
-    end
-
-    # remove pry-nav / pry-debugger / pry-byebug frames
-    def remove_debugger_frames(bindings)
-      bindings.drop_while { |b| b.eval("__FILE__") =~ /\/pry-/ }
-    end
-
-    # binding.pry frame
-    # @return [Boolean]
-    def pry_method_frame?(binding)
-      safe_send(binding.eval("__method__"), :==, :pry)
+      i = top_internal_frame_index(bindings)
+      # DEBUG:
+      #bindings.each_with_index do |b, index|
+      #  puts "#{index}: #{b.eval("self.class")} #{b.eval("__method__")}"
+      #end
+      #puts "FOUND top internal frame: #{bindings.size} => #{i}"
+
+      bindings.drop i+1
     end
 
-    # When a pry session is started within a pry session
-    # @return [Boolean]
-    def nested_session?(bindings)
-      bindings.detect do |b|
-        safe_send(b.eval("__method__"), :==, :re) &&
-          safe_send(b.eval("self.class"), :equal?, Pry)
-      end
-    end
-
-    # @return [Array<Array<Binding, Fixnum>>]
-    def internal_frames_with_indices(bindings)
-      bindings.each_with_index.select do |b, i|
-        b.frame_type == :method &&
-          safe_send(b.eval("self"), :equal?, Pry) &&
-          safe_send(b.eval("__method__"), :==, :start)
+    def top_internal_frame_index(bindings)
+      bindings.rindex do |b|
+        if b.frame_type == :method
+          self_, method = b.eval("self"), b.eval("__method__")
+          self_.equal?(Pry) && method == :start ||
+            self_.class == Binding && method == :pry ||
+            self_.class == PryMoves::Tracer && method == :tracing_func
+        end
       end
     end
 

data/playground/Gemfile.lock

@@ -0,0 +1,29 @@
+PATH
+  remote: ..
+  specs:
+    pry-moves (0.1.5)
+      binding_of_caller (>= 0.7)
+      pry (>= 0.9.10, < 0.11.0)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    binding_of_caller (0.7.2)
+      debug_inspector (>= 0.0.1)
+    coderay (1.1.1)
+    debug_inspector (0.0.3)
+    method_source (0.8.2)
+    pry (0.10.4)
+      coderay (~> 1.1.0)
+      method_source (~> 0.8.1)
+      slop (~> 3.4)
+    slop (3.6.0)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  pry-moves!
+
+BUNDLED WITH
+   1.14.5

data/playground/playground.rb

@@ -0,0 +1,90 @@
+# Rails has such type of definitions
+Fixnum.send(:alias_method, :to_default_s, :to_s)
+Fixnum.send(:define_method, :to_s) do |*args|
+  to_default_s(*args)
+end
+
+class Playground
+
+  def basic_next
+    dummy = :basic_1
+    binding.pry # basic next stop
+    :basic_2 # next step
+  end
+
+  def step_into
+    binding.pry # step_into stop
+    something_inside # point to step inside
+  end
+
+  def continue
+    binding.pry # first stop
+    dummy = :something
+    binding.pry # second stop
+  end
+
+  def recursion(depth = 0)
+    str = 3.to_s # here fired event "return" if "to_s" patched
+    binding.pry if depth == 0
+    recursion depth + 1 if depth < 2 # next step
+    :ok # should stop here after 2 next-s
+  end
+
+  def step_by_name
+    binding.pry # stop in step_by_name
+    level_a.level_c(:target)
+  end
+
+  def step_by_name_wrap
+    step_by_name
+    :after_step_by_name # after_step_by_name
+  end
+
+  def level_a
+    level_b # inside of level_a
+  end
+
+  def level_b
+    hide_from_stack = true
+    level_c
+  end
+
+  def level_c(param = nil)
+    binding.pry # stop in level_c
+    self
+  end
+
+  def with_simple_block
+    binding.pry # stop in with_simple_block
+    iterator do |i|
+      dummy = 1 # inside block
+      dummy = 2
+    end
+    :after_block # after block
+  end
+
+  def zaloop(pass = :root)
+    binding.pry if pass == :root # stop in zaloop
+    iterator do |i|
+      dummy = 1 # inside block
+      zaloop i if pass == :root
+    end
+    :after_block # after block
+  end
+
+  private
+
+  def iterator
+    2.times do |i|
+      dummy = :pre_yield # pre_yield
+      yield i
+      :post_yield # post_yield
+    end
+  end
+
+  def something_inside
+    :something # some internal line
+  end
+
+end
+

data/playground/sand.rb

@@ -1,11 +1,6 @@
 require 'pry-moves'
-#require 'pry-nav'
 require './tracer.rb'
 
-def debucher?
-  binding.pry
-  true
-end
 
 def fi(param)
   a = 2 + 1
@@ -30,19 +25,20 @@ class A
   end
 
   def cc
+    koko = :love
     binding.pry
+    return if true
+    puts :two
   end
+  alias cc_al cc
 
 end
 
-#trace_events
-
-a = 1123
-b = binding
-
 puts :prepare
 
-#binding.pry
+A.new.cc_al
+A.new.cc_al
+A.new.cc_al
 
 a = A.new.aa.bb.cc
 

data/playground/threads.rb

@@ -2,25 +2,28 @@ require 'pry-moves'
 
 Thread.current[:name] = 'main'
 
-a = Thread.new do
-  Thread.current[:name] = 'a'
-  sleep 0.2
-  puts 'a'
+
+def inside_thread
   binding.pry
-  puts 'aaaa'
-  sleep 1
   puts 'aaa'
 end
 
-b = Thread.new do
-  Thread.current[:name] = 'b'
-  20223000.times do
-    432 * 3232
+def aaa
+  pre_callers = binding.callers +
+    (Thread.current[:pre_callers] || [])
+  a = Thread.new do
+    # что можно сделать - записать в текущий тред ссылку на биндинг
+    # предыдущего треда. А если цепочка тредов - то как? Можно прямо там собирать каллеров предыдущего треда... ??
+    Thread.current[:pre_callers] = pre_callers
+
+    Thread.current[:name] = 'a'
+    inside_thread
   end
-  puts '2'
-  binding.pry
-  puts '22'
+  a.join
+end
+
+def bbb
+  aaa
 end
 
-a.join
-b.join
+bbb

data/pry-moves.gemspec

@@ -20,6 +20,6 @@ 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 'binding_of_caller', '>= 0.7'
+  gem.add_runtime_dependency 'binding_of_caller', '~> 0.7'
   gem.add_development_dependency 'pry-remote', '~> 0.1.6'
 end

data/spec/backtrace_spec.rb

@@ -0,0 +1,34 @@
+require_relative 'spec_helper'
+
+describe 'PryMoves Commands' do
+
+  it 'should backtrace' do
+    breakpoints [
+      [nil, 'stop in level_c'],
+      ['bt', lambda{|b, out|
+        lines = out.split("\n").reverse
+        expect(lines[0]).to end_with 'Playground#level_c(param=?) :method'
+        expect(lines[1]).to end_with 'Playground#level_a() :method'
+        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
+      }],
+      ['bt all', lambda{|b, out|
+        lines = out.split("\n").reverse
+        # show hidden frame
+        expect(lines[1]).to end_with 'Playground#level_b() :method'
+        expect(lines.count).to be 6
+      }],
+      ['bt 2', lambda{|b, out|
+        lines = out.split("\n").reverse
+        expect(lines[0]).to end_with 'Playground#level_c(param=?) :method'
+        expect(lines[1]).to end_with 'Playground#level_a() :method'
+        expect(lines[3]).to start_with 'Latest 2 lines'
+        expect(lines.count).to be 4
+      }],
+    ]
+    Playground.new.level_a
+  end
+
+end

data/spec/blocks_spec.rb

@@ -0,0 +1,52 @@
+require_relative 'spec_helper'
+
+describe 'PryMoves Commands' do
+
+
+  it 'should go next over blocks' do
+    breakpoints [
+      [nil, 'stop in zaloop'],
+      ['n', ''],
+      # repeat commands
+      ['', 'inside block'],
+      ['', nil],
+
+      ['s', 'stop in zaloop'],
+      ['n', nil],
+      ['', 'inside block'],
+      ['pass', {out: '=> 0'}],
+
+      ['f', 'after block'],
+      ['pass', {out: '=> 0'}],
+
+      ['f', 'post_yield'], # Тут хорошо бы, чтобы сразу шёл на "after block",
+      # но пока и не понятно, как это угадать
+      ['f', 'after block'],
+      ['pass', {out: '=> :root'}],
+    ]
+    Playground.new.zaloop
+  end
+
+  it 'should finish simple block' do
+    breakpoints [
+      [nil, 'stop in with_simple_block'],
+      ['n', ''],
+      ['', 'inside block'],
+      ['f', 'after block']
+    ]
+    Playground.new.with_simple_block
+  end
+
+  it 'should finish block with sub-calls' do
+    breakpoints [
+      [nil, 'stop in zaloop'],
+      ['n', ''],
+      ['', 'inside block'],
+      ['f', 'after block'],
+      ['pass', {out: '=> :root'}],
+    ]
+    Playground.new.zaloop
+  end
+
+
+end

data/spec/commands_spec.rb

@@ -0,0 +1,73 @@
+require_relative 'spec_helper'
+
+describe 'PryMoves Commands' do
+
+  it 'should make one step next' do
+    breakpoints [
+      [nil, 'basic next stop'],
+      ['n', 'next step'],
+    ]
+    Playground.new.basic_next
+  end
+
+  it 'should stop on second breakpoint' do
+    breakpoints [
+      [nil, 'first stop'],
+      ['c', 'second stop'],
+    ]
+    Playground.new.continue
+  end
+
+  it 'should step into func and 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', {out_includes: 'top of stack'} ],
+      ['down', nil ],
+      ['down', 'some internal line'],
+      ['down', {out_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', {out: '=> :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 go next over recursion calls' do
+    breakpoints [
+      [nil, nil],
+      ['n', 'next step'],
+      ['n', 'should stop here after 2 next-s'],
+      ['depth', {out: '=> 0'}],
+    ]
+    Playground.new.recursion
+  end
+
+  it 'should debug' do
+    breakpoints [
+      [nil, 'basic next stop'],
+      ['debug level_a', 'inside of level_a'],
+      ['n', 'basic next stop'],
+    ]
+    Playground.new.basic_next
+  end
+
+end

data/spec/pry_debugger.rb

@@ -0,0 +1,89 @@
+module PryDebugger
+
+  module Breakpoints
+    def breakpoints(breakpoints)
+      breakpoints.each_with_index do |b, index|
+        next_b = breakpoints[index+1]
+        b[0] = next_b ? next_b[0] : nil
+      end
+
+      PryDebugger.breakpoints =
+          breakpoints.map do |b|
+            Proc.new do |label, binding_, output|
+              compare(b[1], label, binding_, output)
+              b[0]
+            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[:out_includes]
+          expect(output).to include subj[:out_includes]
+        else
+          expect(output).to eq subj[:out]
+        end
+      elsif not subj.nil?
+        expect(label).to eq subj
+      end
+    end
+  end
+
+  class InputPipe
+
+    def readline(*args)
+      repl_binding = binding.callers[1]
+      pry_ = repl_binding.eval('@pry')
+      binding_ = pry_.current_binding
+
+      next_cmd = PryDebugger.enter_breakpoint binding_
+      next_cmd || 'c'
+    end
+
+  end
+
+  class OutputPipe < StringIO
+
+    def print(*args)
+      #STDOUT.print *args
+      super
+    end
+
+    def take_away
+      result = string.clone
+      truncate(0)
+      rewind
+      result.gsub(/\e\[([;\d]+)?m/, '')
+    end
+
+  end
+
+  extend self
+
+  def inject
+    Pry.config.input = InputPipe.new
+    @output = OutputPipe.new
+    Pry.config.output = @output
+  end
+
+  def breakpoints
+    @breakpoints_procs
+  end
+
+  def breakpoints=(breakpoints)
+    @breakpoints_procs = breakpoints
+    @breakpoint_call = 0
+  end
+
+  def enter_breakpoint(binding_)
+    raise 'Next breakpoint handler missing' if @breakpoints_procs.size == 0
+    #puts (@breakpoint_call += 1)
+    output = @output.take_away
+    output.match(/^ => .*#(.*)/)
+    label = ($1 || '').strip
+    @breakpoints_procs.shift.call label, binding_, output.strip
+  end
+
+end

data/spec/spec_helper.rb

@@ -0,0 +1,54 @@
+require 'pry'
+require_relative 'pry_debugger'
+require_relative '../playground/playground.rb'
+
+PryDebugger.inject unless ENV['DEBUG']
+
+RSpec.configure do |config|
+
+  config.include PryDebugger::Breakpoints
+
+  config.before(:example) do
+    PryMoves.unlock if PryMoves.semaphore.locked?
+  end
+
+  config.after(:example) do |example|
+    unless example.exception
+      expect(PryDebugger.breakpoints.count).to be(0), "not all breakpoints launched"
+    end
+  end
+
+end
+
+RSpec::Core::BacktraceFormatter.class_eval do
+
+  alias :native_backtrace_line :backtrace_line
+
+  def format_backtrace(backtrace, options={})
+    return [] unless backtrace
+    return backtrace if options[:full_backtrace] || backtrace.empty?
+
+    @lines = 0
+    backtrace.map { |l| backtrace_line(l) }.compact
+  end
+
+  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'
+
+    result = native_backtrace_line(line)
+    if result
+      @lines += 1 if @lines
+      result[0 .. 1] == './' ? result[2 .. -1] : result
+    end
+  end
+
+end
+
+Pry::REPL.class_eval do
+  def handle_read_errors
+    yield
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pry-moves
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - garmoshka-mo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-14 00:00:00.000000000 Z
+date: 2018-05-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pry
@@ -34,14 +34,14 @@ dependencies:
   name: binding_of_caller
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.7'
 - !ruby/object:Gem::Dependency
@@ -67,6 +67,7 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - Gemfile
+- Gemfile.lock
 - LICENSE
 - README.md
 - Rakefile
@@ -76,6 +77,7 @@ files:
 - lib/pry-moves/cli.rb
 - lib/pry-moves/commands.rb
 - lib/pry-moves/helpers.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
@@ -87,13 +89,20 @@ files:
 - lib/pry-stack_explorer/pry-stack_explorer.rb
 - lib/pry-stack_explorer/when_started_hook.rb
 - playground/Gemfile
+- playground/Gemfile.lock
 - playground/README.md
 - playground/demo.rb
+- playground/playground.rb
 - playground/recursions.rb
 - playground/sand.rb
 - playground/threads.rb
 - playground/tracer.rb
 - pry-moves.gemspec
+- spec/backtrace_spec.rb
+- spec/blocks_spec.rb
+- spec/commands_spec.rb
+- spec/pry_debugger.rb
+- spec/spec_helper.rb
 homepage: https://github.com/garmoshka-mo/pry-moves
 licenses:
 - MIT
@@ -118,4 +127,9 @@ rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: Debugger for ruby
-test_files: []
+test_files:
+- spec/backtrace_spec.rb
+- spec/blocks_spec.rb
+- spec/commands_spec.rb
+- spec/pry_debugger.rb
+- spec/spec_helper.rb