pry 0.9.7.4-i386-mingw32 → 0.9.8-i386-mingw32

data/test/test_default_commands/test_documentation.rb

@@ -3,29 +3,41 @@ require 'helper'
 describe "Pry::DefaultCommands::Documentation" do
   describe "show-doc" do
     it 'should output a method\'s documentation' do
-      str_output = StringIO.new
-      redirect_pry_io(InputTester.new("show-doc sample_method", "exit-all"), str_output) do
+      redirect_pry_io(InputTester.new("show-doc sample_method", "exit-all"), str_output=StringIO.new) do
         pry
       end
 
       str_output.string.should =~ /sample doc/
     end
 
-    it 'should output a method\'s documentation if inside method without needing to use method name' do
-      $str_output = StringIO.new
+    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
+        pry
+      end
+
+      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
+        pry
+      end
+
+      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
 
       # sample comment
       def o.sample
-        redirect_pry_io(InputTester.new("show-doc", "exit-all"), $str_output) do
+        redirect_pry_io(InputTester.new("show-doc", "exit-all"), $out=StringIO.new) do
           binding.pry
        end
       end
       o.sample
-
-      $str_output.string.should =~ /sample comment/
-      $str_output = nil
+      $out.string.should =~ /sample comment/
+      $out = nil
     end
 
     it "should be able to find super methods" do

data/test/test_default_commands/test_input.rb

@@ -154,7 +154,7 @@ describe "Pry::DefaultCommands::Input" 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 => {}
+        Pry.start b, :hooks => Pry::Hooks.new
       end
       str_output.string.should =~ /hello/
     end
@@ -163,66 +163,100 @@ describe "Pry::DefaultCommands::Input" 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 => {}
+        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/
     end
 
+    it 'should play documentation with the -d switch' do
+      o = Object.new
+
+      # @v = 10
+      # @y = 20
+      def o.test_method
+        :test_method_content
+      end
+
+      redirect_pry_io(InputTester.new('play -d test_method', "exit-all"), str_output = StringIO.new) do
+        o.pry
+      end
+
+      o.instance_variable_get(:@v).should == 10
+      o.instance_variable_get(:@y).should == 20
+    end
+
+    it 'should play documentation with the -d switch (restricted by --lines)' do
+      o = Object.new
+
+      # @x = 0
+      # @v = 10
+      # @y = 20
+      # @z = 30
+      def o.test_method
+        :test_method_content
+      end
+
+      redirect_pry_io(InputTester.new('play -d test_method --lines 2..3', "exit-all"), str_output = StringIO.new) do
+        o.pry
+      end
+
+      o.instance_variable_get(:@x).should == nil
+      o.instance_variable_get(:@z).should == nil
+      o.instance_variable_get(:@v).should == 10
+      o.instance_variable_get(:@y).should == 20
+    end
+
+
     it 'should play a method with the -m switch (a single line)' do
-      $o = Object.new
-      def $o.test_method
+      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
+      redirect_pry_io(InputTester.new('play -m test_method --lines 2', "exit-all"), str_output = StringIO.new) do
+        o.pry
       end
 
       str_output.string.should =~ /:test_method_content/
-      $o = nil
     end
 
     it 'should APPEND to the input buffer when playing a line with play -m, not replace it' do
-      $o = Object.new
-      def $o.test_method
+      o = Object.new
+      def o.test_method
         :test_method_content
       end
 
-      redirect_pry_io(InputTester.new('def another_test_method', 'play -m $o.test_method --lines 2', 'show-input', 'exit-all'), str_output = StringIO.new) do
-        pry
+      redirect_pry_io(InputTester.new('def another_test_method', 'play -m test_method --lines 2', 'show-input', 'exit-all'), str_output = StringIO.new) do
+        o.pry
       end
       str_output.string.should =~ /def another_test_method/
       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
-      class << $o
-        attr_accessor :var1, :var2
-      end
+      o = Object.new
 
-      def $o.test_method
+      def o.test_method
+        @var0 = 10
         @var1 = 20
         @var2 = 30
+        @var3 = 40
       end
 
-      obj = Object.new
-      b = Pry.binding_for(obj)
-
-      redirect_pry_io(InputTester.new('play -m $o.test_method --lines 2..3', "exit-all"), str_output = StringIO.new) do
-        b.pry
+      redirect_pry_io(InputTester.new('play -m test_method --lines 3..4', "exit-all"), str_output = StringIO.new) do
+        o.pry
       end
 
-      obj.instance_variable_get(:@var1).should == 20
-      obj.instance_variable_get(:@var2).should == 30
+      o.instance_variable_get(:@var0).should == nil
+      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/
     end
-
   end
 
   describe "hist" do
@@ -235,31 +269,36 @@ describe "Pry::DefaultCommands::Input" do
       @hist.push "hello"
       @hist.push "world"
       str_output = StringIO.new
-      redirect_pry_io(InputTester.new("hist", "exit-all", :history => @hist), str_output) do
+      redirect_pry_io(InputTester.new("hist", "exit-all"), str_output) do
         pry
       end
       str_output.string.should =~ /hello\n.*world/
     end
 
     it 'should replay history correctly (single item)' do
-      @hist.push ":blah"
-      @hist.push ":bucket"
-      @hist.push ":ostrich"
+      o = Object.new
+      @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", :history => @hist), str_output) do
-        pry
+      redirect_pry_io(InputTester.new("hist --replay -1", "exit-all"), str_output) do
+        o.pry
       end
-      str_output.string.should =~ /ostrich/
+      o.instance_variable_get(:@x).should == nil
+      o.instance_variable_get(:@y).should == nil
+      o.instance_variable_get(:@z).should == 30
     end
 
     it 'should replay a range of history correctly (range of items)' do
-      @hist.push ":hello"
-      @hist.push ":carl"
+      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", :history => @hist), str_output) do
-        pry
+      redirect_pry_io(InputTester.new("hist --replay 0..2", "exit-all"), str_output) do
+        o.pry
       end
-      str_output.string.should =~ /:hello\n.*:carl/
+      o.instance_variable_get(:@x).should == 10
+      o.instance_variable_get(:@y).should == 20
     end
 
     it 'should grep for correct lines in history' do
@@ -274,21 +313,21 @@ describe "Pry::DefaultCommands::Input" do
       @hist.push "place holder"
 
       str_output = StringIO.new
-      redirect_pry_io(InputTester.new("hist --grep o", "exit-all", :history => @hist), 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/
 
       # 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
+      redirect_pry_io(InputTester.new("hist --grep def blah", "exit-all"), 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
+      redirect_pry_io(InputTester.new("hist --grep      def boink", "exit-all"), str_output) do
         pry
       end
       str_output.string.should =~ /def boink 2/
@@ -300,7 +339,7 @@ describe "Pry::DefaultCommands::Input" do
       end
 
       str_output = StringIO.new
-      redirect_pry_io(InputTester.new("hist --tail 3", "exit-all", :history => @hist), str_output) do
+      redirect_pry_io(InputTester.new("hist --tail 3", "exit-all"), str_output) do
         pry
       end
 
@@ -316,7 +355,7 @@ describe "Pry::DefaultCommands::Input" do
       end
 
       str_output = StringIO.new
-      redirect_pry_io(InputTester.new("hist --head 4", "exit-all", :history => @hist), str_output) do
+      redirect_pry_io(InputTester.new("hist --head 4", "exit-all"), str_output) do
         pry
       end
 
@@ -332,7 +371,7 @@ describe "Pry::DefaultCommands::Input" do
       end
 
       str_output = StringIO.new
-      redirect_pry_io(InputTester.new("hist --show 1..4", "exit-all", :history => @hist), str_output) do
+      redirect_pry_io(InputTester.new("hist --show 1..4", "exit-all"), str_output) do
         pry
       end
 
@@ -342,7 +381,7 @@ describe "Pry::DefaultCommands::Input" do
 
     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
+      redirect_pry_io(InputTester.new("3", "_ += 1", "_ += 1", "hist", "exit-all"), str_output) do
         pry
       end
 
@@ -351,7 +390,7 @@ describe "Pry::DefaultCommands::Input" do
 
     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
+      redirect_pry_io(InputTester.new(":place_holder", "2 + 2", "", "", "3 + 3", "hist", "exit-all"), str_output) do
         pry
       end
 

data/test/test_default_commands/test_introspection.rb

@@ -48,52 +48,52 @@ describe "Pry::DefaultCommands::Introspection" do
         end
 
         it "should reload the file if it is a ruby file" do
-          tf = Tempfile.new(["tmp", ".rb"])
+          tf = Tempfile.new(["pry", ".rb"])
           path = tf.path
 
           mock_pry("edit #{path}", "$rand").should =~ /#{@rand}/
 
-          tf.close
+          tf.close(true)
         end
 
         it "should not reload the file if it is not a ruby file" do
-          tf = Tempfile.new(["tmp", ".py"])
+          tf = Tempfile.new(["pry", ".py"])
           path = tf.path
 
           mock_pry("edit #{path}", "$rand").should.not =~ /#{@rand}/
 
-          tf.close
+          tf.close(true)
         end
 
         it "should not reload a ruby file if -n is given" do
-          tf = Tempfile.new(["tmp", ".rb"])
+          tf = Tempfile.new(["pry", ".rb"])
           path = tf.path
 
           mock_pry("edit -n #{path}", "$rand").should.not =~ /#{@rand}/
 
-          tf.close
+          tf.close(true)
         end
 
         it "should reload a non-ruby file if -r is given" do
-          tf = Tempfile.new(["tmp", ".pryrc"])
+          tf = Tempfile.new(["pry", ".pryrc"])
           path = tf.path
 
           mock_pry("edit -r #{path}", "$rand").should =~ /#{@rand}/
 
-          tf.close
+          tf.close(true)
         end
       end
     end
 
     describe "with --ex" do
       before do
-        @tf = Tempfile.new(["tmp", ".rb"])
+        @tf = Tempfile.new(["pry", ".rb"])
         @path = @tf.path
         @tf << "1\n2\nraise RuntimeError"
         @tf.flush
       end
       after do
-        @tf.close
+        @tf.close(true)
         File.unlink("#{@path}c") if File.exists?("#{@path}c") #rbx
       end
       it "should open the correct file" do
@@ -133,7 +133,7 @@ describe "Pry::DefaultCommands::Introspection" do
 
       it 'should start editor on first level of backtrace when --ex used with no argument ' do
         pry_instance = Pry.new(:input => StringIO.new("edit -n --ex"), :output => StringIO.new)
-        pry_instance.last_exception = MockPryException.new("a:1", "b:2", "c:3")
+        pry_instance.last_exception = mock_exception("a:1", "b:2", "c:3")
         pry_instance.rep(self)
         @__ex_file__.should == "a"
         @__ex_line__.should == 1
@@ -141,7 +141,7 @@ describe "Pry::DefaultCommands::Introspection" do
 
       it 'should start editor on first level of backtrace when --ex 0 used ' do
         pry_instance = Pry.new(:input => StringIO.new("edit -n --ex 0"), :output => StringIO.new)
-        pry_instance.last_exception = MockPryException.new("a:1", "b:2", "c:3")
+        pry_instance.last_exception = mock_exception("a:1", "b:2", "c:3")
         pry_instance.rep(self)
         @__ex_file__.should == "a"
         @__ex_line__.should == 1
@@ -149,7 +149,7 @@ describe "Pry::DefaultCommands::Introspection" do
 
       it 'should start editor on second level of backtrace when --ex 1 used' do
         pry_instance = Pry.new(:input => StringIO.new("edit -n --ex 1"), :output => StringIO.new)
-        pry_instance.last_exception = MockPryException.new("a:1", "b:2", "c:3")
+        pry_instance.last_exception = mock_exception("a:1", "b:2", "c:3")
         pry_instance.rep(self)
         @__ex_file__.should == "b"
         @__ex_line__.should == 2
@@ -157,7 +157,7 @@ describe "Pry::DefaultCommands::Introspection" do
 
       it 'should start editor on third level of backtrace when --ex 2 used' do
         pry_instance = Pry.new(:input => StringIO.new("edit -n --ex 2"), :output => StringIO.new)
-        pry_instance.last_exception = MockPryException.new("a:1", "b:2", "c:3")
+        pry_instance.last_exception = mock_exception("a:1", "b:2", "c:3")
         pry_instance.rep(self)
         @__ex_file__.should == "c"
         @__ex_line__.should == 3
@@ -165,7 +165,7 @@ describe "Pry::DefaultCommands::Introspection" do
 
       it 'should display error message when backtrace level is out of bounds (using --ex 4)' do
         pry_instance = Pry.new(:input => StringIO.new("edit -n --ex 4"), :output => str_output = StringIO.new)
-        pry_instance.last_exception = MockPryException.new("a:1", "b:2", "c:3")
+        pry_instance.last_exception = mock_exception("a:1", "b:2", "c:3")
         pry_instance.rep(self)
         str_output.string.should =~ /Exception has no associated file/
       end
@@ -254,6 +254,10 @@ describe "Pry::DefaultCommands::Introspection" do
       str_output.string.should =~ /def sample/
     end
 
+    it 'should output help' do
+      mock_pry('show-method -h').should =~ /Usage: show-method/
+    end
+
     it 'should output a method\'s source with line numbers' do
       str_output = StringIO.new
       redirect_pry_io(InputTester.new("show-method -l sample_method", "exit-all"), str_output) do
@@ -316,6 +320,59 @@ describe "Pry::DefaultCommands::Introspection" do
       str_output.string.should =~ /Mr flibble/
     end
 
+    it "should find instance methods with -M" do
+      c = Class.new{ def moo; "ve over!"; end }
+      mock_pry(binding, "cd c","show-method -M moo").should =~ /ve over/
+    end
+
+    it "should not find instance methods with -m" do
+      c = Class.new{ def moo; "ve over!"; end }
+      mock_pry(binding, "cd c", "show-method -m moo").should =~ /could not be found/
+    end
+
+    it "should find normal methods with -m" do
+      c = Class.new{ def self.moo; "ve over!"; end }
+      mock_pry(binding, "cd c", "show-method -m moo").should =~ /ve over/
+    end
+
+    it "should not find normal methods with -M" do
+      c = Class.new{ def self.moo; "ve over!"; end }
+      mock_pry(binding, "cd c", "show-method -M moo").should =~ /could not be found/
+    end
+
+    it "should find normal methods with no -M or -m" do
+      c = Class.new{ def self.moo; "ve over!"; end }
+      mock_pry(binding, "cd c", "show-method moo").should =~ /ve over/
+    end
+
+    it "should find instance methods with no -M or -m" do
+      c = Class.new{ def moo; "ve over!"; end }
+      mock_pry(binding, "cd c", "show-method moo").should =~ /ve over/
+    end
+
+    it "should find super methods" do
+      class Foo
+        def foo(*bars)
+          :super_wibble
+        end
+      end
+      o = Foo.new
+      Object.remove_const(:Foo)
+      def o.foo(*bars)
+        :wibble
+      end
+
+      mock_pry(binding, "show-method --super o.foo").should =~ /:super_wibble/
+
+    end
+
+    it "should not raise an exception when a non-extant super method is requested" do
+      o = Object.new
+      def o.foo(*bars); end
+
+      mock_pry(binding, "show-method --super o.foo").should =~ /'self.foo' has no super method/
+    end
+
     # dynamically defined method source retrieval is only supported in
     # 1.9 - where Method#source_location is native
     if RUBY_VERSION =~ /1.9/
@@ -364,7 +421,7 @@ describe "Pry::DefaultCommands::Introspection" do
   describe "edit-method" do
     describe "on a method defined in a file" do
       before do
-        @tempfile = Tempfile.new(['tmp', '*.rb'])
+        @tempfile = Tempfile.new(['pry', '*.rb'])
         @tempfile.puts <<-EOS
           module A
             def a
@@ -398,7 +455,7 @@ describe "Pry::DefaultCommands::Introspection" do
       end
 
       after do
-        @tempfile.close
+        @tempfile.close(true)
       end
 
       describe 'without -p' do