From 23cb880422d9ca2239b04b34bd5335981c39ac88 Mon Sep 17 00:00:00 2001
From: John Mair <jrmair@gmail.com>
Date: Tue, 14 Dec 2010 23:54:26 +1300
Subject: [PATCH] version bump 0.2.5pre1, added valid_expression? using rue
 maneuver

---
 lib/pry.rb         | 74 +++++++++++++++++++++++++++++-----------------
 lib/pry/input.rb   | 11 +++++++
 lib/pry/output.rb  | 16 +++++-----
 lib/pry/version.rb |  2 +-
 4 files changed, 67 insertions(+), 36 deletions(-)

diff --git a/lib/pry.rb b/lib/pry.rb
index 47389d83..843209b4 100644
--- a/lib/pry.rb
+++ b/lib/pry.rb
@@ -9,6 +9,18 @@ require "#{direc}/pry/input"
 require "#{direc}/pry/output"
 
 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
@@ -16,29 +28,26 @@ class Pry
     attr_accessor :last_result
   end
 
-  attr_accessor :input
-  attr_accessor :output
-  attr_reader :last_result
-  attr_reader :default_prompt
-  attr_reader :wait_prompt
+  attr_accessor :input, :output
+  attr_reader :default_prompt, :wait_prompt, :last_result
   
-  def initialize
-    @output = Output.new
-    @input = Input.new
+  def initialize(input = Input.new, output = Output.new)
+    @input = input
+    @output = output
 
     @default_prompt = proc do |v, nest|
       if nest == 0
-        "pry(#{v.inspect})> "
+        "pry(#{Pry.view(v)})> "
       else
-        "pry(#{v.inspect}):#{nest.inspect}> "
+        "pry(#{Pry.view(v)}):#{Pry.view(nest)}> "
       end
     end
     
     @wait_prompt = proc do |v, nest|
       if nest == 0
-        "pry(#{v.inspect})* "
+        "pry(#{Pry.view(v)})* "
       else
-        "pry(#{v.inspect}):#{nest.inspect}* "
+        "pry(#{Pry.view(v)}):#{Pry.view(nest)}* "
       end
     end
   end
@@ -56,6 +65,7 @@ class Pry
   def nesting=(v)
     self.class.nesting = v
   end
+
   
   # loop
   def repl(target=TOPLEVEL_BINDING)
@@ -97,7 +107,7 @@ class Pry
     target = binding_for(target)
     Pry.last_result = target.eval r(target)
     target.eval("_ = Pry.last_result")
-  rescue StandardError => e
+  rescue Exception => e
     e
   end
 
@@ -141,19 +151,7 @@ class Pry
     when /show_method\s*(\w*)/
       meth_name = ($~.captures).first
       file, line = target.eval("method(:#{meth_name}).source_location")
-      input = Class.new do
-        define_method(:initialize) do
-          @f = File.open(file)
-          (line - 1).times { @f.readline }
-        end
-        
-        def read(prompt)
-          @f.readline
-        end
-      end
-
-      tp = Pry.new
-      tp.input = input.new
+      tp = Pry.new.tap { |v| v.input = SourceInput.new(file, line) }
       tp.r.display
       eval_string.clear
     when /jump_to\s*(\d*)/
@@ -185,6 +183,28 @@ class Pry
   end
 
   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
@@ -206,7 +226,7 @@ class Pry
 
   module ObjectExtensions
     def pry(target=self)
-      Pry.new.start(target)
+      Pry.new.repl(target)
     end
   end
 end
diff --git a/lib/pry/input.rb b/lib/pry/input.rb
index 7415be87..e4d471a4 100644
--- a/lib/pry/input.rb
+++ b/lib/pry/input.rb
@@ -6,4 +6,15 @@ class Pry
       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
diff --git a/lib/pry/output.rb b/lib/pry/output.rb
index 39ec534e..65d8677b 100644
--- a/lib/pry/output.rb
+++ b/lib/pry/output.rb
@@ -5,11 +5,11 @@ class Pry
     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 @@ class Pry
       when Exception
         puts "#{value.class}: #{value.message}"
       else
-        puts "=> #{value.inspect}"
+        puts "=> #{Pry.view(value)}"
       end
     end
 
@@ -40,9 +40,9 @@ class 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,10 +50,10 @@ class 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 warn_already_at_level(nesting_level)
diff --git a/lib/pry/version.rb b/lib/pry/version.rb
index 94ed540d..8ade4a79 100644
--- a/lib/pry/version.rb
+++ b/lib/pry/version.rb
@@ -1,3 +1,3 @@
 class Pry
-  VERSION = "0.2.0"
+  VERSION = "0.2.5pre1"
 end