pry 0.9.4pre1 → 0.9.4pre2

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,25 +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)
-        output.puts "#{text.bold("visibility: ")} #{method_visibility(meth).to_s}"
-        if meth.respond_to?(:parameters)
+          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", ""
@@ -88,11 +89,9 @@ class Pry
         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|
@@ -144,21 +143,28 @@ 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
-          "#{meth.name}(#{param_strings.join(", ")})"
-        end
 
+          "#{method.name}(#{args.join(', ')})"
+        end
+        
         def method_visibility(meth)
           if meth.owner.public_instance_methods.include? meth.name
             :public

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

@@ -54,9 +54,9 @@ e.g amend-line puts 'hello again'   # no line number modifies immediately preced
 
       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_.input = StringIO.new(arg_string)  }
         end
 
         if opts.m?
@@ -82,9 +80,7 @@ e.g amend-line puts 'hello again'   # no line number modifies immediately preced
           range = (0..-2) if opts.o?
 
           _pry_.input = StringIO.new(Array(code.each_line.to_a[range]).join)
-        end
-
-        if opts.f?
+        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)
@@ -92,12 +88,19 @@ e.g amend-line puts 'hello again'   # no line number modifies immediately preced
           range = (0..-2) if opts.o?
 
           _pry_.input = StringIO.new(Array(text_array[range]).join)
+        else
+          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 +135,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
@@ -170,7 +173,7 @@ e.g amend-line puts 'hello again'   # no line number modifies immediately preced
           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
 

data/lib/pry/default_commands/introspection.rb

@@ -9,7 +9,7 @@ class Pry
         target = target()
 
         opts = Slop.parse!(args) do |opt|
-          opt.banner "Usage: show-method [OPTIONS] [METH]\n" \
+          opt.banner "Usage: show-method [OPTIONS] [METH 1] [METH 2] [METH N]\n" \
                      "Show the source for method METH. Tries instance methods first and then methods by default.\n" \
                      "e.g: show-method hello_method"
 
@@ -29,30 +29,33 @@ 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-method --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-method --help` for help"
+            next
+          end
 
-        code, code_type = code_and_code_type_for(meth)
-        next if !code
+          code, code_type = code_and_code_type_for(meth)
+          next if !code
 
-        output.puts make_header(meth, code_type, code)
-        if Pry.color
-          code = CodeRay.scan(code, code_type).term
-        end
+          output.puts make_header(meth, code_type, code)
+          if Pry.color
+            code = CodeRay.scan(code, code_type).term
+          end
 
-        start_line = false
-        if opts.l?
-          start_line = meth.source_location ? meth.source_location.last : 1
-        end
+          start_line = false
+          if opts.l?
+            start_line = meth.source_location ? meth.source_location.last : 1
+          end
 
-        start_line = opts.b? ? 1 : start_line
+          start_line = opts.b? ? 1 : start_line
 
 
-        render_output(opts.flood?, start_line, code)
-        code
+          render_output(opts.flood?, start_line, code)
+          code
+        end
       end
 
       alias_command "show-source", "show-method", ""
@@ -108,13 +111,14 @@ class Pry
       command "edit", "Invoke the default editor on a file. Type `edit --help` for more info" do |*args|
         opts = Slop.parse!(args) do |opt|
           opt.banner "Usage: edit [OPTIONS] [FILE]\n" \
-                      "Edit the method FILE in an editor.\n" \
-                      "Ensure #{text.bold("Pry.editor")} is set to your editor of choice.\n" \
+                      "Edit the method FILE in an editor.\nWhen no file given, opens editor with contents of input buffer and evals after closing." \
+                      "\nEnsure #{text.bold("Pry.config.editor")} is set to your editor of choice.\n" \
                       "e.g: edit sample.rb"
 
           opt.on :r, "reload", "Eval file content after editing (evals at top level)"
-          opt.on :ex, "Open an editor at the line and file that generated the most recent Exception."
-          opt.on :t, "temp", "Open a temporary file in an editor and eval it in current context after closing."
+          opt.on :n, "no-reload", "Do not automatically reload the file after editing (only applies to --ex and -t)."
+          opt.on :ex, "Open an editor at the line and file that generated the most recent Exception, reloads file after editing."
+          opt.on :t, "temp", "Open a temporary file in an editor with contents of input buffer and eval it in current context after closing (same as `edit` with no args)"
           opt.on :p, "play", "Use the pry `play` command to eval the file content after editing."
           opt.on :l, "line", "Specify line number to jump to in file", true, :as => Integer
           opt.on :h, :help, "This message." do
@@ -123,26 +127,32 @@ class Pry
         end
         next if opts.h?
 
-        # the context the file will be eval'd in after closing
-        context = TOPLEVEL_BINDING
-        should_reload = opts[:r]
+        should_reload_at_top_level = opts[:r]
+        should_reload_locally      = false
 
         if opts.ex?
-          next output.puts "No Exception found." if Pry.last_exception.nil?
+          next output.puts "No Exception found." if _pry_.last_exception.nil?
+
+          if is_core_rbx_path?(_pry_.last_exception.file)
+            file_name = rbx_convert_path_to_full(_pry_.last_exception.file)
+          else
+            file_name = _pry_.last_exception.file
+          end
 
-          file_name = Pry.last_exception.file
-          line = Pry.last_exception.line
+          line = _pry_.last_exception.line
           next output.puts "Exception has no associated file." if file_name.nil?
           next output.puts "Cannot edit exceptions raised in REPL." if Pry.eval_path == file_name
-        elsif opts.t?
+
+          should_reload_at_top_level = opts[:n] ? false : true
+
+        elsif opts.t? || args.first.nil?
           file_name = Tempfile.new(["tmp", ".rb"]).tap(&:close).path
-          line = 0
-          should_reload = true
-          context = target
+          File.open(file_name, "w") { |f| f.puts eval_string } if !eval_string.empty?
+          line = eval_string.lines.count + 1
+          should_reload_locally = opts[:n] ? false : true
         else
-          next output.puts("Need to specify a file.") if !args.first
-          file_name = File.expand_path(args.first)
-          line = opts[:l].to_i
+          file_name, line = File.expand_path(args.first).split(/:/)
+          line = line ? line.to_i : opts[:l].to_i
         end
 
         invoke_editor(file_name, line)
@@ -152,9 +162,13 @@ class Pry
           silence_warnings do
             _pry_.input = StringIO.new(File.readlines(file_name).join)
           end
-        elsif should_reload
+        elsif should_reload_locally
+          silence_warnings do
+            eval_string.replace(File.read(file_name))
+          end
+        elsif should_reload_at_top_level
           silence_warnings do
-            context.eval(File.read(file_name), file_name)
+            TOPLEVEL_BINDING.eval(File.read(file_name), file_name)
           end
         end
       end
@@ -165,7 +179,7 @@ class Pry
         opts = Slop.parse!(args) do |opt|
           opt.banner "Usage: edit-method [OPTIONS] [METH]\n" \
                       "Edit the method METH in an editor.\n" \
-                      "Ensure #{text.bold("Pry.editor")} is set to your editor of choice.\n" \
+                      "Ensure #{text.bold("Pry.config.editor")} is set to your editor of choice.\n" \
                       "e.g: edit-method hello_method"
 
           opt.on :M, "instance-methods", "Operate on instance methods."
@@ -188,7 +202,7 @@ class Pry
           next
         end
 
-        next output.puts "Error: No editor set!\nEnsure that #{text.bold("Pry.editor")} is set to your editor of choice." if !Pry.editor
+        next output.puts "Error: No editor set!\nEnsure that #{text.bold("Pry.config.editor")} is set to your editor of choice." if !Pry.config.editor
 
         if is_a_c_method?(meth)
           output.puts "Error: Can't edit a C method."

data/lib/pry/default_commands/shell.rb

@@ -50,12 +50,16 @@ class Pry
 
           opt.on :ex, "Show a window of N lines either side of the last exception (defaults to 5).", :optional => true, :as => Integer do |window_size|
             window_size ||= 5
-            ex = Pry.last_exception
+            ex = _pry_.last_exception
             next if !ex
             start_line = (ex.line - 1) - window_size
             start_line = start_line < 0 ? 0 : start_line
             end_line = (ex.line - 1) + window_size
-            file_name = ex.file
+            if is_core_rbx_path?(ex.file)
+              file_name = rbx_convert_path_to_full(ex.file)
+            else
+              file_name = ex.file
+            end
           end
 
           opt.on :l, "line-numbers", "Show line numbers."
@@ -93,7 +97,7 @@ class Pry
 
           contents = contents.lines.each_with_index.map do |line, idx|
             l = idx + start_line
-            if l == (Pry.last_exception.line - 1)
+            if l == (_pry_.last_exception.line - 1)
               " =>#{line}"
             else
               "   #{line}"
@@ -101,8 +105,8 @@ class Pry
           end.join
 
           # header for exceptions
-          output.puts "\n#{Pry::Helpers::Text.bold('Exception:')}: #{Pry.last_exception.class}: #{Pry.last_exception.message}"
-          output.puts "#{Pry::Helpers::Text.bold('From:')} #{file_name} @ line #{Pry.last_exception.line}\n\n"
+          output.puts "\n#{Pry::Helpers::Text.bold('Exception:')} #{_pry_.last_exception.class}: #{_pry_.last_exception.message}\n--"
+          output.puts "#{Pry::Helpers::Text.bold('From:')} #{file_name} @ line #{_pry_.last_exception.line}\n\n"
         end
 
         set_file_and_dir_locals(file_name)

data/lib/pry/helpers/base_helpers.rb

@@ -36,10 +36,11 @@ class Pry
 
       def set_file_and_dir_locals(file_name)
         return if !target
-        $_file_temp = File.expand_path(file_name)
-        $_dir_temp =  File.dirname($_file_temp)
-        target.eval("_file_ = $_file_temp")
-        target.eval("_dir_ = $_dir_temp")
+        _pry_.last_file = File.expand_path(file_name)
+        _pry_.inject_local("_file_", _pry_.last_file, target)
+
+        _pry_.last_dir = File.dirname(_pry_.last_file)
+        _pry_.inject_local("_dir_", _pry_.last_dir, target)
       end
 
       def stub_proc(name, options)
@@ -86,6 +87,16 @@ class Pry
         27
       end
 
+      # are we on Jruby platform?
+      def jruby?
+        defined?(RUBY_ENGINE) && RUBY_ENGINE =~ /jruby/
+      end
+
+      # are we on rbx platform?
+      def rbx?
+       defined?(RUBY_ENGINE) && RUBY_ENGINE =~ /rbx/
+      end
+
       # a simple pager for systems without `less`. A la windows.
       def simple_pager(text, output=output())
         text_array = text.lines.to_a
@@ -109,7 +120,7 @@ class Pry
         end
 
         # FIXME! Another JRuby hack
-        if Object.const_defined?(:RUBY_ENGINE) && RUBY_ENGINE =~ /jruby/
+        if jruby?
           simple_pager(text, output)
         else
           lesspipe { |less| less.puts text }

data/lib/pry/helpers/command_helpers.rb

@@ -40,11 +40,14 @@ class Pry
       end
 
       ########### RBX HELPERS #############
+      def is_core_rbx_path?(path)
+        rbx? &&
+          path.start_with?("kernel")
+      end
+
       def rbx_core?(meth)
-        defined?(RUBY_ENGINE) &&
-          RUBY_ENGINE =~ /rbx/ &&
           meth.source_location &&
-          meth.source_location.first.start_with?("kernel")
+          is_core_rbx_path?(meth.source_location.first)
       end
 
       def rvm_ruby?(path)
@@ -70,6 +73,28 @@ class Pry
         end
       end
 
+      def rbx_convert_path_to_full(path)
+        if rvm_ruby?(Rubinius::BIN_PATH)
+          rbx_rvm_convert_path_to_full(path)
+        else
+          rbx_std_convert_path_to_full(path)
+        end
+      end
+
+      def rbx_rvm_convert_path_to_full(path)
+          ruby_name = File.dirname(Rubinius::BIN_PATH).split("/").last
+          source_path = File.join(File.dirname(File.dirname(File.dirname(Rubinius::BIN_PATH))),  "src", ruby_name)
+        file_name = File.join(source_path, path)
+        raise "Cannot find rbx core source" if !File.exists?(file_name)
+        file_name
+      end
+
+      def rbx_std_convert_path_to_full(path)
+        file_name = File.join(Rubinius::BIN_PATH, "..", path)
+        raise "Cannot find rbx core source" if !File.exists?(file_name)
+        file_name
+      end
+
       def rbx_core_path_line_for(meth)
         if rvm_ruby?(Rubinius::BIN_PATH)
           rvm_rbx_core_path_line_for(meth)
@@ -79,21 +104,14 @@ class Pry
       end
 
       def std_rbx_core_path_line_for(meth)
-        file_name = File.join(Rubinius::BIN_PATH, "..", meth.source_location.first)
-        raise "Cannot find rbx core source" if !File.exists?(file_name)
-
+        file_name  = rbx_std_convert_path_to_full(meth.source_location.first)
         start_line = meth.source_location.last
 
         [file_name, start_line]
       end
 
       def rvm_rbx_core_path_line_for(meth)
-        ruby_name = File.dirname(Rubinius::BIN_PATH).split("/").last
-        source_path = File.join(File.dirname(File.dirname(File.dirname(Rubinius::BIN_PATH))),  "src", ruby_name)
-
-        file_name = File.join(source_path, meth.source_location.first)
-        raise "Cannot find rbx core source" if !File.exists?(file_name)
-
+        file_name  = rbx_rvm_convert_path_to_full(meth.source_location.first)
         start_line = meth.source_location.last
 
         [file_name, start_line]
@@ -333,19 +351,25 @@ class Pry
       end
 
       def invoke_editor(file, line)
-        if Pry.editor.respond_to?(:call)
-          editor_invocation = Pry.editor.call(file, line)
+        if Pry.config.editor.respond_to?(:call)
+          editor_invocation = Pry.config.editor.call(file, line)
         else
-          editor_invocation = "#{Pry.editor} #{start_line_syntax_for_editor(file, line)}"
+          editor_invocation = "#{Pry.config.editor} #{start_line_syntax_for_editor(file, line)}"
         end
 
-        run ".#{editor_invocation}"
+        if jruby?
+          require 'spoon'
+          pid = Spoon.spawnp(*editor_invocation.split)
+          Process.waitpid(pid)
+        else
+          run ".#{editor_invocation}"
+        end
       end
 
       def start_line_syntax_for_editor(file_name, line_number)
         file_name = file_name.gsub(/\//, '\\') if RUBY_PLATFORM =~ /mswin|mingw/
 
-        case Pry.editor
+        case Pry.config.editor
         when /^[gm]?vi/, /^emacs/, /^nano/, /^pico/, /^gedit/, /^kate/
           "+#{line_number} #{file_name}"
         when /^mate/, /^geany/