pry 0.9.3pre1-i386-mingw32 → 0.9.4-i386-mingw32

data/lib/pry/command_set.rb

@@ -15,7 +15,11 @@ class Pry
           context.instance_eval(&stub_block)
         else
           ret = context.instance_exec(*correct_arg_arity(block.arity, args), &block)
-          ret if options[:keep_retval]
+          if options[:keep_retval]
+            ret
+          else
+            Pry::CommandContext::VOID_VALUE
+          end
         end
       end
 
@@ -24,9 +28,15 @@ class Pry
         case arity <=> 0
         when -1
           args
-        when 1, 0
-          # Keep 1.8 happy
-          args.values_at 0..(arity - 1)
+        when 0
+          []
+        when 1
+          # another jruby hack
+          if Pry::Helpers::BaseHelpers.jruby?
+            args[0..(arity - 1)]
+          else
+            args.values_at 0..(arity - 1)
+          end
         end
       end
     end
@@ -227,11 +237,11 @@ class Pry
           output.puts
           help_text = heading("Command List: ") + "\n"
 
-          commands.each do |key, command|
+          help_text << commands.map do |key, command|
             if command.description && !command.description.empty?
-              help_text << "#{command.options[:listing]}".ljust(18) + command.description + "\n"
+              "#{command.options[:listing]}".ljust(18) + command.description
             end
-          end
+          end.compact.sort.join("\n")
 
           stagger_output(help_text)
         else

data/lib/pry/completion.rb

@@ -94,7 +94,7 @@ class Pry
           begin
             candidates = eval("#{receiver}.constants.collect{|m| m.to_s}", bind)
             candidates |= eval("#{receiver}.methods.collect{|m| m.to_s}", bind)
-          rescue Exception
+          rescue RescuableException
             candidates = []
           end
           candidates.grep(/^#{message}/).collect{|e| receiver + "::" + e}
@@ -114,7 +114,7 @@ class Pry
 
           begin
             candidates = eval(receiver, bind).methods.collect{|m| m.to_s}
-          rescue Exception
+          rescue RescuableException
             candidates = []
           end
           select_message(receiver, message, candidates)
@@ -126,7 +126,7 @@ class Pry
 
           begin
             candidates = eval(receiver, bind).methods.collect{|m| m.to_s}
-          rescue Exception
+          rescue RescuableException
             candidates = []
           end
           select_message(receiver, message, candidates)
@@ -149,7 +149,7 @@ class Pry
             # Foo::Bar.func
             begin
               candidates = eval("#{receiver}.methods", bind).collect{|m| m.to_s}
-            rescue Exception
+            rescue RescuableException
               candidates = []
             end
           else
@@ -157,8 +157,8 @@ class Pry
             candidates = []
             ObjectSpace.each_object(Module){|m|
               begin
-                name = m.name
-              rescue Exception
+                name = m.name.to_s
+              rescue RescuableException
                 name = ""
               end
               next if name != "IRB::Context" and

data/lib/pry/config.rb

@@ -51,9 +51,9 @@ class Pry
     # return value of that callable invocation is used as the exact
     # shell command to invoke the editor.
     # @example String
-    #   Pry.editor = "emacsclient"
+    #   Pry.config.editor = "emacsclient"
     # @example Callable
-    #   Pry.editor = proc { |file, line| "emacsclient #{file} +#{line}" }
+    #   Pry.config.editor = proc { |file, line| "emacsclient #{file} +#{line}" }
     # @return [String, #call]
     attr_accessor :editor
 
@@ -107,6 +107,10 @@ class Pry
 
     # @return [Integer] Amount of results that will be stored into out
     attr_accessor :memory_size
+
+    # @return [Proc] The proc that manages ^D presses in the REPL.
+    #   The proc is passed the current eval_string and the current pry instance.
+    attr_accessor :control_d_handler
   end
 end
 

data/lib/pry/default_commands/basic.rb

@@ -8,11 +8,11 @@ class Pry
       end
 
       command "simple-prompt", "Toggle the simple prompt." do
-        case Pry.active_instance.prompt
+        case _pry_.prompt
         when Pry::SIMPLE_PROMPT
-          Pry.active_instance.pop_prompt
+          _pry_.pop_prompt
         else
-          Pry.active_instance.push_prompt Pry::SIMPLE_PROMPT
+          _pry_.push_prompt Pry::SIMPLE_PROMPT
         end
       end
 
@@ -24,7 +24,7 @@ class Pry
         next output.puts "Provide a command set name" if command_set.nil?
 
         set = target.eval(arg_string)
-        Pry.active_instance.commands.import set
+        _pry_.commands.import set
       end
 
       command "reload-method", "Reload the source file that contains the specified method" do |meth_name|
@@ -44,6 +44,10 @@ class Pry
         end
       end
 
+      command "req", "Require file(s) and expand their paths." do |*args|
+        args.each { |file_name| load File.expand_path(file_name) }
+      end
+
       command "reset", "Reset the REPL to a clean state." do
         output.puts "Pry reset."
         exec "pry"

data/lib/pry/default_commands/context.rb

@@ -6,75 +6,122 @@ class Pry
     Context = Pry::CommandSet.new do
       import Ls
 
-      command "cd", "Start a Pry session on VAR (use `cd ..` to go back and `cd /` to return to Pry top-level)",  :keep_retval => true do |obj|
-        case obj
-        when nil
-          output.puts "Must provide an object."
-          next
-        when ".."
-          throw(:breakout, opts[:nesting].level)
-        when "/"
-          throw(:breakout, 1) if opts[:nesting].level > 0
-          next
-        when "::"
-          TOPLEVEL_BINDING.pry
-          next
+      command "cd", "Move into a new context (use `cd ..` to go back and `cd /` to return to Pry top-level). Complex syntax (e.g cd ../@x/y) also supported."  do |obj|
+        path   = arg_string.split(/\//)
+        stack  = _pry_.binding_stack.dup
+
+        # special case when we only get a single "/", return to root
+        stack  = [stack.first] if path.empty?
+
+        resolve_failure = false
+        path.each do |context|
+          begin
+            case context.chomp
+            when ""
+              stack = [stack.first]
+            when "::"
+              stack.push(TOPLEVEL_BINDING)
+            when "."
+              next
+            when ".."
+              if stack.one?
+                _pry_.binding_stack.clear
+                throw(:breakout)
+              else
+                stack.pop
+              end
+            else
+              stack.push(Pry.binding_for(stack.last.eval(context)))
+            end
+
+          rescue RescuableException
+            output.puts "Bad object path: #{arg_string}. Failed trying to resolve: #{context}"
+            resolve_failure = true
+          end
+        end
+
+        next if resolve_failure
+
+        _pry_.binding_stack = stack
+      end
+
+      command "switch-to", "Start a new sub-session on a binding in the current stack (numbered by nesting)." do |selection|
+        selection = selection.to_i
+
+        if selection < 0 || selection > _pry_.binding_stack.size - 1
+          output.puts "Invalid binding index #{selection} - use `nesting` command to view valid indices."
         else
-          Pry.start target.eval(arg_string)
+          Pry.start(_pry_.binding_stack[selection])
         end
       end
 
       command "nesting", "Show nesting information." do
-        nesting = opts[:nesting]
-
         output.puts "Nesting status:"
         output.puts "--"
-        nesting.each do |level, obj|
+        _pry_.binding_stack.each_with_index do |obj, level|
           if level == 0
-            output.puts "#{level}. #{Pry.view_clip(obj)} (Pry top level)"
+            output.puts "#{level}. #{Pry.view_clip(obj.eval('self'))} (Pry top level)"
           else
-            output.puts "#{level}. #{Pry.view_clip(obj)}"
+            output.puts "#{level}. #{Pry.view_clip(obj.eval('self'))}"
           end
         end
       end
 
-      command "jump-to", "Jump to a Pry session further up the stack, exiting all sessions below." do |break_level|
+      command "jump-to", "Jump to a binding further up the stack, popping all bindings below." do |break_level|
         break_level = break_level.to_i
-        nesting = opts[:nesting]
+        nesting_level = _pry_.binding_stack.size - 1
 
         case break_level
-        when nesting.level
-          output.puts "Already at nesting level #{nesting.level}"
-        when (0...nesting.level)
-          throw(:breakout, break_level + 1)
+        when nesting_level
+          output.puts "Already at nesting level #{nesting_level}"
+        when (0...nesting_level)
+          _pry_.binding_stack.slice!(break_level + 1, _pry_.binding_stack.size)
+
         else
-          max_nest_level = nesting.level - 1
+          max_nest_level = nesting_level - 1
           output.puts "Invalid nest level. Must be between 0 and #{max_nest_level}. Got #{break_level}."
         end
       end
 
-      command "exit", "End the current Pry session. Accepts optional return value. Aliases: quit, back" do
-        throw(:breakout, [opts[:nesting].level, target.eval(arg_string)])
+      command "exit-all", "End the current Pry session (popping all bindings) and returning to caller. Accepts optional return value. Aliases: !!@" do
+        # clear the binding stack
+        _pry_.binding_stack.clear
+
+        # break out of the repl loop
+        throw(:breakout, target.eval(arg_string))
       end
 
-      alias_command "quit", "exit", ""
-      alias_command "back", "exit", ""
+      alias_command "!!@", "exit-all", ""
+
+      command "exit", "Pop the current binding and return to the one immediately prior. Note this does NOT exit the program. Aliases: quit", :keep_retval => true do
+        if _pry_.binding_stack.one?
+          # when breaking out of top-level then behave like `exit-all`
+          _pry_.binding_stack.clear
+          throw(:breakout, target.eval(arg_string))
+        else
+          # otherwise just pop a binding
+          popped_object = _pry_.binding_stack.pop.eval('self')
 
-      command "exit-all", "End all nested Pry sessions. Accepts optional return value. Aliases: !!@" do
-        throw(:breakout, [0, target.eval(arg_string)])
+          # return a user-specified value if given
+          if !arg_string.empty?
+            target.eval(arg_string)
+          else
+            popped_object
+          end
+        end
       end
 
-      alias_command "!!@", "exit-all", ""
+      alias_command "quit", "exit", ""
 
       command "exit-program", "End the current program. Aliases: quit-program, !!!" do
-        Pry.active_instance.save_history if Pry.config.history.should_save
-        exit
+        Pry.save_history if Pry.config.history.should_save
+        Kernel.exit target.eval(arg_string).to_i
       end
 
       alias_command "quit-program", "exit-program", ""
       alias_command "!!!", "exit-program", ""
 
-      command "!pry", "Start a Pry session on current self; this even works mid-expression." do
+      command "!pry", "Start a Pry session on current self; this even works mid multi-line expression." do
         target.pry
       end
 
@@ -100,6 +147,7 @@ class Pry
         set_file_and_dir_locals(file)
         output.puts "\n#{text.bold('From:')} #{file} @ line #{line_num} in #{klass}##{meth_name}:\n\n"
 
+
         # This method inspired by http://rubygems.org/gems/ir_b
         File.open(file).each_with_index do |line, index|
           line_n = index + 1

data/lib/pry/default_commands/documentation.rb

@@ -11,7 +11,7 @@ class Pry
         target = target()
 
         opts = Slop.parse!(args) do |opt|
-          opt.banner = "Usage: show-doc [OPTIONS] [METH]\n" \
+          opt.banner = "Usage: show-doc [OPTIONS] [METH 1] [METH 2] [METH N]\n" \
                        "Show the comments above method METH. Tries instance methods first and then methods by default.\n" \
                        "e.g show-doc hello_method"
 
@@ -28,24 +28,26 @@ class Pry
 
         next if opts.help?
 
-        meth_name = args.shift
-        if (meth = get_method_object(meth_name, target, opts.to_hash(true))).nil?
-          output.puts "Invalid method name: #{meth_name}. Type `show-doc --help` for help"
-          next
-        end
+        args = [nil] if args.empty?
+        args.each do |method_name|
+          meth_name = method_name
+          if (meth = get_method_object(meth_name, target, opts.to_hash(true))).nil?
+            output.puts "Invalid method name: #{meth_name}. Type `show-doc --help` for help"
+            next
+          end
 
-        doc, code_type = doc_and_code_type_for(meth)
-        next if !doc
+          doc, code_type = doc_and_code_type_for(meth)
+          next if !doc
 
-        next output.puts("No documentation found.") if doc.empty?
-        doc = process_comment_markup(doc, code_type)
-        output.puts make_header(meth, code_type, doc)
-        if meth.respond_to?(:parameters)
-          output.puts "#{text.bold("signature")}: #{signature_for(meth)}"
+          next output.puts("No documentation found.") if doc.empty?
+          doc = process_comment_markup(doc, code_type)
+          output.puts make_header(meth, code_type, doc)
+          output.puts "#{text.bold("visibility: ")} #{method_visibility(meth).to_s}"
+          output.puts "#{text.bold("signature: ")} #{signature_for(meth)}"
           output.puts
+          render_output(opts.flood?, false, doc)
+          doc
         end
-        render_output(opts.flood?, false, doc)
-        doc
       end
 
       alias_command "?", "show-doc", ""
@@ -84,13 +86,12 @@ class Pry
         output.puts "--"
         output.puts "Name: " + meth_name
         output.puts "Owner: " + (meth.owner.to_s ? meth.owner.to_s : "Unknown")
+        output.puts "Visibility: " + method_visibility(meth).to_s
         output.puts "Type: " + (meth.is_a?(Method) ? "Bound" : "Unbound")
         output.puts "Arity: " + meth.arity.to_s
+        output.puts "Method Signature: " + signature_for(meth)
 
-        if meth.respond_to?(:parameters)
-          output.puts "Method Signature: " + signature_for(meth)
-        end
-
+        output.puts "Source location: " + (meth.source_location ? meth.source_location.join(":") : "Not found.")
       end
 
       command "gist-method", "Gist a method to github. Type `gist-method --help` for more info.", :requires_gem => "gist" do |*args|
@@ -142,19 +143,38 @@ class Pry
       end
 
       helpers do
-        def signature_for(meth)
-          param_strings = []
-          meth.parameters.each do |kind, name|
-            case kind
-            when :req
-              param_strings << name
-            when :opt
-              param_strings << "#{name}=?"
-            when :rest
-              param_strings << "*#{name}"
+
+        # paraphrased from awesome_print gem
+        def signature_for(method)
+          if method.respond_to?(:parameters)
+
+            args = method.parameters.inject([]) do |arr, (type, name)|
+              name ||= (type == :block ? 'block' : "arg#{arr.size + 1}")
+              arr << case type
+                     when :req        then name.to_s
+                     when :opt, :rest then "*#{name}"
+                     when :block      then "&#{name}"
+                     else '?'
+                     end
             end
+          else 
+            args = (1..method.arity.abs).map { |i| "arg#{i}" }
+            args[-1] = "*#{args[-1]}" if method.arity < 0
+          end
+
+          "#{method.name}(#{args.join(', ')})"
+        end
+        
+        def method_visibility(meth)
+          if meth.owner.public_instance_methods.include? meth.name
+            :public
+          elsif meth.owner.protected_instance_methods.include? meth.name
+            :protected
+          elsif meth.owner.private_instance_methods.include? meth.name
+            :private
+          else
+            :none
           end
-          "#{meth.name}(#{param_strings.join(", ")})"
         end
       end
 

data/lib/pry/default_commands/easter_eggs.rb

@@ -3,6 +3,11 @@ class Pry
 
     EasterEggs = Pry::CommandSet.new do
 
+      command(/!s\/(.*?)\/(.*?)/, "") do |source, dest|
+        eval_string.gsub!(/#{source}/) { dest }
+        run "show-input"
+      end
+
       command "east-coker", "" do
         text = %{
 --

data/lib/pry/default_commands/input.rb

@@ -12,7 +12,7 @@ class Pry
         render_output(false, 1, Pry.color ? CodeRay.scan(eval_string, :ruby).term : eval_string)
       end
 
-      command(/amend-line.?(-?\d+)?(?:\.\.(-?\d+))?/, "Amend a line of input in multi-line mode. Type `amend-line --help` for more information. Aliases %",
+      command(/amend-line(?: (-?\d+)(?:\.\.(-?\d+))?)?/, "Amend a line of input in multi-line mode. Type `amend-line --help` for more information. Aliases %",
               :interpolate => false, :listing => "amend-line")  do |*args|
         start_line_number, end_line_number, replacement_line = *args
 
@@ -52,11 +52,11 @@ e.g amend-line puts 'hello again'   # no line number modifies immediately preced
         run "show-input"
       end
 
-      alias_command(/%.?(-?\d+)?(?:\.\.(-?\d+))?/, /amend-line.?(-?\d+)?(?:\.\.(-?\d+))?/, "")
+      alias_command(/%.?(-?\d+)?(?:\.\.(-?\d+))?/, /amend-line(?: (-?\d+)(?:\.\.(-?\d+))?)?/, "")
 
-      command "play", "Play back a string or a method or a file as input. Type `play --help` for more information." do |*args|
+      command "play", "Play back a string variable or a method or a file as input. Type `play --help` for more information." do |*args|
         opts = Slop.parse!(args) do |opt|
-          opt.banner "Usage: play [OPTIONS] [--help]\nDefault action (no options) is to play the provided string\ne.g `play puts 'hello world'` #=> \"hello world\"\ne.g `play -m Pry#repl --lines 1..-1`\ne.g `play -f Rakefile --lines 5`"
+          opt.banner "Usage: play [OPTIONS] [--help]\nDefault action (no options) is to play the provided string variable\ne.g `play _in_[20] --lines 1..3`\ne.g `play -m Pry#repl --lines 1..-1`\ne.g `play -f Rakefile --lines 5`"
 
           opt.on :l, :lines, 'The line (or range of lines) to replay.', true, :as => Range
           opt.on :m, :method, 'Play a method.', true
@@ -65,8 +65,6 @@ e.g amend-line puts 'hello again'   # no line number modifies immediately preced
           opt.on :h, :help, "This message." do
             output.puts opt
           end
-
-          opt.on_noopts { Pry.active_instance.input = StringIO.new(arg_string)  }
         end
 
         if opts.m?
@@ -75,29 +73,35 @@ e.g amend-line puts 'hello again'   # no line number modifies immediately preced
             output.puts "Invalid method name: #{meth_name}."
             next
           end
-          code, code_type = code_and_code_type_for(meth)
+          code, _ = code_and_code_type_for(meth)
           next if !code
 
           range = opts.l? ? one_index_range_or_number(opts[:l]) : (0..-1)
           range = (0..-2) if opts.o?
 
-          Pry.active_instance.input = StringIO.new(Array(code.each_line.to_a[range]).join)
-        end
-
-        if opts.f?
+          _pry_.input = StringIO.new(Array(code.each_line.to_a[range]).join)
+        elsif opts.f?
           file_name = File.expand_path(opts[:f])
           next output.puts "No such file: #{opts[:f]}" if !File.exists?(file_name)
           text_array = File.readlines(file_name)
           range = opts.l? ? one_index_range_or_number(opts[:l]) : (0..-1)
           range = (0..-2) if opts.o?
 
-          Pry.active_instance.input = StringIO.new(Array(text_array[range]).join)
+          _pry_.input = StringIO.new(Array(text_array[range]).join)
+        else
+          next output.puts "Error: no input to play command" if !args.first
+          code = target.eval(args.first)
+
+          range = opts.l? ? one_index_range_or_number(opts[:l]) : (0..-1)
+          range = (0..-2) if opts.o?
+
+          eval_string << Array(code.each_line.to_a[range]).join
         end
       end
 
       command "hist", "Show and replay Readline history. Type `hist --help` for more info. Aliases: history" do |*args|
         # exclude the current command from history.
-        history = Readline::HISTORY.to_a[0..-2]
+        history = Pry.history.to_a[0..-2]
 
         opts = Slop.parse!(args) do |opt|
           opt.banner "Usage: hist [--replay START..END] [--clear] [--grep PATTERN] [--head N] [--tail N] [--help] [--save [START..END] file.txt]\n"
@@ -132,7 +136,7 @@ e.g amend-line puts 'hello again'   # no line number modifies immediately preced
                      :unless   => :grep do |limit|
 
             limit ||= 10
-            offset = history.size-limit
+            offset = history.size - limit
             offset = offset < 0 ? 0 : offset
 
             list  = history.last limit
@@ -164,13 +168,13 @@ e.g amend-line puts 'hello again'   # no line number modifies immediately preced
                  :as     => Range,
                  :unless => :grep do |range|
             actions = Array(history[range]).join("\n") + "\n"
-            Pry.active_instance.input = StringIO.new(actions)
+            _pry_.input = StringIO.new(actions)
           end
 
           opt.on "save", "Save history to a file. --save [start..end] output.txt. Pry commands are excluded from saved history.", true, :as => Range
 
           opt.on :c, :clear, 'Clear the history', :unless => :grep do
-            Readline::HISTORY.shift until Readline::HISTORY.empty?
+            Pry.history.clear
             output.puts 'History cleared.'
           end