pry-moves 0.1.10 → 0.1.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 59d8dcb4799c37a91cfa512e77b630ec5db8f4bb13e03c16c0d446fd18c6b671
-  data.tar.gz: 55ce87ad4d54f91a3d132ca29e208a5291d596ef443c5f9cb4263b24a7cf8ddd
+  metadata.gz: 4eb609ecd661432f7eca70446fc26fad89320d8ddedda45a037dc8c6c76ab92e
+  data.tar.gz: 9b371f36ba08d7132892d7a3f680aa64401efcc15cd9a0f91eaa27f2c7599456
 SHA512:
-  metadata.gz: e82f7cae3194b3e3246066c940474c98a68e12f20efdb2552bbef97746935468fc864bac5aead31f14405a7976385b0cc315a0292c01c41667a55252022077a4
-  data.tar.gz: 5ce34a40af72680b9d28441ce67e9da713104c73c8cf9d6b2c82860ad7e452551fbb35b11a0226e36a6a624483cea8c177a0a68681af8fcab1450054386bb922
+  metadata.gz: 5d7ee71f4ffb8d919cfd69f8915aac4361b941ca216ff01fdb78ad28c7580130707989ec8e54f1b64217cdae111fec54d62f86c826f29feac01b5fca4bef3982
+  data.tar.gz: e85691ac7f3efd68cdff8efe9010e49c87922a2346dfc4f9bb72be9ce0083a0d2227d80233a8a8e4f8053a35fcbbd41b5c29306bf02045a70a8e5bc6acda40a9

data/README.md

@@ -17,6 +17,7 @@ _An execution control add-on for [Pry][pry]._
 * `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 full` - full backtrace
@@ -26,6 +27,7 @@ _An execution control add-on for [Pry][pry]._
   * `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
 
@@ -136,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'

data/lib/pry-moves/backtrace.rb

@@ -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,14 +5,17 @@ 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|
       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|
       breakout_navigation :next, 'blockless'
@@ -22,15 +25,16 @@ module PryMoves
       breakout_navigation :iterate, param
     end
 
+    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

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

@@ -19,6 +19,9 @@ module PryMoves::Painter
       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

@@ -57,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/trace_commands.rb

@@ -102,4 +102,8 @@ module PryMoves::TraceCommands
       )
   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
@@ -41,6 +44,8 @@ class Tracer
     when :iterate
       @iteration_start_line = binding_.eval('__LINE__')
       @caller_digest = frame_digest(binding_)
+    when :goto
+      @goto_line = @command[:param].to_i
     end
 
     start_tracing
@@ -69,37 +74,13 @@ class Tracer
         Thread.current : Kernel
   end
 
-  def set_traced_method(binding)
-    @recursion_level = 0
-    @c_stack_level = 0
-    @stay_at_frame = nil # reset tracked digest
-
-    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 ": %8s %s:%-2d %10s %8s rec:#{@recursion_level} st:#{@c_stack_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))
@@ -145,16 +126,6 @@ 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
@@ -164,6 +135,6 @@ class Tracer
     @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.10'
+  VERSION = '0.1.12'
 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.9)
+    pry-moves (0.1.11)
       binding_of_caller (~> 0.7)
-      pry (>= 0.10.4, < 0.12.0)
+      pry (>= 0.10.4, < 1)
 
 GEM
   remote: https://rubygems.org/
   specs:
     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

data/playground/sand.rb

@@ -1,7 +1,8 @@
+require 'pry'
 require 'pry-moves'
 require './tracer.rb'
 require './playground.rb'
-
+require './class_a.rb'
 
 def debug?(something)
   puts something
@@ -11,14 +12,39 @@ def sentence
   :opa
 end
 
+class B < A
+
+  def me
+    super
+    puts :ok
+    "rule#{1}"
+    "rule#{1}"
+  end
+
+end
 
 def aaa
-  puts :ok
-  "rule#{1}"
-  binding.pry if debug? "rule#{1}"
-  puts :ok
+  bbb
+end
 
+def bbb
+  hide_from_stack = true
+  ccc
 end
 
-binding.pry
+def ccc
+  hide_from_stack = true
+  binding.pry
+end
+
+x = 34
+aaa
+
+x = 35
+x+=1
+x+=1
+x+=1
+x+=1
+
+B.new.me
 aaa

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.10.4', '< 0.12.0'
+  gem.add_runtime_dependency 'pry', '>= 0.10.4', '< 1'
   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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pry-moves
 version: !ruby/object:Gem::Version
-  version: 0.1.10
+  version: 0.1.12
 platform: ruby
 authors:
 - garmoshka-mo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-02-28 00:00:00.000000000 Z
+date: 2019-08-29 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: '1'
   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: '1'
 - !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