pry 0.7.0pre4-i386-mingw32 → 0.7.1-i386-mingw32

data/CHANGELOG

@@ -1,3 +1,8 @@
+15/3/2011 version 0.7.0
+* add pry-doc support with syntax highlighting for docs
+* add 'mj' option to ls (restrict to singleton methods)
+* add _ex_ local to hold last exception raised in an exception
+
 6/3/2011 version 0.6.8
 * add whereami command, a la the `ir_b` gem
 * make whereami run at the start of every session

data/README.markdown

@@ -22,9 +22,14 @@ is trivial to set it to read from any object that has a `readline` method and wr
 `puts` method - many other aspects of Pry are also configurable making
 it a good choice for implementing custom shells.
 
-Pry now comes with an executable so it can be invoked at the command line.
+Pry comes with an executable so it can be invoked at the command line.
 Just enter `pry` to start. A `.pryrc` file in the user's home directory will
-be loaded if it exists. Type `pry --help` at the command line for more information.
+be loaded if it exists. Type `pry --help` at the command line for more
+information.
+
+Try `gem install pry-doc` for additional documentation on Ruby Core
+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)
@@ -163,10 +168,12 @@ end.
 ###Features:
 
 * Pry can be invoked at any time and on any object in the running program.
+* 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.
 * Pry supports tab completion.
 * Pry has multi-line support built in.
 * Use `^d` (control-d) to quickly break out of a session.

data/lib/pry/commands.rb

@@ -38,15 +38,15 @@ class Pry
     get_method_object = lambda do |meth_name, target, options|
       if options[:M]
         target.eval("instance_method(:#{meth_name})")
-        elsif options[:m]
+      elsif options[:m]
         target.eval("method(:#{meth_name})")
-        else
-          begin
-            target.eval("method(:#{meth_name})")
-          rescue
-            target.eval("instance_method(:#{meth_name})")
-          end
+      else
+        begin
+          target.eval("instance_method(:#{meth_name})")
+        rescue
+          target.eval("method(:#{meth_name})")
         end
+      end
     end
 
     make_header = lambda do |file, line, code_type|
@@ -414,13 +414,12 @@ e.g: eval-file -c self "hello.rb"
       target.eval("#{obj}.pry")
     end
 
-    # FIXME!!! the last matcher doesn't work on "+nil+ or +false+", it
-    # doesn't accurately strip the +
     process_comment_markup = lambda do |comment, code_type|
       comment.gsub(/<code>(?:\s*\n)?(.*?)\s*<\/code>/m) { Pry.color ? CodeRay.scan($1, code_type).term : $1 }.
         gsub(/<em>(?:\s*\n)?(.*?)\s*<\/em>/m) { Pry.color ? "\e[32m#{$1}\e[0m": $1 }.
         gsub(/<i>(?:\s*\n)?(.*?)\s*<\/i>/m) { Pry.color ? "\e[34m#{$1}\e[0m" : $1 }.
-        gsub(/\B\+(.*)\+\B/)  { Pry.color ? "\e[32m#{$1}\e[0m": $1 }
+        gsub(/\B\+(\w*?)\+\B/)  { Pry.color ? "\e[32m#{$1}\e[0m": $1 }.
+        gsub(/((?:^[ \t]+.+(?:\n+|\Z))+)/)  { Pry.color ? CodeRay.scan($1, code_type).term : $1 }
     end
 
     strip_leading_hash_from_ruby_comments = lambda do |comment|
@@ -434,7 +433,7 @@ e.g: eval-file -c self "hello.rb"
       
       OptionParser.new do |opts|
         opts.banner = %{Usage: show-doc [OPTIONS] [METH]
-Show the comments above method METH. Shows _method_ comments (rather than instance methods) by default.
+Show the comments above method METH. Tries instance methods first and then methods by default.
 e.g show-doc hello_method
 --
 }
@@ -473,7 +472,6 @@ e.g show-doc hello_method
       end
 
       code_type = :ruby
-      
       if Pry.has_pry_doc && meth.source_location.nil?
         info = Pry::MethodInfo.info_for(meth)
         if !info
@@ -483,7 +481,13 @@ e.g show-doc hello_method
         doc = info.docstring
         code_type = info.source_type
       else
-        doc = strip_leading_hash_from_ruby_comments.call(meth.comment)
+        begin
+          doc = meth.comment
+        rescue
+          output.puts "Cannot locate source for this method: #{meth_name}. Try `gem install pry-doc` to get access to Ruby Core documentation."
+          next
+        end
+        doc = strip_leading_hash_from_ruby_comments.call(doc)
       end
 
       doc = process_comment_markup.call(doc, code_type)
@@ -508,7 +512,7 @@ e.g show-doc hello_method
       
       OptionParser.new do |opts|
         opts.banner = %{Usage: show-method [OPTIONS] [METH]
-Show the source for method METH. Shows _method_ source (rather than instance methods) by default.
+Show the source for method METH. Tries instance methods first and then methods by default.
 e.g: show-method hello_method
 --
 }
@@ -553,7 +557,7 @@ e.g: show-method hello_method
       # Try to find source for C methods using MethodInfo (if possible)
       if Pry.has_pry_doc && meth.source_location.nil?
         info = Pry::MethodInfo.info_for(meth)
-        if !info
+        if !info || !info.source
           output.puts "Cannot find source for C method: #{meth_name}"
           next
         end
@@ -561,7 +565,12 @@ e.g: show-method hello_method
         code = strip_comments_from_c_code.call(code)
         code_type = info.source_type
       else
-        code = meth.source
+        begin
+          code = meth.source
+        rescue
+          output.puts "Cannot locate source for this method: #{meth_name}. Try `gem install pry-doc` to get access to Ruby Core documentation."
+          next
+        end
       end
       
       file, line = meth.source_location

data/lib/pry/version.rb

@@ -1,3 +1,3 @@
 class Pry
-  VERSION = "0.7.0pre4"
+  VERSION = "0.7.1"
 end

metadata

@@ -1,13 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: pry
 version: !ruby/object:Gem::Version 
-  hash: -766259871
-  prerelease: true
+  prerelease: false
   segments: 
   - 0
   - 7
-  - 0pre4
-  version: 0.7.0pre4
+  - 1
+  version: 0.7.1
 platform: i386-mingw32
 authors: 
 - John Mair (banisterfiend)
@@ -15,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-15 00:00:00 +13:00
+date: 2011-03-16 00:00:00 +13:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -26,7 +25,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 5
         segments: 
         - 2
         - 0
@@ -42,7 +40,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 53
         segments: 
         - 0
         - 9
@@ -58,7 +55,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 19
         segments: 
         - 1
         - 1
@@ -74,7 +70,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 27
         segments: 
         - 0
         - 3
@@ -90,7 +85,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 27
         segments: 
         - 1
         - 3
@@ -151,21 +145,17 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version 
-      hash: 25
       segments: 
-      - 1
-      - 3
-      - 1
-      version: 1.3.1
+      - 0
+      version: "0"
 requirements: []
 
 rubyforge_project: