pry 0.7.7.2-i386-mswin32 → 0.8.0-i386-mswin32

data/lib/pry/version.rb

@@ -1,3 +1,3 @@
 class Pry
-  VERSION = "0.7.7.2"
+  VERSION = "0.8.0"
 end

data/test/test.rb

@@ -10,15 +10,9 @@ puts "Testing Pry #{Pry::VERSION}"
 puts "With method_source version #{MethodSource::VERSION}"
 puts "--"
 
-# Ensure we do not execute any rc files
-Pry::RC_FILES.clear
-Pry.color = false
-Pry.should_load_rc = false
-
 describe Pry do
   describe "open a Pry session on an object" do
     describe "rep" do
-      
       before do
         class Hello
         end
@@ -41,7 +35,7 @@ describe Pry do
       it 'should make self evaluate to the receiver of the rep session' do
         o = Object.new
         str_output = StringIO.new
-        
+
         pry_tester = Pry.new(:input => InputTester.new("self"), :output => str_output)
         pry_tester.rep(o)
         str_output.string.should =~ /#{o.to_s}/
@@ -50,7 +44,7 @@ describe Pry do
       it 'should work with multi-line input' do
         o = Object.new
         str_output = StringIO.new
-        
+
         pry_tester = Pry.new(:input => InputTester.new("x = ", "1 + 4"), :output => str_output)
         pry_tester.rep(o)
         str_output.string.should =~ /5/
@@ -61,6 +55,60 @@ describe Pry do
         pry_tester.rep(Hello)
         Hello.const_defined?(:Nested).should == true
       end
+
+      it 'should suppress output if input ends in a ";" and is an Exception object (single line)' do
+        o = Object.new
+        str_output = StringIO.new
+
+        pry_tester = Pry.new(:input => InputTester.new("Exception.new;"), :output => str_output)
+        pry_tester.rep(o)
+        str_output.string.should == ""
+      end
+
+      it 'should suppress output if input ends in a ";" (single line)' do
+        o = Object.new
+        str_output = StringIO.new
+
+        pry_tester = Pry.new(:input => InputTester.new("x = 5;"), :output => str_output)
+        pry_tester.rep(o)
+        str_output.string.should == ""
+      end
+      
+
+      it 'should suppress output if input ends in a ";" (multi-line)' do
+        o = Object.new
+        str_output = StringIO.new
+
+        pry_tester = Pry.new(:input => InputTester.new("def self.blah", ":test", "end;"), :output => str_output)
+        pry_tester.rep(o)
+        str_output.string.should == ""
+      end
+
+      it 'should be able to evaluate exceptions normally' do
+        o = Exception.new
+        str_output = StringIO.new
+
+        was_called = false
+        pry_tester = Pry.new(:input => InputTester.new("self"),
+                             :output => str_output,
+                             :exception_handler => proc { was_called = true })
+
+        pry_tester.rep(o)
+        was_called.should == false
+      end
+
+      it 'should notice when exceptions are raised' do
+        o = Exception.new
+        str_output = StringIO.new
+
+        was_called = false
+        pry_tester = Pry.new(:input => InputTester.new("raise self"),
+                             :output => str_output,
+                             :exception_handler => proc { was_called = true })
+
+        pry_tester.rep(o)
+        was_called.should == true
+      end
     end
 
     describe "repl" do
@@ -75,16 +123,6 @@ describe Pry do
 
           o.instance_variable_get(:@x).should == 10
         end
-
-        it 'should execute start session and end session hooks' do
-          input = InputTester.new("exit")
-          str_output = StringIO.new
-          o = Object.new
-          
-          pry_tester = Pry.start(o, :input => input, :output => str_output)
-          str_output.string.should =~ /Beginning.*#{o}/
-          str_output.string.should =~ /Ending.*#{o}/
-        end
       end
 
       describe "test loading rc files" do
@@ -119,13 +157,13 @@ describe Pry do
           Pry.should_load_rc = false
         end
       end
-      
+
       describe "nesting" do
         after do
           Pry.reset_defaults
           Pry.color = false
         end
-        
+
         it 'should nest properly' do
           Pry.input = InputTester.new("pry", "pry", "pry", "\"nest:\#\{Pry.nesting.level\}\"", "exit_all")
 
@@ -144,7 +182,7 @@ describe Pry do
           [Object.new, {}, []].each do |val|
             str_input = StringIO.new("def hello;end")
             Pry.new(:input => str_input, :output => StringIO.new).rep(val)
-            
+
             val.methods(false).map(&:to_sym).include?(:hello).should == true
           end
         end
@@ -172,9 +210,9 @@ describe Pry do
             val.class.instance_methods(false).map(&:to_sym).include?(:hello).should == true
           end
         end
-        
-      end        
-        
+
+      end
+
 
       describe "commands" do
         it 'should run a command with no parameter' do
@@ -212,7 +250,7 @@ describe Pry do
           Pry.reset_defaults
           Pry.color = false
         end
-        
+
         it "should start a pry session on the receiver (first form)" do
           Pry.input = InputTester.new("self", "exit")
 
@@ -231,7 +269,7 @@ describe Pry do
           Pry.output = str_output
 
           pry 20
-          
+
           str_output.string.should =~ /20/
         end
 
@@ -256,14 +294,14 @@ describe Pry do
           Pry.reset_defaults
           Pry.color = false
         end
-        
+
         describe "input" do
 
           after do
             Pry.reset_defaults
             Pry.color = false
           end
-          
+
           it 'should set the input default, and the default should be overridable' do
             Pry.input = InputTester.new("5")
 
@@ -308,7 +346,7 @@ describe Pry do
 
             arity_multi_input = Class.new do
               attr_accessor :prompt
-              
+
               def readline(*args)
                 @prompt = args.first
                 "exit"
@@ -318,15 +356,15 @@ describe Pry do
             Pry.start(self, :input => arity_multi_input, :output => Pry::NullOutput)
             arity_multi_input.prompt.should == nil
           end
-          
+
         end
 
         it 'should set the output default, and the default should be overridable' do
           Pry.input = InputTester.new("5", "6", "7")
-          
+
           str_output = StringIO.new
           Pry.output = str_output
-          
+
           Pry.new.rep
           str_output.string.should =~ /5/
 
@@ -351,7 +389,7 @@ describe Pry do
           after do
             Object.remove_const(:RCTest)
           end
-          
+
           it "should execute command in the appropriate object context" do
             result = Pry.run_command "ls", :context => RCTest
             result.map(&:to_sym).should == [:@x]
@@ -365,7 +403,7 @@ describe Pry do
           it "should execute command and show output with :show_output => true flag" do
             str = StringIO.new
             Pry.output = str
-            result = Pry.run_command "ls -av", :context => RCTest, :show_output => true
+            result = Pry.run_command "ls -afv", :context => RCTest, :show_output => true
             str.string.should =~ /global variables/
             Pry.output = $stdout
           end
@@ -377,6 +415,30 @@ describe Pry do
         end
 
         describe "commands" do
+          it 'should interpolate ruby code into commands' do
+            klass = Class.new(Pry::CommandBase) do
+              command "hello", "", :keep_retval => true do |arg|
+                arg
+              end
+            end
+
+            $test_interpolation = "bing"
+            str_output = StringIO.new
+            Pry.new(:input => StringIO.new("hello #{$test_interpolation}"), :output => str_output, :commands => klass).rep
+            str_output.string.should =~ /bing/
+            $test_interpolation = nil
+          end
+
+          it 'should create a comand in  a nested context and that command should be accessible from the parent' do
+            str_input = StringIO.new("@x=nil\ncd 7\n_pry_.commands.instance_eval {\ncommand('bing') { |arg| run arg }\n}\ncd ..\nbing ls\nexit")
+            str_output = StringIO.new
+            Pry.input = str_input
+            obj = Object.new
+            Pry.new(:output => str_output).repl(obj)
+            Pry.input = Readline
+            str_output.string.should =~ /@x/
+          end
+
           it 'should define a command that keeps its return value' do
             class Command68 < Pry::CommandBase
               command "hello", "", :keep_retval => true do
@@ -384,8 +446,9 @@ describe Pry do
               end
             end
             str_output = StringIO.new
-            Pry.new(:input => StringIO.new("hello"), :output => str_output, :commands => Command68).rep
+            Pry.new(:input => StringIO.new("hello\n"), :output => str_output, :commands => Command68).rep
             str_output.string.should =~ /:kept_hello/
+            str_output.string.should =~ /=>/
 
             Object.remove_const(:Command68)
           end
@@ -397,13 +460,13 @@ describe Pry do
               end
             end
             str_output = StringIO.new
-            Pry.new(:input => StringIO.new("hello"), :output => str_output, :commands => Command68).rep
+            Pry.new(:input => StringIO.new("hello\n"), :output => str_output, :commands => Command68).rep
             (str_output.string =~ /:kept_hello/).should == nil
+            str_output.string !~ /=>/
 
             Object.remove_const(:Command68)
           end
-          
-          
+
           it 'should set the commands default, and the default should be overridable' do
             class Command0 < Pry::CommandBase
               command "hello" do
@@ -424,7 +487,7 @@ describe Pry do
             end
 
             str_output = StringIO.new
-            
+
             Pry.new(:input => InputTester.new("goodbye"), :output => str_output, :commands => Command1).rep
             str_output.string.should =~ /goodbye world/
 
@@ -438,8 +501,9 @@ describe Pry do
               end
             end
 
-            Command2.commands.keys.size.should == 2
+            Command2.commands.keys.size.should == 3
             Command2.commands.keys.include?("help").should == true
+            Command2.commands.keys.include?("install").should == true
             Command2.commands.keys.include?("h").should == true
 
             Object.remove_const(:Command2)
@@ -473,7 +537,7 @@ describe Pry do
           end
 
           it 'should change description of a command using desc' do
-            
+
             class Command7 < Pry::Commands
             end
 
@@ -485,10 +549,10 @@ describe Pry do
 
             Command7.commands["help"][:description].should.not == orig
             Command7.commands["help"][:description].should == "blah"
-            
+
             Object.remove_const(:Command7)
           end
-          
+
           it 'should run a command from within a command' do
             class Command01 < Pry::Commands
               command "v" do
@@ -520,30 +584,33 @@ describe Pry do
             str_output = StringIO.new
             Pry.new(:print => proc {}, :input => InputTester.new("v"),
                     :output => str_output, :commands => Command4).rep("john")
-            str_output.string.chomp.should == "john"
+
+            str_output.string.rstrip.should == "john"
 
             Object.remove_const(:Command3)
             Object.remove_const(:Command4)
           end
 
           it 'should import commands from another command object' do
-            class Command3 < Pry::CommandBase
+            Object.remove_const(:Command77) if Object.const_defined?(:Command77)
+
+            class Command77 < Pry::CommandBase
               import_from Pry::Commands, "status", "jump-to"
             end
 
             str_output = StringIO.new
             Pry.new(:print => proc {}, :input => InputTester.new("status"),
-                    :output => str_output, :commands => Command3).rep("john")
+                    :output => str_output, :commands => Command77).rep("john")
             str_output.string.should =~ /Status:/
 
-            Object.remove_const(:Command3)
+            Object.remove_const(:Command77)
           end
 
           it 'should delete some inherited commands when using delete method' do
             class Command3 < Pry::Commands
               command "v" do
               end
-              
+
               delete "show_doc", "show_method"
               delete "ls"
             end
@@ -572,15 +639,15 @@ describe Pry do
 
             # suppress evaluation output
             Pry.print = proc {}
-            
+
             str_output = StringIO.new
             Pry.new(:input => InputTester.new("jump-to"), :output => str_output, :commands => Command3).rep
-            str_output.string.chomp.should == "jump-to the music"
+            str_output.string.rstrip.should == "jump-to the music"
 
             str_output = StringIO.new
             Pry.new(:input => InputTester.new("help"), :output => str_output, :commands => Command3).rep
-            str_output.string.chomp.should == "help to the music"
-            
+            str_output.string.rstrip.should == "help to the music"
+
             Object.remove_const(:Command3)
 
             Pry.reset_defaults
@@ -601,7 +668,7 @@ describe Pry do
           Pry.new(:input => InputTester.new("\"test\""), :output => str_output,
                   :print => proc { |out, value| out.puts value.reverse }).rep
           str_output.string.should == "tset\n"
-          
+
           Pry.new.print.should == Pry.print
           str_output = StringIO.new
           Pry.new(:input => InputTester.new("\"test\""), :output => str_output).rep
@@ -629,7 +696,7 @@ describe Pry do
             Pry.start("carl", :input => StringIO.new("exit self"), :output => Pry::NullOutput).should == "carl"
           end
         end
-        
+
         describe "prompts" do
           it 'should set the prompt default, and the default should be overridable (single prompt)' do
             new_prompt = proc { "test prompt> " }
@@ -644,7 +711,7 @@ describe Pry do
             pry_tester.prompt.should == new_prompt
             pry_tester.select_prompt(true, 0).should == "A"
             pry_tester.select_prompt(false, 0).should == "A"
-                                 
+
             Pry.new.prompt.should == Pry.prompt
             Pry.new.select_prompt(true, 0).should == "test prompt> "
             Pry.new.select_prompt(false, 0).should == "test prompt> "
@@ -663,7 +730,7 @@ describe Pry do
             pry_tester.prompt.should == new_prompt
             pry_tester.select_prompt(true, 0).should == "A"
             pry_tester.select_prompt(false, 0).should == "B"
-                                 
+
             Pry.new.prompt.should == Pry.prompt
             Pry.new.select_prompt(true, 0).should == "test prompt> "
             Pry.new.select_prompt(false, 0).should == "test prompt* "
@@ -676,12 +743,12 @@ describe Pry do
             :before_session => proc { |out,_| out.puts "HELLO" },
             :after_session => proc { |out,_| out.puts "BYE" }
           }
-          
+
           str_output = StringIO.new
           Pry.new(:output => str_output).repl
           str_output.string.should =~ /HELLO/
           str_output.string.should =~ /BYE/
-          
+
           Pry.input.rewind
 
           str_output = StringIO.new
@@ -703,7 +770,7 @@ describe Pry do
                     :before_session => proc { |out,_| out.puts "OPEN" }
                   }
                   ).repl
-          
+
           str_output.string.should =~ /OPEN/
 
           Pry.input.rewind

data/test/test_helper.rb

@@ -1,3 +1,8 @@
+# Ensure we do not execute any rc files
+Pry::RC_FILES.clear
+Pry.color = false
+Pry.should_load_rc = false
+
 class Module
   public :remove_const
 end
@@ -30,6 +35,7 @@ class Pry
   # null output class - doesn't write anywwhere.
   class NullOutput
     def self.puts(*) end
+    def self.string(*) end
   end
 end