pry 0.9.10pre1-i386-mingw32 → 0.9.11-i386-mingw32

data/{test/test_pry_defaults.rb → spec/pry_defaults_spec.rb}

@@ -40,7 +40,7 @@ describe "test Pry defaults" do
         end
       end.new
 
-      Pry.start(self, :input => arity_one_input, :output => Pry::NullOutput)
+      Pry.start(self, :input => arity_one_input, :output => StringIO.new)
       arity_one_input.prompt.should == Pry.prompt.call
     end
 
@@ -53,7 +53,7 @@ describe "test Pry defaults" do
         end
       end.new
 
-      lambda { Pry.start(self, :input => arity_zero_input, :output => Pry::NullOutput) }.should.not.raise Exception
+      lambda { Pry.start(self, :input => arity_zero_input, :output => StringIO.new) }.should.not.raise Exception
     end
 
     it 'should not pass in the prompt if the arity is -1' do
@@ -68,7 +68,7 @@ describe "test Pry defaults" do
         end
       end.new
 
-      Pry.start(self, :input => arity_multi_input, :output => Pry::NullOutput)
+      Pry.start(self, :input => arity_multi_input, :output => StringIO.new)
       arity_multi_input.prompt.should == nil
     end
 
@@ -92,12 +92,12 @@ describe "test Pry defaults" do
   end
 
   it "should set the print default, and the default should be overridable" do
-    new_print = proc { |out, value| out.puts value }
+    new_print = proc { |out, value| out.puts "=> LOL" }
     Pry.print =  new_print
 
     Pry.new.print.should == Pry.print
     Pry.new(:input => InputTester.new("\"test\""), :output => @str_output).rep
-    @str_output.string.should == "test\n"
+    @str_output.string.should == "=> LOL\n"
 
     @str_output = StringIO.new
     Pry.new(:input => InputTester.new("\"test\""), :output => @str_output,
@@ -107,28 +107,28 @@ describe "test Pry defaults" do
     Pry.new.print.should == Pry.print
     @str_output = StringIO.new
     Pry.new(:input => InputTester.new("\"test\""), :output => @str_output).rep
-    @str_output.string.should == "test\n"
+    @str_output.string.should == "=> LOL\n"
   end
 
   describe "pry return values" do
     it 'should return nil' do
-      Pry.start(self, :input => StringIO.new("exit-all"), :output => Pry::NullOutput).should == nil
+      Pry.start(self, :input => StringIO.new("exit-all"), :output => StringIO.new).should == nil
     end
 
     it 'should return the parameter given to exit-all' do
-      Pry.start(self, :input => StringIO.new("exit-all 10"), :output => Pry::NullOutput).should == 10
+      Pry.start(self, :input => StringIO.new("exit-all 10"), :output => StringIO.new).should == 10
     end
 
     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"
+      Pry.start(self, :input => StringIO.new("exit-all \"john mair\""), :output => StringIO.new).should == "john mair"
     end
 
     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'
+      Pry.start(self, :input => StringIO.new("exit-all 'abc'.reverse"), :output => StringIO.new).should == 'cba'
     end
 
     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"
+      Pry.start("carl", :input => StringIO.new("exit-all self"), :output => StringIO.new).should == "carl"
     end
   end
 
@@ -355,17 +355,17 @@ describe "test Pry defaults" do
 
   describe 'toplevel_binding' do
     it 'should be devoid of local variables' do
-      mock_pry(Pry.toplevel_binding, "ls -l").should.not =~ /version/
+      pry_eval(Pry.toplevel_binding, "ls -l").should.not =~ /version/
     end
 
     it 'should have self the same as TOPLEVEL_BINDING' do
-      mock_pry(Pry.toplevel_binding, "self.equal? TOPLEVEL_BINDING.eval('self')").should =~ /=> true/
+      Pry.toplevel_binding.eval('self').should.equal? TOPLEVEL_BINDING.eval('self')
     end
 
     # https://github.com/rubinius/rubinius/issues/1779
     unless Pry::Helpers::BaseHelpers.rbx?
       it 'should define private methods on Object' do
-        mock_pry(TOPLEVEL_BINDING, "def gooey_fooey; end")
+        TOPLEVEL_BINDING.eval 'def gooey_fooey; end'
         method(:gooey_fooey).owner.should == Object
         Pry::Method(method(:gooey_fooey)).visibility.should == :private
       end

data/{test/test_pry_history.rb → spec/pry_history_spec.rb}

@@ -23,6 +23,21 @@ describe Pry do
     Pry.history.restore_default_behavior
   end
 
+  describe '#push' do
+    it "should not record duplicated lines" do
+      Pry.history << '3'
+      Pry.history << '_ += 1'
+      Pry.history << '_ += 1'
+      Pry.history.to_a.grep('_ += 1').count.should == 1
+    end
+
+    it "should not record empty lines" do
+      c = Pry.history.to_a.count
+      Pry.history << ''
+      Pry.history.to_a.count.should == c
+    end
+  end
+
   describe ".load_history" do
     it "should read the contents of the file" do
       Pry.history.to_a[-2..-1].should == %w(2 3)

data/spec/pry_output_spec.rb

@@ -0,0 +1,95 @@
+require 'helper'
+
+describe Pry do
+  describe "output failsafe" do
+    after do
+      Pry.config.print = Pry::DEFAULT_PRINT
+    end
+
+    it "should catch serialization exceptions" do
+      Pry.config.print = lambda { |*a| raise "catch-22" }
+
+      lambda {
+        mock_pry("1")
+      }.should.not.raise
+    end
+
+    it "should display serialization exceptions" do
+      Pry.config.print = lambda { |*a| raise "catch-22" }
+
+      mock_pry("1").should =~ /\(pry\) output error: #<RuntimeError: catch-22>/
+    end
+
+    it "should catch errors serializing exceptions" do
+      Pry.config.print = lambda do |*a|
+        raise Exception.new("catch-22").tap{ |e| class << e; def inspect; raise e; end; end }
+      end
+
+      mock_pry("1").should =~ /\(pry\) output error: failed to show result/
+    end
+  end
+
+  describe "DEFAULT_PRINT" do
+    it "should output the right thing" do
+      mock_pry("[1]").should =~ /^=> \[1\]/
+    end
+
+    it "should include the =>" do
+      accumulator = StringIO.new
+      Pry.config.print.call(accumulator, [1])
+      accumulator.string.should == "=> \[1\]\n"
+    end
+
+    it "should not be phased by un-inspectable things" do
+      mock_pry("class NastyClass; undef pretty_inspect; end", "NastyClass.new").should =~ /#<.*NastyClass:0x.*?>/
+    end
+  end
+
+  describe "color" do
+    before do
+      Pry.color = true
+    end
+
+    after do
+      Pry.color = false
+    end
+
+    it "should colorize strings as though they were ruby" do
+      accumulator = StringIO.new
+      Pry.config.print.call(accumulator, [1])
+      accumulator.string.should == "=> [\e[1;34m1\e[0m]\e[0m\n"
+    end
+
+    it "should not colorize strings that already include color" do
+      f = Object.new
+      def f.inspect
+        "\e[1;31mFoo\e[0m"
+      end
+      accumulator = StringIO.new
+      Pry.config.print.call(accumulator, f)
+      # We add an extra \e[0m to prevent color leak
+      accumulator.string.should == "=> \e[1;31mFoo\e[0m\e[0m\n"
+    end
+  end
+
+  describe "output suppression" do
+    before do
+      @t = pry_tester
+    end
+    it "should normally output the result" do
+      mock_pry("1 + 2").should == "=> 3\n\n"
+    end
+
+    it "should not output anything if the input ends with a semicolon" do
+      mock_pry("1 + 2;").should == "\n"
+    end
+
+    it "should output something if the input ends with a comment" do
+      mock_pry("1 + 2 # basic addition").should == "=> 3\n\n"
+    end
+
+    it "should not output something if the input is only a comment" do
+      mock_pry("# basic addition").should == "\n"
+    end
+  end
+end

data/{test/test_pry.rb → spec/pry_spec.rb}

@@ -20,6 +20,35 @@ describe Pry do
     end
   end
 
+  describe 'DISABLE_PRY' do
+    before do
+      ENV['DISABLE_PRY'] = 'true'
+    end
+
+    after do
+      ENV.delete 'DISABLE_PRY'
+    end
+
+    it 'should not binding.pry' do
+      binding.pry.should == nil
+    end
+
+    it 'should not Pry.start' do
+      Pry.start.should == nil
+    end
+  end
+
+  describe "Pry.critical_section" do
+    it "should prevent Pry being called" do
+      output = StringIO.new
+      Pry.output = output
+      Pry.critical_section do
+        Pry.start
+      end
+      output.string.should =~ /Pry started inside Pry/
+    end
+  end
+
   describe "Pry.binding_for" do
 
     # regression test for burg's bug (see git history)
@@ -31,6 +60,12 @@ describe Pry do
 
       lambda { Pry.binding_for(o) }.should.not.raise Exception
     end
+
+    it "should not leak local variables" do
+      [Object.new, Array, 3].each do |obj|
+        Pry.binding_for(obj).eval("local_variables").should.be.empty
+      end
+    end
   end
 
   describe "open a Pry session on an object" do
@@ -72,16 +107,14 @@ describe Pry do
         input = InputTester.new(input_string)
         o = Object.new
 
-        pry_tester = Pry.new(:input => input, :output => Pry::NullOutput)
+        pry_tester = Pry.new(:input => input, :output => StringIO.new)
         pry_tester.rep(o)
         o.instance_variable_get(:@x).should == 10
       end
 
-      it 'should display error and throw(:breakout) if Pry instance runs out of input' do
-        catch(:breakout) do
-          redirect_pry_io(StringIO.new(":nothing\n"), @str_output) do
-            Pry.new.repl
-          end
+      it 'should display error if Pry instance runs out of input' do
+        redirect_pry_io(StringIO.new, @str_output) do
+          Pry.new.repl
         end
         @str_output.string.should =~ /Error: Pry ran out of things to read/
       end
@@ -103,7 +136,7 @@ describe Pry do
       end
 
       it 'should define a nested class under Hello and not on top-level or Pry' do
-        pry_tester = Pry.new(:input => InputTester.new("class Nested", "end"), :output => Pry::NullOutput)
+        pry_tester = Pry.new(:input => InputTester.new("class Nested", "end"), :output => StringIO.new)
         pry_tester.rep(Hello)
         Hello.const_defined?(:Nested).should == true
       end
@@ -171,7 +204,7 @@ describe Pry do
 
           o = Object.new
 
-          pry_tester = Pry.start(o, :input => input, :output => Pry::NullOutput)
+          pry_tester = Pry.start(o, :input => input, :output => StringIO.new)
 
           o.instance_variable_get(:@x).should == 10
         end
@@ -190,7 +223,7 @@ describe Pry do
         it 'sets _ to the last result' do
           res   = []
           input = InputTester.new *[":foo", "self << _", "42", "self << _"]
-          pry   = Pry.new(:input => input, :output => Pry::NullOutput)
+          pry   = Pry.new(:input => input, :output => StringIO.new)
           pry.repl(res)
 
           res.should == [:foo, 42]
@@ -199,7 +232,7 @@ describe Pry do
         it 'sets out to an array with the result' do
           res   = {}
           input = InputTester.new *[":foo", "42", "self[:res] = _out_"]
-          pry   = Pry.new(:input => input, :output => Pry::NullOutput)
+          pry   = Pry.new(:input => input, :output => StringIO.new)
           pry.repl(res)
 
           res[:res].should.be.kind_of Pry::HistoryArray
@@ -209,7 +242,7 @@ describe Pry do
         it 'sets _in_ to an array with the entered lines' do
           res   = {}
           input = InputTester.new *[":foo", "42", "self[:res] = _in_"]
-          pry   = Pry.new(:input => input, :output => Pry::NullOutput)
+          pry   = Pry.new(:input => input, :output => StringIO.new)
           pry.repl(res)
 
           res[:res].should.be.kind_of Pry::HistoryArray
@@ -219,7 +252,7 @@ describe Pry do
         it 'uses 100 as the size of _in_ and _out_' do
           res   = []
           input = InputTester.new *["self << _out_.max_size << _in_.max_size"]
-          pry   = Pry.new(:input => input, :output => Pry::NullOutput)
+          pry   = Pry.new(:input => input, :output => StringIO.new)
           pry.repl(res)
 
           res.should == [100, 100]
@@ -228,7 +261,7 @@ describe Pry do
         it 'can change the size of the history arrays' do
           res   = []
           input = InputTester.new *["self << _out_.max_size << _in_.max_size"]
-          pry   = Pry.new(:input => input, :output => Pry::NullOutput,
+          pry   = Pry.new(:input => input, :output => StringIO.new,
                           :memory_size => 1000)
           pry.repl(res)
 
@@ -238,7 +271,7 @@ describe Pry do
         it 'store exceptions' do
           res   = []
           input = InputTester.new *["foo!","self << _in_[-1] << _out_[-1]"]
-          pry   = Pry.new(:input => input, :output => Pry::NullOutput,
+          pry   = Pry.new(:input => input, :output => StringIO.new,
                           :memory_size => 1000)
           pry.repl(res)
 
@@ -249,44 +282,51 @@ describe Pry do
 
       describe "last_result" do
         it "should be set to the most recent value" do
-          mock_pry("2", "_ + 82").should =~ /84/
+          pry_eval("2", "_ + 82").should == 84
         end
 
+        # This test needs mock_pry because the command retvals work by
+        # replacing the eval_string, so _ won't be modified without Pry doing
+        # a REPL loop.
         it "should be set to the result of a command with :keep_retval" do
-          mock_pry("Pry::Commands.block_command '++', '', {:keep_retval => true} do |a| a.to_i + 1; end", '++ 86', '++ #{_}').should =~ /88/
+          Pry::Commands.block_command '++', '', :keep_retval => true do |a|
+            a.to_i + 1
+          end
+
+          mock_pry('++ 86', '++ #{_}').should =~ /88/
         end
 
         it "should be preserved over an empty line" do
-          mock_pry("2 + 2", " ", "\t",  " ", "_ + 92").should =~ /96/
+          pry_eval("2 + 2", " ", "\t",  " ", "_ + 92").should == 96
         end
 
         it "should be preserved when evalling a  command without :keep_retval" do
-          mock_pry("2 + 2", "ls -l", "_ + 96").should =~ /100/
+          pry_eval("2 + 2", "ls -l", "_ + 96").should == 100
         end
       end
 
       describe "test loading rc files" do
-
         before do
+          Pry::HOME_RC_FILE.replace "spec/fixtures/testrc"
+          Pry::LOCAL_RC_FILE.replace "spec/fixtures/testrc/../testrc"
           Pry.instance_variable_set(:@initial_session, true)
         end
 
         after do
-          Pry::RC_FILES.clear
+          Pry::HOME_RC_FILE.replace "~/.pryrc"
+          Pry::LOCAL_RC_FILE.replace "./.pryrc"
           Pry.config.should_load_rc = false
+          Object.remove_const(:TEST_RC) if defined?(TEST_RC)
         end
 
-        it "should run the rc file only once" do
+        it "should never run the rc file twice" do
           Pry.config.should_load_rc = true
-          2.times { Pry::RC_FILES << File.expand_path("../testrc", __FILE__) }
 
-          Pry.start(self, :input => StringIO.new("exit-all\n"), :output => Pry::NullOutput)
+          Pry.start(self, :input => StringIO.new("exit-all\n"), :output => StringIO.new)
           TEST_RC.should == [0]
 
-          Pry.start(self, :input => StringIO.new("exit-all\n"), :output => Pry::NullOutput)
+          Pry.start(self, :input => StringIO.new("exit-all\n"), :output => StringIO.new)
           TEST_RC.should == [0]
-
-          Object.remove_const(:TEST_RC)
         end
 
         it "should not load the pryrc if it cannot expand ENV[HOME]" do
@@ -294,7 +334,7 @@ describe Pry do
           old_rc = Pry.config.should_load_rc
           ENV['HOME'] = nil
           Pry.config.should_load_rc = true
-          lambda { Pry.start(self, :input => StringIO.new("exit-all\n"), :output => Pry::NullOutput) }.should.not.raise
+          lambda { Pry.start(self, :input => StringIO.new("exit-all\n"), :output => StringIO.new) }.should.not.raise
 
           ENV['HOME'] = old_home
           Pry.config.should_load_rc = old_rc
@@ -302,21 +342,22 @@ 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-all\n"), :output => Pry::NullOutput)
+          Pry.start(self, :input => StringIO.new("exit-all\n"), :output => StringIO.new)
           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-all\n"), :output => Pry::NullOutput).repl(self)
+          Pry.new(:input => StringIO.new("exit-all\n"), :output => StringIO.new).repl(self)
           Object.const_defined?(:TEST_RC).should == false
           Pry.config.should_load_rc = false
         end
 
         describe "that raise exceptions" do
           before do
-            Pry::RC_FILES << File.expand_path("../testrcbad", __FILE__)
+            Pry::HOME_RC_FILE = "spec/fixtures/testrcbad"
             Pry.config.should_load_rc = true
+            Pry.config.should_load_local_rc = false
 
             putsed = nil
 
@@ -327,7 +368,7 @@ describe Pry do
             }
 
             @doing_it = lambda{
-              Pry.start(self, :input => StringIO.new("Object::TEST_AFTER_RAISE=1\nexit-all\n"), :output => Pry::NullOutput)
+              Pry.start(self, :input => StringIO.new("Object::TEST_AFTER_RAISE=1\nexit-all\n"), :output => StringIO.new)
               putsed
             }
           end
@@ -349,7 +390,8 @@ describe Pry do
           end
 
           it "should output an error" do
-            @doing_it[].should =~ /Error loading #{File.expand_path("../testrcbad", __FILE__)}: messin with ya/
+            @doing_it.call.split("\n").first.should ==
+              "Error loading spec/fixtures/testrcbad: messin with ya"
           end
         end
       end