pry 0.9.9.6 → 0.9.10pre1

data/test/test_exception_whitelist.rb

@@ -1,15 +1,19 @@
 require 'helper'
 
 describe "Pry.config.exception_whitelist" do
+  before do
+    @str_output = StringIO.new
+  end
+
   it 'should rescue all exceptions NOT specified on whitelist' do
     Pry.config.exception_whitelist.include?(NameError).should == false
-    lambda { Pry.start(self, :input => StringIO.new("raise NameError\nexit"), :output => StringIO.new) }.should.not.raise NameError
+    lambda { Pry.start(self, :input => StringIO.new("raise NameError\nexit"), :output => @str_output) }.should.not.raise NameError
   end
 
   it 'should NOT rescue exceptions specified on whitelist' do
     old_whitelist = Pry.config.exception_whitelist
     Pry.config.exception_whitelist = [NameError]
-    lambda { Pry.start(self, :input => StringIO.new("raise NameError"), :output => StringIO.new) }.should.raise NameError
+    lambda { Pry.start(self, :input => StringIO.new("raise NameError"), :output => @str_output) }.should.raise NameError
     Pry.config.exception_whitelist = old_whitelist
   end
 end

data/test/test_hooks.rb

@@ -316,6 +316,7 @@ describe Pry::Hooks do
         redirect_pry_io(StringIO.new("exit"), out=StringIO.new) do
           Pry.start binding, :hello => :baby
         end
+
         options[:hello].should == :baby
 
         Pry.config.hooks.delete_hook(:when_started, :test_hook)
@@ -394,6 +395,37 @@ describe Pry::Hooks do
         Pry.config.exception_whitelist = old_ew
       end
 
+      describe "before_eval hook" do
+        describe "modifying input code" do
+          it 'should replace input code with code determined by hook' do
+            hooks = Pry::Hooks.new.add_hook(:before_eval, :quirk) { |code, pry| code.replace(":little_duck") }
+            redirect_pry_io(InputTester.new(":jemima", "exit-all"), out = StringIO.new) do
+              Pry.start(self, :hooks => hooks)
+            end
+            out.string.should =~ /little_duck/
+            out.string.should.not =~ /jemima/
+          end
+
+          it 'should not interfere with command processing when replacing input code' do
+            commands = Pry::CommandSet.new do
+              import_from Pry::Commands, "exit-all"
+
+              command "how-do-you-like-your-blue-eyed-boy-now-mister-death" do
+                output.puts "in hours of bitterness i imagine balls of sapphire, of metal"
+              end
+            end
+
+            hooks = Pry::Hooks.new.add_hook(:before_eval, :quirk) { |code, pry| code.replace(":little_duck") }
+            redirect_pry_io(InputTester.new("how-do-you-like-your-blue-eyed-boy-now-mister-death", "exit-all"), out = StringIO.new) do
+              Pry.start(self, :hooks => hooks, :commands => commands)
+            end
+            out.string.should =~ /in hours of bitterness i imagine balls of sapphire, of metal/
+            out.string.should.not =~ /little_duck/
+          end
+        end
+
+      end
+
       describe "exceptions" do
         before do
           Pry.config.hooks.add_hook(:after_eval, :baddums){ raise "Baddums" }

data/test/test_input_stack.rb

@@ -2,6 +2,10 @@
 require 'helper'
 
 describe "Pry#input_stack" do
+  before do
+    @str_output = StringIO.new
+  end
+
   it 'should accept :input_stack as a config option' do
     stack = [StringIO.new("test")]
     Pry.new(:input_stack => stack).input_stack.should == stack
@@ -16,30 +20,30 @@ describe "Pry#input_stack" do
   it 'should read from all input objects on stack and exit session (usingn repl)' do
     stack = [b = StringIO.new(":cloister\nexit\n"), c = StringIO.new(":baron\n")]
     instance = Pry.new(:input => StringIO.new(":alex\n"),
-                       :output => str_output = StringIO.new,
+                       :output => @str_output,
                        :input_stack => stack)
 
     instance.repl
-    str_output.string.should =~ /:alex/
-    str_output.string.should =~ /:baron/
-    str_output.string.should =~ /:cloister/
+    @str_output.string.should =~ /:alex/
+    @str_output.string.should =~ /:baron/
+    @str_output.string.should =~ /:cloister/
   end
 
   it 'input objects should be popped off stack as they are used up' do
     stack = [StringIO.new(":cloister\n"), StringIO.new(":baron\n")]
     instance = Pry.new(:input => StringIO.new(":alex\n"),
-                       :output => str_output = StringIO.new,
+                       :output => @str_output,
                        :input_stack => stack)
 
     stack.size.should == 2
 
     instance.rep
-    str_output.string.should =~ /:alex/
+    @str_output.string.should =~ /:alex/
     instance.rep
-    str_output.string.should =~ /:baron/
+    @str_output.string.should =~ /:baron/
     stack.size.should == 1
     instance.rep
-    str_output.string.should =~ /:cloister/
+    @str_output.string.should =~ /:cloister/
     stack.size.should == 0
   end
 
@@ -47,25 +51,24 @@ describe "Pry#input_stack" do
     redirect_pry_io(StringIO.new(":rimbaud\nexit\n"), StringIO.new) do
       stack = [StringIO.new(":cloister\n"), StringIO.new(":baron\n")]
       instance = Pry.new(:input => StringIO.new(":alex\n"),
-                         :output => str_output = StringIO.new,
+                         :output => @str_output,
                          :input_stack => stack)
 
       instance.repl
-      str_output.string.should =~ /:alex/
-      str_output.string.should =~ /:baron/
-      str_output.string.should =~ /:cloister/
-      str_output.string.should =~ /:rimbaud/
+      @str_output.string.should =~ /:alex/
+      @str_output.string.should =~ /:baron/
+      @str_output.string.should =~ /:cloister/
+      @str_output.string.should =~ /:rimbaud/
     end
   end
 
   it 'should display error and throw(:breakout) if at end of input after using up input_stack objects' do
-    str_output = StringIO.new
     catch(:breakout) do
-      redirect_pry_io(StringIO.new(":rimbaud\n"), str_output) do
+      redirect_pry_io(StringIO.new(":rimbaud\n"), @str_output) do
         Pry.new(:input_stack => [StringIO.new(":a\n"), StringIO.new(":b\n")]).repl
       end
     end
-    str_output.string.should =~ /Error: Pry ran out of things to read/
+    @str_output.string.should =~ /Error: Pry ran out of things to read/
   end
 
   if "".respond_to?(:encoding)

data/test/test_method.rb

@@ -79,10 +79,6 @@ describe Pry::Method do
       Pry::Method.from_binding(Class.new{ def self.foo; binding; end }.foo).name.should == "foo"
     end
 
-    it 'should NOT find a method from the special pry bindings' do
-      Pry::Method.from_binding(5.__binding__).should == nil
-    end
-
     it 'should NOT find a method from the toplevel binding' do
       Pry::Method.from_binding(TOPLEVEL_BINDING).should == nil
     end

data/test/test_prompt.rb

@@ -0,0 +1,60 @@
+require 'helper'
+
+describe "Prompts" do
+  describe "one-parameter prompt proc" do
+    it 'should get full config object' do
+      config = nil
+      redirect_pry_io(InputTester.new("exit-all")) do
+        Pry.start(self, :prompt => proc { |v| config = v })
+      end
+      config.is_a?(OpenStruct).should == true
+    end
+
+    it 'should get full config object, when using a proc array' do
+      config1 = nil
+      redirect_pry_io(InputTester.new("exit-all")) do
+        Pry.start(self, :prompt => [proc { |v| config1 = v }, proc { |v| config2 = v }])
+      end
+      config1.is_a?(OpenStruct).should == true
+    end
+
+    it 'should receive correct data in the config object' do
+      config = nil
+      redirect_pry_io(InputTester.new("def hello", "exit-all")) do
+        Pry.start(self, :prompt => proc { |v| config = v })
+      end
+      config.eval_string.should =~ /def hello/
+      config.nesting_level.should == 0
+      config.expr_number.should == 1
+      config.cont.should == true
+      config._pry_.is_a?(Pry).should == true
+      config.object.should == self
+    end
+  end
+
+  describe "BACKWARDS COMPATIBILITY: 3 parameter prompt proc" do
+    it 'should get 3 parameters' do
+      o = n = p = nil
+      redirect_pry_io(InputTester.new("exit-all")) do
+        Pry.start(:test, :prompt => proc { |obj, nesting, _pry_|
+                    o, n, p = obj, nesting, _pry_ })
+      end
+      o.should == :test
+      n.should == 0
+      p.is_a?(Pry).should == true
+    end
+
+    it 'should get 3 parameters, when using proc array' do
+      o1 = n1 = p1 = nil
+      redirect_pry_io(InputTester.new("exit-all")) do
+        Pry.start(:test, :prompt => [proc { |obj, nesting, _pry_|
+                                       o1, n1, p1 = obj, nesting, _pry_ },
+                                     proc { |obj, nesting, _pry_|
+                                       o2, n2, p2 = obj, nesting, _pry_ }])
+      end
+      o1.should == :test
+      n1.should == 0
+      p1.is_a?(Pry).should == true
+    end
+  end
+end

data/test/test_pry.rb

@@ -1,6 +1,9 @@
 require 'helper'
 
 describe Pry do
+  before do
+    @str_output = StringIO.new
+  end
 
   if RUBY_VERSION =~ /1.9/
     describe "Exotic object support" do
@@ -44,10 +47,9 @@ describe Pry do
       # bug fix for https://github.com/banister/pry/issues/93
       it 'should not leak pry constants into Object namespace' do
         input_string = "Command"
-        str_output = StringIO.new
         o = Object.new
         pry_tester = Pry.new(:input => StringIO.new(input_string),
-                             :output => str_output,
+                             :output => @str_output,
                              :exception_handler => proc { |_, exception, _pry_| @excep = exception },
                              :print => proc {}
                              ).rep(o)
@@ -57,12 +59,11 @@ describe Pry do
 
       if defined?(BasicObject)
         it 'should be able to operate inside the BasicObject class' do
-          $obj = nil
-          redirect_pry_io(InputTester.new(":foo", "$obj = _", "exit-all"), StringIO.new) do
+          redirect_pry_io(InputTester.new(":foo", "Pad.obj = _", "exit-all")) do
             BasicObject.pry
           end
-          $obj.should == :foo
-          $obj = nil
+
+          Pad.obj.should == :foo
         end
       end
 
@@ -77,31 +78,28 @@ describe Pry do
       end
 
       it 'should display error and throw(:breakout) if Pry instance runs out of input' do
-        str_output = StringIO.new
         catch(:breakout) do
-          redirect_pry_io(StringIO.new(":nothing\n"), str_output) do
+          redirect_pry_io(StringIO.new(":nothing\n"), @str_output) do
             Pry.new.repl
           end
         end
-        str_output.string.should =~ /Error: Pry ran out of things to read/
+        @str_output.string.should =~ /Error: Pry ran out of things to read/
       end
 
       it 'should make self evaluate to the receiver of the rep session' do
         o = :john
-        str_output = StringIO.new
 
-        pry_tester = Pry.new(:input => InputTester.new("self"), :output => str_output)
+        pry_tester = Pry.new(:input => InputTester.new("self"), :output => @str_output)
         pry_tester.rep(o)
-        str_output.string.should =~ /:john/
+        @str_output.string.should =~ /:john/
       end
 
       it 'should work with multi-line input' do
         o = Object.new
-        str_output = StringIO.new
 
-        pry_tester = Pry.new(:input => InputTester.new("x = ", "1 + 4"), :output => str_output)
+        pry_tester = Pry.new(:input => InputTester.new("x = ", "1 + 4"), :output => @str_output)
         pry_tester.rep(o)
-        str_output.string.should =~ /5/
+        @str_output.string.should =~ /5/
       end
 
       it 'should define a nested class under Hello and not on top-level or Pry' do
@@ -112,38 +110,34 @@ describe Pry do
 
       it 'should suppress output if input ends in a ";" and is an Exception object (single line)' do
         o = Object.new
-        str_output = StringIO.new
 
-        pry_tester = Pry.new(:input => InputTester.new("Exception.new;"), :output => str_output)
+        pry_tester = Pry.new(:input => InputTester.new("Exception.new;"), :output => @str_output)
         pry_tester.rep(o)
-        str_output.string.should == ""
+        @str_output.string.should == ""
       end
 
       it 'should suppress output if input ends in a ";" (single line)' do
         o = Object.new
-        str_output = StringIO.new
 
-        pry_tester = Pry.new(:input => InputTester.new("x = 5;"), :output => str_output)
+        pry_tester = Pry.new(:input => InputTester.new("x = 5;"), :output => @str_output)
         pry_tester.rep(o)
-        str_output.string.should == ""
+        @str_output.string.should == ""
       end
 
       it 'should suppress output if input ends in a ";" (multi-line)' do
         o = Object.new
-        str_output = StringIO.new
 
-        pry_tester = Pry.new(:input => InputTester.new("def self.blah", ":test", "end;"), :output => str_output)
+        pry_tester = Pry.new(:input => InputTester.new("def self.blah", ":test", "end;"), :output => @str_output)
         pry_tester.rep(o)
-        str_output.string.should == ""
+        @str_output.string.should == ""
       end
 
       it 'should be able to evaluate exceptions normally' do
         o = Exception.new
-        str_output = StringIO.new
 
         was_called = false
         pry_tester = Pry.new(:input => InputTester.new("self"),
-                             :output => str_output,
+                             :output => @str_output,
                              :exception_handler => proc { was_called = true })
 
         pry_tester.rep(o)
@@ -152,11 +146,10 @@ describe Pry do
 
       it 'should notice when exceptions are raised' do
         o = Exception.new
-        str_output = StringIO.new
 
         was_called = false
         pry_tester = Pry.new(:input => InputTester.new("raise self"),
-                             :output => str_output,
+                             :output => @str_output,
                              :exception_handler => proc { was_called = true })
 
         pry_tester.rep(o)
@@ -370,13 +363,12 @@ describe Pry do
         it 'should nest properly' do
           Pry.input = InputTester.new("cd 1", "cd 2", "cd 3", "\"nest:\#\{(_pry_.binding_stack.size - 1)\}\"", "exit-all")
 
-          str_output = StringIO.new
-          Pry.output = str_output
+          Pry.output = @str_output
 
           o = Object.new
 
           pry_tester = o.pry
-          str_output.string.should =~ /nest:3/
+          @str_output.string.should =~ /nest:3/
         end
       end
 

data/test/test_pry_defaults.rb

@@ -1,5 +1,11 @@
 require 'helper'
+
+version = 1
+
 describe "test Pry defaults" do
+  before do
+    @str_output = StringIO.new
+  end
 
   after do
     Pry.reset_defaults
@@ -7,7 +13,6 @@ describe "test Pry defaults" do
   end
 
   describe "input" do
-
     after do
       Pry.reset_defaults
       Pry.color = false
@@ -16,13 +21,12 @@ describe "test Pry defaults" do
     it 'should set the input default, and the default should be overridable' do
       Pry.input = InputTester.new("5")
 
-      str_output = StringIO.new
-      Pry.output = str_output
+      Pry.output = @str_output
       Pry.new.rep
-      str_output.string.should =~ /5/
+      @str_output.string.should =~ /5/
 
       Pry.new(:input => InputTester.new("6")).rep
-      str_output.string.should =~ /6/
+      @str_output.string.should =~ /6/
     end
 
     it 'should pass in the prompt if readline arity is 1' do
@@ -73,19 +77,18 @@ describe "test Pry defaults" do
   it 'should set the output default, and the default should be overridable' do
     Pry.input = InputTester.new("5", "6", "7")
 
-    str_output = StringIO.new
-    Pry.output = str_output
+    Pry.output = @str_output
 
     Pry.new.rep
-    str_output.string.should =~ /5/
+    @str_output.string.should =~ /5/
 
     Pry.new.rep
-    str_output.string.should =~ /5\n.*6/
+    @str_output.string.should =~ /5\n.*6/
 
-    str_output2 = StringIO.new
-    Pry.new(:output => str_output2).rep
-    str_output2.string.should.not =~ /5\n.*6/
-    str_output2.string.should =~ /7/
+    @str_output = StringIO.new
+    Pry.new(:output => @str_output).rep
+    @str_output.string.should.not =~ /5\n.*6/
+    @str_output.string.should =~ /7/
   end
 
   it "should set the print default, and the default should be overridable" do
@@ -93,19 +96,18 @@ describe "test Pry defaults" do
     Pry.print =  new_print
 
     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"
+    Pry.new(:input => InputTester.new("\"test\""), :output => @str_output).rep
+    @str_output.string.should == "test\n"
 
-    str_output = StringIO.new
-    Pry.new(:input => InputTester.new("\"test\""), :output => str_output,
+    @str_output = StringIO.new
+    Pry.new(:input => InputTester.new("\"test\""), :output => @str_output,
             :print => proc { |out, value| out.puts value.reverse }).rep
-    str_output.string.should == "tset\n"
+    @str_output.string.should == "tset\n"
 
     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 = StringIO.new
+    Pry.new(:input => InputTester.new("\"test\""), :output => @str_output).rep
+    @str_output.string.should == "test\n"
   end
 
   describe "pry return values" do
@@ -332,70 +334,86 @@ describe "test Pry defaults" do
 
   end
 
+  describe 'quiet' do
+    it 'should show whereami by default' do
+      Pry.start(binding, :input => InputTester.new("1", "exit-all"),
+              :output => @str_output,
+              :hooks => Pry::DEFAULT_HOOKS)
+
+      @str_output.string.should =~ /[w]hereami by default/
+    end
+
+    it 'should hide whereami if quiet is set' do
+      Pry.new(:input => InputTester.new("exit-all"),
+              :output => @str_output,
+              :quiet => true,
+              :hooks => Pry::DEFAULT_HOOKS)
+
+      @str_output.string.should == ""
+    end
+  end
+
+  describe 'toplevel_binding' do
+    it 'should be devoid of local variables' do
+      mock_pry(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/
+    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")
+        method(:gooey_fooey).owner.should == Object
+        Pry::Method(method(:gooey_fooey)).visibility.should == :private
+      end
+    end
+  end
+
   it 'should set the hooks default, and the default should be overridable' do
     Pry.input = InputTester.new("exit-all")
     Pry.hooks = Pry::Hooks.new.
       add_hook(:before_session, :my_name) { |out,_,_|  out.puts "HELLO" }.
       add_hook(:after_session, :my_name) { |out,_,_| out.puts "BYE" }
 
-    str_output = StringIO.new
-    Pry.new(:output => str_output).repl
-    str_output.string.should =~ /HELLO/
-    str_output.string.should =~ /BYE/
+    Pry.new(:output => @str_output).repl
+    @str_output.string.should =~ /HELLO/
+    @str_output.string.should =~ /BYE/
 
     Pry.input.rewind
 
-    str_output = StringIO.new
-    Pry.new(:output => str_output,
+    @str_output = StringIO.new
+    Pry.new(:output => @str_output,
             :hooks => Pry::Hooks.new.
             add_hook( :before_session, :my_name) { |out,_,_| out.puts "MORNING" }.
             add_hook(:after_session, :my_name) { |out,_,_| out.puts "EVENING" }
             ).repl
 
-    str_output.string.should =~ /MORNING/
-    str_output.string.should =~ /EVENING/
+    @str_output.string.should =~ /MORNING/
+    @str_output.string.should =~ /EVENING/
 
     # try below with just defining one hook
     Pry.input.rewind
-    str_output = StringIO.new
-    Pry.new(:output => str_output,
+    @str_output = StringIO.new
+    Pry.new(:output => @str_output,
             :hooks => Pry::Hooks.new.
             add_hook(:before_session, :my_name) { |out,_,_| out.puts "OPEN" }
             ).repl
 
-    str_output.string.should =~ /OPEN/
+    @str_output.string.should =~ /OPEN/
 
     Pry.input.rewind
-    str_output = StringIO.new
-    Pry.new(:output => str_output,
+    @str_output = StringIO.new
+    Pry.new(:output => @str_output,
             :hooks => Pry::Hooks.new.
             add_hook(:after_session, :my_name) { |out,_,_| out.puts "CLOSE" }
             ).repl
 
-    str_output.string.should =~ /CLOSE/
+    @str_output.string.should =~ /CLOSE/
 
     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