pry 0.9.0pre3-java → 0.9.4pre2-java

data/test/test_default_commands/test_documentation.rb

@@ -10,6 +10,16 @@ describe "Pry::DefaultCommands::Documentation" do
 
       str_output.string.should =~ /sample doc/
     end
+    
+    it 'should output multiple methods\' documentation' do
+      str_output = StringIO.new
+      redirect_pry_io(InputTester.new("show-doc sample_method another_sample_method", "exit-all"), str_output) do
+        pry
+      end
+
+      str_output.string.should =~ /sample doc/
+      str_output.string.should =~ /another sample doc/
+    end
 
     it 'should output a method\'s documentation if inside method without needing to use method name' do
       $str_output = StringIO.new

data/test/test_default_commands/test_input.rb

@@ -13,11 +13,118 @@ describe "Pry::DefaultCommands::Input" do
 
     it 'should correctly amend the specified line of input when line number given ' do
       str_output = StringIO.new
-      redirect_pry_io(InputTester.new("def hello", "puts :bing", "puts :bang", "amend-line-0 def goodbye", "show-input", "exit-all"), str_output) do
+      redirect_pry_io(InputTester.new("def hello", "puts :bing", "puts :bang", "amend-line 1 def goodbye", "show-input", "exit-all"), str_output) do
         pry
       end
       str_output.string.should =~ /\A\d+: def goodbye\n\d+: puts :bing\n\d+: puts :bang/
     end
+
+    it 'should correctly amend the specified line of input when line number given, 0 should behave as 1 ' do
+      str_output = StringIO.new
+      redirect_pry_io(InputTester.new("def hello", "puts :bing", "puts :bang", "amend-line 0 def goodbye", "show-input", "exit-all"), str_output) do
+        pry
+      end
+      str_output.string.should =~ /\A\d+: def goodbye\n\d+: puts :bing\n\d+: puts :bang/
+    end
+
+    it 'should correctly amend the specified line of input when line number given (negative number)' do
+      str_output = StringIO.new
+      redirect_pry_io(InputTester.new("def hello", "puts :bing", "puts :bang", "amend-line -1 puts :bink", "show-input", "exit-all"), str_output) do
+        pry
+      end
+      str_output.string.should =~ /\A\d+: def hello\n\d+: puts :bing\n\d+: puts :bink/
+
+      str_output = StringIO.new
+      redirect_pry_io(InputTester.new("def hello", "puts :bing", "puts :bang", "amend-line -2 puts :bink", "show-input", "exit-all"), str_output) do
+        pry
+      end
+      str_output.string.should =~ /\A\d+: def hello\n\d+: puts :bink\n\d+: puts :bang/
+    end
+
+    it 'should correctly amend the specified range of lines of input when range of negative numbers given (negative number)' do
+      str_output = StringIO.new
+      redirect_pry_io(InputTester.new("def hello", "puts :bing", "puts :bang", "puts :boat", "amend-line -3..-2 puts :bink", "show-input", "exit-all"), str_output) do
+        pry
+      end
+      str_output.string.should =~ /\A\d+: def hello\n\d+: puts :bink\n\d+: puts :boat/
+    end
+
+    it 'should correctly amend the specified line with string interpolated text' do
+      str_output = StringIO.new
+      redirect_pry_io(InputTester.new("def hello", "puts :bing", "puts :bang", 'amend-line puts "#{goodbye}"', "show-input", "exit-all"), str_output) do
+        pry
+      end
+
+      str_output.string.should =~ /\A\d+: def hello\n\d+: puts :bing\n\d+: puts \"\#{goodbye}\"/
+    end
+
+    it 'should display error if nothing to amend' do
+      str_output = StringIO.new
+      redirect_pry_io(InputTester.new("amend-line", "exit-all"), str_output) do
+        pry
+      end
+      str_output.string.should =~ /No input to amend/
+    end
+
+
+    it 'should correctly amend the specified range of lines' do
+      str_output = StringIO.new
+      redirect_pry_io(InputTester.new("def hello", "puts :bing", "puts :bang", "puts :heart", "amend-line 2..3 puts :bong", "show-input", "exit-all"), str_output) do
+        pry
+      end
+      str_output.string.should =~ /\A\d+: def hello\n\d+: puts :bong\n\d+: puts :heart/
+    end
+
+    it 'should correctly delete a specific line using the ! for content' do
+      str_output = StringIO.new
+      redirect_pry_io(InputTester.new("def hello", "puts :bing", "puts :bang", "puts :boast", "puts :heart", "amend-line 3 !", "show-input", "exit-all"), str_output) do
+        pry
+      end
+
+      str_output.string.should =~ /\d+: def hello\n\d+: puts :bing\n\d+: puts :boast\n\d+: puts :heart/
+    end
+
+    it 'should correctly delete a range of lines using the ! for content' do
+      str_output = StringIO.new
+      redirect_pry_io(InputTester.new("def hello", "puts :bing", "puts :bang", "puts :boast", "puts :heart", "amend-line 2..4 !", "show-input", "exit-all"), str_output) do
+        pry
+      end
+
+      str_output.string.should =~ /\d+: def hello\n\d+: puts :heart\n\Z/
+    end
+
+    it 'should correctly delete the previous line using the ! for content' do
+      str_output = StringIO.new
+      redirect_pry_io(InputTester.new("def hello", "puts :bing", "puts :bang", "puts :boast", "puts :heart", "amend-line !", "show-input", "exit-all"), str_output) do
+        pry
+      end
+
+      str_output.string.should =~ /\d+: def hello\n\d+: puts :bing\n\d+: puts :bang\n\d+: puts :boast\n\Z/
+    end
+
+    it 'should correctly amend the specified range of lines, using negative numbers in range' do
+      str_output = StringIO.new
+      redirect_pry_io(InputTester.new("def hello", "puts :bing", "puts :bang", "puts :boast", "puts :heart", "amend-line-2..-2 puts :bong", "show-input", "exit-all"), str_output) do
+        pry
+      end
+      str_output.string.should =~ /\d+: def hello\n\d+: puts :bong\n\d+: puts :heart/
+    end
+
+    it 'should correctly insert a new line of input before a specified line using the > syntax' do
+      str_output = StringIO.new
+      redirect_pry_io(InputTester.new("def hello", "puts :bing", "puts :bang", "amend-line 2 >puts :inserted", "show-input", "exit-all"), str_output) do
+        pry
+      end
+      str_output.string.should =~ /\d+: def hello\n\d+: puts :inserted\n\d+: puts :bing\n\d+: puts :bang/
+    end
+
+    it 'should correctly insert a new line of input before a specified line using the > syntax (should ignore second value of range)' do
+      str_output = StringIO.new
+      redirect_pry_io(InputTester.new("def hello", "puts :bing", "puts :bang", "amend-line 2..21 >puts :inserted", "show-input", "exit-all"), str_output) do
+        pry
+      end
+      str_output.string.should =~ /\d+: def hello\n\d+: puts :inserted\n\d+: puts :bing\n\d+: puts :bang/
+    end
   end
 
   describe "show-input" do
@@ -42,14 +149,66 @@ describe "Pry::DefaultCommands::Input" do
     end
   end
 
+  describe "play" do
+    it 'should play a string variable  (with no args)' do
+      b = binding
+      b.eval('x = "\"hello\""')
+      redirect_pry_io(InputTester.new("play x", "exit-all"), str_output = StringIO.new) do
+        Pry.start b, :hooks => {}
+      end
+      str_output.string.should =~ /hello/
+    end
+
+    it 'should play a string variable  (with no args) using --lines to select what to play' do
+      b = binding
+      b.eval('x = "\"hello\"\n\"goodbye\"\n\"love\""')
+      redirect_pry_io(InputTester.new("play x --lines 1", "exit-all"), str_output = StringIO.new) do
+        Pry.start b, :hooks => {}
+      end
+      str_output.string.should =~ /hello/
+      str_output.string.should.not =~ /love/
+      str_output.string.should.not =~ /goodbye/
+    end
+
+    it 'should play a method with the -m switch (a single line)' do
+      $o = Object.new
+      def $o.test_method
+        :test_method_content
+      end
+
+      redirect_pry_io(InputTester.new('play -m $o.test_method --lines 2', "exit-all"), str_output = StringIO.new) do
+        pry
+      end
+
+      str_output.string.should =~ /:test_method_content/
+      $o = nil
+    end
+
+    it 'should play a method with the -m switch (multiple line)' do
+      $o = Object.new
+      def $o.test_method
+        1 + 102
+        5 * 6
+      end
+
+      redirect_pry_io(InputTester.new('play -m $o.test_method --lines 2..3', "exit-all"), str_output = StringIO.new) do
+        pry
+      end
+
+      str_output.string.should =~ /103\n.*30/
+      $o = nil
+    end
+
+  end
+
   describe "hist" do
     push_first_hist_line = lambda do |hist, line|
       hist.push line
     end
 
     before do
-      Readline::HISTORY.shift until Readline::HISTORY.empty?
-      @hist = Readline::HISTORY
+      Pry.history.clear
+      @hist = Pry.history
     end
 
     it 'should display the correct history' do
@@ -57,7 +216,7 @@ describe "Pry::DefaultCommands::Input" do
       @hist.push "hello"
       @hist.push "world"
       str_output = StringIO.new
-      redirect_pry_io(InputTester.new("hist", "exit-all"), str_output) do
+      redirect_pry_io(InputTester.new("hist", "exit-all", :history => @hist), str_output) do
         pry
       end
       str_output.string.should =~ /hello\n.*world/
@@ -69,7 +228,7 @@ describe "Pry::DefaultCommands::Input" do
       @hist.push ":bucket"
       @hist.push ":ostrich"
       str_output = StringIO.new
-      redirect_pry_io(InputTester.new("hist --replay -1", "exit-all"), str_output) do
+      redirect_pry_io(InputTester.new("hist --replay -1", "exit-all", :history => @hist), str_output) do
         pry
       end
       str_output.string.should =~ /ostrich/
@@ -80,7 +239,7 @@ describe "Pry::DefaultCommands::Input" do
       @hist.push ":hello"
       @hist.push ":carl"
       str_output = StringIO.new
-      redirect_pry_io(InputTester.new("hist --replay 0..2", "exit-all"), str_output) do
+      redirect_pry_io(InputTester.new("hist --replay 0..2", "exit-all", :history => @hist), str_output) do
         pry
       end
       str_output.string.should =~ /:hello\n.*:carl/
@@ -94,13 +253,29 @@ describe "Pry::DefaultCommands::Input" do
       @hist.push "pepper"
       @hist.push "orange"
       @hist.push "grape"
+      @hist.push "def blah 1"
+      @hist.push "def boink 2"
+      @hist.push "place holder"
 
       str_output = StringIO.new
-      redirect_pry_io(InputTester.new("hist --grep o", "exit-all"), str_output) do
+      redirect_pry_io(InputTester.new("hist --grep o", "exit-all", :history => @hist), str_output) do
         pry
       end
-
       str_output.string.should =~ /\d:.*?box\n\d:.*?button\n\d:.*?orange/
+
+      # test more than one word in a regex match (def blah)
+      str_output = StringIO.new
+      redirect_pry_io(InputTester.new("hist --grep def blah", "exit-all", :history => @hist), str_output) do
+        pry
+      end
+      str_output.string.should =~ /def blah 1/
+
+      # test more than one word with leading white space in a regex match (def boink)
+      str_output = StringIO.new
+      redirect_pry_io(InputTester.new("hist --grep      def boink", "exit-all", :history => @hist), str_output) do
+        pry
+      end
+      str_output.string.should =~ /def boink 2/
     end
 
     it 'should return last N lines in history with --tail switch' do
@@ -110,7 +285,7 @@ describe "Pry::DefaultCommands::Input" do
       end
 
       str_output = StringIO.new
-      redirect_pry_io(InputTester.new("hist --tail 3", "exit-all"), str_output) do
+      redirect_pry_io(InputTester.new("hist --tail 3", "exit-all", :history => @hist), str_output) do
         pry
       end
 
@@ -127,7 +302,7 @@ describe "Pry::DefaultCommands::Input" do
       end
 
       str_output = StringIO.new
-      redirect_pry_io(InputTester.new("hist --head 4", "exit-all"), str_output) do
+      redirect_pry_io(InputTester.new("hist --head 4", "exit-all", :history => @hist), str_output) do
         pry
       end
 
@@ -144,13 +319,34 @@ describe "Pry::DefaultCommands::Input" do
       end
 
       str_output = StringIO.new
-      redirect_pry_io(InputTester.new("hist --show 1..4", "exit-all"), str_output) do
+      redirect_pry_io(InputTester.new("hist --show 1..4", "exit-all", :history => @hist), str_output) do
         pry
       end
 
       str_output.string.each_line.count.should == 4
       str_output.string.should =~ /b\n\d+:.*c\n\d+:.*d/
     end
+
+    it "should not contain duplicated lines" do
+      str_output = StringIO.new
+      redirect_pry_io(InputTester.new("3", "_ += 1", "_ += 1", "hist", "exit-all", :history => @hist), str_output) do
+        pry
+      end
+
+      str_output.string.each_line.grep(/_ \+= 1/).count.should == 1
+    end
+
+    it "should not contain duplicated lines" do
+      str_output = StringIO.new
+      redirect_pry_io(InputTester.new(":place_holder", "2 + 2", "", "", "3 + 3", "hist", "exit-all", :history => @hist), str_output) do
+        pry
+      end
+
+      a = str_output.string.each_line.to_a.index{|line| line.include?("2 + 2") }
+      b = str_output.string.each_line.to_a.index{|line| line.include?("3 + 3") }
+
+      (a + 1).should == b
+    end
   end
 
 

data/test/test_default_commands/test_introspection.rb

@@ -10,6 +10,16 @@ describe "Pry::DefaultCommands::Introspection" do
 
       str_output.string.should =~ /def sample/
     end
+    
+    it 'should output multiple methods\' sources' do
+      str_output = StringIO.new
+      redirect_pry_io(InputTester.new("show-method sample_method another_sample_method", "exit-all"), str_output) do
+        pry
+      end
+
+      str_output.string.should =~ /def sample/
+      str_output.string.should =~ /def another_sample/
+    end
 
     it 'should output a method\'s source with line numbers' do
       str_output = StringIO.new
@@ -20,6 +30,15 @@ describe "Pry::DefaultCommands::Introspection" do
       str_output.string.should =~ /\d+: def sample/
     end
 
+    it 'should output a method\'s source with line numbers starting at 1' do
+      str_output = StringIO.new
+      redirect_pry_io(InputTester.new("show-method -b sample_method", "exit-all"), str_output) do
+        pry
+      end
+
+      str_output.string.should =~ /1: def sample/
+    end
+
     it 'should output a method\'s source if inside method without needing to use method name' do
       $str_output = StringIO.new
 
@@ -85,7 +104,7 @@ describe "Pry::DefaultCommands::Introspection" do
 
       it 'should output an instance method\'s source for a method defined inside pry using define_method' do
         str_output = StringIO.new
-        redirect_pry_io(InputTester.new("class A", "define_method(:yup) {}", "end", "end", "show-method A#yup"), str_output) do
+        redirect_pry_io(InputTester.new("class A", "define_method(:yup) {}", "end", "show-method A#yup"), str_output) do
           TOPLEVEL_BINDING.pry
         end
 

data/test/test_default_commands/test_shell.rb

@@ -0,0 +1,18 @@
+require 'helper'
+
+describe "Pry::DefaultCommands::Shell" do
+  describe "cat" do
+
+    # this doesnt work so well on rbx due to differences in backtrace
+    # so we currently skip rbx until we figure out a workaround
+    if !rbx?
+      it 'cat --ex should give warning when exception is raised in repl' do
+        mock_pry("this raises error", "cat --ex").should =~ /Cannot cat exceptions raised in REPL/
+      end
+
+      it 'cat --ex should correctly display code that generated exception' do
+        mock_pry("broken_method", "cat --ex").should =~ /this method is broken/
+      end
+    end
+  end
+end

data/test/test_pry.rb

@@ -7,14 +7,45 @@ puts "--"
 
 describe Pry do
 
-  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|
-        stderr.read.empty?.should == true
+  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|
+          stderr.read.empty?.should == true
+        end
       end
     end
   end
 
+  if RUBY_VERSION =~ /1.9/
+    describe "Exotic object support" do
+
+      # regression test for exotic object support
+      it "Should not error when return value is a BasicObject instance" do
+
+        lambda do
+          redirect_pry_io(InputTester.new("BasicObject.new", "exit-all"), StringIO.new) do
+            Pry.start
+          end
+        end.should.not.raise NoMethodError
+
+      end
+    end
+  end
+
+  describe "Pry.binding_for" do
+
+    # regression test for burg's bug (see git history)
+    it "Should not error when object doesn't have a valid == method" do
+      o = Object.new
+      def o.==(other)
+        raise
+      end
+
+      lambda { Pry.binding_for(o) }.should.not.raise Exception
+    end
+  end
+
   describe "open a Pry session on an object" do
     describe "rep" do
       before do
@@ -40,6 +71,17 @@ describe Pry do
         @excep.is_a?(NameError).should == true
       end
 
+      if defined?(BasicObject)
+        it 'should be able to operate inside the BasicObject class' do
+          $obj = nil
+          redirect_pry_io(InputTester.new(":foo", "$obj = _", "exit-all"), StringIO.new) do
+            BasicObject.pry
+          end
+          $obj.should == :foo
+          $obj = nil
+        end
+      end
+
       it 'should set an ivar on an object' do
         input_string = "@x = 10"
         input = InputTester.new(input_string)
@@ -50,13 +92,25 @@ 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 = Object.new
+        o = :john
         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}/
+        str_output.string.should =~ /:john/
       end
 
       it 'should work with multi-line input' do
@@ -127,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
@@ -155,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)
 
@@ -163,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)
 
@@ -173,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)
 
@@ -184,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)
@@ -194,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)
@@ -219,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)
@@ -230,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
@@ -249,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
@@ -300,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
@@ -314,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
@@ -334,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
@@ -345,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
@@ -403,7 +463,7 @@ describe Pry do
               attr_accessor :prompt
               def readline(prompt)
                 @prompt = prompt
-                "exit"
+                "exit-all"
               end
             end.new
 
@@ -416,7 +476,7 @@ describe Pry do
 
             arity_zero_input = Class.new do
               def readline
-                "exit"
+                "exit-all"
               end
             end.new
 
@@ -431,7 +491,7 @@ describe Pry do
 
               def readline(*args)
                 @prompt = args.first
-                "exit"
+                "exit-all"
               end
             end.new
 
@@ -474,6 +534,15 @@ describe Pry do
             $test_interpolation = nil
           end
 
+          # bug fix for https://github.com/pry/pry/issues/170
+          it 'should not choke on complex string interpolation when checking if ruby code is a command' do
+            redirect_pry_io(InputTester.new('/#{Regexp.escape(File.expand_path("."))}/'), str_output = StringIO.new) do
+              pry
+            end
+
+            str_output.string.should.not =~ /SyntaxError/
+          end
+
           it 'should NOT interpolate ruby code into commands if :interpolate => false' do
             klass = Pry::CommandSet.new do
               command "hello", "", :keep_retval => true, :interpolate => false do |arg|
@@ -488,6 +557,21 @@ describe Pry do
             $test_interpolation = nil
           end
 
+          it 'should NOT try to interpolate pure ruby code (no commands) ' do
+            str_output = StringIO.new
+            Pry.new(:input => StringIO.new('puts \'#{aggy}\''), :output => str_output).rep
+            str_output.string.should.not =~ /NameError/
+
+            Pry.new(:input => StringIO.new('puts #{aggy}'), :output => str_output).rep
+            str_output.string.should.not =~ /NameError/
+
+            $test_interpolation = "blah"
+            Pry.new(:input => StringIO.new('puts \'#{$test_interpolation}\''), :output => str_output).rep
+
+            str_output.string.should.not =~ /blah/
+            $test_interpolation = nil
+          end
+
           it 'should create a command with a space in its name' do
             set = Pry::CommandSet.new do
               command "hello baby", "" do
@@ -605,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
@@ -640,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
@@ -673,7 +815,7 @@ describe Pry do
 
               klass.commands.keys.size.should == 3
               klass.commands.keys.include?("help").should == true
-              klass.commands.keys.include?("install").should == true
+              klass.commands.keys.include?("install-command").should == true
               klass.commands.keys.include?("h").should == true
             end
 
@@ -859,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
 
@@ -980,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" }