pry_ext.rb in pry-moves-0.1.2

- old
+ new

@@ -7,11 +7,11 @@
   def start_with_pry_nav(target = TOPLEVEL_BINDING, options = {})
     old_options = options.reject { |k, _| k == :pry_remote }
 
     if target.is_a?(Binding) && PryMoves.check_file_context(target)
       # Wrap the tracer around the usual Pry.start
-      PryMoves::Tracer.new(options).run do
+      PryMoves::PryWrapper.new(target, options).run do
         start_without_pry_nav(target, old_options)
       end
     else
       # No need for the tracer unless we have a file context to step through
       start_without_pry_nav(target, old_options)
@@ -21,22 +21,60 @@
   alias_method :start, :start_with_pry_nav
 end
 
 Binding.class_eval do
 
-  alias original_pry pry
+  alias pry_forced pry
 
   def pry
-    original_pry unless Pry.config.disable_breakpoints
+    unless Pry.config.disable_breakpoints
+      PryMoves.synchronize_threads
+      pry_forced
+    end
   end
 
 end
 
-require 'pry-stack_explorer'
+Pry.config.pager = false
 
-PryStackExplorer::WhenStartedHook.class_eval do
+Pry::Command::Whereami.class_eval do
+  # Negligent function from Pry - evidently poor output format
+  # would be wanted to be changed often by developers,
+  # but definition so long... :(
+  def process
+    if bad_option_combination?
+      raise CommandError, "Only one of -m, -c, -f, and  LINES may be specified."
+    end
 
-  def remove_debugger_frames(bindings)
-    bindings.drop_while { |b| b.eval("__FILE__") =~ /\/pry-/ }
+    if nothing_to_do?
+      return
+    elsif internal_binding?(target)
+      handle_internal_binding
+      return
+    end
+
+    set_file_and_dir_locals(@file)
+
+    _pry_.pager.page build_output
   end
 
+  def build_output
+    lines = []
+    lines << "#{text.bold('From:')} #{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}"
+    lines << ''
+    lines.join "\n"
+  end
+
+  def location
+    me = target.eval 'self' rescue nil
+    if me
+      colored_str = ''
+      Pry::ColorPrinter.pp me, colored_str
+      me = colored_str.chomp
+    end
+    file = defined?(Rails) ? @file.gsub(Rails.root.to_s, '') : @file
+    "#{file}:#{@line} #{me}"
+  end
 end