pry 0.10.4 → 0.12.2

data/lib/pry/cli.rb

@@ -1,12 +1,9 @@
 class Pry
-
   # Manage the processing of command line options
   class CLI
-
     NoOptionsError = Class.new(StandardError)
 
     class << self
-
       # @return [Proc] The Proc defining the valid command line options.
       attr_accessor :options
 
@@ -19,7 +16,7 @@ class Pry
       #   as CLI options.
       attr_accessor :input_args
 
-      # Add another set of CLI options (a Slop block)
+      # Add another set of CLI options (a Pry::Slop block)
       def add_options(&block)
         if options
           old_options = options
@@ -57,7 +54,7 @@ class Pry
         self.option_processors = nil
       end
 
-      def parse_options(args=ARGV)
+      def parse_options(args = ARGV)
         unless options
           raise NoOptionsError, "No command line options defined! Use Pry::CLI.add_options to add command line options."
         end
@@ -65,39 +62,62 @@ class Pry
         self.input_args = args
 
         begin
-          opts = Slop.parse!(
+          opts = Pry::Slop.parse!(
             args,
-            :help => true,
-            :multiple_switches => false,
-            :strict => true,
+            help: true,
+            multiple_switches: false,
+            strict: true,
             &options
           )
-        rescue Slop::InvalidOptionError
+        rescue Pry::Slop::InvalidOptionError
           # Display help message on unknown switches and exit.
-          puts Slop.new(&options)
+          puts Pry::Slop.new(&options)
           exit
         end
 
+        Pry.initial_session_setup
+        Pry.final_session_setup
+
         # Option processors are optional.
         if option_processors
           option_processors.each { |processor| processor.call(opts) }
         end
 
-        self
+        opts
       end
 
+      def start(opts)
+        exit if opts.help?
+
+        # invoked via cli
+        Pry.cli = true
+
+        # create the actual context
+        if opts[:context]
+          Pry.initial_session_setup
+          context = Pry.binding_for(eval(opts[:context]))
+          Pry.final_session_setup
+        else
+          context = Pry.toplevel_binding
+        end
+
+        if Pry::CLI.input_args.any? && Pry::CLI.input_args != ["pry"]
+          full_name = File.expand_path(Pry::CLI.input_args.first)
+          Pry.load_file_through_repl(full_name)
+          exit
+        end
+
+        # Start the session (running any code passed with -e, if there is any)
+        Pry.start(context, input: StringIO.new(Pry.config.exec_string))
+      end
     end
 
     reset
   end
 end
 
-
-# String that is built to be executed on start (created by -e and -exec switches)
-exec_string = ""
-
 # Bring in options defined by plugins
-Slop.new do
+Pry::Slop.new do
   on "no-plugins" do
     Pry.config.should_load_plugins = false
   end
@@ -109,14 +129,15 @@ end
 
 # The default Pry command line options (before plugin options are included)
 Pry::CLI.add_options do
-  banner %{Usage: pry [OPTIONS]
-Start a Pry session.
-See http://pryrepl.org/ for more information.
-Copyright (c) 2013 John Mair (banisterfiend)
---
-}
+  banner(
+    "Usage: pry [OPTIONS]\n" \
+    "Start a Pry session.\n" \
+    "See http://pryrepl.org/ for more information.\n"
+  )
+
   on :e, :exec=, "A line of code to execute in context before the session starts" do |input|
-    exec_string << input << "\n"
+    Pry.config.exec_string += "\n" if Pry.config.exec_string.length > 0
+    Pry.config.exec_string += input
   end
 
   on "no-pager", "Disable pager for long output" do
@@ -131,7 +152,7 @@ Copyright (c) 2013 John Mair (banisterfiend)
     Pry.config.color = false
   end
 
-  on :f, "Suppress loading of ~/.pryrc and ./.pryrc" do
+  on :f, "Suppress loading of pryrc" do
     Pry.config.should_load_rc = false
     Pry.config.should_load_local_rc = false
   end
@@ -159,18 +180,18 @@ Copyright (c) 2013 John Mair (banisterfiend)
   end
 
   on "simple-prompt", "Enable simple prompt mode" do
-    Pry.config.prompt = Pry::SIMPLE_PROMPT
+    Pry.config.prompt = Pry::Prompt[:simple][:value]
   end
 
   on "noprompt", "No prompt mode" do
-    Pry.config.prompt = Pry::NO_PROMPT
+    Pry.config.prompt = Pry::Prompt[:none][:value]
   end
 
   on :r, :require=, "`require` a Ruby script at startup" do |file|
     Pry.config.requires << file
   end
 
-  on :I=, "Add a path to the $LOAD_PATH", :as => Array, :delimiter => ":" do |load_path|
+  on :I=, "Add a path to the $LOAD_PATH", as: Array, delimiter: ":" do |load_path|
     load_path.map! do |path|
       /\A\.\// =~ path ? path : File.expand_path(path)
     end
@@ -192,29 +213,6 @@ Copyright (c) 2013 John Mair (banisterfiend)
 
   on(:c, :context=,
      "Start the session in the specified context. Equivalent to `context.pry` in a session.",
-     :default => "Pry.toplevel_binding"
+     default: "Pry.toplevel_binding"
      )
-end.add_option_processor do |opts|
-
-  exit if opts.help?
-
-  # invoked via cli
-  Pry.cli = true
-
-  # create the actual context
-  if opts[:context]
-    Pry.initial_session_setup
-    context = Pry.binding_for(eval(opts[:context]))
-  else
-    context = Pry.toplevel_binding
-  end
-
-  if Pry::CLI.input_args.any? && Pry::CLI.input_args != ["pry"]
-    full_name = File.expand_path(Pry::CLI.input_args.first)
-    Pry.load_file_through_repl(full_name)
-    exit
-  end
-
-  # Start the session (running any code passed with -e, if there is any)
-  Pry.start(context, :input => StringIO.new(exec_string))
 end

data/lib/pry/code/code_file.rb

@@ -17,10 +17,18 @@ class Pry
       %w(.c .h)      => :c,
       %w(.rhtml)     => :rhtml,
       %w(.yaml .yml) => :yaml,
-      %w(.cpp .hpp .cc .h cxx) => :cpp,
-      %w(.rb .ru .irbrc .gemspec .pryrc) => :ruby,
+      %w(.cpp .hpp .cc .h .cxx) => :cpp,
+      %w(.rb .ru .irbrc .gemspec .pryrc .rake) => :ruby,
     }
 
+    FILES = {
+      %w(Gemfile Rakefile Guardfile Capfile) => :ruby
+    }
+
+    # 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
+
     # @return [Symbol] The type of code stored in this wrapper.
     attr_reader :code_type
 
@@ -37,8 +45,6 @@ class Pry
         Pry.line_buffer.drop(1)
       elsif Pry::Method::Patcher.code_for(@filename)
         Pry::Method::Patcher.code_for(@filename)
-      elsif RbxPath.is_core_path?(@filename)
-        File.read(RbxPath.convert_path_to_full(@filename))
       else
         path = abs_path
         @code_type = type_from_filename(path)
@@ -79,6 +85,8 @@ class Pry
     def type_from_filename(filename, default = :unknown)
       _, @code_type = EXTENSIONS.find do |k, _|
         k.any? { |ext| ext == File.extname(filename) }
+      end || FILES.find do |k, _|
+        k.any? { |file_name| file_name == File.basename(filename) }
       end
 
       code_type || default
@@ -91,13 +99,12 @@ class Pry
 
     # @return [String]
     def from_pry_init_pwd
-      File.expand_path(@filename, Pry::INITIAL_PWD)
+      File.expand_path(@filename, INITIAL_PWD)
     end
 
     # @return [String]
     def from_load_path
       $LOAD_PATH.map { |path| File.expand_path(@filename, path) }
     end
-
   end
 end

data/lib/pry/code/code_range.rb

@@ -1,11 +1,9 @@
 class Pry
   class Code
-
     # Represents a range of lines in a code listing.
     #
     # @api private
     class CodeRange
-
       # @param [Integer] start_line
       # @param [Integer?] end_line
       def initialize(start_line, end_line = nil)
@@ -23,6 +21,7 @@ class Pry
       private
 
       def start_line; @start_line; end
+
       def end_line; @end_line; end
 
       # If `end_line` is equal to `nil`, then calculate it from the first
@@ -48,12 +47,14 @@ class Pry
       # @return [Integer]
       def find_start_index(lines)
         return start_line if start_line < 0
+
         lines.index { |loc| loc.lineno >= start_line } || lines.length
       end
 
       # @return [Integer]
       def find_end_index(lines)
         return end_line if end_line < 0
+
         (lines.index { |loc| loc.lineno > end_line } || 0) - 1
       end
 
@@ -66,6 +67,5 @@ class Pry
         @start_line = start_line.first
       end
     end
-
   end
 end

data/lib/pry/code/loc.rb

@@ -1,10 +1,11 @@
 class Pry
   class Code
-
-    # Represents a line of code. A line of code is a tuple, which consists of a
-    # line and a line number. A `LOC` object's state (namely, the line
-    # parameter) can be changed via instance methods. `Pry::Code` heavily uses
-    # this class.
+    # Represents a line of code (which may, in fact, contain multiple lines if the
+    # entirety was eval'd as a single unit following the `edit` command).
+    #
+    # A line of code is a tuple, which consists of a line and a line number. A
+    # `LOC` object's state (namely, the line parameter) can be changed via
+    # instance methods.  `Pry::Code` heavily uses this class.
     #
     # @api private
     # @example
@@ -18,7 +19,6 @@ class Pry
     #   loc.indent(3)
     #   loc.line #=> "   def example\n  :example\nend"
     class LOC
-
       # @return [Array<String, Integer>]
       attr_reader :tuple
 
@@ -62,7 +62,8 @@ class Pry
       def add_line_number(max_width = 0, color = false)
         padded = lineno.to_s.rjust(max_width)
         colorized_lineno = color ? Pry::Helpers::BaseHelpers.colorize_code(padded) : padded
-        tuple[0] = "#{ colorized_lineno }: #{ line }"
+        properly_padded_line = handle_multiline_entries_from_edit_command(line, max_width)
+        tuple[0] = "#{ colorized_lineno }: #{ properly_padded_line }"
       end
 
       # Prepends a marker "=>" or an empty marker to the +line+.
@@ -86,7 +87,12 @@ class Pry
       def indent(distance)
         tuple[0] = "#{ ' ' * distance }#{ line }"
       end
-    end
 
+      def handle_multiline_entries_from_edit_command(line, max_width)
+        line.split("\n").map.with_index do |inner_line, i|
+          i.zero? ? inner_line : "#{' ' * (max_width + 2)}#{inner_line}"
+        end.join("\n")
+      end
+    end
   end
 end

data/lib/pry/code.rb

@@ -66,7 +66,7 @@ class Pry
       # @param [Integer, nil] start_line The line number to start on, or nil to
       #   use the method's original line numbers.
       # @return [Code]
-      def from_module(mod, candidate_rank = 0, start_line=nil)
+      def from_module(mod, candidate_rank = 0, start_line = nil)
         candidate = Pry::WrappedModule(mod).candidate(candidate_rank)
         start_line ||= candidate.line
         new(candidate.source, start_line, :ruby)
@@ -92,7 +92,7 @@ class Pry
         LOC.new(line, lineno + start_line.to_i) }
       @code_type = code_type
 
-      @with_marker = @with_indentation = nil
+      @with_marker = @with_indentation = @with_line_numbers = nil
     end
 
     # Append the given line. +lineno+ is one more than the last existing
@@ -201,6 +201,7 @@ class Pry
     # @return [Code]
     def grep(pattern)
       return self unless pattern
+
       pattern = Regexp.new(pattern)
 
       select do |loc|
@@ -265,7 +266,7 @@ class Pry
 
     # Writes a formatted representation (based on the configuration of the
     # object) to the given output, which must respond to `#<<`.
-    def print_to_output(output, color=false)
+    def print_to_output(output, color = false)
       @lines.each do |loc|
         loc = loc.dup
         loc.colorize(@code_type)              if color
@@ -291,15 +292,14 @@ class Pry
     # @param [Integer] line_number (1-based)
     # @return [String] the code.
     def expression_at(line_number, consume = 0)
-      self.class.expression_at(raw, line_number, :consume => consume)
+      self.class.expression_at(raw, line_number, consume: consume)
     end
 
     # Get the (approximate) Module.nesting at the give line number.
     #
     # @param [Integer] line_number line number starting from 1
-    # @param [Module] top_module the module in which this code exists
     # @return [Array<Module>] a list of open modules.
-    def nesting_at(line_number, top_module = Object)
+    def nesting_at(line_number)
       Pry::Indent.nesting_at(raw, line_number)
     end
 
@@ -337,6 +337,11 @@ class Pry
     end
     undef =~
 
+    # Check whether String responds to missing methods.
+    def respond_to_missing?(name, include_all = false)
+      ''.respond_to?(name, include_all)
+    end
+
     protected
 
     # An abstraction of the `dup.instance_eval` pattern used throughout this

data/lib/pry/code_object.rb

@@ -1,5 +1,4 @@
 class Pry
-
   # This class is responsible for taking a string (identifying a
   # command/class/method/etc) and returning the relevant type of object.
   # For example, if the user looks up "show-source" then  a
@@ -37,12 +36,34 @@ class Pry
       def command?
         is_a?(Module) && self <= Pry::Command
       end
+
+      # @return [Boolean] `true` if this module was defined by means of the C API,
+      #   `false` if it's a Ruby module.
+      # @note If a module defined by C was extended with a lot of methods written
+      #   in Ruby, this method would fail.
+      def c_module?
+        if is_a?(WrappedModule)
+
+          method_locations = wrapped.methods(false).map do |m|
+            wrapped.method(m).source_location
+          end
+
+          method_locations.concat(wrapped.instance_methods(false).map do |m|
+                                    wrapped.instance_method(m).source_location
+                                  end)
+
+          c_methods = method_locations.grep(nil).count
+          ruby_methods = method_locations.count - c_methods
+
+          c_methods > ruby_methods
+        end
+      end
     end
 
     include Pry::Helpers::CommandHelpers
 
     class << self
-      def lookup(str, _pry_, options={})
+      def lookup(str, _pry_, options = {})
         co = new(str, _pry_, options)
 
         co.default_lookup || co.method_or_class_lookup ||
@@ -55,9 +76,9 @@ class Pry
     attr_accessor :_pry_
     attr_accessor :super_level
 
-    def initialize(str, _pry_, options={})
+    def initialize(str, _pry_, options = {})
       options = {
-        :super => 0,
+        super: 0,
       }.merge!(options)
 
       @str = str
@@ -147,6 +168,8 @@ class Pry
     # @return [Boolean]
     def safe_to_evaluate?(str)
       return true if str.strip == "self"
+      return false if str =~ /%/
+
       kind = target.eval("defined?(#{str})")
       kind =~ /variable|constant/
     end

data/lib/pry/color_printer.rb

@@ -12,8 +12,8 @@ class Pry
 
     CodeRay::Encoders::Terminal::TOKEN_COLORS[:comment][:self] = "\e[1;34m"
 
-    def self.pp(obj, out = $>, width = 79)
-      q = ColorPrinter.new(out, width)
+    def self.pp(obj, out = $>, width = 79, newline = "\n")
+      q = ColorPrinter.new(out, width, newline)
       q.guard_inspect_key { q.pp obj }
       q.flush
       out << "\n"
@@ -31,17 +31,27 @@ class Pry
     end
 
     def pp(obj)
-      super
+      if String === obj
+        # Avoid calling Ruby 2.4+ String#pretty_print that prints multiline
+        # Strings prettier
+        text(obj.inspect)
+      else
+        super
+      end
     rescue => e
       raise if e.is_a? Pry::Pager::StopPaging
 
-      # Read the class name off of the singleton class to provide a default
-      # inspect.
-      singleton = class << obj; self; end
-      ancestors = Pry::Method.safe_send(singleton, :ancestors)
-      klass  = ancestors.reject { |k| k == singleton }.first
-      obj_id = obj.__id__.to_s(16) rescue 0
-      str    = "#<#{klass}:0x#{obj_id}>"
+      begin
+        str = obj.inspect
+      rescue Exception 
+        # Read the class name off of the singleton class to provide a default
+        # inspect.
+        singleton = class << obj; self; end
+        ancestors = Pry::Method.safe_send(singleton, :ancestors)
+        klass  = ancestors.reject { |k| k == singleton }.first
+        obj_id = obj.__id__.to_s(16) rescue 0
+        str    = "#<#{klass}:0x#{obj_id}>"
+      end
 
       text highlight_object_literal(str)
     end