pry 0.6.8.1 → 0.7.0pre4

data/Rakefile

@@ -8,7 +8,7 @@ require "#{direc}/lib/pry/version"
 CLOBBER.include("**/*.#{dlext}", "**/*~", "**/*#*", "**/*.log", "**/*.o")
 CLEAN.include("ext/**/*.#{dlext}", "ext/**/*.log", "ext/**/*.o",
               "ext/**/*~", "ext/**/*#*", "ext/**/*.obj", "**/*#*", "**/*#*.*",
-              "ext/**/*.def", "ext/**/*.pdb", "**/*_flymake*.*", "**/*_flymake")
+              "ext/**/*.def", "ext/**/*.pdb", "**/*_flymake*.*", "**/*_flymake", "**/*.rbc")
 
 def apply_spec_defaults(s)
   s.name = "pry"
@@ -25,8 +25,8 @@ def apply_spec_defaults(s)
   s.homepage = "http://banisterfiend.wordpress.com"
   s.has_rdoc = 'yard'
   s.executables = ["pry"]
-  s.files = Dir["ext/**/extconf.rb", "ext/**/*.h", "ext/**/*.c", "lib/**/*.rb", "examples/**/*.rb",
-                     "test/*.rb", "test/testrc", "CHANGELOG", "LICENSE", "README.markdown", "Rakefile", ".gemtest"]
+  s.files = Dir["ext/**/extconf.rb", "ext/**/*.h", "ext/**/*.c", "lib/**/*", "examples/**/*.rb",
+                "test/*.rb", "test/testrc", "CHANGELOG", "LICENSE", "README.markdown", "Rakefile", ".gemtest"]
 end
 
 task :test do

data/lib/pry.rb

@@ -4,6 +4,7 @@
 direc = File.dirname(__FILE__)
 
 $LOAD_PATH << File.expand_path(direc)
+$LOAD_PATH << "."
 
 require "method_source"
 require 'shellwords'

data/lib/pry/commands.rb

@@ -3,6 +3,11 @@ require "method_source"
 require "pry/command_base"
 require "pry/pry_instance"
 
+begin
+  require "pry-doc"
+rescue LoadError
+end
+
 class Pry
 
   # Default commands used by Pry.
@@ -30,44 +35,29 @@ class Pry
       text.split.drop(1).join(' ')
     end
 
-    command "whereami", "Show the code context for the session." do
-      file = target.eval('__FILE__')
-      line_num = target.eval('__LINE__')
-      klass = target.eval('self.class')
-
-      meth_name = meth_name_from_binding.call(target)
-      if !meth_name
-        output.puts "Cannot find containing method. Did you remember to use \`binding.pry\` ?"
-        next
-      end
-
-      check_for_dynamically_defined_method.call(file)
-     
-      output.puts "--\nFrom #{file} @ line #{line_num} in #{klass}##{meth_name}:\n--"
-      
-      # This method inspired by http://rubygems.org/gems/ir_b
-      File.open(file).each_with_index do |line, index|
-        line_n = index + 1
-        next unless line_n > (line_num - 6)
-        break if line_n > (line_num + 5)
-        if line_n == line_num
-          code =" =>#{line_n.to_s.rjust(3)}: #{line.chomp}"
-          if Pry.color
-            code = CodeRay.scan(code, :ruby).term
-          end
-          output.puts code
-          code
+    get_method_object = lambda do |meth_name, target, options|
+      if options[:M]
+        target.eval("instance_method(:#{meth_name})")
+        elsif options[:m]
+        target.eval("method(:#{meth_name})")
         else
-          code = "#{line_n.to_s.rjust(6)}: #{line.chomp}"
-          if Pry.color
-            code = CodeRay.scan(code, :ruby).term
+          begin
+            target.eval("method(:#{meth_name})")
+          rescue
+            target.eval("instance_method(:#{meth_name})")
           end
-          output.puts code
-          code
         end
-      end
     end
-    
+
+    make_header = lambda do |file, line, code_type|
+      header = case code_type
+               when :ruby
+                 "--\nFrom #{file} @ line #{line}:\n--"
+               else
+                 "--\nFrom Ruby Core (C Method):\n--"
+               end
+    end
+
     command "!", "Clear the input buffer. Useful if the parsing process goes wrong and you get stuck in the read loop." do
       output.puts "Input buffer cleared!"
       opts[:eval_string].clear
@@ -128,6 +118,44 @@ class Pry
       output.puts "Last result: #{Pry.view(Pry.last_result)}"
     end
 
+    command "whereami", "Show the code context for the session." do
+      file = target.eval('__FILE__')
+      line_num = target.eval('__LINE__')
+      klass = target.eval('self.class')
+
+      meth_name = meth_name_from_binding.call(target)
+      if !meth_name
+        output.puts "Cannot find containing method. Did you remember to use \`binding.pry\` ?"
+        next
+      end
+
+      check_for_dynamically_defined_method.call(file)
+     
+      output.puts "--\nFrom #{file} @ line #{line_num} in #{klass}##{meth_name}:\n--"
+      
+      # This method inspired by http://rubygems.org/gems/ir_b
+      File.open(file).each_with_index do |line, index|
+        line_n = index + 1
+        next unless line_n > (line_num - 6)
+        break if line_n > (line_num + 5)
+        if line_n == line_num
+          code =" =>#{line_n.to_s.rjust(3)}: #{line.chomp}"
+          if Pry.color
+            code = CodeRay.scan(code, :ruby).term
+          end
+          output.puts code
+          code
+        else
+          code = "#{line_n.to_s.rjust(6)}: #{line.chomp}"
+          if Pry.color
+            code = CodeRay.scan(code, :ruby).term
+          end
+          output.puts code
+          code
+        end
+      end
+    end
+    
     command "version", "Show Pry version." do
       output.puts "Pry version: #{Pry::VERSION} on Ruby #{RUBY_VERSION}."
     end
@@ -190,6 +218,10 @@ Shows local and instance variables by default.
 
         opts.on("-p", "--private", "Display private methods (with -m).") do 
           options[:p] = true
+        end
+
+        opts.on("-j", "--just-singletons", "Display just the singleton methods (with -m).") do 
+          options[:j] = true
         end        
 
         opts.on("-s", "--super", "Include superclass entries (relevant to constant and methods options).") do 
@@ -224,7 +256,7 @@ Shows local and instance variables by default.
                      }) if options.empty? || (options.size == 1 && options[:v])
 
       # Display public methods by default if -m or -M switch is used.
-      options[:P] = true if (options[:m] || options[:M]) && !(options[:p] || options[:r])
+      options[:P] = true if (options[:m] || options[:M]) && !(options[:p] || options[:r] || options[:j])
       
       info = {}
       target_self = target.eval('self')
@@ -253,6 +285,8 @@ Shows local and instance variables by default.
       info["protected methods"] = [Array(target.eval("protected_methods(#{options[:s]})")).sort, i += 1] if (options[:m] && options[:r]) || options[:a]
 
       info["private methods"] = [Array(target.eval("private_methods(#{options[:s]})")).sort, i += 1] if (options[:m] && options[:p]) || options[:a]
+
+      info["just singleton methods"] = [Array(target.eval("methods(#{options[:s]})")).sort, i += 1] if (options[:m] && options[:j]) || options[:a]
       
       info["public instance methods"] = [Array(target.eval("public_instance_methods(#{options[:s]})")).uniq.sort, i += 1] if target_self.is_a?(Module) && ((options[:M] && options[:P]) || options[:a])
 
@@ -288,6 +322,7 @@ Shows local and instance variables by default.
       # plain
       else
         list = info.values.sort_by { |v| v.last }.map { |v| v.first }.inject(&:+)
+        list.uniq! if list
         if Pry.color
           output.puts CodeRay.scan(Pry.view(list), :ruby).term
         else
@@ -374,11 +409,24 @@ e.g: eval-file -c self "hello.rb"
       if obj == "/" 
         throw(:breakout, 1) if opts[:nesting].level > 0
         next
-      end
+      end    
 
       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 }
+    end
+
+    strip_leading_hash_from_ruby_comments = lambda do |comment|
+      comment.gsub /^\s*#\s*/, ''
+    end
+
     command "show-doc", "Show the comments above METH. Type `show-doc --help` for more info." do |*args|
       options = {}
       target = target()
@@ -390,10 +438,14 @@ Show the comments above method METH. Shows _method_ comments (rather than instan
 e.g show-doc hello_method
 --
 }
-        opts.on("-M", "--instance-methods", "Operate on instance methods instead.") do 
+        opts.on("-M", "--instance-methods", "Operate on instance methods.") do 
           options[:M] = true
         end
 
+        opts.on("-m", "--methods", "Operate on methods.") do 
+          options[:m] = true
+        end
+
         opts.on("-c", "--context CONTEXT", "Select object context to run under.") do |context|
           target = Pry.binding_for(target.eval(context))
         end
@@ -414,30 +466,41 @@ e.g show-doc hello_method
       end
       
       begin
-        if options[:M]
-          meth = target.eval("instance_method(:#{meth_name})")
-        else
-          meth = target.eval("method(:#{meth_name})")
-        end
+        meth = get_method_object.call(meth_name, target, options)
       rescue
         output.puts "Invalid method name: #{meth_name}. Type `show-doc --help` for help"
         next
       end
 
-      doc = meth.comment
+      code_type = :ruby
+      
+      if Pry.has_pry_doc && meth.source_location.nil?
+        info = Pry::MethodInfo.info_for(meth)
+        if !info
+          output.puts "Cannot find docs for C method: #{meth_name}"
+          next
+        end
+        doc = info.docstring
+        code_type = info.source_type
+      else
+        doc = strip_leading_hash_from_ruby_comments.call(meth.comment)
+      end
+
+      doc = process_comment_markup.call(doc, code_type)
+      
       file, line = meth.source_location
       check_for_dynamically_defined_method.call(file)
 
-      output.puts "--\nFrom #{file} @ line ~#{line}:\n--"
-
-      if Pry.color
-        doc = CodeRay.scan(doc, :ruby).term
-      end
-
+      output.puts make_header.call(file, line, code_type)
+      
       output.puts doc
       doc
     end
 
+    strip_comments_from_c_code = lambda do |code|
+      code.sub /\A\s*\/\*.*?\*\/\s*/m, ''
+    end
+    
     command "show-method", "Show the source for METH. Type `show-method --help` for more info." do |*args|
       options = {}
       target = target()
@@ -449,10 +512,14 @@ Show the source for method METH. Shows _method_ source (rather than instance met
 e.g: show-method hello_method
 --
 }
-        opts.on("-M", "--instance-methods", "Operate on instance methods instead.") do 
+        opts.on("-M", "--instance-methods", "Operate on instance methods.") do 
           options[:M] = true
         end
 
+        opts.on("-m", "--methods", "Operate on methods.") do 
+          options[:m] = true
+        end
+
         opts.on("-c", "--context CONTEXT", "Select object context to run under.") do |context|
           target = Pry.binding_for(target.eval(context))
         end
@@ -469,36 +536,41 @@ e.g: show-method hello_method
 
       # If no method name is given then use current method, if it exists
       meth_name = meth_name_from_binding.call(target) if !meth_name
-
       if !meth_name
         output.puts "You need to specify a method. Type `show-method --help` for help"
         next
       end
       
       begin
-        if options[:M]
-          meth = target.eval("instance_method(:#{meth_name})")
-        else
-          meth = target.eval("method(:#{meth_name})")
-        end
+        meth = get_method_object.call(meth_name, target, options)
       rescue
-        target_self = target.eval('self')
-        if !options[:M]&& target_self.is_a?(Module) &&
-            target_self.method_defined?(meth_name)
-          output.puts "Did you mean: show-method -M #{meth_name} ?"
-        end
         output.puts "Invalid method name: #{meth_name}. Type `show-method --help` for help"
         next
       end
 
-      code = meth.source
+      code_type = :ruby
+
+      # 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
+          output.puts "Cannot find source for C method: #{meth_name}"
+          next
+        end
+        code = info.source
+        code = strip_comments_from_c_code.call(code)
+        code_type = info.source_type
+      else
+        code = meth.source
+      end
+      
       file, line = meth.source_location
       check_for_dynamically_defined_method.call(file)
       
-      output.puts "--\nFrom #{file} @ line #{line}:\n--"
+      output.puts make_header.call(file, line, code_type)
 
       if Pry.color
-        code = CodeRay.scan(code, :ruby).term
+        code = CodeRay.scan(code, code_type).term
       end
       
       output.puts code

data/lib/pry/pry_class.rb

@@ -17,6 +17,11 @@ class Pry
     # @return [Object] The last result.
     attr_accessor :last_result
 
+    # Get last exception raised.
+    # This method should not need to be accessed directly.
+    # @return [Exception] The last exception.
+    attr_accessor :last_exception
+
     # Get the active Pry instance that manages the active Pry session.
     # This method should not need to be accessed directly.
     # @return [Pry] The active Pry instance.
@@ -73,6 +78,10 @@ class Pry
     # Set to true if Pry is invoked from command line using `pry` executable
     # @return [Boolean]
     attr_accessor :cli
+
+    # Set to true if the pry-doc extension is loaded.
+    # @return [Boolean]
+    attr_accessor :has_pry_doc
   end
 
   # Load the rc files given in the `Pry::RC_FILES` array.

data/lib/pry/pry_instance.rb

@@ -135,19 +135,20 @@ class Pry
       Readline.completion_proc = Pry::InputCompleter.build_completion_proc(target, commands.commands.keys)
     end
 
-    # eval the expression and save to last_result
-    Pry.last_result = target.eval r(target), __FILE__, __LINE__
 
     # save the pry instance to active_instance
     Pry.active_instance = self
-
-    # define locals _pry_ and _ (active instance and last expression)
     target.eval("_pry_ = Pry.active_instance")
-    target.eval("_ = Pry.last_result")
+
+    # eval the expression and save to last_result
+    # Do not want __FILE__, __LINE__ here because we need to distinguish
+    # (eval) methods for show-method and friends.
+    # This also sets the `_` local for the session.
+    set_last_result(target.eval(r(target)), target)
   rescue SystemExit => e
     exit
   rescue Exception => e
-    e
+    set_last_exception(e, target)
   end
 
   # Perform a read.
@@ -188,6 +189,22 @@ class Pry
     end
   end
 
+  # Set the last result of an eval.
+  # @param [Object] result The result.
+  # @param [Binding] target The binding to set `_` on.
+  def set_last_result(result, target)
+    Pry.last_result = result
+    target.eval("_ = Pry.last_result")
+  end
+
+  # Set the last exception for a session.
+  # @param [Exception] ex The exception.
+  # @param [Binding] target The binding to set `_ex_` on.
+  def set_last_exception(ex, target)
+    Pry.last_exception = ex
+    target.eval("_ex_ = Pry.last_exception")
+  end
+
   # Process Pry commands. Pry commands are not Ruby methods and are evaluated
   # prior to Ruby expressions.
   # Commands can be modified/configured by the user: see `Pry::Commands`

data/lib/pry/version.rb

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

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: pry
 version: !ruby/object:Gem::Version 
-  hash: 93
-  prerelease: 
+  hash: -766259871
+  prerelease: true
   segments: 
   - 0
-  - 6
-  - 8
-  - 1
-  version: 0.6.8.1
+  - 7
+  - 0pre4
+  version: 0.7.0pre4
 platform: ruby
 authors: 
 - John Mair (banisterfiend)
@@ -16,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-06 00:00:00 +13:00
+date: 2011-03-15 00:00:00 +13:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -92,7 +91,6 @@ extensions: []
 extra_rdoc_files: []
 
 files: 
-- lib/pry.rb
 - lib/pry/commands.rb
 - lib/pry/version.rb
 - lib/pry/command_base.rb
@@ -103,6 +101,7 @@ files:
 - lib/pry/print.rb
 - lib/pry/pry_class.rb
 - lib/pry/pry_instance.rb
+- lib/pry.rb
 - examples/example_commands.rb
 - examples/example_image_edit.rb
 - examples/example_input2.rb
@@ -122,7 +121,7 @@ files:
 - Rakefile
 - .gemtest
 - bin/pry
-has_rdoc: true
+has_rdoc: yard
 homepage: http://banisterfiend.wordpress.com
 licenses: []
 
@@ -143,16 +142,18 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version 
-      hash: 3
+      hash: 25
       segments: 
-      - 0
-      version: "0"
+      - 1
+      - 3
+      - 1
+      version: 1.3.1
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.6.1
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: attach an irb-like session to any object at runtime