pry-moves 1.0.2 → 1.0.4

data/lib/pry-moves/diff.rb

@@ -0,0 +1,27 @@
+class PryMoves::Diff
+
+  @@saved_dump = nil
+
+  def initialize(pry, binding)
+    @pry = pry
+    @binding = binding
+  end
+
+  def run_command cmd
+    if !@@saved_dump
+      @@saved_dump = eval_cmd cmd
+      @pry.output.puts "💾 Saved for diff compare:\n".cyan + @@saved_dump
+    else
+      diff = Diffy.diff @@saved_dump, eval_cmd(cmd)
+      @pry.output.puts diff
+      @@saved_dump = nil
+    end
+  end
+
+  private
+
+  def eval_cmd cmd
+    "#{@binding.eval(cmd)}"
+  end
+
+end

data/lib/pry-moves/formatter.rb

@@ -40,7 +40,11 @@ class PryMoves::Formatter
   end
 
   def format_arg binding, arg_name
-    arg = binding.eval(arg_name.to_s)
+    arg = begin
+      binding.eval(arg_name.to_s)
+    rescue Exception
+      "?"
+    end
     format_obj arg
   end
 
@@ -56,7 +60,9 @@ class PryMoves::Formatter
   PATH_TRASH = defined?(Rails) ? Rails.root.to_s : Dir.pwd
 
   def shorten_path(path)
-    path.gsub( /^#{PATH_TRASH}\//, '')
+    path = path.gsub( /^#{PATH_TRASH}\//, '')
+    PryMoves::Backtrace.trim_path ?
+      File.basename(path, ".*") : path
   end
 
   def format_obj(obj)

data/lib/pry-moves/pry_ext.rb

@@ -42,9 +42,9 @@ Pry::Command.class_eval do
   alias run_origin_for_pry_moves run
   def run(command_string, *args)
     Pry.config.original_user_input = self.class.original_user_input
-    result = run_origin_for_pry_moves command_string, *args
+    run_origin_for_pry_moves command_string, *args
+  ensure
     Pry.config.original_user_input = nil
-    result
   end
 end
 
@@ -86,24 +86,32 @@ Pry::Command::Whereami.class_eval do
 
     formatter = PryMoves::Formatter.new
     prefix = Thread.current[:pry_moves_debug] ? "👾 " : ""
-    lines << "#{prefix}#{formatter.shorten_path location}"
+    lines << "🦆 step_in_everywhere" if PryMoves.step_in_everywhere
+    lines << "#{prefix}#{formatter.shorten_path location}:#{@line} #{me}"
     lines << "   ." + formatter.method_signature(target)
     lines << ''
     lines << "#{code.with_line_numbers(use_line_numbers?).with_marker(marker).highlighted}"
 
     lines << PryMoves::Watch.instance.output(target) unless PryMoves::Watch.instance.empty?
-    lines.concat PryMoves.messages
+    lines.concat(PryMoves.messages.map do |message|
+      message
+      # message.length > MAX_MESSAGE_CHARS ?
+      #   message[0 .. MAX_MESSAGE_CHARS] + "... (cut)" : message
+    end)
     PryMoves.messages.clear
 
     lines << ''
     lines.join "\n"
   end
 
-  def location
+  def me
     me = target.eval 'self' rescue nil
     me = PryMoves::Painter.colorize me if me
-    file = defined?(Rails) ? @file.gsub(Rails.root.to_s, '') : @file
-    "#{file}:#{@line} #{me}"
+    me
+  end
+
+  def location
+    defined?(Rails) ? @file.gsub(Rails.root.to_s, '') : @file
   end
 end
 
@@ -123,7 +131,9 @@ Pry::Output.class_eval do
   alias pry_moves_origin_for_puts puts
 
   def puts *args
+    # <first> formatted by Pry.config.print = proc do |output, value|
     first = args[0]
+    # Kernel.puts  "Pry::Output.puts: #{first}"
     if first.is_a? String and first.start_with? "(pry) output error"
       first.slice! 400..-1
     end

data/lib/pry-moves/pry_wrapper.rb

@@ -12,7 +12,7 @@ class PryWrapper
     PryMoves.lock
 
     initial_frame = PryMoves::BindingsStack.new(@pry_start_options).initial_frame
-    if not @pry_start_options[:pry_moves_loop] and
+    if not @pry_start_options[:pry_moves_loop] and initial_frame and
         initial_frame.local_variable_defined? :debug_redirect
       debug_redirect = initial_frame.local_variable_get(:debug_redirect)
       PryMoves.messages << "⏩ redirected to #{debug_redirect}"

data/lib/pry-moves/restartable.rb

@@ -1,17 +1,21 @@
 module PryMoves::Restartable
 
   attr_accessor :restart_requested, :reload_requested,
+    :reload_ruby_scripts, :reloader,
     :reload_rake_tasks
 
   def restartable context
     trigger :each_new_run, context
-    yield
+    context[:retry] ||= 0
+    PryMoves.reloader&.reload if context[:retry] > 0
+    yield context
     re_execution
   rescue PryMoves::Restart
     puts "🔄️  Restarting execution"
     self.restart_requested = false
     PryMoves.reset
     trigger :restart, context
+    context[:retry] += 1
     retry
   rescue PryMoves::Reload
     puts "🔮  try to use @ with reload"

data/lib/pry-moves/tools.rb

@@ -0,0 +1,22 @@
+class PryMoves::Tools
+
+  def initialize pry
+    @pry = pry
+  end
+
+  def add_breakpoint var_name, line_number, binding
+    file, line = binding.eval('[__FILE__, __LINE__]')
+    line_number ||= line
+    lines = IO.readlines(file)
+
+    value = binding.eval(var_name)
+    value = value.to_json if value.is_a? String
+    lines.insert line_number-1, "debug if #{var_name} == #{value}"
+
+    File.open(file, 'w') do |file|
+      file.puts lines
+    end
+    @pry.output.puts "🔴 Breakpoint added to #{File.basename file}:#{line_number}"
+  end
+
+end

data/lib/pry-moves/version.rb

@@ -1,3 +1,3 @@
 module PryMoves
-  VERSION = '1.0.2'
+  VERSION = '1.0.4'
 end

data/lib/pry-moves.rb

@@ -1,37 +1,4 @@
-require 'pry' unless defined? Pry
-require 'colorize'
-require 'diffy'
-
-require 'pry-moves/version'
-require 'pry-moves/pry_ext'
-require 'pry-moves/commands'
-require 'pry-moves/add_suffix'
-require 'pry-moves/pry_wrapper'
-require 'pry-moves/bindings_stack'
-require 'pry-moves/formatter'
-require 'pry-moves/backtrace'
-require 'pry-moves/watch'
-require 'pry-moves/painter'
-require 'pry-moves/restartable'
-require 'pry-moves/recursion_tracker'
-require 'pry-moves/error_with_data'
-
-require 'commands/traced_method'
-require 'commands/trace_helpers'
-require 'commands/trace_command'
-require 'commands/debug'
-require 'commands/finish'
-require 'commands/goto'
-require 'commands/iterate'
-require 'commands/next'
-require 'commands/next_breakpoint'
-require 'commands/step'
-
-require 'pry-stack_explorer/pry-stack_explorer'
-require 'debug_sugar'
-
-# Optionally load pry-remote monkey patches
-require 'pry-moves/pry_remote_ext' if defined? PryRemote
+require 'requires.rb'
 
 module PryMoves
   TRACE_IGNORE_FILES = Dir[File.join(File.dirname(__FILE__), '**', '*.rb')].map { |f| File.expand_path(f) }
@@ -40,22 +7,35 @@ module PryMoves
   extend PryMoves::Restartable
 
   attr_accessor :is_open, :trace, :stack_tips,
-    :stop_on_breakpoints, :launched_specs_examples, :debug_called_times
+    :stop_on_breakpoints, :launched_specs_examples,
+    :debug_called_times, :step_in_everywhere
+
+  def init
+    reset
+    self.trace = true if ENV['TRACE_MOVES']
+    self.reload_ruby_scripts = {
+      monitor: %w(app spec),
+      except: %w(app/assets app/views)
+    }
+    self.reloader = CodeReloader.new unless ENV['PRY_MOVES_RELOADER'] == 'off'
+    self.reload_rake_tasks = true
+  end
 
   def reset
     self.launched_specs_examples = 0
-    self.stop_on_breakpoints = true
+    self.stop_on_breakpoints = true unless ENV['PRY_MOVES'] == 'off' ||
+      (defined?(Rails) and Rails.env.production?)
     self.debug_called_times = 0
+    self.step_in_everywhere = false
   end
 
-  def debug(message = nil, at: nil, options: nil)
+  def debug(message = nil, at: nil, from: nil, options: nil)
     pry_moves_stack_end = true
     PryMoves.re_execution
     if PryMoves.stop_on_breakpoints
       self.debug_called_times += 1
-      if at
-        return unless self.debug_called_times == at
-      end
+      return if at and self.debug_called_times != at
+      return if from and self.debug_called_times < from
       if message
         PryMoves.messages << (message.is_a?(String) ? message : message.ai)
       end
@@ -64,7 +44,43 @@ module PryMoves
     end
   end
 
-  def error(message)
+  ROOT_DIR = File.expand_path(".")
+
+  def runtime_debug(instance, external: false)
+    do_debug = (
+      stop_on_breakpoints and
+        not open? and
+        (external or is_project_file?) and
+        not [RubyVM::InstructionSequence].include?(instance)
+    )
+    if do_debug
+      hide_from_stack = true
+      err, obj = yield
+      # HINT: when pry failed to start use: caller.reverse
+      PryMoves.debug_error err, obj
+      true
+    end
+  end
+
+  def is_project_file?
+    files = caller[2..3] # -2 steps upside: runtime_debug, debug sugar function
+    files.any? do |file|
+      !file.start_with?("/") || file.start_with?(ROOT_DIR)
+    end
+  end
+
+  MAX_MESSAGE_CHARS = 520
+  def format_debug_object obj
+    output = obj.ai rescue "#{obj.class} #{obj}"
+    output.length > MAX_MESSAGE_CHARS ?
+      output[0 .. MAX_MESSAGE_CHARS] + "... (cut)" : output
+  end
+
+  def debug_error(message, debug_object=nil)
+    pry_moves_stack_end = true
+    if debug_object
+      message = [format_debug_object(debug_object), message].join "\n"
+    end
     debug message, options: {is_error: true}
   end
 
@@ -123,7 +139,7 @@ module PryMoves
 
   TRIGGERS = [:each_new_run, :restart]
   def on(trigger, &block)
-    error "Invalid trigger, possible triggers: #{TRIGGERS}", trigger unless trigger.in? TRIGGERS
+    error "Invalid trigger, possible triggers: #{TRIGGERS}", trigger unless TRIGGERS.include? trigger
     triggers[trigger] << block
   end
 
@@ -131,5 +147,6 @@ module PryMoves
   attr_accessor :current_remote_server
 end
 
-PryMoves.reset
-PryMoves.trace = true if ENV['TRACE_MOVES']
+PryMoves.init
+
+require 'sugar/debug_of_missing' # After PryMoves loaded

data/lib/pry-stack_explorer/frame_helpers.rb

@@ -88,6 +88,7 @@ module PryStackExplorer::FrameHelpers
   end
 
   def find_frame_by_direction(dir, step_into_vapid: false)
+    PryMoves.step_in_everywhere = true if step_into_vapid
     frame_index = find_frame_by_block(dir) do |b|
       step_into_vapid or not b.hidden
     end

data/lib/requires.rb

@@ -0,0 +1,38 @@
+require 'pry' unless defined? Pry
+require 'colorize'
+require 'diffy'
+
+require 'pry-moves/version'
+require 'pry-moves/pry_ext'
+require 'pry-moves/commands'
+require 'pry-moves/add_suffix'
+require 'pry-moves/pry_wrapper'
+require 'pry-moves/bindings_stack'
+require 'pry-moves/code_reloader'
+require 'pry-moves/formatter'
+require 'pry-moves/backtrace'
+require 'pry-moves/backtrace_builder'
+require 'pry-moves/tools'
+require 'pry-moves/watch'
+require 'pry-moves/diff'
+require 'pry-moves/painter'
+require 'pry-moves/restartable'
+require 'pry-moves/recursion_tracker'
+require 'pry-moves/error_with_data'
+
+require 'commands/traced_method'
+require 'commands/trace_helpers'
+require 'commands/trace_command'
+require 'commands/debug'
+require 'commands/finish'
+require 'commands/goto'
+require 'commands/iterate'
+require 'commands/next'
+require 'commands/next_breakpoint'
+require 'commands/step'
+
+require 'pry-stack_explorer/pry-stack_explorer'
+require 'sugar/debug_sugar'
+
+# Optionally load pry-remote monkey patches
+require 'pry-moves/pry_remote_ext' if defined? PryRemote

data/lib/sugar/debug_of_missing.rb

@@ -0,0 +1,36 @@
+Object.class_eval do
+
+  def method_missing(method, *args)
+    pry_moves_stack_end = true
+    pry_cancel_debug = true
+
+    debug_missing_method = (
+      not ([:begin, :to_s, :to_str, :to_int, :to_ary, :to_io, :to_hash].include? method)
+
+      # not ([:begin, :to_s, :to_str, :to_int, :to_ary, :to_io, :to_hash].include? method) and
+      #   not caller[0].match PryMoves::Backtrace::filter
+    )
+
+    PryMoves.runtime_debug(self) do
+      message = self.nil? ?
+        "\e[31mCalling \e[1m#{method}\e[0m\e[31m on nil\e[0m" :
+        "\e[31mMethod \e[1m#{method}\e[0m\e[31m missing\e[0m"
+      [message, self]
+    end if debug_missing_method
+
+    super
+  end
+
+  def self.const_missing(name)
+    super
+  rescue => e
+    unless PryMoves.open?
+      hide_from_stack = true
+      message = "😱  \e[31m#{e.to_s}\e[0m"
+      PryMoves.debug_error message
+    end
+    raise
+  end unless defined?(Rails)
+
+end if ENV['PRY_MOVES_DEBUG_MISSING'] != 'off' and ENV['PRY_MOVES'] != 'off' and
+  not (defined?(Rails) and Rails.env.production?)

data/lib/{debug_sugar.rb → sugar/debug_sugar.rb}

@@ -1,4 +1,5 @@
 def debug *args
+  return binding.pry_forced if args.first == :forced
   pry_moves_stack_end = true
   PryMoves.debug *args
 end
@@ -8,11 +9,9 @@ def error(msg = "Error", debug_object = nil)
   err = "😱  #{msg}"
   unless PryMoves.open?
     if PryMoves.stop_on_breakpoints
-      lines = [err.red]
-      lines.prepend debug_object.ai if debug_object
-      PryMoves.error lines.join("\n")
+      PryMoves.debug_error err.red, debug_object
     else
-      STDERR.puts debug_object.ai if debug_object
+      STDERR.puts PryMoves.format_debug_object(debug_object) if debug_object
       STDERR.puts err.ljust(80, ' ').red
     end
   end
@@ -26,14 +25,26 @@ def shit!(err = 'Oh, shit!', debug_object = nil)
   raise err unless PryMoves.stop_on_breakpoints
   lines = [message.red]
   lines.prepend debug_object.ai if debug_object
-  PryMoves.error lines.join("\n")
+  PryMoves.debug_error lines.join("\n")
   nil
 end
 
-def required(var)
-  pry_moves_stack_end = true
-  error("required parameter is missing") if var.nil?
-  var
+Object.class_eval do
+
+  def required!
+    pry_moves_stack_end = true
+    error("required parameter is missing") if self.nil?
+    self
+  end
+
+  def should_be *classes
+    hide_from_stack = true
+    if self && !classes.some?{self.is_a?(_1)}
+      error("Expected class #{classes.join ", "}, got #{self.class.ai}", self)
+    end
+    self
+  end
+
 end
 
 RSpec.configure do |config|
@@ -41,7 +52,7 @@ RSpec.configure do |config|
   config.before(:each) do
     PryMoves.launched_specs_examples += 1
     PryMoves.stop_on_breakpoints =
-      PryMoves.launched_specs_examples < 2
+      RSpec.configuration.world.example_count == 1
   end
 
   config.around(:each) do |example|
@@ -50,7 +61,7 @@ RSpec.configure do |config|
     end
   end
 
-end if defined? RSpec
+end if ENV['PRY_MOVES'] != 'off' and defined? RSpec
 
 Rake::Task.class_eval do
 
@@ -58,8 +69,8 @@ Rake::Task.class_eval do
 
   def execute(args=nil)
     args ||= EMPTY_TASK_ARGS
-    PryMoves.restartable(rake_args: args) do
-      reload_actions if PryMoves.reload_rake_tasks
+    PryMoves.restartable(rake_args: args) do |context|
+      reload_actions if PryMoves.reload_rake_tasks and context[:retry] > 0
       execute_origin_for_pry_moves args
     end
   end
@@ -70,4 +81,18 @@ Rake::Task.class_eval do
     load rake_task_path
   end
 
-end if defined? Rake and defined? Rake::Task
+end if ENV['PRY_MOVES'] != 'off' and defined? Rake and defined? Rake::Task
+
+Diffy.module_eval do
+
+  class << self
+    def diff text1, text2
+      diff = Diffy::Diff.new(
+        text1 + "\n", text2 + "\n"
+      ).to_s "color"
+      diff = 'Outputs are equal' if diff.strip.empty?
+      diff
+    end
+  end
+
+end

data/playground/Gemfile.lock

@@ -1,10 +1,10 @@
 PATH
   remote: ..
   specs:
-    pry-moves (1.0.1)
+    pry-moves (1.0.2)
       binding_of_caller (~> 0.7)
       colorize (~> 0.8)
-      diffy
+      diffy (~> 3.4.0)
       pry (>= 0.10.4, < 0.13)
 
 GEM
@@ -15,7 +15,7 @@ GEM
     coderay (1.1.3)
     colorize (0.8.1)
     debug_inspector (1.1.0)
-    diffy (3.4.0)
+    diffy (3.4.2)
     method_source (0.9.2)
     pry (0.12.2)
       coderay (~> 1.1.0)

data/playground/playground.rb

@@ -155,13 +155,18 @@ class Playground
   def method_with_breakpoints
     binding.pry # method_with_breakpoints host
     dummy = 1 # some internal line
-    debug_ # breakpoint
+    method_with_breakpoint # breakpoint
     dummy = 1 # after breakpoint
     dummy = 1 # after after breakpoint
-    debug_ # breakpoint 2
+    method_with_breakpoint # breakpoint 2
     dummy = 1 # after breakpoint 2
   end
 
+  def method_with_breakpoint
+    pry_breakpoint = true
+    hide_from_stack = true
+  end
+
   def skip_test
     binding.pry # stop in skip_test
     skipped_method.not_skipped_method # next step

data/pry-moves.gemspec

@@ -22,6 +22,7 @@ Gem::Specification.new do |gem|
   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_runtime_dependency 'awesome_print', '>= 1.8.0'
   gem.add_runtime_dependency 'diffy', '~> 3.4.0'
   gem.add_development_dependency 'pry-remote', '~> 0.1.6'
 end

data/publish.sh

@@ -1,3 +1,6 @@
-bundle exec rspec && \
-gem build pry-moves.gemspec && \
+set -e
+set -o pipefail
+
+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

@@ -17,6 +17,9 @@ describe 'backtrace' do
       }],
       ['bt hidden', lambda{|b, output|
         lines = output.split("\n").reverse
+        2.times do
+          lines.pop if lines.last.end_with? "main" # remove tech frames from bin/rspec
+        end
         # show hidden frame
         expect(lines[1]).to end_with 'level_b()'
         expect(lines.count).to be 11

data/spec/commands_spec.rb

@@ -2,6 +2,8 @@ require_relative 'spec_helper'
 
 describe 'PryMoves commands' do
 
+  # todo: test sugars: method_missing, etc...
+
   it 'should make one move next' do
     breakpoints [
       [nil, 'basic next stop'],

data/spec/spec_helper.rb

@@ -12,12 +12,13 @@ RSpec.configure do |config|
 
   config.before(:example) do
     PryMoves.unlock if PryMoves.semaphore.locked?
+    PryMoves.step_in_everywhere = false
   end
 
   config.after(:example) do |example|
     unless example.exception
       expect(PryDebugger.breakpoints.count).to be(0),
-        "not all breakpoints launched: #{PryDebugger.breakpoints.count}"
+        "not all breakpoints launched, left to launch: #{PryDebugger.breakpoints.count}. All following specs may fail."
     end
   end