pry 0.9.9.6pre2-java → 0.9.10-java

data/test/test_default_commands/test_documentation.rb

@@ -3,42 +3,47 @@ require 'helper'
 if !mri18_and_no_real_source_location?
   describe "Pry::DefaultCommands::Documentation" do
     describe "show-doc" do
+      before do
+        @str_output = StringIO.new
+        @o = Object.new
+      end
+
       it 'should output a method\'s documentation' do
-        redirect_pry_io(InputTester.new("show-doc sample_method", "exit-all"), str_output=StringIO.new) do
+        redirect_pry_io(InputTester.new("show-doc sample_method", "exit-all"), @str_output) do
           pry
         end
 
-        str_output.string.should =~ /sample doc/
+        @str_output.string.should =~ /sample doc/
       end
 
       it 'should output a method\'s documentation with line numbers' do
-        redirect_pry_io(InputTester.new("show-doc sample_method -l", "exit-all"), str_output=StringIO.new) do
+        redirect_pry_io(InputTester.new("show-doc sample_method -l", "exit-all"), @str_output) do
           pry
         end
 
-        str_output.string.should =~ /\d: sample doc/
+        @str_output.string.should =~ /\d: sample doc/
       end
 
       it 'should output a method\'s documentation with line numbers (base one)' do
-        redirect_pry_io(InputTester.new("show-doc sample_method -b", "exit-all"), str_output=StringIO.new) do
+        redirect_pry_io(InputTester.new("show-doc sample_method -b", "exit-all"), @str_output) do
           pry
         end
 
-        str_output.string.should =~ /1: sample doc/
+        @str_output.string.should =~ /1: sample doc/
       end
 
       it 'should output a method\'s documentation if inside method without needing to use method name' do
-        o = Object.new
+        Pad.str_output = @str_output
 
         # sample comment
-        def o.sample
-          redirect_pry_io(InputTester.new("show-doc", "exit-all"), $out=StringIO.new) do
+        def @o.sample
+          redirect_pry_io(InputTester.new("show-doc", "exit-all"), Pad.str_output) do
             binding.pry
           end
         end
-        o.sample
-        $out.string.should =~ /sample comment/
-        $out = nil
+        @o.sample
+
+        Pad.str_output.string.should =~ /sample comment/
       end
 
       it "should be able to find super methods" do
@@ -206,11 +211,11 @@ if !mri18_and_no_real_source_location?
             end
           end
 
-          redirect_pry_io(InputTester.new("show-doc BetaClass", "exit-all"), out=StringIO.new) do
+          redirect_pry_io(InputTester.new("show-doc BetaClass", "exit-all"), outp=StringIO.new) do
             AlphaClass.pry
           end
 
-          out.string.should =~ /nested beta/
+          outp.string.should =~ /nested beta/
         end
       end
 
@@ -243,6 +248,68 @@ if !mri18_and_no_real_source_location?
           result.should =~ /local monkeypatch/
         end
       end
+
+      describe "when no class/module arg is given" do
+        before do
+          module TestHost
+
+            # hello there froggy
+            module M
+              def d; end
+              def e; end
+            end
+          end
+        end
+
+        after do
+          Object.remove_const(:TestHost)
+        end
+
+        it 'should return doc for current module' do
+          redirect_pry_io(InputTester.new("show-doc"), out = StringIO.new) do
+            Pry.start(TestHost::M)
+          end
+
+          out.string.should =~ /hello there froggy/
+        end
+
+      end
+
+
+      describe "should skip over broken modules" do
+        before do
+          module TestHost
+
+            # hello
+            module M
+              binding.eval("def a; end", "dummy.rb", 1)
+              binding.eval("def b; end", "dummy.rb", 2)
+              binding.eval("def c; end", "dummy.rb", 3)
+            end
+
+            # goodbye
+            module M
+              def d; end
+              def e; end
+            end
+          end
+        end
+
+        after do
+          Object.remove_const(:TestHost)
+        end
+
+        it 'should return doc for first valid module' do
+          redirect_pry_io(InputTester.new("show-doc TestHost::M"), out = StringIO.new) do
+            Pry.start
+          end
+
+          out.string.should =~ /goodbye/
+          out.string.should.not =~ /hello/
+        end
+
+      end
     end
+
   end
 end

data/test/test_default_commands/test_find_method.rb

@@ -20,7 +20,7 @@ unless Pry::Helpers::BaseHelpers.mri_18?
       it "should find a method by regex" do
         mock_pry("find-method hell MyKlass").should =~ /MyKlass.*?hello/m
       end
-      
+
       it "should NOT match a method that does not match the regex" do
         mock_pry("find-method hell MyKlass").should.not =~ /MyKlass.*?goodbye/m
       end
@@ -35,7 +35,15 @@ unless Pry::Helpers::BaseHelpers.mri_18?
         mock_pry("find-method timothy MyKlass").should.not =~ /MyKlass.*?goodbye/m
       end
     end
-    
+
+    it "should work with badly behaved constants" do
+      MyKlass::X = Object.new
+      def (MyKlass::X).hash
+        raise "mooo"
+      end
+
+      mock_pry("find-method -c timothy MyKlass").should =~ /MyKlass.*?hello/m
+    end
   end
 
   Object.remove_const(:MyKlass)

data/test/test_default_commands/test_input.rb

@@ -1,149 +1,148 @@
 require 'helper'
 
 describe "Pry::DefaultCommands::Input" do
+  before do
+    @str_output = StringIO.new
+  end
 
   describe "amend-line" do
     it 'should correctly amend the last line of input when no line number specified ' do
-      str_output = StringIO.new
-      redirect_pry_io(InputTester.new("def hello", "puts :bing", "amend-line puts :blah", "show-input", "exit-all"), str_output) do
+      redirect_pry_io(InputTester.new("def hello", "puts :bing", "amend-line puts :blah", "show-input", "exit-all"), @str_output) do
         pry
       end
-      str_output.string.should =~ /\A\d+: def hello\n\d+: puts :blah/
+
+      @str_output.string.should =~ /\A\d+: def hello\n\d+: puts :blah/
     end
 
     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 1 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/
+
+      @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
+      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/
+
+      @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
+      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
+      @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/
+
+      @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
+      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/
+
+      @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
+      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\}\"/
+      @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
+      redirect_pry_io(InputTester.new("amend-line", "exit-all"), @str_output) do
         pry
       end
-      str_output.string.should =~ /No input to amend/
+
+      @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
+      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/
+
+      @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
+      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/
+      @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
+      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/
+      @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
+      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/
+      @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
+      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/
+      @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
+      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/
+
+      @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
+      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/
+
+      @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
     it 'should correctly show the current lines in the input buffer' do
-      str_output = StringIO.new
-      redirect_pry_io(InputTester.new("def hello", "puts :bing", "show-input", "exit-all"), str_output) do
+      redirect_pry_io(InputTester.new("def hello", "puts :bing", "show-input", "exit-all"), @str_output) do
         pry
       end
-      str_output.string.should =~ /\A\d+: def hello\n\d+: puts :bing/
+
+      @str_output.string.should =~ /\A\d+: def hello\n\d+: puts :bing/
     end
   end
 
   describe "!" do
     it 'should correctly clear the input buffer ' do
-      str_output = StringIO.new
-      redirect_pry_io(InputTester.new("def hello", "puts :bing", "!", "show-input", "exit-all"), str_output) do
+      redirect_pry_io(InputTester.new("def hello", "puts :bing", "!", "show-input", "exit-all"), @str_output) do
         pry
       end
-      stripped_output = str_output.string.strip!
+
+      stripped_output = @str_output.string.strip!
       stripped_output.each_line.count.should == 1
       stripped_output.should =~ /Input buffer cleared!/
     end
@@ -153,21 +152,23 @@ describe "Pry::DefaultCommands::Input" 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
+      redirect_pry_io(InputTester.new("play x", "exit-all"), @str_output) do
         Pry.start b, :hooks => Pry::Hooks.new
       end
-      str_output.string.should =~ /hello/
+
+      @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
+      redirect_pry_io(InputTester.new("play x --lines 1", "exit-all"), @str_output) do
         Pry.start b, :hooks => Pry::Hooks.new
       end
-      str_output.string.should =~ /hello/
-      str_output.string.should.not =~ /love/
-      str_output.string.should.not =~ /goodbye/
+
+      @str_output.string.should =~ /hello/
+      @str_output.string.should.not =~ /love/
+      @str_output.string.should.not =~ /goodbye/
     end
 
     it 'should play documentation with the -d switch' do
@@ -179,7 +180,7 @@ describe "Pry::DefaultCommands::Input" do
         :test_method_content
       end
 
-      redirect_pry_io(InputTester.new('play -d test_method', "exit-all"), str_output = StringIO.new) do
+      redirect_pry_io(InputTester.new('play -d test_method', "exit-all")) do
         o.pry
       end
 
@@ -198,7 +199,7 @@ describe "Pry::DefaultCommands::Input" do
         :test_method_content
       end
 
-      redirect_pry_io(InputTester.new('play -d test_method --lines 2..3', "exit-all"), str_output = StringIO.new) do
+      redirect_pry_io(InputTester.new('play -d test_method --lines 2..3', "exit-all")) do
         o.pry
       end
 
@@ -215,11 +216,11 @@ describe "Pry::DefaultCommands::Input" do
         :test_method_content
       end
 
-      redirect_pry_io(InputTester.new('play -m test_method --lines 2', "exit-all"), str_output = StringIO.new) do
+      redirect_pry_io(InputTester.new('play -m test_method --lines 2', "exit-all"), @str_output) do
         o.pry
       end
 
-      str_output.string.should =~ /:test_method_content/
+      @str_output.string.should =~ /:test_method_content/
     end
 
     it 'should APPEND to the input buffer when playing a line with play -m, not replace it' do
@@ -228,11 +229,12 @@ describe "Pry::DefaultCommands::Input" do
         :test_method_content
       end
 
-      redirect_pry_io(InputTester.new('def another_test_method', 'play -m test_method --lines 2', 'show-input', 'exit-all'), str_output = StringIO.new) do
+      redirect_pry_io(InputTester.new('def another_test_method', 'play -m test_method --lines 2', 'show-input', 'exit-all'), @str_output) do
         o.pry
       end
-      str_output.string.should =~ /def another_test_method/
-      str_output.string.should =~ /:test_method_content/
+
+      @str_output.string.should =~ /def another_test_method/
+      @str_output.string.should =~ /:test_method_content/
     end
 
 
@@ -246,7 +248,7 @@ describe "Pry::DefaultCommands::Input" do
         @var3 = 40
       end
 
-      redirect_pry_io(InputTester.new('play -m test_method --lines 3..4', "exit-all"), str_output = StringIO.new) do
+      redirect_pry_io(InputTester.new('play -m test_method --lines 3..4', "exit-all"), @str_output) do
         o.pry
       end
 
@@ -254,8 +256,8 @@ describe "Pry::DefaultCommands::Input" do
       o.instance_variable_get(:@var1).should == 20
       o.instance_variable_get(:@var2).should == 30
       o.instance_variable_get(:@var3).should == nil
-      str_output.string.should =~ /30/
-      str_output.string.should.not =~ /20/
+      @str_output.string.should =~ /30/
+      @str_output.string.should.not =~ /20/
     end
   end
 
@@ -268,11 +270,11 @@ describe "Pry::DefaultCommands::Input" do
     it 'should display the correct history' 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"), @str_output) do
         pry
       end
-      str_output.string.should =~ /hello\n.*world/
+
+      @str_output.string.should =~ /hello\n.*world/
     end
 
     it 'should replay history correctly (single item)' do
@@ -280,8 +282,7 @@ describe "Pry::DefaultCommands::Input" do
       @hist.push "@x = 10"
       @hist.push "@y = 20"
       @hist.push "@z = 30"
-      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")) do
         o.pry
       end
       o.instance_variable_get(:@x).should == nil
@@ -293,8 +294,7 @@ describe "Pry::DefaultCommands::Input" do
       o = Object.new
       @hist.push "@x = 10"
       @hist.push "@y = 20"
-      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")) do
         o.pry
       end
       o.instance_variable_get(:@x).should == 10
@@ -312,25 +312,24 @@ describe "Pry::DefaultCommands::Input" do
       @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"), @str_output) do
         pry
       end
-      str_output.string.should =~ /\d:.*?box\n\d:.*?button\n\d:.*?orange/
+      @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"), str_output) do
+      @str_output = StringIO.new
+      redirect_pry_io(InputTester.new("hist --grep def blah", "exit-all"), @str_output) do
         pry
       end
-      str_output.string.should =~ /def blah 1/
+      @str_output.string.should =~ /def blah 1/
 
+      @str_output = StringIO.new
       # 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"), str_output) do
+      redirect_pry_io(InputTester.new("hist --grep      def boink", "exit-all"), @str_output) do
         pry
       end
-      str_output.string.should =~ /def boink 2/
+      @str_output.string.should =~ /def boink 2/
     end
 
     it 'should return last N lines in history with --tail switch' do
@@ -338,13 +337,12 @@ describe "Pry::DefaultCommands::Input" do
         @hist.push v
       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"), @str_output) do
         pry
       end
 
-      str_output.string.each_line.count.should == 3
-      str_output.string.should =~ /x\n\d+:.*y\n\d+:.*z/
+      @str_output.string.each_line.count.should == 3
+      @str_output.string.should =~ /x\n\d+:.*y\n\d+:.*z/
     end
 
     it 'should apply --tail after --grep' do
@@ -355,12 +353,12 @@ describe "Pry::DefaultCommands::Input" do
       @hist.push "puts  5"
 
       str_output = StringIO.new
-      redirect_pry_io(InputTester.new("hist --tail 2 --grep print", "exit-all"), str_output) do
+      redirect_pry_io(InputTester.new("hist --tail 2 --grep print", "exit-all"), @str_output) do
         pry
       end
 
-      str_output.string.each_line.count.should == 2
-      str_output.string.should =~ /\d:.*?print 2\n\d:.*?print 4/
+      @str_output.string.each_line.count.should == 2
+      @str_output.string.should =~ /\d:.*?print 2\n\d:.*?print 4/
     end
 
     it 'should apply --head after --grep' do
@@ -370,13 +368,12 @@ describe "Pry::DefaultCommands::Input" do
       @hist.push "print 4"
       @hist.push "print 5"
 
-      str_output = StringIO.new
-      redirect_pry_io(InputTester.new("hist --head 2 --grep print", "exit-all"), str_output) do
+      redirect_pry_io(InputTester.new("hist --head 2 --grep print", "exit-all"), @str_output) do
         pry
       end
 
-      str_output.string.each_line.count.should == 2
-      str_output.string.should =~ /\d:.*?print 2\n\d:.*?print 4/
+      @str_output.string.each_line.count.should == 2
+      @str_output.string.should =~ /\d:.*?print 2\n\d:.*?print 4/
     end
 
     # strangeness in this test is due to bug in Readline::HISTORY not
@@ -386,13 +383,12 @@ describe "Pry::DefaultCommands::Input" do
         @hist.push v
       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"), @str_output) do
         pry
       end
 
-      str_output.string.each_line.count.should == 4
-      str_output.string.should =~ /a\n\d+:.*b\n\d+:.*c/
+      @str_output.string.each_line.count.should == 4
+      @str_output.string.should =~ /a\n\d+:.*b\n\d+:.*c/
     end
 
     # strangeness in this test is due to bug in Readline::HISTORY not
@@ -402,36 +398,31 @@ describe "Pry::DefaultCommands::Input" do
         @hist.push v
       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"), @str_output) do
         pry
       end
 
-      str_output.string.each_line.count.should == 4
-      str_output.string.should =~ /b\n\d+:.*c\n\d+:.*d/
+      @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"), str_output) do
+      redirect_pry_io(InputTester.new("3", "_ += 1", "_ += 1", "hist", "exit-all"), @str_output) do
         pry
       end
 
-      str_output.string.each_line.grep(/_ \+= 1/).count.should == 1
+      @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"), str_output) do
+      redirect_pry_io(InputTester.new(":place_holder", "2 + 2", "", "", "3 + 3", "hist", "exit-all"), @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 = @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
-
-
 end