pry 0.2.0 → 0.2.5pre1

data/lib/pry.rb

@@ -8,106 +8,123 @@ require "#{direc}/pry/version"
 require "#{direc}/pry/input"
 require "#{direc}/pry/output"
 
-module Pry
+class Pry
+  def self.start(target)
+    new.repl(target)
+  end
+
+  def self.view(obj)
+    case obj
+    when String, Symbol, nil
+      obj.inspect
+    else
+      obj.to_s
+    end
+  end
   
   # class accessors
   class << self
     attr_reader :nesting
-    attr_reader :last_result
-    attr_accessor :default_prompt
-    attr_accessor :wait_prompt
-    attr_accessor :input
-    attr_accessor :output
+    attr_accessor :last_result
   end
+
+  attr_accessor :input, :output
+  attr_reader :default_prompt, :wait_prompt, :last_result
   
-  @default_prompt = lambda do |v, nest|
-    if nest == 0
-      "pry(#{v.inspect})> "
-    else
-      "pry(#{v.inspect}):#{nest.inspect}> "
+  def initialize(input = Input.new, output = Output.new)
+    @input = input
+    @output = output
+
+    @default_prompt = proc do |v, nest|
+      if nest == 0
+        "pry(#{Pry.view(v)})> "
+      else
+        "pry(#{Pry.view(v)}):#{Pry.view(nest)}> "
+      end
     end
-  end
-  
-  @wait_prompt = lambda do |v, nest|
-    if nest == 0
-      "pry(#{v.inspect})* "
-    else
-      "pry(#{v.inspect}):#{nest.inspect}* "
+    
+    @wait_prompt = proc do |v, nest|
+      if nest == 0
+        "pry(#{Pry.view(v)})* "
+      else
+        "pry(#{Pry.view(v)}):#{Pry.view(nest)}* "
+      end
     end
   end
-  
-  @output = Output.new
-  @input = Input.new
-  
+
   @nesting = []
 
   def @nesting.level
     last.is_a?(Array) ? last.first : nil
   end
+
+  def nesting
+    self.class.nesting
+  end
+
+  def nesting=(v)
+    self.class.nesting = v
+  end
+
   
   # loop
-  def self.repl(target=TOPLEVEL_BINDING)
+  def repl(target=TOPLEVEL_BINDING)
     target = binding_for(target)
     target_self = target.eval('self')
     output.session_start(target_self)
 
-    nesting_level = @nesting.size
+    nesting_level = nesting.size
 
     # Make sure _ exists
     target.eval("_ = Pry.last_result")
     
-    nesting_level_breakout = catch(:breakout) do
-      @nesting << [@nesting.size, target_self]
+    break_level = catch(:breakout) do
+      nesting << [nesting.size, target_self]
       loop do
-         rep(target) 
+        rep(target) 
       end
     end
 
-    @nesting.pop
+    nesting.pop
     output.session_end(target_self)
 
     # we only enter here if :breakout has been thrown
-    if nesting_level_breakout
-      throw :breakout, nesting_level_breakout if nesting_level != nesting_level_breakout
+    if nesting_level != break_level
+      throw :breakout, break_level 
     end
     
     target_self
   end
   
-  class << self
-    alias_method :into, :repl
-    alias_method :start, :repl
-  end
-  
   # print
-  def self.rep(target=TOPLEVEL_BINDING)
+  def rep(target=TOPLEVEL_BINDING)
     target = binding_for(target)
     output.print re(target)
   end
 
   # eval
-  def self.re(target=TOPLEVEL_BINDING)
+  def re(target=TOPLEVEL_BINDING)
     target = binding_for(target)
-    @last_result = target.eval r(target)
+    Pry.last_result = target.eval r(target)
     target.eval("_ = Pry.last_result")
-  rescue StandardError => e
+  rescue Exception => e
     e
   end
 
   # read
-  def self.r(target=TOPLEVEL_BINDING)
+  def r(target=TOPLEVEL_BINDING)
     target = binding_for(target)
     eval_string = ""
     loop do
       val = input.read(prompt(eval_string, target, nesting.level))
-      eval_string += "#{val}\n"
+      eval_string += "#{val.chomp}\n"
       process_commands(val, eval_string, target)
       
       break eval_string if valid_expression?(eval_string)
     end
   end
   
-  def self.process_commands(val, eval_string, target)
+  def process_commands(val, eval_string, target)
     def eval_string.clear() replace("") end
     
     case val
@@ -131,20 +148,31 @@ module Pry
     when "exit", "quit", "back"
       output.exit
       throw(:breakout, nesting.level)
+    when /show_method\s*(\w*)/
+      meth_name = ($~.captures).first
+      file, line = target.eval("method(:#{meth_name}).source_location")
+      tp = Pry.new.tap { |v| v.input = SourceInput.new(file, line) }
+      tp.r.display
+      eval_string.clear
     when /jump_to\s*(\d*)/
-      nesting_level_breakout = ($~.captures).first.to_i
-      output.jump_to(nesting_level_breakout)
-      
-      if nesting_level_breakout < 0 || nesting_level_breakout >= nesting.level
-        output.error_invalid_nest_level(nesting_level_breakout, nesting.level - 1)
+      break_level = ($~.captures).first.to_i
+      output.jump_to(break_level)
+
+      case break_level
+      when nesting.level
+        output.warn_already_at_level(nesting.level)
         eval_string.clear
+      when (0...nesting.level)
+        throw(:breakout, break_level + 1)
       else
-        throw(:breakout, nesting_level_breakout + 1)
+        output.err_invalid_nest_level(break_level,
+                                      nesting.level - 1)
+        eval_string.clear
       end
     end
   end
 
-  def self.prompt(eval_string, target, nest)
+  def prompt(eval_string, target, nest)
     target_self = target.eval('self')
     
     if eval_string.empty?
@@ -154,7 +182,29 @@ module Pry
     end
   end
 
-  def self.valid_expression?(code)
+  def valid_expression?(code)
+    test_bed = Object.new.instance_eval { binding }
+
+    begin
+      test_bed.eval(code)
+    rescue Exception => e
+      case e
+      when SyntaxError 
+        case e.message
+        when /(parse|syntax) error.*?\$end/i, /unterminated/i 
+          return false
+        else
+          return true
+        end
+      else
+        true
+      end
+      true
+    end
+    true
+  end
+
+  def old_valid_expression?(code)
     RubyParser.new.parse(code)
   rescue Racc::ParseError, SyntaxError
     false
@@ -162,7 +212,7 @@ module Pry
     true
   end
 
-  def self.binding_for(target)
+  def binding_for(target)
     if target.is_a?(Binding)
       target
     else
@@ -176,7 +226,7 @@ module Pry
 
   module ObjectExtensions
     def pry(target=self)
-      Pry.start(Pry.binding_for(target))
+      Pry.new.repl(target)
     end
   end
 end

data/lib/pry/input.rb

@@ -1,9 +1,20 @@
 require 'readline'
 
-module Pry
+class Pry
   class Input
     def read(prompt)
       Readline.readline(prompt, true)
     end
   end
+
+  class SourceInput
+    def initialize(file, line)
+      @f = File.open(file)
+      (line - 1).times { @f.readline }
+    end
+    
+    def read(prompt)
+      @f.readline
+    end
+  end
 end

data/lib/pry/output.rb

@@ -1,15 +1,15 @@
-module Pry
+class Pry
   class Output
     def refresh
       puts "Refreshed REPL"
     end
 
     def session_start(obj)
-      puts "Beginning Pry session for #{obj.inspect}"
+      puts "Beginning Pry session for #{Pry.view(obj)}"
     end
 
     def session_end(obj)
-      puts "Ending Pry session for #{obj.inspect}"
+      puts "Ending Pry session for #{Pry.view(obj)}"
     end
 
     # the print component of READ-EVAL-PRINT-LOOP
@@ -18,7 +18,7 @@ module Pry
       when Exception
         puts "#{value.class}: #{value.message}"
       else
-        puts "=> #{value.inspect}"
+        puts "=> #{Pry.view(value)}"
       end
     end
 
@@ -40,9 +40,9 @@ module Pry
       puts "--"
       nesting.each do |level, obj|
         if level == 0
-          puts "#{level}. #{obj.inspect} (Pry top level)"
+          puts "#{level}. #{Pry.view(obj)} (Pry top level)"
         else
-          puts "#{level}. #{obj.inspect}"
+          puts "#{level}. #{Pry.view(obj)}"
         end
       end
     end
@@ -50,13 +50,17 @@ module Pry
     def show_status(nesting, target)
       puts "Status:"
       puts "--"
-      puts "Receiver: #{target.eval('self').inspect}"
+      puts "Receiver: #{Pry.view(target.eval('self'))}"
       puts "Nesting level: #{nesting.level}"
-      puts "Local variables: #{target.eval("local_variables").inspect}"
-      puts "Last result: #{Pry.last_result.inspect}"
+      puts "Local variables: #{Pry.view(target.eval("local_variables"))}"
+      puts "Last result: #{Pry.view(Pry.last_result)}"
     end
 
-    def error_invalid_nest_level(nest_level, max_nest_level)
+    def warn_already_at_level(nesting_level)
+      puts "Already at nesting level #{nesting_level}"
+    end
+    
+    def err_invalid_nest_level(nest_level, max_nest_level)
       puts "Invalid nest level. Must be between 0 and #{max_nest_level}. Got #{nest_level}."
     end
 

data/lib/pry/version.rb

@@ -1,3 +1,3 @@
-module Pry
-  VERSION = "0.2.0"
+class Pry
+  VERSION = "0.2.5pre1"
 end

metadata

@@ -1,13 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: pry
 version: !ruby/object:Gem::Version 
-  hash: 23
-  prerelease: false
+  prerelease: true
   segments: 
   - 0
   - 2
-  - 0
-  version: 0.2.0
+  - 5pre1
+  version: 0.2.5pre1
 platform: ruby
 authors: 
 - John Mair (banisterfiend)
@@ -15,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-11 00:00:00 +13:00
+date: 2010-12-14 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
@@ -64,19 +62,19 @@ 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: 3
       segments: 
-      - 0
-      version: "0"
+      - 1
+      - 3
+      - 1
+      version: 1.3.1
 requirements: []
 
 rubyforge_project: