pry 0.9.4pre1-i386-mingw32 → 0.9.4pre2-i386-mingw32

data/test/test_pry.rb

@@ -7,7 +7,7 @@ puts "--"
 
 describe Pry do
 
-  if RUBY_PLATFORM !~ /mingw/ && RUBY_PLATFORM !~ /mswin/
+  if RUBY_PLATFORM !~ /mingw/ && RUBY_PLATFORM !~ /mswin/ && RUBY_PLATFORM != 'java'
     describe 'warning emissions' do
       it 'should emit no warnings' do
         Open4.popen4 'ruby -I lib -rubygems -r"pry" -W -e "exit"' do |pid, stdin, stdout, stderr|
@@ -33,7 +33,6 @@ describe Pry do
     end
   end
 
-
   describe "Pry.binding_for" do
 
     # regression test for burg's bug (see git history)
@@ -93,6 +92,18 @@ describe Pry do
         o.instance_variable_get(:@x).should == 10
       end
 
+      it 'should not output anything for no input' do
+        outp = StringIO.new
+
+        # note i could not use mock_pry() for this test for some
+        # reason, as i'd always get "\n" as output instead of ""
+        redirect_pry_io(StringIO.new(""), outp) do
+          Pry.new.rep(self)
+        end
+
+        outp.string.empty?.should == true
+      end
+
       it 'should make self evaluate to the receiver of the rep session' do
         o = :john
         str_output = StringIO.new
@@ -170,12 +181,18 @@ describe Pry do
         pry_tester.rep(o)
         was_called.should == true
       end
+
+      it 'should not try to catch intended exceptions' do
+        lambda { mock_pry("raise SystemExit") }.should.raise SystemExit
+        # SIGTERM
+        lambda { mock_pry("raise SignalException.new(15)") }.should.raise SignalException
+      end
     end
 
     describe "repl" do
       describe "basic functionality" do
         it 'should set an ivar on an object and exit the repl' do
-          input_strings = ["@x = 10", "exit"]
+          input_strings = ["@x = 10", "exit-all"]
           input = InputTester.new(*input_strings)
 
           o = Object.new
@@ -198,7 +215,7 @@ describe Pry do
 
         it 'sets out to an array with the result' do
           res   = {}
-          input = InputTester.new *[":foo", "42", "self[:res] = out"]
+          input = InputTester.new *[":foo", "42", "self[:res] = _out_"]
           pry   = Pry.new(:input => input, :output => Pry::NullOutput)
           pry.repl(res)
 
@@ -206,9 +223,9 @@ describe Pry do
           res[:res][1..2].should == [:foo, 42]
         end
 
-        it 'sets inp to an array with the entered lines' do
+        it 'sets _in_ to an array with the entered lines' do
           res   = {}
-          input = InputTester.new *[":foo", "42", "self[:res] = inp"]
+          input = InputTester.new *[":foo", "42", "self[:res] = _in_"]
           pry   = Pry.new(:input => input, :output => Pry::NullOutput)
           pry.repl(res)
 
@@ -216,9 +233,9 @@ describe Pry do
           res[:res][1..2].should == [":foo\n", "42\n"]
         end
 
-        it 'uses 100 as the size of inp and out' do
+        it 'uses 100 as the size of _in_ and _out_' do
           res   = []
-          input = InputTester.new *["self << out.max_size << inp.max_size"]
+          input = InputTester.new *["self << _out_.max_size << _in_.max_size"]
           pry   = Pry.new(:input => input, :output => Pry::NullOutput)
           pry.repl(res)
 
@@ -227,7 +244,7 @@ describe Pry do
 
         it 'can change the size of the history arrays' do
           res   = []
-          input = InputTester.new *["self << out.max_size << inp.max_size"]
+          input = InputTester.new *["self << _out_.max_size << _in_.max_size"]
           pry   = Pry.new(:input => input, :output => Pry::NullOutput,
                           :memory_size => 1000)
           pry.repl(res)
@@ -237,7 +254,7 @@ describe Pry do
 
         it 'store exceptions' do
           res   = []
-          input = InputTester.new *["foo!","self << inp[-1] << out[-1]"]
+          input = InputTester.new *["foo!","self << _in_[-1] << _out_[-1]"]
           pry   = Pry.new(:input => input, :output => Pry::NullOutput,
                           :memory_size => 1000)
           pry.repl(res)
@@ -262,10 +279,10 @@ describe Pry do
           Pry.config.should_load_rc = true
           Pry::RC_FILES << File.expand_path("../testrc", __FILE__)
 
-          Pry.start(self, :input => StringIO.new("exit\n"), :output => Pry::NullOutput)
+          Pry.start(self, :input => StringIO.new("exit-all\n"), :output => Pry::NullOutput)
           TEST_RC.should == [0]
 
-          Pry.start(self, :input => StringIO.new("exit\n"), :output => Pry::NullOutput)
+          Pry.start(self, :input => StringIO.new("exit-all\n"), :output => Pry::NullOutput)
           TEST_RC.should == [0]
 
           Object.remove_const(:TEST_RC)
@@ -273,13 +290,13 @@ describe Pry do
 
         it "should not run the rc file at all if Pry.config.should_load_rc is false" do
           Pry.config.should_load_rc = false
-          Pry.start(self, :input => StringIO.new("exit\n"), :output => Pry::NullOutput)
+          Pry.start(self, :input => StringIO.new("exit-all\n"), :output => Pry::NullOutput)
           Object.const_defined?(:TEST_RC).should == false
         end
 
         it "should not load the rc file if #repl method invoked" do
           Pry.config.should_load_rc = true
-          Pry.new(:input => StringIO.new("exit\n"), :output => Pry::NullOutput).repl(self)
+          Pry.new(:input => StringIO.new("exit-all\n"), :output => Pry::NullOutput).repl(self)
           Object.const_defined?(:TEST_RC).should == false
           Pry.config.should_load_rc = false
         end
@@ -292,7 +309,7 @@ describe Pry do
         end
 
         it 'should nest properly' do
-          Pry.input = InputTester.new("pry", "pry", "pry", "\"nest:\#\{Pry.nesting.level\}\"", "exit_all")
+          Pry.input = InputTester.new("cd 1", "cd 2", "cd 3", "\"nest:\#\{(_pry_.binding_stack.size - 1)\}\"", "exit-all")
 
           str_output = StringIO.new
           Pry.output = str_output
@@ -343,7 +360,7 @@ describe Pry do
         it 'should run a command with no parameter' do
           pry_tester = Pry.new
           pry_tester.commands = CommandTester
-          pry_tester.input = InputTester.new("command1", "exit_all")
+          pry_tester.input = InputTester.new("command1", "exit-all")
           pry_tester.commands = CommandTester
 
           str_output = StringIO.new
@@ -357,7 +374,7 @@ describe Pry do
         it 'should run a command with one parameter' do
           pry_tester = Pry.new
           pry_tester.commands = CommandTester
-          pry_tester.input = InputTester.new("command2 horsey", "exit_all")
+          pry_tester.input = InputTester.new("command2 horsey", "exit-all")
           pry_tester.commands = CommandTester
 
           str_output = StringIO.new
@@ -377,7 +394,7 @@ describe Pry do
         end
 
         it "should start a pry session on the receiver (first form)" do
-          Pry.input = InputTester.new("self", "exit")
+          Pry.input = InputTester.new("self", "exit-all")
 
           str_output = StringIO.new
           Pry.output = str_output
@@ -388,7 +405,7 @@ describe Pry do
         end
 
         it "should start a pry session on the receiver (second form)" do
-          Pry.input = InputTester.new("self", "exit")
+          Pry.input = InputTester.new("self", "exit-all")
 
           str_output = StringIO.new
           Pry.output = str_output
@@ -446,7 +463,7 @@ describe Pry do
               attr_accessor :prompt
               def readline(prompt)
                 @prompt = prompt
-                "exit"
+                "exit-all"
               end
             end.new
 
@@ -459,7 +476,7 @@ describe Pry do
 
             arity_zero_input = Class.new do
               def readline
-                "exit"
+                "exit-all"
               end
             end.new
 
@@ -474,7 +491,7 @@ describe Pry do
 
               def readline(*args)
                 @prompt = args.first
-                "exit"
+                "exit-all"
               end
             end.new
 
@@ -672,15 +689,13 @@ describe Pry do
           end
 
           it 'should create a command in  a nested context and that command should be accessible from the parent' do
-            redirect_pry_io(StringIO.new, StringIO.new) 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/
+            str_output = StringIO.new
+            x = "@x=nil\ncd 7\n_pry_.commands.instance_eval {\ncommand('bing') { |arg| run arg }\n}\ncd ..\nbing ls\nexit-all"
+            redirect_pry_io(StringIO.new("@x=nil\ncd 7\n_pry_.commands.instance_eval {\ncommand('bing') { |arg| run arg }\n}\ncd ..\nbing ls\nexit-all"), str_output) do
+              Pry.new.repl(0)
             end
+
+            str_output.string.should =~ /@x/
           end
 
           it 'should define a command that keeps its return value' do
@@ -707,6 +722,66 @@ describe Pry do
               str_output.string !~ /=>/
           end
 
+          it 'should define a command that keeps its return value even when nil' do
+            klass = Pry::CommandSet.new do
+              command "hello", "", :keep_retval => true do
+                nil
+              end
+            end
+            str_output = StringIO.new
+            Pry.new(:input => StringIO.new("hello\n"), :output => str_output, :commands => klass).rep
+            str_output.string.should =~ /nil/
+            str_output.string.should =~ /=>/
+          end
+
+          it 'should define a command that keeps its return value but does not return when value is void' do
+            klass = Pry::CommandSet.new do
+              command "hello", "", :keep_retval => true do
+                void
+              end
+            end
+            str_output = StringIO.new
+            Pry.new(:input => StringIO.new("hello\n"), :output => str_output, :commands => klass).rep
+            str_output.string.empty?.should == true
+          end
+
+          it 'a command (with :keep_retval => false) that replaces eval_string with a valid expression should not have the expression value suppressed' do
+            klass = Pry::CommandSet.new do
+              command "hello", "" do
+                eval_string.replace("6")
+              end
+            end
+            str_output = StringIO.new
+            Pry.new(:input => StringIO.new("def yo\nhello\n"), :output => str_output, :commands => klass).rep
+            str_output.string.should =~ /6/
+            end
+
+
+          it 'a command (with :keep_retval => true) that replaces eval_string with a valid expression should overwrite the eval_string with the return value' do
+            klass = Pry::CommandSet.new do
+              command "hello", "", :keep_retval => true do
+                  eval_string.replace("6")
+                  7
+              end
+            end
+            str_output = StringIO.new
+            Pry.new(:input => StringIO.new("def yo\nhello\n"), :output => str_output, :commands => klass).rep
+              str_output.string.should =~ /7/
+              str_output.string.should.not =~ /6/
+            end
+
+          it 'a command that return a value in a multi-line expression should clear the expression and return the value' do
+            klass = Pry::CommandSet.new do
+              command "hello", "", :keep_retval => true do
+                5
+              end
+            end
+            str_output = StringIO.new
+            Pry.new(:input => StringIO.new("def yo\nhello\n"), :output => str_output, :commands => klass).rep
+            str_output.string.should =~ /5/
+          end
+
+
           it 'should set the commands default, and the default should be overridable' do
             klass = Pry::CommandSet.new do
               command "hello" do
@@ -926,23 +1001,23 @@ describe Pry do
 
           describe "pry return values" do
             it 'should return the target object' do
-              Pry.start(self, :input => StringIO.new("exit"), :output => Pry::NullOutput).should == self
+              Pry.start(self, :input => StringIO.new("exit-all"), :output => Pry::NullOutput).should == self
             end
 
-            it 'should return the parameter given to exit' do
-              Pry.start(self, :input => StringIO.new("exit 10"), :output => Pry::NullOutput).should == 10
+            it 'should return the parameter given to exit-all' do
+              Pry.start(self, :input => StringIO.new("exit-all 10"), :output => Pry::NullOutput).should == 10
             end
 
-            it 'should return the parameter (multi word string) given to exit' do
-              Pry.start(self, :input => StringIO.new("exit \"john mair\""), :output => Pry::NullOutput).should == "john mair"
+            it 'should return the parameter (multi word string) given to exit-all' do
+              Pry.start(self, :input => StringIO.new("exit-all \"john mair\""), :output => Pry::NullOutput).should == "john mair"
             end
 
-            it 'should return the parameter (function call) given to exit' do
-              Pry.start(self, :input => StringIO.new("exit 'abc'.reverse"), :output => Pry::NullOutput).should == 'cba'
+            it 'should return the parameter (function call) given to exit-all' do
+              Pry.start(self, :input => StringIO.new("exit-all 'abc'.reverse"), :output => Pry::NullOutput).should == 'cba'
             end
 
-            it 'should return the parameter (self) given to exit' do
-              Pry.start("carl", :input => StringIO.new("exit self"), :output => Pry::NullOutput).should == "carl"
+            it 'should return the parameter (self) given to exit-all' do
+              Pry.start("carl", :input => StringIO.new("exit-all self"), :output => Pry::NullOutput).should == "carl"
             end
           end
 
@@ -1047,8 +1122,82 @@ describe Pry do
             end
           end
 
+          describe "view_clip used for displaying an object in a truncated format" do
+
+            VC_MAX_LENGTH = 60
+
+            describe "given an object with an #inspect string shorter than the maximum specified" do
+              it "returns the #inspect string" do
+                o = Object.new
+                def o.inspect; "a" * VC_MAX_LENGTH; end
+
+                Pry.view_clip(o, VC_MAX_LENGTH).should == o.inspect
+              end
+            end
+
+            describe "given an object with an #inspect string as long as the maximum specified" do
+              it "returns the #inspect string" do
+                o = Object.new
+                def o.inspect; "a" * VC_MAX_LENGTH; end
+
+                Pry.view_clip(o, VC_MAX_LENGTH).should == o.inspect
+              end
+            end
+
+            describe "given a regular object with an #inspect string longer than the maximum specified" do
+
+              describe "when the object is a regular one" do
+                it "returns a string of the #<class name:object idish> format" do
+                  o = Object.new
+                  def o.inspect; "a" * (VC_MAX_LENGTH + 1); end
+
+                  Pry.view_clip(o, VC_MAX_LENGTH).should =~ /Object:0x\d+?/
+                end
+              end
+
+              describe "when the object is a Class or a Module" do
+                describe "without a name (usually a c = Class.new)" do
+                  it "returns a string of the #<class name:object idish> format" do
+                    c, m = Class.new, Module.new
+
+                    Pry.view_clip(c, VC_MAX_LENGTH).should =~ /Class:0x.*?/
+                    Pry.view_clip(m, VC_MAX_LENGTH).should =~ /Module:0x.*?/
+                  end
+                end
+
+                describe "with a #name longer than the maximum specified" do
+                  it "returns a string of the #<class name:object idish> format" do
+                    c, m = Class.new, Module.new
+
+
+                    def c.name; "a" * (VC_MAX_LENGTH + 1); end
+                    def m.name; "a" * (VC_MAX_LENGTH + 1); end
+
+                    Pry.view_clip(c, VC_MAX_LENGTH).should =~ /Class:0x.*?/
+                    Pry.view_clip(m, VC_MAX_LENGTH).should =~ /Module:0x.*?/
+                  end
+                end
+
+                describe "with a #name shorter than or equal to the maximum specified" do
+                  it "returns a string of the #<class name:object idish> format" do
+                    c, m = Class.new, Module.new
+
+                    def c.name; "a" * VC_MAX_LENGTH; end
+                    def m.name; "a" * VC_MAX_LENGTH; end
+
+                    Pry.view_clip(c, VC_MAX_LENGTH).should == c.name
+                    Pry.view_clip(m, VC_MAX_LENGTH).should == m.name
+                  end
+                end
+
+              end
+
+            end
+
+          end
+
           it 'should set the hooks default, and the default should be overridable' do
-            Pry.input = InputTester.new("exit")
+            Pry.input = InputTester.new("exit-all")
             Pry.hooks = {
               :before_session => proc { |out,_| out.puts "HELLO" },
               :after_session => proc { |out,_| out.puts "BYE" }

data/test/test_pry_history.rb

@@ -4,7 +4,7 @@ require 'tempfile'
 describe Pry do
 
   before do
-    Readline::HISTORY.shift while Readline::HISTORY.length > 0
+    Pry.history.clear
     @hist = Tempfile.new(["tmp", ".pry_history"]).tap(&:close).path
     File.open(@hist, 'w') {|f| f << "1\n2\n3\n" }
     @old_hist = Pry.config.history.file
@@ -19,13 +19,13 @@ describe Pry do
 
   describe ".load_history" do
     it "should read the contents of the file" do
-      Readline::HISTORY.to_a[-2..-1].should === ["2", "3"]
+      Pry.history.to_a[-2..-1].should === ["2", "3"]
     end
   end
 
   describe ".save_history" do
     it "should include a trailing newline" do
-      Readline::HISTORY << "4"
+      Pry.history << "4"
       Pry.save_history
       File.read(@hist).should =~ /4\n\z/
     end
@@ -37,45 +37,45 @@ describe Pry do
     end
 
     it "should append new lines to the file" do
-      Readline::HISTORY << "4"
+      Pry.history << "4"
       Pry.save_history
       File.read(@hist).should == "1\n2\n3\n4\n"
     end
 
     it "should not clobber lines written by other Pry's in the meantime" do
-      Readline::HISTORY << "5"
+      Pry.history << "5"
       File.open(@hist, 'a') {|f| f << "4\n" }
       Pry.save_history
 
-      Readline::HISTORY.to_a[-3..-1].should == ["2", "3", "5"]
+      Pry.history.to_a[-3..-1].should == ["2", "3", "5"]
       File.read(@hist).should == "1\n2\n3\n4\n5\n"
     end
 
     it "should not delete lines from the file if this session's history was cleared" do
-      Readline::HISTORY.pop while Readline::HISTORY.size > 0
+      Pry.history.clear
       Pry.save_history
       File.read(@hist).should == "1\n2\n3\n"
     end
 
     it "should save new lines that are added after the history was cleared" do
-      Readline::HISTORY.pop while Readline::HISTORY.size > 0
-      Readline::HISTORY << "4"
+      Pry.history.clear
+      Pry.history << "4"
 
       # doing this twice as libedit on 1.8.7 has bugs and sometimes ignores the
       # first line in history
-      Readline::HISTORY << "4"
+      Pry.history << "4"
       Pry.save_history
       File.read(@hist).should =~ /1\n2\n3\n4\n/
     end
 
     it "should only append new lines the second time it is saved" do
-      Readline::HISTORY << "4"
+      Pry.history << "4"
       Pry.save_history
       File.open(@hist, 'a') {|f| f << "5\n" }
-      Readline::HISTORY << "6"
+      Pry.history << "6"
       Pry.save_history
 
-      Readline::HISTORY.to_a[-4..-1].should == ["2", "3", "4", "6"]
+      Pry.history.to_a[-4..-1].should == ["2", "3", "4", "6"]
       File.read(@hist).should == "1\n2\n3\n4\n5\n6\n"
     end
   end