pry 0.11.1 → 0.12.0

data/lib/pry/slop.rb

@@ -24,19 +24,18 @@ class Pry::Slop
 
   # Returns a default Hash of configuration options this Slop instance uses.
   DEFAULT_OPTIONS = {
-    :strict => false,
-    :help => false,
-    :banner => nil,
-    :ignore_case => false,
-    :autocreate => false,
-    :arguments => false,
-    :optional_arguments => false,
-    :multiple_switches => true,
-    :longest_flag => 0
+    strict: false,
+    help: false,
+    banner: nil,
+    ignore_case: false,
+    autocreate: false,
+    arguments: false,
+    optional_arguments: false,
+    multiple_switches: true,
+    longest_flag: 0
   }
 
   class << self
-
     # items  - The Array of items to extract options from (default: ARGV).
     # config - The Hash of configuration options to send to Slop.new().
     # block  - An optional block used to add options.
@@ -106,7 +105,6 @@ class Pry::Slop
 
       opts
     end
-
   end
 
   # The Hash of configuration options for this Slop instance.
@@ -135,7 +133,7 @@ class Pry::Slop
     end
 
     if config[:help]
-      on('-h', '--help', 'Display this help message.', :tail => true) do
+      on('-h', '--help', 'Display this help message.', tail: true) do
         $stderr.puts help
       end
     end
@@ -217,7 +215,7 @@ class Pry::Slop
       return items
     end
 
-    if cmd = @commands[items[0]]
+    if (cmd = @commands[items[0]])
       return cmd.parse! items[1..-1]
     end
 
@@ -332,7 +330,7 @@ class Pry::Slop
   # Override this method so we can check if an option? method exists.
   #
   # Returns true if this option key exists in our list of options.
-  def respond_to_missing?(method_name, include_all=false)
+  def respond_to_missing?(method_name, include_all = false)
     options.any? { |o| o.key == method_name.to_s.chop } || super
   end
 
@@ -464,7 +462,8 @@ class Pry::Slop
   #
   # Returns nothing.
   def process_item(items, index, &block)
-    return unless item = items[index]
+    return unless (item = items[index])
+
     option, argument = extract_option(item) if item.start_with?('-')
 
     if option
@@ -514,6 +513,7 @@ class Pry::Slop
       if config[:multiple_switches] && strict?
         raise InvalidOptionError, "Unknown option -#{item}"
       end
+
       return
     end
 
@@ -544,7 +544,8 @@ class Pry::Slop
   def execute_multiple_switches(option, argument, index)
     execute_option(option, nil, index)
     argument.split('').each do |key|
-      next unless opt = fetch_option(key)
+      next unless (opt = fetch_option(key))
+
       opt.count += 1
       execute_option(opt, nil, index, key)
     end
@@ -657,5 +658,4 @@ class Pry::Slop
       "  #{cmd}#{' ' * (padding - cmd.size)}   #{opts.description}"
     end.join("\n")
   end
-
 end

data/lib/pry/terminal.rb

@@ -41,7 +41,7 @@ class Pry::Terminal
     end
 
     def screen_size_according_to_io_console
-      return if Pry::Helpers::BaseHelpers.jruby?
+      return if Pry::Helpers::Platform.jruby?
 
       begin
         require 'io/console'
@@ -77,6 +77,7 @@ class Pry::Terminal
 
     def screen_size_according_to_ansicon_env
       return unless ENV['ANSICON'] =~ /\((.*)x(.*)\)/
+
       size = [$2, $1]
       size if nonzero_column?(size)
     end

data/lib/pry/testable/evalable.rb

@@ -0,0 +1,15 @@
+module Pry::Testable::Evalable
+  def pry_tester(*args, &block)
+    if args.length == 0 || args[0].is_a?(Hash)
+      args.unshift(Pry.toplevel_binding)
+    end
+    Pry::Testable::PryTester.new(*args).tap do |t|
+      t.singleton_class.class_eval(&block) if block
+    end
+  end
+
+  def pry_eval(*eval_strs)
+    b = String === eval_strs.first ? Pry.toplevel_binding : Pry.binding_for(eval_strs.shift)
+    pry_tester(b).eval(*eval_strs)
+  end
+end

data/lib/pry/testable/mockable.rb

@@ -0,0 +1,14 @@
+module Pry::Testable::Mockable
+  def mock_command(cmd, args = [], opts = {})
+    output = StringIO.new
+    pry = Pry.new(output: output)
+    ret = cmd.new(opts.merge(pry_instance: pry, output: output)).call_safely(*args)
+    Struct.new(:output, :return).new(output.string, ret)
+  end
+
+  def mock_exception(*mock_backtrace)
+    StandardError.new.tap do |e|
+      e.define_singleton_method(:backtrace) { mock_backtrace }
+    end
+  end
+end

data/lib/pry/testable/pry_tester.rb

@@ -0,0 +1,73 @@
+class Pry::Testable::PryTester
+  extend Pry::Forwardable
+  attr_reader :pry, :out
+  def_delegators :@pry, :eval_string, :eval_string=
+
+  def initialize(target = TOPLEVEL_BINDING, options = {})
+    @pry = Pry.new(options.merge(target: target))
+    @history = options[:history]
+    @pry.inject_sticky_locals!
+    reset_output
+  end
+
+  def eval(*strs)
+    reset_output
+    result = nil
+
+    strs.flatten.each do |str|
+      # Check for space prefix. See #1369.
+      if str !~ /^\s\S/
+        str = "#{str.strip}\n"
+      end
+      @history.push str if @history
+
+      if @pry.process_command(str)
+        result = last_command_result_or_output
+      else
+        result = @pry.evaluate_ruby(str)
+      end
+    end
+
+    result
+  end
+
+  def push(*lines)
+    Array(lines).flatten.each do |line|
+      @pry.eval(line)
+    end
+  end
+
+  def push_binding(context)
+    @pry.push_binding context
+  end
+
+  def last_output
+    @out.string if @out
+  end
+
+  def process_command(command_str)
+    @pry.process_command(command_str) or raise "Not a valid command"
+    last_command_result_or_output
+  end
+
+  def last_command_result
+    result = Pry.current[:pry_cmd_result]
+    result.retval if result
+  end
+
+  protected
+
+  def last_command_result_or_output
+    result = last_command_result
+    if result != Pry::Command::VOID_VALUE
+      result
+    else
+      last_output
+    end
+  end
+
+  def reset_output
+    @out = StringIO.new
+    @pry.output = @out
+  end
+end

data/lib/pry/testable/utility.rb

@@ -0,0 +1,26 @@
+module Pry::Testable::Utility
+  #
+  # Creates a Tempfile then unlinks it after the block has yielded.
+  #
+  # @yieldparam [String] file
+  #   The path of the temp file
+  #
+  # @return [void]
+  #
+  def temp_file(ext = '.rb')
+    file = Tempfile.open(['pry', ext])
+    yield file
+  ensure
+    file.close(true) if file
+  end
+
+  def unindent(*args)
+    Pry::Helpers::CommandHelpers.unindent(*args)
+  end
+
+  def inner_scope
+    catch(:inner_scope) do
+      yield -> { throw(:inner_scope, self) }
+    end
+  end
+end

data/lib/pry/testable/variables.rb

@@ -0,0 +1,46 @@
+module Pry::Testable::Variables
+  #
+  # @example
+  #   temporary_constants(:Foo, :Bar) do
+  #     Foo = Class.new(RuntimeError)
+  #     Bar = Class.new(RuntimeError)
+  #   end
+  #   Foo # => NameError
+  #   Bar # => NameError
+  #
+  # @param [Array<Symbol>] names
+  #   An array of constant names that be defined by a block,
+  #   and removed by this method afterwards.
+  #
+  # @return [void]
+  #
+  def temporary_constants(*names)
+    names.each do |name|
+      Object.remove_const name if Object.const_defined?(name)
+    end
+    yield
+  ensure
+    names.each do |name|
+      Object.remove_const name if Object.const_defined?(name)
+    end
+  end
+
+  #
+  # @param [String] name
+  #   The name of a variable.
+  #
+  # @param [String] value
+  #   Its value.
+  #
+  # @param [Binding] b
+  #   The binding object to insert a variable into.
+  #
+  # @return [void]
+  #
+  def insert_variable(name, value, b)
+    Pry.current[:pry_local] = value
+    b.eval("#{name} = ::Pry.current[:pry_local]")
+  ensure
+    Pry.current[:pry_local] = nil   
+  end
+end

data/lib/pry/testable.rb

@@ -0,0 +1,70 @@
+# good idea ???
+# if you're testing pry plugin you should require pry by yourself, no?
+require 'pry' if not defined?(Pry)
+
+module Pry::Testable
+  extend self
+  require_relative "testable/pry_tester"
+  require_relative "testable/evalable"
+  require_relative "testable/mockable"
+  require_relative "testable/variables"
+  require_relative "testable/utility"
+
+  #
+  # When {Pry::Testable} is included into another module or class,
+  # the following modules are also included: {Pry::Testable::Mockable},
+  # {Pry::Testable::Evalable}, {Pry::Testable::Variables}, and
+  # {Pry::Testable::Utility}.
+  #
+  # @note
+  #   Each of the included modules mentioned above may also be used
+  #   standalone or in a pick-and-mix fashion.
+  #
+  # @param [Module] mod
+  #   A class or module.
+  #
+  # @return [void]
+  #
+  def self.included(mod)
+    mod.module_eval do
+      include Pry::Testable::Mockable
+      include Pry::Testable::Evalable
+      include Pry::Testable::Variables
+      include Pry::Testable::Utility
+    end
+  end
+
+  TEST_DEFAULTS = {
+    color: false,
+    pager: false,
+    should_load_rc: false,
+    should_load_local_rc: false,
+    correct_indent: false,
+    collison_warning: false,
+    history: {
+      should_load: false,
+      should_save: false
+    }
+  }
+  private_constant :TEST_DEFAULTS
+
+  #
+  # Sets various configuration options that make Pry optimal for a test
+  # environment, see source code for complete details.
+  #
+  # @return [void]
+  #
+  def self.set_testenv_variables
+    Pry.config = Pry::Config.from_hash(TEST_DEFAULTS, Pry::Config::Default.new)
+    Pry.config.hooks = Pry::Hooks.new
+  end
+
+  #
+  # Reset the Pry configuration to their default values.
+  #
+  # @return [void]
+  #
+  def self.unset_testenv_variables
+    Pry.config = Pry::Config.from_hash({}, Pry::Config::Default.new)
+  end
+end

data/lib/pry/version.rb

@@ -1,3 +1,3 @@
 class Pry
-  VERSION = "0.11.1"
+  VERSION = '0.12.0'
 end

data/lib/pry/wrapped_module/candidate.rb

@@ -2,7 +2,6 @@ require 'pry/helpers/documentation_helpers'
 
 class Pry
   class WrappedModule
-
     # This class represents a single candidate for a module/class definition.
     # It provides access to the source, documentation, line and file
     # for a monkeypatch (reopening) of a class/module.
@@ -64,6 +63,7 @@ class Pry
       # @return [String] The documentation for the candidate.
       def doc
         return nil if file.nil?
+
         @doc ||= get_comment_content(Pry::Code.from_file(file).comment_describing(line))
       end
 
@@ -76,7 +76,7 @@ class Pry
         file, line = first_method_source_location
         return nil if !file.is_a?(String)
 
-        @source_location = [file,  first_line_of_module_definition(file, line)]
+        @source_location = [file, first_line_of_module_definition(file, line)]
       rescue Pry::RescuableException
         nil
       end

data/lib/pry/wrapped_module.rb

@@ -26,7 +26,7 @@ class Pry
     # @return [Module, nil] The module or `nil` (if conversion failed).
     # @example
     #   Pry::WrappedModule.from_str("Pry::Code")
-    def self.from_str(mod_name, target=TOPLEVEL_BINDING)
+    def self.from_str(mod_name, target = TOPLEVEL_BINDING)
       if safe_to_evaluate?(mod_name, target)
         Pry::WrappedModule.new(target.eval(mod_name))
       else
@@ -49,6 +49,7 @@ class Pry
       def safe_to_evaluate?(str, target)
         return true if str.strip == "self"
         return false if str =~ /%/
+
         kind = target.eval("defined?(#{str})")
         kind =~ /variable|constant/
       end
@@ -58,6 +59,7 @@ class Pry
     # @param [Module] mod
     def initialize(mod)
       raise ArgumentError, "Tried to initialize a WrappedModule with a non-module #{mod.inspect}" unless ::Module === mod
+
       @wrapped = mod
       @memoized_candidates = []
       @host_file_lines = nil
@@ -109,10 +111,6 @@ class Pry
     def singleton_class?
       if Pry::Method.safe_send(wrapped, :respond_to?, :singleton_class?)
         Pry::Method.safe_send(wrapped, :singleton_class?)
-      elsif defined?(Rubinius)
-        # https://github.com/rubinius/rubinius/commit/2e71722dba53d1a92c54d5e3968d64d1042486fe singleton_class? added 30 Jul 2014
-        # https://github.com/rubinius/rubinius/commit/4310f6b2ef3c8fc88135affe697db4e29e4621c4 has been around since 2011
-        !!Rubinius::Type.singleton_class_object(wrapped)
       else
         wrapped != Pry::Method.safe_send(wrapped, :ancestors).first
       end
@@ -138,10 +136,10 @@ class Pry
     def singleton_instance
       raise ArgumentError, "tried to get instance of non singleton class" unless singleton_class?
 
-      if Helpers::BaseHelpers.jruby?
+      if Helpers::Platform.jruby?
         wrapped.to_java.attached
       else
-        @singleton_instance ||= ObjectSpace.each_object(wrapped).detect{ |x| (class << x; self; end) == wrapped }
+        @singleton_instance ||= ObjectSpace.each_object(wrapped).detect { |x| (class << x; self; end) == wrapped }
       end
     end
 
@@ -150,7 +148,7 @@ class Pry
       wrapped.send(method_name, *args, &block)
     end
 
-    def respond_to?(method_name, include_all=false)
+    def respond_to?(method_name, include_all = false)
       super || wrapped.respond_to?(method_name, include_all)
     end
 
@@ -253,7 +251,7 @@ class Pry
                  y.yield candidate(num)
                end
              end
-      Pry::Helpers::BaseHelpers.jruby_19? ? enum.to_a : enum
+      Helpers::Platform.jruby_19? ? enum.to_a : enum
     end
 
     # @return [Boolean] Whether YARD docs are available for this module.
@@ -267,7 +265,7 @@ class Pry
     #   When `self` is a `Module` then return the
     #   nth ancestor, otherwise (in the case of classes) return the
     #   nth ancestor that is a class.
-    def super(times=1)
+    def super(times = 1)
       return self if times.zero?
 
       if wrapped.is_a?(Class)
@@ -302,7 +300,7 @@ class Pry
     #   speed up source code extraction.
     def method_candidates
       @method_candidates ||= all_source_locations_by_popularity.map do |group|
-        methods_sorted_by_source_line  = group.last.sort_by(&:source_line)
+        methods_sorted_by_source_line = group.last.sort_by(&:source_line)
         [methods_sorted_by_source_line.first, methods_sorted_by_source_line.last]
       end
     end
@@ -315,7 +313,7 @@ class Pry
       @all_source_locations_by_popularity = ims.group_by { |v| Array(v.source_location).first }.
         sort_by do |path, methods|
           expanded = File.expand_path(path)
-          load_order = $LOADED_FEATURES.index{ |file| expanded.end_with?(file) }
+          load_order = $LOADED_FEATURES.index { |file| expanded.end_with?(file) }
 
           [-methods.size, load_order || (1.0 / 0.0)]
         end
@@ -323,16 +321,16 @@ class Pry
 
     # We only want methods that have a non-nil `source_location`. We also
     # skip some spooky internal methods.
-    # (i.e we skip `__class_init__` because it's an odd rbx specific thing that causes tests to fail.)
+    #
     # @return [Array<Pry::Method>]
     def all_relevant_methods_for(mod)
       methods = all_methods_for(mod).select(&:source_location).
-        reject{ |x| x.name == '__class_init__' || method_defined_by_forwardable_module?(x) }
+        reject { |x| method_defined_by_forwardable_module?(x) }
 
       return methods unless methods.empty?
 
       safe_send(mod, :constants).flat_map do |const_name|
-        if const = nested_module?(mod, const_name)
+        if (const = nested_module?(mod, const_name))
           all_relevant_methods_for(const)
         else
           []
@@ -349,9 +347,11 @@ class Pry
 
     def nested_module?(parent, name)
       return if safe_send(parent, :autoload?, name)
+
       child = safe_send(parent, :const_get, name)
       return unless Module === child
       return unless safe_send(child, :name) == "#{safe_send(parent, :name)}::#{name}"
+
       child
     end
 

data/lib/pry.rb

@@ -1,10 +1,8 @@
-# (C) John Mair (banisterfiend) 2016
-# MIT License
-#
 require 'pp'
 require 'pry/forwardable'
 require 'pry/input_lock'
 require 'pry/exceptions'
+require 'pry/platform'
 require 'pry/helpers/base_helpers'
 require 'pry/hooks'
 
@@ -12,6 +10,7 @@ class Pry
   # The default hooks - display messages when beginning and ending Pry sessions.
   DEFAULT_HOOKS = Pry::Hooks.new.add_hook(:before_session, :default) do |out, target, _pry_|
     next if _pry_.quiet?
+
     _pry_.run_command("whereami --quiet")
   end
 
@@ -45,47 +44,18 @@ class Pry
     else
       output.puts "#{exception.class}: #{exception.message}"
       output.puts "from #{exception.backtrace.first}"
+
+      if exception.respond_to? :cause
+        cause = exception.cause
+        while cause
+          output.puts "Caused by #{cause.class}: #{cause}\n"
+          output.puts "from #{cause.backtrace.first}"
+          cause = cause.cause
+        end
+      end
     end
   end
 
-  DEFAULT_PROMPT_NAME = 'pry'
-
-  # The default prompt; includes the target and nesting level
-  DEFAULT_PROMPT = [
-                    proc { |target_self, nest_level, pry|
-                      "[#{pry.input_array.size}] #{pry.config.prompt_name}(#{Pry.view_clip(target_self)})#{":#{nest_level}" unless nest_level.zero?}> "
-                    },
-
-                    proc { |target_self, nest_level, pry|
-                      "[#{pry.input_array.size}] #{pry.config.prompt_name}(#{Pry.view_clip(target_self)})#{":#{nest_level}" unless nest_level.zero?}* "
-                    }
-                   ]
-
-  DEFAULT_PROMPT_SAFE_OBJECTS = [String, Numeric, Symbol, nil, true, false]
-
-  # A simple prompt - doesn't display target or nesting level
-  SIMPLE_PROMPT = [proc { ">> " }, proc { " | " }]
-
-  NO_PROMPT = [proc { '' }, proc { '' }]
-
-  SHELL_PROMPT = [
-                  proc { |target_self, _, _pry_| "#{_pry_.config.prompt_name} #{Pry.view_clip(target_self)}:#{Dir.pwd} $ " },
-                  proc { |target_self, _, _pry_| "#{_pry_.config.prompt_name} #{Pry.view_clip(target_self)}:#{Dir.pwd} * " }
-                 ]
-
-  # A prompt that includes the full object path as well as
-  # input/output (_in_ and _out_) information. Good for navigation.
-  NAV_PROMPT = [
-                proc do |_, _, _pry_|
-                  tree = _pry_.binding_stack.map { |b| Pry.view_clip(b.eval("self")) }.join " / "
-                  "[#{_pry_.input_array.count}] (#{_pry_.config.prompt_name}) #{tree}: #{_pry_.binding_stack.size - 1}> "
-                end,
-                proc do |_, _, _pry_|
-                  tree = _pry_.binding_stack.map { |b| Pry.view_clip(b.eval("self")) }.join " / "
-                  "[#{_pry_.input_array.count}] (#{ _pry_.config.prompt_name}) #{tree}: #{_pry_.binding_stack.size - 1}* "
-                end,
-               ]
-
   # Deal with the ^D key being pressed. Different behaviour in different cases:
   #   1. In an expression behave like `!` command.
   #   2. At top-level session behave like `exit` command.
@@ -111,10 +81,6 @@ class Pry
     end
   end
 
-  # Store the current working directory. This allows show-source etc. to work if
-  # your process has changed directory since boot. [Issue #675]
-  INITIAL_PWD = Dir.pwd
-
   # This is to keep from breaking under Rails 3.2 for people who are doing that
   # IRB = Pry thing.
   module ExtendCommandBundle; end
@@ -132,9 +98,8 @@ require 'pathname'
 
 require 'pry/version'
 require 'pry/repl'
-require 'pry/rbx_path'
 require 'pry/code'
-require 'pry/history_array'
+require 'pry/ring'
 require 'pry/helpers'
 require 'pry/code_object'
 require 'pry/method'
@@ -145,6 +110,12 @@ require 'pry/command_set'
 require 'pry/commands'
 require 'pry/plugins'
 require 'pry/core_extensions'
+require 'pry/basic_object'
+require 'pry/config/behavior'
+require 'pry/config/memoization'
+require 'pry/config/default'
+require 'pry/config/convenience'
+require 'pry/config'
 require 'pry/pry_class'
 require 'pry/pry_instance'
 require 'pry/cli'