pry 0.9.12.6 → 0.10.0.pre2

data/lib/pry/commands/ls/methods_helper.rb

@@ -0,0 +1,46 @@
+require 'pry/commands/ls/jruby_hacks'
+
+module Pry::Command::Ls::MethodsHelper
+
+  include Pry::Command::Ls::JRubyHacks
+
+  private
+
+  # Get all the methods that we'll want to output.
+  def all_methods(instance_methods = false)
+    methods = if instance_methods || @instance_methods_switch
+                Pry::Method.all_from_class(@interrogatee)
+              else
+                Pry::Method.all_from_obj(@interrogatee)
+              end
+
+    if Pry::Helpers::BaseHelpers.jruby? && !@jruby_switch
+      methods = trim_jruby_aliases(methods)
+    end
+
+    methods.select { |method| @ppp_switch || method.visibility == :public }
+  end
+
+  def resolution_order
+    if @instance_methods_switch
+      Pry::Method.instance_resolution_order(@interrogatee)
+    else
+      Pry::Method.resolution_order(@interrogatee)
+    end
+  end
+
+  def format(methods)
+    methods.sort_by(&:name).map do |method|
+      if method.name == 'method_missing'
+        color(:method_missing, 'method_missing')
+      elsif method.visibility == :private
+        color(:private_method, method.name)
+      elsif method.visibility == :protected
+        color(:protected_method, method.name)
+      else
+        color(:public_method, method.name)
+      end
+    end
+  end
+
+end

data/lib/pry/commands/ls/self_methods.rb

@@ -0,0 +1,32 @@
+require 'pry/commands/ls/interrogatable'
+require 'pry/commands/ls/methods_helper'
+
+class Pry
+  class Command::Ls < Pry::ClassCommand
+    class SelfMethods < Pry::Command::Ls::Formatter
+      include Pry::Command::Ls::Interrogatable
+      include Pry::Command::Ls::MethodsHelper
+
+      def initialize(interrogatee, no_user_opts, opts, _pry_)
+        super(_pry_)
+        @interrogatee = interrogatee
+        @no_user_opts = no_user_opts
+      end
+
+      def output_self
+        methods = all_methods(true).select do |m|
+          m.owner == @interrogatee && grep.regexp[m.name]
+        end
+        heading = "#{ Pry::WrappedModule.new(@interrogatee).method_prefix }methods"
+        output_section(heading, format(methods))
+      end
+
+      private
+
+      def correct_opts?
+        @no_user_opts && interrogating_a_module?
+      end
+
+    end
+  end
+end

data/lib/pry/commands/play.rb

@@ -2,7 +2,7 @@ class Pry
   class Command::Play < Pry::ClassCommand
     match 'play'
     group 'Editing'
-    description 'Playback a string variable or a method or a file as input.'
+    description 'Playback a string variable, method, line, or file as input.'
 
     banner <<-'BANNER'
       Usage: play [OPTIONS] [--help]
@@ -10,10 +10,15 @@ class Pry
       The play command enables you to replay code from files and methods as if they
       were entered directly in the Pry REPL.
 
-      play --lines 149..153
-      play -i 20 --lines 1..3
-      play Pry#repl --lines 1..-1
-      play Rakefile --lines 5
+      play --lines 149..153   # assumes current context
+      play -i 20 --lines 1..3 # assumes lines of the input expression at 20
+      play -o 4               # the output of of an expression at 4
+      play Pry#repl -l 1..-1  # play the contents of Pry#repl method
+      play -e 2               # play from specified line until end of valid expression
+      play hello.rb           # play a file
+      play Rakefile -l 5      # play line 5 of a file
+      play -d hi              # play documentation of hi method
+      play hi --open          # play hi method and leave it open
 
       https://github.com/pry/pry/wiki/User-Input#wiki-Play
     BANNER
@@ -21,23 +26,52 @@ class Pry
     def options(opt)
       CodeCollector.inject_options(opt)
 
-      opt.on :open, 'Plays the select content except except' \
-                    ' the last line. Useful for replaying methods and leaving the method definition "open". `amend-line`' \
-                    ' can then be used to modify the method.'
+      opt.on :open, 'Plays the selected content except the last line. Useful' \
+                    ' for replaying methods and leaving the method definition' \
+                    ' "open". `amend-line` can then be used to' \
+                    ' modify the method.'
+
+      opt.on :e, :expression=, 'Executes until end of valid expression', :as => Integer
+      opt.on :p, :print, 'Prints executed code'
     end
 
     def process
       @cc = CodeCollector.new(args, opts, _pry_)
 
       perform_play
-      run "show-input" unless Pry::Code.complete_expression?(eval_string)
+      show_input
     end
 
     def perform_play
-      eval_string << (opts.present?(:open) ? restrict_to_lines(content, (0..-2)) : content)
+      eval_string << content_after_options
       run "fix-indent"
     end
 
+    def show_input
+      if opts.present?(:print) or !Pry::Code.complete_expression?(eval_string)
+        run "show-input"
+      end
+    end
+
+
+    def content_after_options
+      if opts.present?(:open)
+        restrict_to_lines(content, (0..-2))
+      elsif opts.present?(:expression)
+        content_at_expression
+      else
+        content
+      end
+    end
+
+    def content_at_expression
+      code_object.expression_at(opts[:expression])
+    end
+
+    def code_object
+      Pry::Code.new(content)
+    end
+
     def should_use_default_file?
       !args.first && !opts.present?(:in) && !opts.present?(:out)
     end

data/lib/pry/commands/pry_backtrace.rb

@@ -17,8 +17,7 @@ class Pry
     BANNER
 
     def process
-      stagger_output text.bold('Backtrace:') +
-        "\n--\n" + _pry_.backtrace.join("\n")
+      _pry_.pager.page text.bold('Backtrace:') << "\n--\n" << _pry_.backtrace.join("\n")
     end
   end
 

data/lib/pry/commands/raise_up.rb

@@ -1,7 +1,7 @@
 class Pry
   # N.B. using a regular expresion here so that "raise-up 'foo'" does the right thing.
   class Command::RaiseUp < Pry::ClassCommand
-    match /raise-up(!?\b.*)/
+    match(/raise-up(!?\b.*)/)
     group 'Context'
     description 'Raise an exception out of the current pry instance.'
     command_options :listing => 'raise-up'
@@ -22,7 +22,7 @@ class Pry
     BANNER
 
     def process
-      return stagger_output help if captures[0] =~ /(-h|--help)\b/
+      return _pry.pager.page help if captures[0] =~ /(-h|--help)\b/
       # Handle 'raise-up', 'raise-up "foo"', 'raise-up RuntimeError, 'farble' in a rubyesque manner
       target.eval("_pry_.raise_up#{captures[0]}")
     end

data/lib/pry/commands/reload_code.rb

@@ -10,19 +10,17 @@ class Pry
       e.g reload-code MyClass#my_method    #=> reload a method
           reload-code MyClass              #=> reload a class
           reload-code my-command           #=> reload a pry command
-          reload-code self                 #=> reload the 'current' object
-          reload-code                      #=> identical to reload-code self
+          reload-code self                 #=> reload the current object
+          reload-code                      #=> reload the current file or object
     BANNER
 
     def process
-
-      if obj_name.empty?
-        # if no parameters were provided then try to reload the
-        # current file (i.e target.eval("__FILE__"))
-        reload_current_file
+      if !args.empty?
+        reload_object(args.join(" "))
+      elsif internal_binding?(target)
+        reload_object("self")
       else
-        code_object = Pry::CodeObject.lookup(obj_name, _pry_)
-        reload_code_object(code_object)
+        reload_current_file
       end
     end
 
@@ -41,21 +39,20 @@ class Pry
       output.puts "The current file: #{current_file} was reloaded!"
     end
 
-    def reload_code_object(code_object)
-      check_for_reloadability(code_object)
+    def reload_object(identifier)
+      code_object = Pry::CodeObject.lookup(identifier, _pry_)
+      check_for_reloadability(code_object, identifier)
       load code_object.source_file
-      output.puts "#{obj_name} was reloaded!"
-    end
-
-    def obj_name
-      @obj_name ||= args.join(" ")
+      output.puts "#{identifier} was reloaded!"
     end
 
-    def check_for_reloadability(code_object)
+    def check_for_reloadability(code_object, identifier)
       if !code_object || !code_object.source_file
-        raise CommandError, "Cannot locate #{obj_name}!"
+        raise CommandError, "Cannot locate #{identifier}!"
       elsif !File.exists?(code_object.source_file)
-        raise CommandError, "Cannot reload #{obj_name} as it has no associated file on disk. File found was: #{code_object.source_file}"
+        raise CommandError,
+          "Cannot reload #{identifier} as it has no associated file on disk. " \
+          "File found was: #{code_object.source_file}"
       end
     end
   end

data/lib/pry/commands/ri.rb

@@ -23,14 +23,18 @@ class Pry
         subclass = Class.new(RDoc::RI::Driver) # the hard way.
 
         subclass.class_eval do
+          def initialize(pager, opts)
+            @pager = pager
+            super opts
+          end
           def page
             paging_text = StringIO.new
             yield paging_text
-            Pry::Pager.page(paging_text.string)
+            @pager.page(paging_text.string)
           end
 
           def formatter(io)
-            if @formatter_klass then
+            if @formatter_klass
               @formatter_klass.new
             else
               RDoc::Markup::ToAnsi.new
@@ -42,7 +46,7 @@ class Pry
       end
 
       # Spin-up an RI insance.
-      ri = RDoc::RI::PryDriver.new :use_stdout => true, :interactive => false
+      ri = RDoc::RI::PryDriver.new _pry_.pager, :use_stdout => true, :interactive => false
 
       begin
         ri.display_names [spec]  # Get the documentation (finally!)

data/lib/pry/commands/shell_command.rb

@@ -1,6 +1,6 @@
 class Pry
   class Command::ShellCommand < Pry::ClassCommand
-    match /\.(.*)/
+    match(/\.(.*)/)
     group 'Input and Output'
     description "All text following a '.' is forwarded to the shell."
     command_options :listing => '.<shell command>', :use_prefix => false,
@@ -16,27 +16,32 @@ class Pry
     BANNER
 
     def process(cmd)
-      if cmd =~ /^cd\s+(.+)/i
-        dest = $1
-        begin
-          Dir.chdir File.expand_path(dest)
-        rescue Errno::ENOENT
-          raise CommandError, "No such directory: #{dest}"
-        end
+      if cmd =~ /^cd\s*(.*)/i
+        process_cd parse_destination($1)
       else
         pass_block(cmd)
-
         if command_block
           command_block.call `#{cmd}`
         else
-          Pry.config.system.call(output, cmd, _pry_)
+          _pry_.config.system.call(output, cmd, _pry_)
         end
       end
     end
 
-    def complete(search)
-      super + Bond::Rc.files(search.split(" ").last || '')
-    end
+    private
+
+      def parse_destination(dest)
+        return "~" if dest.empty?
+        return dest unless dest == "-"
+        state.old_pwd || raise(CommandError, "No prior directory available")
+      end
+
+      def process_cd(dest)
+        state.old_pwd = Dir.pwd
+        Dir.chdir File.expand_path(dest)
+      rescue Errno::ENOENT
+        raise CommandError, "No such directory: #{dest}"
+      end
   end
 
   Pry::Commands.add_command(Pry::Command::ShellCommand)

data/lib/pry/commands/shell_mode.rb

@@ -12,12 +12,10 @@ class Pry
       case _pry_.prompt
       when Pry::SHELL_PROMPT
         _pry_.pop_prompt
-        _pry_.custom_completions = Pry::DEFAULT_CUSTOM_COMPLETIONS
+        _pry_.custom_completions = _pry_.config.file_completions
       else
         _pry_.push_prompt Pry::SHELL_PROMPT
-        _pry_.custom_completions = Pry::FILE_COMPLETIONS
-        Readline.completion_proc = Pry::InputCompleter.build_completion_proc target,
-        _pry_.instance_eval(&Pry::FILE_COMPLETIONS)
+        _pry_.custom_completions = _pry_.config.command_completions
       end
     end
   end

data/lib/pry/commands/show_doc.rb

@@ -35,6 +35,11 @@ class Pry
         # command '--help' shouldn't use markup highlighting
         docs
       else
+        if docs.empty?
+          raise CommandError, "No docs found for: #{
+            obj_name ? obj_name : 'current context'
+          }"
+        end
         process_comment_markup(docs)
       end
     end

data/lib/pry/commands/show_info.rb

@@ -2,18 +2,13 @@ class Pry
   class Command::ShowInfo < Pry::ClassCommand
     extend Pry::Helpers::BaseHelpers
 
-    command_options :shellwords => false
-    command_options :requires_gem => "ruby18_source_location" if mri_18?
-
-    def setup
-      require 'ruby18_source_location' if mri_18?
-    end
+    command_options :shellwords => false, :interpolate => false
 
     def options(opt)
       opt.on :s, :super, "Select the 'super' method. Can be repeated to traverse the ancestors", :as => :count
       opt.on :l, "line-numbers", "Show line numbers"
       opt.on :b, "base-one", "Show line numbers but start numbering at 1 (useful for `amend-line` and `play` commands)"
-      opt.on :a, :all,   "Show all definitions and monkeypatches of the module/class"
+      opt.on :a, :all,  "Show all definitions and monkeypatches of the module/class"
     end
 
     def process
@@ -32,7 +27,7 @@ class Pry
       end
 
       set_file_and_dir_locals(code_object.source_file)
-      stagger_output result
+      _pry_.pager.page result
     end
 
     # This method checks whether the `code_object` is a WrappedModule,
@@ -63,7 +58,7 @@ class Pry
     end
 
     def content_and_header_for_code_object(code_object)
-      header(code_object) + content_for(code_object)
+      header(code_object) << content_for(code_object)
     end
 
     def content_and_headers_for_all_module_candidates(mod)
@@ -95,7 +90,7 @@ class Pry
       h << code_object_header(code_object, line_num)
       h << "\n#{Pry::Helpers::Text.bold('Number of lines:')} " <<
         "#{content_for(code_object).lines.count}\n\n"
-      h << Helpers::Text.bold('** Warning:') + " Cannot find code for #{@original_code_object.nonblank_name}. Showing superclass #{code_object.nonblank_name} instead. **\n\n" if @used_super
+      h << Helpers::Text.bold('** Warning:') << " Cannot find code for #{@original_code_object.nonblank_name}. Showing superclass #{code_object.nonblank_name} instead. **\n\n" if @used_super
       h
     end
 
@@ -128,7 +123,7 @@ class Pry
       h << " #{text.bold('name:')} #{code_object.nonblank_name}"
 
       if code_object.number_of_candidates > 1
-        h << (text.bold("\nNumber of monkeypatches: ") + code_object.number_of_candidates.to_s)
+        h << (text.bold("\nNumber of monkeypatches: ") << code_object.number_of_candidates.to_s)
         h << ". Use the `-a` option to display all available monkeypatches"
       end
       h
@@ -155,7 +150,7 @@ class Pry
     end
 
     def obj_name
-      @obj_name ||= args.empty? ? nil : args.join(" ")
+      @obj_name ||= args.empty? ? nil : args.join(' ')
     end
 
     def use_line_numbers?
@@ -186,7 +181,7 @@ class Pry
         prefix, search = [$1, $2]
         methods = begin
                     Pry::Method.all_from_class(binding.eval(prefix))
-                  rescue RescuableException => e
+                  rescue RescuableException
                     return super
                   end
         methods.map do |method|

data/lib/pry/commands/show_source.rb

@@ -18,17 +18,29 @@ class Pry
       show-source Pry#rep     # source for Pry#rep method
       show-source Pry         # for Pry class
       show-source Pry -a      # for all Pry class definitions (all monkey patches)
+      show-source Pry.foo -e  # for class of the return value of expression `Pry.foo`
       show-source Pry --super # for superclass of Pry (Object class)
 
       https://github.com/pry/pry/wiki/Source-browsing#wiki-Show_method
     BANNER
 
+    def options(opt)
+      opt.on :e, :eval, "evaluate the command's argument as a ruby expression and show the class its return value"
+      super(opt)
+    end
+
+    def process
+      if opts.present?(:e)
+        obj = target.eval(args.first)
+        self.args = Array.new(1) { Module === obj ? obj.name : obj.class.name }
+      end
+      super
+    end
+
     # The source for code_object prepared for display.
     def content_for(code_object)
-      cannot_locate_source_error if !code_object.source
-
       Code.new(code_object.source, start_line_for(code_object)).
-        with_line_numbers(use_line_numbers?).to_s
+        with_line_numbers(use_line_numbers?).highlighted
     end
   end