pry 0.9.9.6pre2-i386-mingw32 → 0.9.10-i386-mingw32

data/test/test_default_commands/test_introspection.rb

@@ -1,7 +1,6 @@
 require 'helper'
 
 describe "Pry::DefaultCommands::Introspection" do
-
   describe "edit" do
     before do
       @old_editor = Pry.config.editor
@@ -11,6 +10,7 @@ describe "Pry::DefaultCommands::Introspection" do
         nil
       end
     end
+
     after do
       Pry.config.editor = @old_editor
     end
@@ -458,6 +458,10 @@ describe "Pry::DefaultCommands::Introspection" do
   # show-command only works in implementations that support Proc#source_location
   if Proc.method_defined?(:source_location)
     describe "show-command" do
+      before do
+        @str_output = StringIO.new
+      end
+
       it 'should show source for an ordinary command' do
         set = Pry::CommandSet.new do
           import_from Pry::Commands, "show-command"
@@ -465,11 +469,12 @@ describe "Pry::DefaultCommands::Introspection" do
             :body_of_foo
           end
         end
-        str_output = StringIO.new
-        redirect_pry_io(InputTester.new("show-command foo"), str_output) do
+
+        redirect_pry_io(InputTester.new("show-command foo"), @str_output) do
           Pry.new(:commands => set).rep
         end
-        str_output.string.should =~ /:body_of_foo/
+
+        @str_output.string.should =~ /:body_of_foo/
       end
 
       it 'should show source for a command with spaces in its name' do
@@ -479,11 +484,12 @@ describe "Pry::DefaultCommands::Introspection" do
             :body_of_foo_bar
           end
         end
-        str_output = StringIO.new
-        redirect_pry_io(InputTester.new("show-command \"foo bar\""), str_output) do
+
+        redirect_pry_io(InputTester.new("show-command \"foo bar\""), @str_output) do
           Pry.new(:commands => set).rep
         end
-        str_output.string.should =~ /:body_of_foo_bar/
+
+        @str_output.string.should =~ /:body_of_foo_bar/
       end
 
       it 'should show source for a command by listing name' do
@@ -493,14 +499,13 @@ describe "Pry::DefaultCommands::Introspection" do
             :body_of_foo_regex
           end
         end
-        str_output = StringIO.new
-        redirect_pry_io(InputTester.new("show-command bar"), str_output) do
+
+        redirect_pry_io(InputTester.new("show-command bar"), @str_output) do
           Pry.new(:commands => set).rep
         end
-        str_output.string.should =~ /:body_of_foo_regex/
+
+        @str_output.string.should =~ /:body_of_foo_regex/
       end
     end
   end
-
-
 end

data/test/test_default_commands/test_ls.rb

@@ -1,4 +1,5 @@
 require 'helper'
+
 describe "ls" do
   describe "below ceiling" do
     it "should stop before Object by default" do
@@ -30,21 +31,21 @@ describe "ls" do
 
   describe "methods" do
     it "should show public methods by default" do
-      mock_pry("ls Class.new{ def goo; end }.new").should =~ /goo/
+      mock_pry("ls Class.new{ def goo; end }.new").should =~ /methods: goo/
     end
 
     it "should not show protected/private by default" do
-      mock_pry("ls -M Class.new{ def goo; end; private :goo }").should.not =~ /goo/
-      mock_pry("ls Class.new{ def goo; end; protected :goo }.new").should.not =~ /goo/
+      mock_pry("ls -M Class.new{ def goo; end; private :goo }").should.not =~ /methods: goo/
+      mock_pry("ls Class.new{ def goo; end; protected :goo }.new").should.not =~ /methods: goo/
     end
 
     it "should show public methods with -p" do
-      mock_pry("ls -p Class.new{ def goo; end }.new").should =~ /goo/
+      mock_pry("ls -p Class.new{ def goo; end }.new").should =~ /methods: goo/
     end
 
     it "should show protected/private methods with -p" do
-      mock_pry("ls -pM Class.new{ def goo; end; protected :goo }").should =~ /goo/
-      mock_pry("ls -p Class.new{ def goo; end; private :goo }.new").should =~ /goo/
+      mock_pry("ls -pM Class.new{ def goo; end; protected :goo }").should =~ /methods: goo/
+      mock_pry("ls -p Class.new{ def goo; end; private :goo }.new").should =~ /methods: goo/
     end
 
     it "should work for objects with an overridden method method" do
@@ -92,6 +93,7 @@ describe "ls" do
       mock_pry("ls -c").should =~ /ArgumentError/
       mock_pry("ls -c --grep Run").should.not =~ /ArgumentError/
     end
+
     it "should still output matching things" do
       mock_pry("ls -c --grep Run").should =~ /RuntimeError/
     end

data/test/test_default_commands/test_shell.rb

@@ -154,7 +154,7 @@ describe "Pry::DefaultCommands::Shell" do
 
     describe "-c" do
       it 'should save a command to a file' do
-        redirect_pry_io(InputTester.new("save-file #{@path} -c show-method",
+        redirect_pry_io(InputTester.new("save-file #{@path} -k show-method",
                                         "exit-all")) do
           Pry.start(@o)
         end
@@ -192,6 +192,9 @@ describe "Pry::DefaultCommands::Shell" do
   end
 
   describe "cat" do
+    before do
+      @str_output = StringIO.new
+    end
 
     describe "on receiving a file that does not exist" do
       it 'should display an error message' do
@@ -250,7 +253,7 @@ describe "Pry::DefaultCommands::Shell" do
 
     describe "with --ex N" do
       it 'should cat first level of backtrace when --ex used with no argument ' do
-        pry_instance = Pry.new(:input => StringIO.new("cat --ex"), :output => str_output = StringIO.new)
+        pry_instance = Pry.new(:input => StringIO.new("cat --ex"), :output => @str_output)
 
         temp_file do |f|
           f << "bt number 1"
@@ -259,11 +262,11 @@ describe "Pry::DefaultCommands::Shell" do
           pry_instance.rep(self)
         end
 
-        str_output.string.should =~ /bt number 1/
+        @str_output.string.should =~ /bt number 1/
       end
 
       it 'should cat first level of backtrace when --ex 0 used ' do
-        pry_instance = Pry.new(:input => StringIO.new("cat --ex 0"), :output => str_output = StringIO.new)
+        pry_instance = Pry.new(:input => StringIO.new("cat --ex 0"), :output => @str_output)
 
         temp_file do |f|
           f << "bt number 1"
@@ -272,11 +275,11 @@ describe "Pry::DefaultCommands::Shell" do
           pry_instance.rep(self)
         end
 
-        str_output.string.should =~ /bt number 1/
+        @str_output.string.should =~ /bt number 1/
       end
 
       it 'should cat second level of backtrace when --ex 1 used ' do
-        pry_instance = Pry.new(:input => StringIO.new("cat --ex 1"), :output => str_output = StringIO.new)
+        pry_instance = Pry.new(:input => StringIO.new("cat --ex 1"), :output => @str_output)
 
         temp_file do |f|
           f << "bt number 2"
@@ -285,11 +288,11 @@ describe "Pry::DefaultCommands::Shell" do
           pry_instance.rep(self)
         end
 
-        str_output.string.should =~ /bt number 2/
+        @str_output.string.should =~ /bt number 2/
       end
 
       it 'should cat third level of backtrace when --ex 2 used' do
-        pry_instance = Pry.new(:input => StringIO.new("cat --ex 2"), :output => str_output = StringIO.new)
+        pry_instance = Pry.new(:input => StringIO.new("cat --ex 2"), :output => @str_output)
 
         temp_file do |f|
           f << "bt number 3"
@@ -298,14 +301,14 @@ describe "Pry::DefaultCommands::Shell" do
           pry_instance.rep(self)
         end
 
-        str_output.string.should =~ /bt number 3/
+        @str_output.string.should =~ /bt number 3/
       end
 
       it 'should show error when backtrace level out of bounds' do
-        pry_instance = Pry.new(:input => StringIO.new("cat --ex 3"), :output => str_output = StringIO.new)
+        pry_instance = Pry.new(:input => StringIO.new("cat --ex 3"), :output => @str_output)
         pry_instance.last_exception = mock_exception("x", "x", "x")
         pry_instance.rep(self)
-        str_output.string.should =~ /out of bounds/
+        @str_output.string.should =~ /out of bounds/
       end
 
       it 'each successive cat --ex should show the next level of backtrace, and going past the final level should return to the first' do
@@ -317,18 +320,18 @@ describe "Pry::DefaultCommands::Shell" do
         end
 
         pry_instance = Pry.new(:input => StringIO.new("cat --ex\n" * 4),
-                               :output => (str_output = StringIO.new))
+                               :output => @str_output)
 
         pry_instance.last_exception = mock_exception(*temp_files.map { |f| "#{f.path}:1" })
 
         3.times do |i|
           pry_instance.rep(self)
-          str_output.string.should =~ /bt number #{i}/
+          @str_output.string.should =~ /bt number #{i}/
         end
 
-        str_output.reopen
+        @str_output.reopen
         pry_instance.rep(self)
-        str_output.string.should =~ /bt number 0/
+        @str_output.string.should =~ /bt number 0/
 
         temp_files.each do |file|
           file.close(true)

data/test/test_default_commands/test_show_source.rb

@@ -2,13 +2,21 @@ require 'helper'
 
 if !mri18_and_no_real_source_location?
   describe "show-source" do
+    before do
+      @str_output = StringIO.new
+      @o = Object.new
+    end
+
+    after do
+      Pad.clear
+    end
+
     it 'should output a method\'s source' do
-      str_output = StringIO.new
-      redirect_pry_io(InputTester.new("show-source sample_method", "exit-all"), str_output) do
+      redirect_pry_io(InputTester.new("show-source sample_method", "exit-all"), @str_output) do
         pry
       end
 
-      str_output.string.should =~ /def sample/
+      @str_output.string.should =~ /def sample/
     end
 
     it 'should output help' do
@@ -16,65 +24,59 @@ if !mri18_and_no_real_source_location?
     end
 
     it 'should output a method\'s source with line numbers' do
-      str_output = StringIO.new
-      redirect_pry_io(InputTester.new("show-source -l sample_method", "exit-all"), str_output) do
+      redirect_pry_io(InputTester.new("show-source -l sample_method", "exit-all"), @str_output) do
         pry
       end
 
-      str_output.string.should =~ /\d+: def sample/
+      @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-source -b sample_method", "exit-all"), str_output) do
+      redirect_pry_io(InputTester.new("show-source -b sample_method", "exit-all"), @str_output) do
         pry
       end
 
-      str_output.string.should =~ /1: def sample/
+      @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
+      Pad.str_output = @str_output
 
-      o = Object.new
-      def o.sample
-        redirect_pry_io(InputTester.new("show-source", "exit-all"), $str_output) do
+      def @o.sample
+        redirect_pry_io(InputTester.new("show-source", "exit-all"), Pad.str_output) do
           binding.pry
         end
       end
-      o.sample
+      @o.sample
 
-      $str_output.string.should =~ /def o.sample/
-      $str_output = nil
+      Pad.str_output.string.should =~ /def @o.sample/
     end
 
     it 'should output a method\'s source if inside method without needing to use method name, and using the -l switch' do
-      $str_output = StringIO.new
+      Pad.str_output = @str_output
 
-      o = Object.new
-      def o.sample
-        redirect_pry_io(InputTester.new("show-source -l", "exit-all"), $str_output) do
+      def @o.sample
+        redirect_pry_io(InputTester.new("show-source -l", "exit-all"), Pad.str_output) do
           binding.pry
         end
       end
-      o.sample
+      @o.sample
 
-      $str_output.string.should =~ /\d+: def o.sample/
-      $str_output = nil
+      Pad.str_output.string.should =~ /def @o.sample/
     end
 
     it "should find methods even if there are spaces in the arguments" do
-      o = Object.new
-      def o.foo(*bars);
+      def @o.foo(*bars)
         "Mr flibble"
-        self;
+        self
       end
 
-      str_output = StringIO.new
-      redirect_pry_io(InputTester.new("show-source o.foo('bar', 'baz bam').foo", "exit-all"), str_output) do
+      redirect_pry_io(InputTester.new("show-source @o.foo('bar', 'baz bam').foo",
+                                      "exit-all"), @str_output) do
         binding.pry
       end
-      str_output.string.should =~ /Mr flibble/
+
+      @str_output.string.should =~ /Mr flibble/
     end
 
     it "should find methods even if the object has an overridden method method" do
@@ -145,54 +147,49 @@ if !mri18_and_no_real_source_location?
     end
 
     it "should not raise an exception when a non-extant super method is requested" do
-      o = Object.new
-      def o.foo(*bars); end
+      def @o.foo(*bars); end
 
-      mock_pry(binding, "show-source --super o.foo").should =~ /'self.foo' has no super method/
+      mock_pry(binding, "show-source --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/
       it 'should output a method\'s source for a method defined inside pry' do
-        str_output = StringIO.new
-        redirect_pry_io(InputTester.new("def dyna_method", ":testing", "end", "show-source dyna_method"), str_output) do
+        redirect_pry_io(InputTester.new("def dyna_method", ":testing", "end", "show-source dyna_method"), @str_output) do
           TOPLEVEL_BINDING.pry
         end
 
-        str_output.string.should =~ /def dyna_method/
+        @str_output.string.should =~ /def dyna_method/
         Object.remove_method :dyna_method
       end
 
       it 'should output a method\'s source for a method defined inside pry, even if exceptions raised before hand' do
-        str_output = StringIO.new
-        redirect_pry_io(InputTester.new("bad code", "123", "bad code 2", "1 + 2", "def dyna_method", ":testing", "end", "show-source dyna_method"), str_output) do
+        redirect_pry_io(InputTester.new("bad code", "123", "bad code 2", "1 + 2", "def dyna_method", ":testing", "end", "show-source dyna_method"), @str_output) do
           TOPLEVEL_BINDING.pry
         end
 
-        str_output.string.should =~ /def dyna_method/
+        @str_output.string.should =~ /def dyna_method/
         Object.remove_method :dyna_method
       end
 
       it 'should output an instance method\'s source for a method defined inside pry' do
-        str_output = StringIO.new
         Object.remove_const :A if defined?(A)
-        redirect_pry_io(InputTester.new("class A", "def yo", "end", "end", "show-source A#yo"), str_output) do
+        redirect_pry_io(InputTester.new("class A", "def yo", "end", "end", "show-source A#yo"), @str_output) do
           TOPLEVEL_BINDING.pry
         end
 
-        str_output.string.should =~ /def yo/
+        @str_output.string.should =~ /def yo/
         Object.remove_const :A
       end
 
       it 'should output an instance method\'s source for a method defined inside pry using define_method' do
-        str_output = StringIO.new
         Object.remove_const :A if defined?(A)
-        redirect_pry_io(InputTester.new("class A", "define_method(:yup) {}", "end", "show-source A#yup"), str_output) do
+        redirect_pry_io(InputTester.new("class A", "define_method(:yup) {}", "end", "show-source A#yup"), @str_output) do
           TOPLEVEL_BINDING.pry
         end
 
-        str_output.string.should =~ /define_method\(:yup\)/
+        @str_output.string.should =~ /define_method\(:yup\)/
         Object.remove_const :A
       end
     end
@@ -289,6 +286,9 @@ if !mri18_and_no_real_source_location?
         end
       end
 
+      # note that pry assumes a class is only monkey-patched at most
+      # ONCE per file, so will not find multiple monkeypatches in the
+      # SAME file.
       describe "show-source -a" do
         it 'should show the source for all monkeypatches defined in different files' do
           class TestClassForShowSource
@@ -300,7 +300,133 @@ if !mri18_and_no_real_source_location?
           result.should =~ /def alpha/
           result.should =~ /def beta/
         end
+
+        it 'should show the source for a class_eval-based monkeypatch' do
+          TestClassForShowSourceClassEval.class_eval do
+            def class_eval_method
+            end
+          end
+
+          result = mock_pry("show-source TestClassForShowSourceClassEval -a")
+          result.should =~ /def class_eval_method/
+        end
+
+        it 'should show the source for an instance_eval-based monkeypatch' do
+          TestClassForShowSourceInstanceEval.instance_eval do
+            def instance_eval_method
+            end
+          end
+
+          result = mock_pry("show-source TestClassForShowSourceInstanceEval -a")
+          result.should =~ /def instance_eval_method/
+        end
+      end
+
+      describe "when show-source is invoked without a method or class argument" do
+        before do
+          module TestHost
+            class M
+              def alpha; end
+              def beta; end
+            end
+
+            module C
+            end
+
+            module D
+              def self.invoked_in_method
+                redirect_pry_io(InputTester.new("show-source", "exit-all"), out = StringIO.new) do
+                  Pry.start(binding)
+                end
+                out.string
+              end
+            end
+          end
+        end
+
+        after do
+          Object.remove_const(:TestHost)
+        end
+
+        describe "inside a module" do
+          it 'should display module source by default' do
+            redirect_pry_io(InputTester.new("show-source", "exit-all"), out = StringIO.new) do
+              Pry.start(TestHost::M)
+            end
+
+            out.string.should =~ /class M/
+            out.string.should =~ /def alpha/
+            out.string.should =~ /def beta/
+          end
+
+          it 'should be unable to find module source if no methods defined' do
+            redirect_pry_io(InputTester.new("show-source", "exit-all"), out = StringIO.new) do
+              Pry.start(TestHost::C)
+            end
+
+            out.string.should.should =~ /Cannot find a definition for/
+          end
+
+          it 'should display method code (rather than class) if Pry started inside method binding' do
+            string = TestHost::D.invoked_in_method
+            string.should =~ /invoked_in_method/
+            string.should.not =~ /module D/
+          end
+
+          it 'should display class source when inside instance' do
+            redirect_pry_io(InputTester.new("show-source", "exit-all"), out = StringIO.new) do
+              Pry.start(TestHost::M.new)
+            end
+
+            out.string.should =~ /class M/
+            out.string.should =~ /def alpha/
+            out.string.should =~ /def beta/
+          end
+
+          it 'should allow options to be passed' do
+            redirect_pry_io(InputTester.new("show-source -b", "exit-all"), out = StringIO.new) do
+              Pry.start(TestHost::M)
+            end
+
+            out.string.should =~ /\d:\s*class M/
+            out.string.should =~ /\d:\s*def alpha/
+            out.string.should =~ /\d:\s*def beta/
+          end
+
+           describe "should skip over broken modules" do
+            before do
+              module BabyDuck
+
+                module Muesli
+                  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
+
+                module Muesli
+                  def d; end
+                  def e; end
+                end
+              end
+            end
+
+            after do
+              Object.remove_const(:BabyDuck)
+            end
+
+            it 'should return source for first valid module' do
+              redirect_pry_io(InputTester.new("show-source BabyDuck::Muesli"), out = StringIO.new) do
+                Pry.start
+              end
+
+              out.string.should =~ /def d; end/
+              out.string.should.not =~ /def a; end/
+            end
+
+          end
+        end
       end
     end
   end
 end
+