pry 0.9.2 → 0.9.3pre1

data/.gitignore

@@ -7,3 +7,4 @@ doc/
 pkg/
 coverage/
 .yardoc/
+/tags

data/CHANGELOG

@@ -1,3 +1,20 @@
+*/7/2011 version 0.9.3
+* cat --ex (cats 5 lines above and below line in file where exception was raised)
+* edit --ex (edits line in file where exception was raised)
+* edit -t (opens a temporary file and evals it in current context when closed)
+* `pry -r` requires now happen after plugin loading (so as not to interfere with
+* new Pry.config.disable_auto_reload option, for turning off auto reloading by edit-method and related (thanks ryanf)
+* add better error messages for `cd` command
+* fixed exotic object regression - BasicObject.new etc now return "=> unknown"
+* added reload-method command (reloads the associated file of a method)
+* converted: import => import-set, version => pry-version, install => install-command
+* Pry.config.command_prefix support (thanks ryanf!)
+* fixed indentation for simple-prompt
+* hist command now excludes last line of input (the command invocation itself)
+* hist now has `history` alias
+* missing plugins no longer raise exception, just print a warning to $stderr
+* fixed jedit editor support
+
 21/6/2011 version 0.9.2
 * fixed string interpolation bug (caused valid ruby code not to execute, sorry!)
 * fixed `ls` command, so it can properly display members of Object and classes, and BasicObject, etc

data/README.markdown

@@ -4,14 +4,11 @@
 
 _Get to the code_
 
-## These docs are now out of date for the 0.9.0 release.
-
-** New documentation will be available shortly, please see the CHANGELOG and Pry's own livehelp system for information in the meantime.
-
-Also note that JRuby is not yet supported in this release, but will be soon.
-
-Thanks **
+**Note that JRuby is not yet supported in this release, but will be
+  soon.**
 
+[Skip to the website](http://pry.github.com) <br />
+[Skip to the wiki](https://github.com/pry/pry/wiki)
 
 Pry is a powerful alternative to the standard IRB shell for Ruby. It is
 written from scratch to provide a number of advanced features, some of
@@ -37,7 +34,7 @@ currently not nearly as powerful as tools like [SLIME](http://en.wikipedia.org/w
 general direction Pry is heading.
 
 Pry is also fairly flexible and allows significant user
-[customization](http://rdoc.info/github/banister/pry/master/file/wiki/Customizing-pry.md). It
+[customization](https://github.com/pry/pry/wiki/Customization-and-configuration)
 is trivial to set it to read from any object that has a `readline` method and write to any object that has a
 `puts` method - many other aspects of Pry are also configurable making
 it a good choice for implementing custom shells.
@@ -52,8 +49,9 @@ methods. The additional docs are accessed through the `show-doc` and
 `show-method` commands.
 
 * Install the [gem](https://rubygems.org/gems/pry): `gem install pry`
-* Read the [documentation](http://rdoc.info/github/banister/pry/master/file/README.markdown)
-* See the [source code](http://github.com/banister/pry)
+* Browse the comprehensive [documentation at the official Pry wiki](https://github.com/pry/pry/wiki)
+* Read the [YARD API documentation](http://rdoc.info/github/pry/pry/master/file/README.markdown)
+* See the [source code](http://github.com/pry/pry)
 
 Pry also has `rubygems-test` support; to participate, first install
 Pry, then:
@@ -71,7 +69,7 @@ whitespace in between. Commands support a flexible syntax and allow
 Pry command will show a list of all private instance methods (in
 scope) that begin with 'pa'
 
-    pry(YARD::Parser::SourceParser):5> ls -Mp --grep pa
+    pry(YARD::Parser::SourceParser):5> ls -Mp --grep ^pa
     [:parser_class, :parser_type=, :parser_type_for_filename]
 
 ### Navigating around state
@@ -202,8 +200,6 @@ current directory and count the number of lines in that file with
 
 ### Code Browsing
 
-#### show-method
-
 You can browse method source code with the `show-method` command. Nearly all Ruby methods (and some C methods, with the pry-doc
 gem) can have their source viewed. Code that is longer than a page is
 sent through a pager (such as less), and all code is properly syntax
@@ -233,7 +229,7 @@ instance methods beginning with 're' and display the source code for the `rep` m
     148: end
 
 Note that we can also view C methods (from Ruby Core) using the
-`pry-doc` gem; we also show off the alternate syntax for
+`pry-doc` plugin; we also show off the alternate syntax for
 `show-method`:
 
     pry(main)> show-method Array#select
@@ -257,47 +253,6 @@ Note that we can also view C methods (from Ruby Core) using the
         return result;
     }
 
-#### Special locals
-
-Some commands such as `show-method`, `show-doc`, `show-command`, `stat`
-and `cat` update the `_file_` and `_dir_` local variables after they
-run. These locals contain the full path to the file involved in the
-last command as well as the directory containing that file.
-
-You can then use these special locals in conjunction with shell
-commands to do such things as change directory into the directory
-containing the file, open the file in an editor, display the file using `cat`, and so on.
-
-In the following example we wil use Pry to fix a bug in a method:
-
-    pry(main)> greet "john"
-    hello johnhow are you?=> nil
-    pry(main)> show-method greet
-
-    From: /Users/john/ruby/play/bug.rb @ line 2:
-    Number of lines: 4
-
-    def greet(name)
-      print "hello #{name}"
-      print "how are you?"
-    end
-    pry(main)> .emacsclient #{_file_}
-    pry(main)> load _file_
-    pry(main)> greet "john"
-    hello john
-    how are you?
-    => nil
-    pry(main)> show-method greet
-
-    From: /Users/john/ruby/play/bug.rb @ line 2:
-    Number of lines: 4
-
-    def greet(name)
-      puts "hello #{name}"
-      puts "how are you?"
-    end
-
-
 ### Documentation Browsing
 
 One use-case for Pry is to explore a program at run-time by `cd`-ing
@@ -352,63 +307,6 @@ We can also use `ri` in the normal way:
 
             a -- b -- c --
 
-
-### History
-
-Readline history can be viewed and replayed using the `hist`
-command. When `hist` is invoked with no arguments it simply displays
-the history (passing the output through a pager if necessary))
-when the `--replay` option is used a line or a range of lines of
-history can be replayed.
-
-In the example below we will enter a few lines in a Pry session and
-then view history; we will then replay one of those lines:
-
-    pry(main)> hist
-    0: hist -h
-    1: ls
-    2: ls
-    3: show-method puts
-    4: x = rand
-    5: hist
-    pry(main)> hist --replay 3
-
-    From: io.c in Ruby Core (C Method):
-    Number of lines: 8
-
-    static VALUE
-    rb_f_puts(int argc, VALUE *argv, VALUE recv)
-    {
-        if (recv == rb_stdout) {
-        return rb_io_puts(argc, argv, recv);
-        }
-        return rb_funcall2(rb_stdout, rb_intern("puts"), argc, argv);
-    }
-
-In the next example we will replay a range of lines in history. Note
-that we replay to a point where a class definition is still open and so
-we can continue to add instance methods to the class:
-
-    pry(main)> hist
-    0: class Hello
-    1:   def hello_world
-    2:     puts "hello world!"
-    3:   end
-    4: end
-    5: hist
-    pry(main)> hist --replay 0..3
-    pry(main)* def goodbye_world
-    pry(main)*   puts "goodbye world!"
-    pry(main)* end
-    pry(main)* end
-    => nil
-    pry(main)> Hello.new.goodbye_world;
-    goodbye world!
-    pry(main)>
-
-Also note that in the above the line `Hello.new.goodbye_world;` ends
-with a semi-colon which causes expression evaluation output to be suppressed.
-
 ### Gist integration
 
 If the `gist` gem is installed then method source or documentation can be gisted to github with the
@@ -456,54 +354,12 @@ avaiable.
 
 MyArtChannel has kindly provided a hack to replace the `rails console` command in Rails 3: [https://gist.github.com/941174](https://gist.github.com/941174) This is not recommended for code bases with multiple developers, as they may not all want to use Pry.
 
-### Other Features and limitations
-
-#### Other Features:
-
-* Pry can be invoked both at the command-line and used as a more
-powerful alternative to IRB or it can be invoked at runtime and used
-as a developer consoler / debugger.
-* Additional documentation and source code for Ruby Core methods are supported when the `pry-doc` gem is installed.
-* Pry sessions can nest arbitrarily deeply -- to go back one level of nesting type 'exit' or 'quit' or 'back'
-* Pry comes with syntax highlighting on by default just use the `toggle-color` command to turn it on and off.
-* Use `_` to recover last result.
-* Use `_pry_` to reference the Pry instance managing the current session.
-* Use `_ex_` to recover the last exception.
-* Use `_file_` and `_dir_` to refer to the associated file or
-  directory containing the definition for a method.
-* A trailing `;` on an entered expression suppresses the display of
-  the evaluation output.
-* Typing `!` on a line by itself will clear the input buffer - useful for
-  getting you out of a situation where the parsing process
-  goes wrong and you get stuck in an endless read loop.
-* Pry supports tab completion.
-* Pry has multi-line support built in.
-* Use `^d` (control-d) to quickly break out of a session.
-* Pry has special commands not found in many other Ruby REPLs: `show-method`, `show-doc`
-`jump-to`, `ls`, `cd`, `cat`
-* Pry gives good control over nested sessions (important when exploring complicated runtime state)
-* Pry is not based on the IRB codebase.
-* Pry allows significant customizability.
-* Pry uses the [method_source](https://github.com/banister/method_source) gem; so
-this functionality is available to a Pry session.
-* Pry uses [RubyParser](https://github.com/seattlerb/ruby_parser) to
-validate expressions in 1.8, and [Ripper](http://rdoc.info/docs/ruby-core/1.9.2/Ripper) for 1.9.
-* Pry implements all the methods in the REPL chain separately: `Pry#r`
-for reading; `Pry#re` for eval; `Pry#rep` for printing; and `Pry#repl`
-for the loop (`Pry.start` simply wraps `Pry.new.repl`). You can
-invoke any of these methods directly depending on exactly what aspect of the functionality you need.
-
-#### Limitations:
-
-* Some Pry commands (e.g `show-command`) do not work in Ruby 1.8
-  MRI. But many other commands do work in Ruby 1.8 MRI, e.g
-  `show-method`, due to a functional 1.8 source_location implementation.
+### Limitations:
+
 * JRuby not officially supported due to currently too many quirks and
- strange behaviour. Nonetheless most functionality should still work
- OK in JRuby. Full JRuby support coming in a future version.
-* `method_source` functionality does not work in JRuby with Ruby 1.8
+ strange behaviour. This will be fixed soon.
 * Tab completion is currently a bit broken/limited this will have a
-   major overhaul in a future version.
+  major overhaul in a future version.
 
 ### Syntax Highlighting
 
@@ -512,40 +368,15 @@ off in a session by using the `toggle-color` command. Alternatively,
 you can turn it off permanently by putting the line `Pry.color =
 false` in your `~/.pryrc` file.
 
-### Example Programs
-
-Pry comes bundled with a few example programs to illustrate some
-features, see the `examples/` directory.
-
-* `example_basic.rb`             - Demonstrate basic Pry functionality
-* `example_input.rb`             - Demonstrates how to set the `input` object.
-* `example_output.rb`            - Demonstrates how to set the `output` object.
-* `example_hooks.rb`             - Demonstrates how to set the `hooks` hash.
-* `example_print.rb`             - Demonstrates how to set the `print` object.
-* `example_prompt.rb`            - Demonstrates how to set the `prompt`.
-* `example_input2.rb`            - An advanced `input` example.
-* `example_commands.rb`          - Implementing a mathematical command set.
-* `example_commands_override.rb` - An advanced `commands` example.
-* `example_image_edit.rb`        - A simple image editor using a Pry REPL (requires `Gosu` and `TexPlay` gems).
-
-### Customizing Pry
-
-Pry allows a large degree of customization.
-
-[Read how to customize Pry here.](http://rdoc.info/github/banister/pry/master/file/wiki/Customizing-pry.md)
-
 ### Future Directions
 
 Many new features are planned such as:
 
+* Increase modularity (rely more on plugin system)
 * Much improved tab completion (using [Bond](http://github.com/cldwalker/bond))
 * Improved JRuby support
-* Support for viewing source-code of binary gems and C stdlib
-* git integration
 * Much improved documentation system, better support for YARD
-* A proper plugin system
-* Get rid of `.` prefix for shell commands in `shell-mode`
-* Better support for code and method reloading
+* Better support for code and method reloading and saving code
 * Extended and more sophisticated command system, allowing piping
 between commands and running commands in background
 
@@ -558,6 +389,6 @@ Problems or questions contact me at [github](http://github.com/banister)
 The Pry team consists of:
 
 * [banisterfiend](http://github.com/banister)
-* [injekt](http://github.com/injekt)
-* [Mon_Ouie](http://github.com/mon-ouie)
 * [Rob Gleeson](https://github.com/robgleeson)
+* [Mon_Ouie](http://github.com/mon-ouie)
+* [injekt](http://github.com/injekt)

data/Rakefile

@@ -10,13 +10,13 @@ CLEAN.include("**/*#*", "**/*#*.*", "**/*_flymake*.*", "**/*_flymake",
 
 def apply_spec_defaults(s)
   s.name = "pry"
-  s.summary = "an IRB alternative and runtime developer console"
+  s.summary = "An IRB alternative and runtime developer console"
   s.version = Pry::VERSION
   s.date = Time.now.strftime '%Y-%m-%d'
   s.author = "John Mair (banisterfiend)"
   s.email = 'jrmair@gmail.com'
   s.description = s.summary
-  s.homepage = "http://banisterfiend.wordpress.com"
+  s.homepage = "http://pry.github.com"
   s.executables = ["pry"]
   s.files = `git ls-files`.split("\n")
   s.test_files = `git ls-files -- test/*`.split("\n")

data/TODO

@@ -1,10 +1,17 @@
-
-ROADMAP
-
-FUTURE
---------
-* Pry server and Pry client for SLIME style remote repl connectinos.
-* i18n support
+0.9.3
+* hist command now excludes last line of input (the command invocation itself)
+* hist now has `history` alias
+* `pry -r` requires now happen after plugin loading (so as not to interfere with
+* new Pry.config.disable_auto_reload option, for turning off auto reloading by edit-method and related
+* add better error messages for `cd` command
+* add command_prefix
+* change some command names to include hyphen, e.g version => pry-version, install => install-command
+* do cat --ex and edit --ex
+* add reload-method
+* fixed exotic object regression - BasicObject.new etc now return "=> unknown"
+* converted: import => import-set, version => pry-version, install => install-command
+* fix show-doc bug for ruby 1.8 and Kernel.fork
+* edit -t (opens a temporary file and evals it in current context when closed)
 
 0.9.0
 Major features

data/bin/pry

@@ -46,7 +46,7 @@ See: `https://github.com/banister` for more information.
   end
 
   on :r, :require, "`require` a Ruby script at startup", true do |file|
-    require file
+    Pry.config.requires << file
   end
 
   on :I, "Add a path to the $LOAD_PATH", true do |path|

data/lib/pry.rb

@@ -20,7 +20,11 @@ class Pry
 
   # The default prints
   DEFAULT_PRINT = proc do |output, value|
-    Helpers::BaseHelpers.stagger_output("=> #{Helpers::BaseHelpers.colorize_code(value.pretty_inspect)}", output)
+    begin
+      Helpers::BaseHelpers.stagger_output("=> #{Helpers::BaseHelpers.colorize_code(value.pretty_inspect)}", output)
+    rescue NoMethodError
+      output.puts "=> unknown"
+    end
   end
 
   # Will only show the first line of the backtrace
@@ -49,7 +53,7 @@ class Pry
   ]
 
   # A simple prompt - doesn't display target or nesting level
-  SIMPLE_PROMPT = [proc { ">> " }, proc { "  | " }]
+  SIMPLE_PROMPT = [proc { ">> " }, proc { " | " }]
 
   SHELL_PROMPT = [
     proc { |target_self, _| "pry #{Pry.view_clip(target_self)}:#{Dir.pwd} $ " },

data/lib/pry/command_context.rb

@@ -11,6 +11,15 @@ class Pry
     attr_accessor :command_set
     attr_accessor :command_processor
 
+    # Run a command from another command.
+    # @param [String] command_string The string that invokes the command
+    # @param [Array] args Further arguments to pass to the command
+    # @example
+    #   run "show-input"
+    # @example
+    #   run ".ls"
+    # @example
+    #   run "amend-line",  "5", 'puts "hello world"'
     def run(command_string, *args)
       complete_string = "#{command_string} #{args.join(" ")}"
       command_processor.process_commands(complete_string, eval_string, target)

data/lib/pry/command_processor.rb

@@ -55,7 +55,10 @@ class Pry
     def command_matched(val, target)
       _, cmd_data = commands.commands.find do |name, data|
 
-        command_regex = /^#{convert_to_regex(name)}(?!\S)/
+        prefix = Regexp.escape(Pry.config.command_prefix)
+        prefix = "(?:#{prefix})?" unless data.options[:use_prefix]
+
+        command_regex = /^#{prefix}#{convert_to_regex(name)}(?!\S)/
 
         if data.options[:interpolate]
           # If interpolation fails then the command cannot be matched,

data/lib/pry/command_set.rb

@@ -68,6 +68,9 @@ class Pry
     # @option options [String] :listing The listing name of the
     #   command. That is the name by which the command is looked up by
     #   help and by show-command. Necessary for regex based commands.
+    # @option options [Boolean] :use_prefix Whether the command uses
+    #   `Pry.config.command_prefix` prefix (if one is defined). Defaults
+    #   to true.
     # @yield The action to perform. The parameters in the block
     #   determines the parameters the command will receive. All
     #   parameters passed into the block will be strings. Successive
@@ -105,7 +108,8 @@ class Pry
         :keep_retval => false,
         :argument_required => false,
         :interpolate => true,
-        :listing => name
+        :listing => name,
+        :use_prefix => true
       }.merge!(options)
 
       unless command_dependencies_met? options
@@ -115,7 +119,7 @@ class Pry
         options[:stub_info] = proc do
           output.puts "\nThe command '#{name}' is #{Helpers::Text.bold("unavailable")} because it requires the following gems to be installed: #{(gems_not_installed.join(", "))}"
           output.puts "-"
-          output.puts "Type `install #{name}` to install the required gems and activate this command."
+          output.puts "Type `install-command #{name}` to install the required gems and activate this command."
         end
       end
 
@@ -123,7 +127,7 @@ class Pry
     end
 
     def each &block
-      @commands.each(&block) 
+      @commands.each(&block)
     end
 
     # Removes some commands from the set
@@ -239,7 +243,7 @@ class Pry
         end
       end
 
-      command "install", "Install a disabled command." do |name|
+      command "install-command", "Install a disabled command." do |name|
         command = find_command(name)
         stub_info = command.options[:stub_info]
 

data/lib/pry/config.rb

@@ -57,6 +57,11 @@ class Pry
     # @return [String, #call]
     attr_accessor :editor
 
+    # A string that must precede all Pry commands (e.g., if command_prefix is
+    # set to "%", the "cd" command must be invoked as "%cd").
+    # @return [String]
+    attr_accessor :command_prefix
+
     # @return [Boolean] Toggle Pry color on and off.
     attr_accessor :color
 
@@ -71,6 +76,14 @@ class Pry
     # @return [Boolean]
     attr_accessor :should_load_plugins
 
+    # Determines whether to load files specified with the -r flag.
+    # @return [Boolean]
+    attr_accessor :should_load_requires
+
+    # Determines whether to disable edit-method's auto-reloading behavior.
+    # @return [Boolean]
+    attr_accessor :disable_auto_reload
+
     # Config option for history.
     # sub-options include hist.file, hist.load, and hist.save
     # hist.file is the file to save/load history too, e.g
@@ -89,12 +102,11 @@ class Pry
     # @return [OpenStruct]
     attr_accessor :plugins
 
+    # @return [Array<String>] Ruby files to be required after loading any plugins.
+    attr_accessor :requires
+
     # @return [Integer] Amount of results that will be stored into out
     attr_accessor :memory_size
-
-    # @return [Boolean] Whether or not evalation results (`=>`) are sent
-    # through a pager.
-    attr_accessor :result_pager
   end
 end
 

data/lib/pry/default_commands/basic.rb

@@ -16,17 +16,34 @@ class Pry
         end
       end
 
-      command "version", "Show Pry version." do
+      command "pry-version", "Show Pry version." do
         output.puts "Pry version: #{Pry::VERSION} on Ruby #{RUBY_VERSION}."
       end
 
-      command "import", "Import a command set" do |command_set_name|
+      command "import-set", "Import a command set" do |command_set_name|
         next output.puts "Provide a command set name" if command_set.nil?
 
         set = target.eval(arg_string)
         Pry.active_instance.commands.import set
       end
 
+      command "reload-method", "Reload the source file that contains the specified method" do |meth_name|
+        if (meth = get_method_object(meth_name, target, {})).nil?
+          output.puts "Invalid method name: #{meth_name}."
+          next
+        end
+
+        if is_a_c_method?(meth)
+          output.puts "Error: Can't reload a C method."
+        elsif is_a_dynamically_defined_method?(meth)
+          output.puts "Error: Can't reload an eval method."
+        else
+          file_name = meth.source_location.first
+          load file_name
+          output.puts "Reloaded #{file_name}."
+        end
+      end
+
       command "reset", "Reset the REPL to a clean state." do
         output.puts "Pry reset."
         exec "pry"

data/lib/pry/default_commands/input.rb

@@ -3,7 +3,7 @@ class Pry
 
     Input = Pry::CommandSet.new do
 
-      command "!", "Clear the input buffer. Useful if the parsing process goes wrong and you get stuck in the read loop." do
+      command "!", "Clear the input buffer. Useful if the parsing process goes wrong and you get stuck in the read loop.", :use_prefix => false do
         output.puts "Input buffer cleared!"
         eval_string.replace("")
       end
@@ -56,11 +56,11 @@ e.g amend-line puts 'hello again'   # no line number modifies immediately preced
 
       command "play", "Play back a string 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`\n"
+          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.on :l, :lines, 'The line (or range of lines) to replay.', true, :as => Range
           opt.on :m, :method, 'Play a method.', true
-          opt.on :f, "file", 'The line (or range of lines) to replay.', true
+          opt.on :f, "file", 'The file to replay in context.', true
           opt.on :o, "open", 'When used with the -m switch, it plays the entire method except the last line, leaving the method definition "open". `amend-line` can then be used to modify the method.'
           opt.on :h, :help, "This message." do
             output.puts opt
@@ -95,8 +95,9 @@ e.g amend-line puts 'hello again'   # no line number modifies immediately preced
         end
       end
 
-      command "hist", "Show and replay Readline history. Type `hist --help` for more info." do |*args|
-        history = Readline::HISTORY.to_a
+      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]
 
         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"
@@ -213,6 +214,7 @@ e.g amend-line puts 'hello again'   # no line number modifies immediately preced
 
       end
 
+      alias_command "history", "hist", ""
 
       helpers do
         def one_index_number(line_number)

data/lib/pry/default_commands/introspection.rb

@@ -1,3 +1,5 @@
+require 'tempfile'
+
 class Pry
   module DefaultCommands
 
@@ -110,8 +112,10 @@ class Pry
                       "Ensure #{text.bold("Pry.editor")} is set to your editor of choice.\n" \
                       "e.g: edit sample.rb"
 
-          opt.on :r, "reload", "Eval file content after editing (using `load`)"
-          opt.on :p, "play", "Use the pry `play` command to eval the file content after editing (instead of the `load` method)."
+          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 :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
             output.puts opt
@@ -119,19 +123,38 @@ class Pry
         end
         next if opts.h?
 
-        next output.puts("Need to specify a file.") if !args.first
-        file_name = File.expand_path(args.first)
+        # the context the file will be eval'd in after closing
+        context = TOPLEVEL_BINDING
+        should_reload = opts[:r]
+
+        if opts.ex?
+          next output.puts "No Exception found." if Pry.last_exception.nil?
+
+          file_name = Pry.last_exception.file
+          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?
+          file_name = Tempfile.new("tmp").tap(&:close).path
+          line = 0
+          should_reload = true
+          context = target
+        else
+          next output.puts("Need to specify a file.") if !args.first
+          file_name = File.expand_path(args.first)
+          line = opts[:l].to_i
+        end
 
-        invoke_editor(file_name, opts[:l].to_i)
+        invoke_editor(file_name, line)
         set_file_and_dir_locals(file_name)
 
-        if opts[:r]
+        if opts[:p]
           silence_warnings do
-            load file_name
+            Pry.active_instance.input = StringIO.new(File.readlines(file_name).join)
           end
-        elsif opts[:p]
+        elsif should_reload
           silence_warnings do
-            Pry.active_instance.input = StringIO.new(File.readlines(file_name).join)
+            context.eval(File.read(file_name))
           end
         end
       end
@@ -147,7 +170,7 @@ class Pry
 
           opt.on :M, "instance-methods", "Operate on instance methods."
           opt.on :m, :methods, "Operate on methods."
-          opt.on :n, "no-reload", "Do not automatically reload the method's file after editting."
+          opt.on :n, "no-reload", "Do not automatically reload the method's file after editing."
           opt.on "no-jump", "Do not fast forward editor to first line of method."
           opt.on :c, :context, "Select object context to run under.", true do |context|
             target = Pry.binding_for(target.eval(context))
@@ -179,7 +202,7 @@ class Pry
 
           invoke_editor(file, opts["no-jump"] ? 0 : line)
           silence_warnings do
-            load file if !opts.n?
+            load file if !opts.n? && !Pry.config.disable_auto_reload
           end
         end
       end
@@ -197,7 +220,7 @@ class Pry
         end
 
         def start_line_syntax_for_editor(file_name, line_number)
-          file_name.gsub!(/\//, '\\') if RUBY_PLATFORM =~ /mswin|mingw/
+          file_name = file_name.gsub(/\//, '\\') if RUBY_PLATFORM =~ /mswin|mingw/
 
           case Pry.editor
           when /^[gm]?vi/, /^emacs/, /^nano/, /^pico/, /^gedit/, /^kate/
@@ -207,7 +230,7 @@ class Pry
           when /^uedit32/
             "#{file_name}/#{line_number}"
           when /^jedit/
-            "#{file_name} +#{line_number}"
+            "#{file_name} +line:#{line_number}"
           else
             if RUBY_PLATFORM =~ /mswin|mingw/
               "#{file_name}"

data/lib/pry/default_commands/shell.rb

@@ -3,7 +3,7 @@ class Pry
 
     Shell = Pry::CommandSet.new do
 
-      command(/\.(.*)/, "All text following a '.' is forwarded to the shell.", :listing => ".<shell command>") do |cmd|
+      command(/\.(.*)/, "All text following a '.' is forwarded to the shell.", :listing => ".<shell command>", :use_prefix => false) do |cmd|
         if cmd =~ /^cd\s+(.+)/i
           dest = $1
           begin
@@ -37,6 +37,7 @@ class Pry
       command "cat", "Show output of file FILE. Type `cat --help` for more information." do |*args|
         start_line = 0
         end_line = -1
+        file_name = nil
 
         opts = Slop.parse!(args) do |opt|
           opt.on :s, :start, "Start line (defaults to start of file)Line 1 is the first line.", true, :as => Integer do |line|
@@ -47,6 +48,16 @@ class Pry
             end_line = line - 1
           end
 
+          opt.on :ex, "Show a window of N lines around last exception (defaults to 5).", :optional => true, :as => Integer do |window_size|
+            window_size ||= 5
+            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
+          end
+
           opt.on :l, "line-numbers", "Show line numbers."
           opt.on :t, :type, "The specific file type for syntax higlighting (e.g ruby, python)", true, :as => Symbol
           opt.on :f, :flood, "Do not use a pager to view text longer than one screen."
@@ -57,7 +68,13 @@ class Pry
 
         next if opts.help?
 
-        file_name = args.shift
+        if opts.ex?
+          next output.puts "No Exception or Exception has no associated file." if file_name.nil?
+          next output.puts "Cannot cat exceptions raised in REPL." if Pry.eval_path == file_name
+        else
+          file_name = args.shift
+        end
+
         if !file_name
           output.puts "Must provide a file name."
           next
@@ -65,6 +82,18 @@ class Pry
 
         contents, normalized_start_line, _ = read_between_the_lines(file_name, start_line, end_line)
 
+        # add the arrow pointing to line that caused the exception
+        if opts.ex?
+          contents = contents.lines.each_with_index.map do |line, idx|
+            l = idx + start_line
+            if l == (Pry.last_exception.line - 1)
+              "=> #{line}"
+            else
+              "   #{line}"
+            end
+          end.join
+        end
+
         if Pry.color
           contents = syntax_highlight_by_file_type_or_specified(contents, file_name, opts[:type])
         end

data/lib/pry/extended_commands/experimental.rb

@@ -11,67 +11,6 @@ class Pry
 
         meth.reload
       end
-
-      command "blame", "Show blame for a method", :requires_gem => "grit" do |meth_name|
-        require 'grit'
-        if (meth = get_method_object(meth_name, target, {})).nil?
-          output.puts "Invalid method name: #{meth_name}."
-          next
-        end
-
-        repo ||= Grit::Repo.new(".")
-        start_line = meth.source_location.last
-        num_lines = meth.source.lines.count
-        authors = repo.blame(meth.source_location.first).lines.select do |v|
-          v.lineno >= start_line && v.lineno <= start_line + num_lines
-        end.map do |v|
-          v.commit.author.output(Time.new).split(/</).first.strip
-        end
-
-        lines_with_blame = []
-        meth.source.lines.zip(authors) { |line, author| lines_with_blame << ("#{author}".ljust(10) + colorize_code(line)) }
-        output.puts        lines_with_blame.join
-      end
-
-      command "diff", "Show the diff for a method", :requires_gem => ["grit", "diffy"] do |meth_name|
-        require 'grit'
-        require 'diffy'
-
-        if (meth = get_method_object(meth_name, target, {})).nil?
-          output.puts "Invalid method name: #{meth_name}."
-          next
-        end
-
-        output.puts colorize_code(Diffy::Diff.new(method_code_from_head(meth), meth.source))
-      end
-
-      helpers do
-        def get_file_from_commit(path)
-          repo = Grit::Repo.new('.')
-          head = repo.commits.first
-          tree_names = path.split("/")
-          start_tree = head.tree
-          blob_name = tree_names.last
-          tree = tree_names[0..-2].inject(start_tree)  { |a, v|  a.trees.find { |t| t.basename == v } }
-          blob = tree.blobs.find { |v| v.basename == blob_name }
-          blob.data
-        end
-
-        def method_code_from_head(meth)
-          rel_path = relative_path(meth.source_location.first)
-          code = get_file_from_commit(rel_path)
-          start_line = meth.source_location.last
-          code_length = meth.source.lines.count
-          code.lines.to_a[(start_line - 1)...((start_line - 1) + code_length)].join
-        end
-
-        def relative_path(path)
-          path =~ /#{Regexp.escape(File.expand_path("."))}\/(.*)/
-          $1
-        end
-
-      end
-
     end
   end
 end

data/lib/pry/plugins.rb

@@ -27,7 +27,7 @@ class Pry
         begin
           require gem_name
         rescue LoadError
-          raise PluginNotFound, "The plugin '#{gem_name}' was not found!"
+          $stderr.puts "Warning: The plugin '#{gem_name}' was not found!"
         end
         self.active = true
         self.enabled = true

data/lib/pry/pry_class.rb

@@ -82,6 +82,13 @@ class Pry
     end
   end
 
+  # Load any Ruby files specified with the -r flag on the command line.
+  def self.load_requires
+    Pry.config.requires.each do |file|
+      require file
+    end
+  end
+
   # Start a Pry REPL.
   # This method also loads the files specified in `Pry::RC_FILES` the
   # first time it is invoked.
@@ -97,6 +104,7 @@ class Pry
       # multiple times per each new session (i.e in debugging)
       load_rc if Pry.config.should_load_rc
       load_plugins if Pry.config.plugins.enabled
+      load_requires if Pry.config.should_load_requires
       load_history if Pry.config.history.should_load
 
       @initial_session = false
@@ -190,11 +198,16 @@ class Pry
     config.pager = true
     config.editor = default_editor_for_platform
     config.should_load_rc = true
+    config.disable_auto_reload = false
+    config.command_prefix = ""
 
     config.plugins ||= OpenStruct.new
     config.plugins.enabled = true
     config.plugins.strict_loading = true
 
+    config.requires ||= []
+    config.should_load_requires = true
+
     config.history ||= OpenStruct.new
     config.history.should_save = true
     config.history.should_load = true
@@ -247,7 +260,7 @@ class Pry
     if target.is_a?(Binding)
       target
     else
-      if target == TOPLEVEL_BINDING.eval('self')
+      if TOPLEVEL_BINDING.eval('self') == target
         TOPLEVEL_BINDING
       else
         target.__binding__

data/lib/pry/version.rb

@@ -1,3 +1,3 @@
 class Pry
-  VERSION = "0.9.2"
+  VERSION = "0.9.3pre1"
 end

data/test/helper.rb

@@ -74,12 +74,15 @@ end
 
 class InputTester
   def initialize(*actions)
+    if actions.last.is_a?(Hash) && actions.last.keys == [:history]
+      @hist = actions.pop[:history]
+    end
     @orig_actions = actions.dup
     @actions = actions
   end
 
   def readline(*)
-    @actions.shift
+    @actions.shift.tap{ |line| @hist << line if @hist }
   end
 
   def rewind

data/test/test_command_processor.rb

@@ -93,6 +93,57 @@ describe "Pry::CommandProcessor" do
     pos.should == command.name.length
   end
 
+  it 'should correctly match a command preceded by the command_prefix if one is defined' do
+    Pry.config.command_prefix = "%"
+
+    @pry.commands.command("test-command") {}
+    command, captures, pos = @command_processor.command_matched "%test-command hello", binding
+
+    command.name.should == "test-command"
+    captures.should == []
+    pos.should == "test-command".length + "%".length
+
+    Pry.config.command_prefix = ''
+  end
+
+  it 'should not match a command not preceded by the command_prefix if one is defined' do
+    Pry.config.command_prefix = "%"
+
+    @pry.commands.command("test-command") {}
+    command, captures, pos = @command_processor.command_matched "test-command hello", binding
+
+    command.should == nil
+    captures.should == nil
+
+    Pry.config.command_prefix = ''
+  end
+
+  it 'should match a command preceded by the command_prefix when :use_prefix => false' do
+    Pry.config.command_prefix = "%"
+
+    @pry.commands.command("test-command", "", :use_prefix => false) {}
+    command, captures, pos = @command_processor.command_matched "%test-command hello", binding
+
+    command.name.should == "test-command"
+    captures.should == []
+    pos.should == "test-command".length + "%".length
+
+    Pry.config.command_prefix = ''
+  end
+
+  it 'should match a command not preceded by the command_prefix when :use_prefix => false' do
+    Pry.config.command_prefix = "%"
+
+    @pry.commands.command("test-command", "", :use_prefix => false) {}
+    command, captures, pos = @command_processor.command_matched "test-command hello", binding
+
+    command.name.should == "test-command"
+    captures.should == []
+    pos.should == "test-command".length
+
+    Pry.config.command_prefix = ''
+  end
+
   it 'should correctly match a regex command with spaces in its name' do
     regex_command_name = /test\s+(.+)\s+command/
     @pry.commands.command(regex_command_name) {}
@@ -201,5 +252,4 @@ describe "Pry::CommandProcessor" do
     # you'll cause yourself incredible confusion
     lambda { @command_processor.command_matched('boast #{c}', binding) }.should.not.raise NameError
   end
-
 end

data/test/test_default_commands/test_input.rb

@@ -211,7 +211,7 @@ describe "Pry::DefaultCommands::Input" do
       @hist.push "hello"
       @hist.push "world"
       str_output = StringIO.new
-      redirect_pry_io(InputTester.new("hist", "exit-all"), str_output) do
+      redirect_pry_io(InputTester.new("hist", "exit-all", :history => @hist), str_output) do
         pry
       end
       str_output.string.should =~ /hello\n.*world/
@@ -223,7 +223,7 @@ describe "Pry::DefaultCommands::Input" do
       @hist.push ":bucket"
       @hist.push ":ostrich"
       str_output = StringIO.new
-      redirect_pry_io(InputTester.new("hist --replay -1", "exit-all"), str_output) do
+      redirect_pry_io(InputTester.new("hist --replay -1", "exit-all", :history => @hist), str_output) do
         pry
       end
       str_output.string.should =~ /ostrich/
@@ -234,7 +234,7 @@ describe "Pry::DefaultCommands::Input" do
       @hist.push ":hello"
       @hist.push ":carl"
       str_output = StringIO.new
-      redirect_pry_io(InputTester.new("hist --replay 0..2", "exit-all"), str_output) do
+      redirect_pry_io(InputTester.new("hist --replay 0..2", "exit-all", :history => @hist), str_output) do
         pry
       end
       str_output.string.should =~ /:hello\n.*:carl/
@@ -253,21 +253,21 @@ describe "Pry::DefaultCommands::Input" do
       @hist.push "place holder"
 
       str_output = StringIO.new
-      redirect_pry_io(InputTester.new("hist --grep o", "exit-all"), str_output) do
+      redirect_pry_io(InputTester.new("hist --grep o", "exit-all", :history => @hist), str_output) do
         pry
       end
       str_output.string.should =~ /\d:.*?box\n\d:.*?button\n\d:.*?orange/
 
       # test more than one word in a regex match (def blah)
       str_output = StringIO.new
-      redirect_pry_io(InputTester.new("hist --grep def blah", "exit-all"), str_output) do
+      redirect_pry_io(InputTester.new("hist --grep def blah", "exit-all", :history => @hist), str_output) do
         pry
       end
       str_output.string.should =~ /def blah 1/
 
       # test more than one word with leading white space in a regex match (def boink)
       str_output = StringIO.new
-      redirect_pry_io(InputTester.new("hist --grep      def boink", "exit-all"), str_output) do
+      redirect_pry_io(InputTester.new("hist --grep      def boink", "exit-all", :history => @hist), str_output) do
         pry
       end
       str_output.string.should =~ /def boink 2/
@@ -280,7 +280,7 @@ describe "Pry::DefaultCommands::Input" do
       end
 
       str_output = StringIO.new
-      redirect_pry_io(InputTester.new("hist --tail 3", "exit-all"), str_output) do
+      redirect_pry_io(InputTester.new("hist --tail 3", "exit-all", :history => @hist), str_output) do
         pry
       end
 
@@ -297,7 +297,7 @@ describe "Pry::DefaultCommands::Input" do
       end
 
       str_output = StringIO.new
-      redirect_pry_io(InputTester.new("hist --head 4", "exit-all"), str_output) do
+      redirect_pry_io(InputTester.new("hist --head 4", "exit-all", :history => @hist), str_output) do
         pry
       end
 
@@ -314,7 +314,7 @@ describe "Pry::DefaultCommands::Input" do
       end
 
       str_output = StringIO.new
-      redirect_pry_io(InputTester.new("hist --show 1..4", "exit-all"), str_output) do
+      redirect_pry_io(InputTester.new("hist --show 1..4", "exit-all", :history => @hist), str_output) do
         pry
       end
 

data/test/test_pry.rb

@@ -17,6 +17,36 @@ describe Pry do
     end
   end
 
+  if RUBY_VERSION =~ /1.9/
+    describe "Exotic object support" do
+
+      # regression test for exotic object support
+      it "Should not error when return value is a BasicObject instance" do
+
+        lambda do
+          redirect_pry_io(InputTester.new("BasicObject.new", "exit-all"), StringIO.new) do
+            Pry.start
+          end
+        end.should.not.raise NoMethodError
+
+      end
+    end
+  end
+
+
+  describe "Pry.binding_for" do
+
+    # regression test for burg's bug (see git history)
+    it "Should not error when object doesn't have a valid == method" do
+      o = Object.new
+      def o.==(other)
+        raise
+      end
+
+      lambda { Pry.binding_for(o) }.should.not.raise Exception
+    end
+  end
+
   describe "open a Pry session on an object" do
     describe "rep" do
       before do
@@ -710,7 +740,7 @@ describe Pry do
 
               klass.commands.keys.size.should == 3
               klass.commands.keys.include?("help").should == true
-              klass.commands.keys.include?("install").should == true
+              klass.commands.keys.include?("install-command").should == true
               klass.commands.keys.include?("h").should == true
             end
 

metadata

@@ -1,8 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: pry
 version: !ruby/object:Gem::Version 
-  prerelease: 
-  version: 0.9.2
+  prerelease: 5
+  version: 0.9.3pre1
 platform: ruby
 authors: 
 - John Mair (banisterfiend)
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-21 00:00:00 Z
+date: 2011-07-27 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: ruby_parser
@@ -78,7 +78,7 @@ dependencies:
         version: 1.0.1
   type: :development
   version_requirements: *id006
-description: an IRB alternative and runtime developer console
+description: An IRB alternative and runtime developer console
 email: jrmair@gmail.com
 executables: 
 - pry
@@ -153,7 +153,7 @@ files:
 - test/testrc
 - wiki/Customizing-pry.md
 - wiki/Home.md
-homepage: http://banisterfiend.wordpress.com
+homepage: http://pry.github.com
 licenses: []
 
 post_install_message: 
@@ -170,16 +170,16 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version 
-      version: "0"
+      version: 1.3.1
 requirements: []
 
 rubyforge_project: 
 rubygems_version: 1.7.2
 signing_key: 
 specification_version: 3
-summary: an IRB alternative and runtime developer console
+summary: An IRB alternative and runtime developer console
 test_files: 
 - test/helper.rb
 - test/test_command_helpers.rb