pry 0.9.8.4-i386-mingw32 → 0.9.9-i386-mingw32

data/test/test_default_commands/test_ls.rb

@@ -58,6 +58,14 @@ describe "ls" do
     it "should still work" do
       mock_pry("cd Module.new{ def foobie; end }", "ls -M").should =~ /foobie/
     end
+
+    it "should work for ivars" do
+      mock_pry("module StigmaT1sm; def foobie; @@gharble = 456; end; end", "Object.new.tap{ |o| o.extend(StigmaT1sm) }.foobie", "cd StigmaT1sm", "ls -i").should =~ /@@gharble/
+    end
+
+    it "should include instance methods by default" do
+      mock_pry("ls Module.new{ def shinanagarns; 4; end }").should =~ /shinanagarns/
+    end
   end
 
   describe "constants" do
@@ -124,4 +132,18 @@ describe "ls" do
       end
     end
   end
+
+  if Pry::Helpers::BaseHelpers.jruby?
+    describe 'on java objects' do
+      it 'should omit java-esque aliases by default' do
+        mock_pry('ls java.lang.Thread.current_thread').should =~ / thread_group /
+        mock_pry('ls java.lang.Thread.current_thread').should.not =~ / getThreadGroup /
+      end
+
+      it 'should include java-esque aliases if requested' do
+        mock_pry('ls java.lang.Thread.current_thread -J').should =~ / thread_group /
+        mock_pry('ls java.lang.Thread.current_thread -J').should =~ / getThreadGroup /
+      end
+    end
+  end
 end

data/test/test_default_commands/test_show_source.rb

@@ -0,0 +1,306 @@
+require 'helper'
+
+if !mri18_and_no_real_source_location?
+  describe "show-source" do
+    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
+        pry
+      end
+
+      str_output.string.should =~ /def sample/
+    end
+
+    it 'should output help' do
+      mock_pry('show-source -h').should =~ /Usage: show-source/
+    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
+        pry
+      end
+
+      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
+        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
+
+      o = Object.new
+      def o.sample
+        redirect_pry_io(InputTester.new("show-source", "exit-all"), $str_output) do
+          binding.pry
+        end
+      end
+      o.sample
+
+      $str_output.string.should =~ /def o.sample/
+      $str_output = nil
+    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
+
+      o = Object.new
+      def o.sample
+        redirect_pry_io(InputTester.new("show-source -l", "exit-all"), $str_output) do
+          binding.pry
+        end
+      end
+      o.sample
+
+      $str_output.string.should =~ /\d+: def o.sample/
+      $str_output = nil
+    end
+
+    it "should find methods even if there are spaces in the arguments" do
+      o = Object.new
+      def o.foo(*bars);
+        "Mr flibble"
+        self;
+      end
+
+      str_output = StringIO.new
+      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/
+    end
+
+    it "should find methods even if the object has an overridden method method" do
+      c = Class.new{
+        def method;
+          98
+        end
+      }
+
+      mock_pry(binding, "show-source c.new.method").should =~ /98/
+    end
+
+    it "should find instance_methods even if the class has an override instance_method method" do
+      c = Class.new{
+        def method;
+          98
+        end
+
+        def self.instance_method; 789; end
+      }
+
+      mock_pry(binding, "show-source c#method").should =~ /98/
+    end
+
+    it "should find instance methods with -M" do
+      c = Class.new{ def moo; "ve over!"; end }
+      mock_pry(binding, "cd c","show-source -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-source -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-source -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-source -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-source 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-source 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-source --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-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
+          TOPLEVEL_BINDING.pry
+        end
+
+        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
+          TOPLEVEL_BINDING.pry
+        end
+
+        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
+          TOPLEVEL_BINDING.pry
+        end
+
+        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
+          TOPLEVEL_BINDING.pry
+        end
+
+        str_output.string.should =~ /define_method\(:yup\)/
+        Object.remove_const :A
+      end
+    end
+
+    describe "on modules" do
+      before do
+        class ShowSourceTestClass
+          def alpha
+          end
+        end
+
+        module ShowSourceTestModule
+          def alpha
+          end
+        end
+
+        ShowSourceTestClassWeirdSyntax = Class.new do
+          def beta
+          end
+        end
+
+        ShowSourceTestModuleWeirdSyntax = Module.new do
+          def beta
+          end
+        end
+      end
+
+      after do
+        Object.remove_const :ShowSourceTestClass
+        Object.remove_const :ShowSourceTestClassWeirdSyntax
+        Object.remove_const :ShowSourceTestModule
+        Object.remove_const :ShowSourceTestModuleWeirdSyntax
+      end
+
+      describe "basic functionality, should find top-level module definitions" do
+        it 'should show source for a class' do
+          mock_pry("show-source ShowSourceTestClass").should =~ /class ShowSourceTest.*?def alpha/m
+        end
+
+        it 'should show source for a module' do
+          mock_pry("show-source ShowSourceTestModule").should =~ /module ShowSourceTestModule/
+        end
+
+        it 'should show source for a class when Const = Class.new syntax is used' do
+          mock_pry("show-source ShowSourceTestClassWeirdSyntax").should =~ /ShowSourceTestClassWeirdSyntax = Class.new/
+        end
+
+        it 'should show source for a module when Const = Module.new syntax is used' do
+          mock_pry("show-source ShowSourceTestModuleWeirdSyntax").should =~ /ShowSourceTestModuleWeirdSyntax = Module.new/
+        end
+      end
+
+      if !Pry::Helpers::BaseHelpers.mri_18?
+        describe "in REPL" do
+          it 'should find class defined in repl' do
+            mock_pry("class TobinaMyDog", "def woof", "end", "end", "show-source TobinaMyDog").should =~ /class TobinaMyDog/
+            Object.remove_const :TobinaMyDog
+          end
+        end
+      end
+
+      it 'should lookup module name with respect to current context' do
+        constant_scope(:AlphaClass, :BetaClass) do
+          class BetaClass
+            def alpha
+            end
+          end
+
+          class AlphaClass
+            class BetaClass
+              def beta
+              end
+            end
+          end
+
+          redirect_pry_io(InputTester.new("show-source BetaClass", "exit-all"), out=StringIO.new) do
+            AlphaClass.pry
+          end
+
+          out.string.should =~ /def beta/
+        end
+      end
+
+      it 'should lookup nested modules' do
+        constant_scope(:AlphaClass) do
+          class AlphaClass
+            class BetaClass
+              def beta
+              end
+            end
+          end
+
+          mock_pry("show-source AlphaClass::BetaClass").should =~ /class BetaClass/
+        end
+      end
+
+      describe "show-source -a" do
+        it 'should show the source for all monkeypatches defined in different files' do
+          class TestClassForShowSource
+            def beta
+            end
+          end
+
+          result = mock_pry("show-source TestClassForShowSource -a")
+          result.should =~ /def alpha/
+          result.should =~ /def beta/
+        end
+      end
+    end
+  end
+end

data/test/test_pry.rb

@@ -188,7 +188,7 @@ describe Pry do
         it "should not mutate the input!" do
           clean = "puts <<-FOO\nhi\nFOO\n"
           a = clean.dup
-          Pry.new.complete_expression?(a)
+          Pry::Code.complete_expression?(a)
           a.should == clean
         end
       end
@@ -444,8 +444,8 @@ describe Pry do
           str_output.string.should =~ /20/
         end
 
-        it "should error if more than one argument is passed to Object#pry" do
-          lambda { pry(20, :input => Readline) }.should.raise ArgumentError
+        it "should raise if more than two arguments are passed to Object#pry" do
+          lambda { pry(20, :quiet, :input => Readline) }.should.raise ArgumentError
         end
       end
 

data/test/test_pry_defaults.rb

@@ -377,4 +377,25 @@ describe "test Pry defaults" do
     Pry.reset_defaults
     Pry.color = false
   end
+
+  describe 'quiet' do
+    it 'should show whereami by default' do
+      output = StringIO.new
+      Pry.start(binding, :input => InputTester.new("1", "exit-all"),
+              :output => output,
+              :hooks => Pry::DEFAULT_HOOKS)
+
+      output.string.should =~ /[w]hereami by default/
+    end
+
+    it 'should hide whereami if quiet is set' do
+      output = StringIO.new
+      Pry.new(:input => InputTester.new("exit-all"),
+              :output => output,
+              :quiet => true,
+              :hooks => Pry::DEFAULT_HOOKS)
+
+      output.string.should == ""
+    end
+  end
 end

data/test/test_sticky_locals.rb

@@ -32,7 +32,87 @@ describe "Sticky locals (_file_ and friends)" do
     Pry.commands.delete "file-and-dir-test"
   end
 
-  describe "User defined sticky locals, Pry#add_sticky_local()" do
+  describe "User defined sticky locals" do
+    describe "setting as Pry.config option" do
+      it 'should define a new sticky local for the session (normal value)' do
+        Pry.config.extra_sticky_locals[:test_local] = :john
+
+        o = Object.new
+        redirect_pry_io(InputTester.new("@value = test_local",
+                                        "exit-all")) do
+          Pry.start(o)
+        end
+
+        o.instance_variable_get(:@value).should == :john
+        Pry.config.extra_sticky_locals = {}
+      end
+
+      it 'should define a new sticky local for the session (proc)' do
+        Pry.config.extra_sticky_locals[:test_local] = proc { :john }
+
+        o = Object.new
+        redirect_pry_io(InputTester.new("@value = test_local",
+                                        "exit-all")) do
+          Pry.start(o)
+        end
+
+        o.instance_variable_get(:@value).should == :john
+        Pry.config.extra_sticky_locals = {}
+      end
+
+    end
+
+    describe "passing in as hash option when creating pry instance" do
+      it 'should define a new sticky local for the session (normal value)' do
+        o = Object.new
+        redirect_pry_io(InputTester.new("@value = test_local",
+                                        "exit-all")) do
+          Pry.start(o, :extra_sticky_locals => { :test_local => :john } )
+        end
+
+        o.instance_variable_get(:@value).should == :john
+      end
+
+      it 'should define multiple sticky locals' do
+        o = Object.new
+        redirect_pry_io(InputTester.new("@value1 = test_local1",
+                                        "@value2 = test_local2",
+                                        "exit-all")) do
+          Pry.start(o, :extra_sticky_locals => { :test_local1 => :john ,
+                      :test_local2 => :carl} )
+        end
+
+        o.instance_variable_get(:@value1).should == :john
+        o.instance_variable_get(:@value2).should == :carl
+      end
+
+
+      it 'should define a new sticky local for the session (as Proc)' do
+        o = Object.new
+        redirect_pry_io(InputTester.new("@value = test_local",
+                                        "exit-all")) do
+          Pry.start(o, :extra_sticky_locals => { :test_local => proc { :john }} )
+        end
+
+        o.instance_variable_get(:@value).should == :john
+      end
+    end
+
+    describe "hash option value should override config value" do
+      it 'should define a new sticky local for the session (normal value)' do
+        Pry.config.extra_sticky_locals[:test_local] = :john
+
+        o = Object.new
+        redirect_pry_io(InputTester.new("@value = test_local",
+                                        "exit-all")) do
+          Pry.start(o, :extra_sticky_locals => { :test_local => :carl })
+        end
+
+        o.instance_variable_get(:@value).should == :carl
+        Pry.config.extra_sticky_locals = {}
+      end
+    end
+
     it 'should create a new sticky local' do
       o = Object.new
       pi = Pry.new