RubyGems - pry - Versions diffs - 0.9.9.6pre2-i386-mswin32 → 0.9.10-i386-mswin32 - Mend

pry 0.9.9.6pre2-i386-mswin32 → 0.9.10-i386-mswin32

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (68) hide show

data/CHANGELOG +41 -0
data/CONTRIBUTORS +27 -26
data/README.markdown +4 -4
data/Rakefile +2 -2
data/lib/pry.rb +25 -19
data/lib/pry/cli.rb +31 -10
data/lib/pry/code.rb +41 -83
data/lib/pry/command.rb +87 -76
data/lib/pry/command_set.rb +13 -20
data/lib/pry/completion.rb +139 -121
data/lib/pry/config.rb +4 -0
data/lib/pry/core_extensions.rb +88 -31
data/lib/pry/default_commands/cd.rb +31 -8
data/lib/pry/default_commands/context.rb +4 -58
data/lib/pry/default_commands/easter_eggs.rb +1 -1
data/lib/pry/default_commands/editing.rb +21 -14
data/lib/pry/default_commands/find_method.rb +5 -7
data/lib/pry/default_commands/gist.rb +187 -0
data/lib/pry/default_commands/hist.rb +6 -6
data/lib/pry/default_commands/input_and_output.rb +73 -129
data/lib/pry/default_commands/introspection.rb +107 -52
data/lib/pry/default_commands/ls.rb +1 -1
data/lib/pry/default_commands/misc.rb +0 -5
data/lib/pry/default_commands/whereami.rb +92 -0
data/lib/pry/helpers/base_helpers.rb +6 -1
data/lib/pry/helpers/command_helpers.rb +30 -9
data/lib/pry/helpers/documentation_helpers.rb +7 -7
data/lib/pry/helpers/options_helpers.rb +1 -1
data/lib/pry/helpers/text.rb +7 -9
data/lib/pry/history.rb +15 -2
data/lib/pry/hooks.rb +1 -1
data/lib/pry/indent.rb +17 -10
data/lib/pry/method.rb +35 -19
data/lib/pry/module_candidate.rb +130 -0
data/lib/pry/pry_class.rb +54 -22
data/lib/pry/pry_instance.rb +71 -14
data/lib/pry/repl_file_loader.rb +80 -0
data/lib/pry/version.rb +1 -1
data/lib/pry/wrapped_module.rb +121 -142
data/pry.gemspec +13 -13
data/test/candidate_helper1.rb +11 -0
data/test/candidate_helper2.rb +8 -0
data/test/helper.rb +16 -0
data/test/test_code.rb +1 -1
data/test/test_command.rb +364 -270
data/test/test_command_integration.rb +235 -267
data/test/test_completion.rb +36 -0
data/test/test_control_d_handler.rb +45 -0
data/test/test_default_commands/example.erb +5 -0
data/test/test_default_commands/test_cd.rb +316 -11
data/test/test_default_commands/test_context.rb +143 -192
data/test/test_default_commands/test_documentation.rb +81 -14
data/test/test_default_commands/test_find_method.rb +10 -2
data/test/test_default_commands/test_input.rb +102 -111
data/test/test_default_commands/test_introspection.rb +17 -12
data/test/test_default_commands/test_ls.rb +8 -6
data/test/test_default_commands/test_shell.rb +18 -15
data/test/test_default_commands/test_show_source.rb +170 -44
data/test/test_exception_whitelist.rb +6 -2
data/test/test_hooks.rb +32 -0
data/test/test_input_stack.rb +19 -16
data/test/test_method.rb +0 -4
data/test/test_prompt.rb +60 -0
data/test/test_pry.rb +23 -31
data/test/test_pry_defaults.rb +75 -57
data/test/test_syntax_checking.rb +12 -11
data/test/test_wrapped_module.rb +103 -0
metadata +72 -26

data/test/test_completion.rb CHANGED Viewed

@@ -22,5 +22,41 @@ describe Pry::InputCompleter do
       lambda{ completer.call "a.to_s." }.should.not.raise Exception
     end
   end
+  it 'should take parenthesis and other characters into account for symbols' do
+    b         = Pry.binding_for(Object.new)
+    completer = Pry::InputCompleter.build_completion_proc(b)
+    lambda { completer.call(":class)") }.should.not.raise(RegexpError)
+  end
+  it 'should complete instance variables' do
+    object = Object.new
+    object.instance_variable_set(:'@name', 'Pry')
+    object.class.send(:class_variable_set, :'@@number', 10)
+    object.instance_variables.map { |v| v.to_sym } \
+      .include?(:'@name').should == true
+    object.class.class_variables.map { |v| v.to_sym } \
+      .include?(:'@@number').should == true
+    completer = Pry::InputCompleter.build_completion_proc(
+      Pry.binding_for(object)
+    )
+    # Complete instance variables.
+    completer.call('@na').include?('@name').should                 == true
+    completer.call('@name.down').include?('@name.downcase').should == true
+    # Complete class variables.
+    completer = Pry::InputCompleter.build_completion_proc(
+      Pry.binding_for(object.class)
+    )
+    completer.call('@@nu').include?('@@number').should              == true
+    completer.call('@@number.cl').include?('@@number.class').should == true
+  end
 end

data/test/test_control_d_handler.rb ADDED Viewed

@@ -0,0 +1,45 @@
+require 'helper'
+describe Pry::DEFAULT_CONTROL_D_HANDLER do
+  describe 'control-d press' do
+    before do
+      @control_d = "Pry::DEFAULT_CONTROL_D_HANDLER.call('', _pry_)"
+      @binding_stack = "self.binding_stack = _pry_.binding_stack.dup"
+    end
+   describe 'in an expression' do
+      it 'should clear out passed string' do
+        str = "hello world"
+        Pry::DEFAULT_CONTROL_D_HANDLER.call(str, nil)
+        str.should == ""
+      end
+    end
+    describe 'at top-level session' do
+      it 'should break out of a REPL loop' do
+        instance = nil
+        redirect_pry_io(InputTester.new(@control_d)) do
+          instance = Pry.new
+          instance.repl
+        end
+        instance.binding_stack.should.be.empty
+      end
+    end
+    describe 'in a nested session' do
+      it 'should pop last binding from the binding stack' do
+        base = OpenStruct.new
+        base.obj = OpenStruct.new
+        redirect_pry_io(InputTester.new("cd obj", "self.stack_size = _pry_.binding_stack.size",
+                                        @control_d, "self.stack_size = _pry_.binding_stack.size", "exit-all")) do
+          Pry.start(base)
+        end
+        base.obj.stack_size.should == 2
+        base.stack_size.should == 1
+      end
+    end
+  end
+end

data/test/test_default_commands/example.erb ADDED Viewed

@@ -0,0 +1,5 @@
+<html>
+  Look at me, testing my erb!
+</html>

data/test/test_default_commands/test_cd.rb CHANGED Viewed

@@ -1,16 +1,321 @@
 require 'helper'
-describe 'Pry::DefaultCommands::CD' do
-  describe 'cd' do
-    # Regression test for ticket #516.
-    #it 'should be able to cd into the Object BasicObject.' do
-    #  mock_pry('cd BasicObject.new').should.not =~ /\Aundefined method `__binding__'/
-    #end
-    # Regression test for ticket #516
-    # Possibly move higher up.
-    it 'should not fail with undefined BasicObject#is_a?' do
-      mock_pry('cd BasicObject.new').should.not =~ /undefined method `is_a\?'/
+describe 'Pry::DefaultCommands::Cd' do
+  before do
+    @o, @obj = Object.new, Object.new
+    @obj.instance_variable_set(:@x, 66)
+    @obj.instance_variable_set(:@y, 79)
+    @o.instance_variable_set(:@obj, @obj)
+    # Shortcuts. They save a lot of typing.
+    @bs1 = "Pad.bs1 = _pry_.binding_stack.dup"
+    @bs2 = "Pad.bs2 = _pry_.binding_stack.dup"
+    @bs3 = "Pad.bs3 = _pry_.binding_stack.dup"
+    @os1 = "Pad.os1 = _pry_.command_state['cd'].old_stack.dup"
+    @os2 = "Pad.os2 = _pry_.command_state['cd'].old_stack.dup"
+    @self  = "Pad.self = self"
+    @inner = "Pad.inner = self"
+    @outer = "Pad.outer = self"
+  end
+  after do
+    Pad.clear
+  end
+  describe 'state' do
+    it 'should not to be set up in fresh instance' do
+      redirect_pry_io(InputTester.new(@os1, "exit-all")) do
+        Pry.start(@o)
+      end
+      Pad.os1.should == nil
     end
   end
+  describe 'old stack toggling with `cd -`' do
+    describe 'in fresh pry instance' do
+      it 'should not toggle when there is no old stack' do
+        redirect_pry_io(InputTester.new("cd -", @bs1, "cd -",
+                                         @bs2, "exit-all")) do
+          Pry.start(@o)
+        end
+        Pad.bs1.map { |v| v.eval("self") }.should == [@o]
+        Pad.bs2.map { |v| v.eval("self") }.should == [@o]
+      end
+    end
+    describe 'when an error was raised' do
+      it 'should ensure cd @ raises SyntaxError' do
+        mock_pry("cd @").should =~ /SyntaxError/
+      end
+      it 'should not toggle and should keep correct old stack' do
+        redirect_pry_io(InputTester.new("cd @", @os1, "cd -", @os2, "exit-all")) do
+          Pry.start(@o)
+        end
+        Pad.os1.should == []
+        Pad.os2.should == []
+      end
+      it 'should not toggle and should keep correct current binding stack' do
+        redirect_pry_io(InputTester.new("cd @", @bs1, "cd -", @bs2, "exit-all")) do
+          Pry.start(@o)
+        end
+        Pad.bs1.map { |v| v.eval("self") }.should == [@o]
+        Pad.bs2.map { |v| v.eval("self") }.should == [@o]
+      end
+    end
+    describe 'when using simple cd syntax' do
+      it 'should toggle' do
+        redirect_pry_io(InputTester.new("cd :mon_dogg", "cd -", @bs1,
+                                        "cd -", @bs2, "exit-all")) do
+          Pry.start(@o)
+        end
+        Pad.bs1.map { |v| v.eval("self") }.should == [@o]
+        Pad.bs2.map { |v| v.eval("self") }.should == [@o, :mon_dogg]
+      end
+    end
+    describe "when using complex cd syntax" do
+      it 'should toggle with a complex path (simple case)' do
+        redirect_pry_io(InputTester.new("cd 1/2/3", "cd -", @bs1,
+                                        "cd -", @bs2, "exit-all")) do
+          Pry.start(@o)
+        end
+        Pad.bs1.map { |v| v.eval('self') }.should == [@o]
+        Pad.bs2.map { |v| v.eval('self') }.should == [@o, 1, 2, 3]
+      end
+      it 'should toggle with a complex path (more complex case)' do
+        redirect_pry_io(InputTester.new("cd 1/2/3", "cd ../4", "cd -",
+                                        @bs1, "cd -", @bs2, "exit-all")) do
+          Pry.start(@o)
+        end
+        Pad.bs1.map { |v| v.eval('self') }.should == [@o, 1, 2, 3]
+        Pad.bs2.map { |v| v.eval('self') }.should == [@o, 1, 2, 4]
+      end
+    end
+    describe 'series of cd calls' do
+      it 'should toggle with fuzzy `cd -` calls' do
+        redirect_pry_io(InputTester.new("cd :mon_dogg", "cd -", "cd 42", "cd -",
+                                        @bs1, "cd -", @bs2, "exit-all")) do
+          Pry.start(@o)
+        end
+        Pad.bs1.map { |v| v.eval('self') }.should == [@o]
+        Pad.bs2.map { |v| v.eval('self') }.should == [@o, 42]
+      end
+    end
+    describe 'when using cd ..' do
+      it 'should toggle with a simple path' do
+        redirect_pry_io(InputTester.new("cd :john_dogg", "cd ..", @bs1,
+                                        "cd -", @bs2, "exit-all")) do
+          Pry.start(@o)
+        end
+        Pad.bs1.map { |v| v.eval('self') }.should == [@o]
+        Pad.bs2.map { |v| v.eval('self') }.should == [@o, :john_dogg]
+      end
+      it 'should toggle with a complex path' do
+        redirect_pry_io(InputTester.new("cd 1/2/3/../4", "cd -", @bs1,
+                                        "cd -", @bs2, "exit-all")) do
+          Pry.start(@o)
+        end
+        Pad.bs1.map { |v| v.eval('self') }.should == [@o]
+        Pad.bs2.map { |v| v.eval('self') }.should == [@o, 1, 2, 4]
+      end
+    end
+    describe 'when using cd ::' do
+      it 'should toggle' do
+        redirect_pry_io(InputTester.new("cd ::", "cd -", @bs1,
+                                        "cd -", @bs2, "exit-all")) do
+          Pry.start(@o)
+        end
+        Pad.bs1.map { |v| v.eval('self') }.should == [@o]
+        Pad.bs2.map { |v| v.eval('self') }.should == [@o, TOPLEVEL_BINDING.eval("self")]
+      end
+    end
+    describe 'when using cd /' do
+      it 'should toggle' do
+        redirect_pry_io(InputTester.new("cd /", "cd -", @bs1, "cd :john_dogg",
+                                        "cd /", "cd -", @bs2, "exit-all")) do
+          Pry.start(@o)
+        end
+        Pad.bs1.map { |v| v.eval('self') }.should == [@o]
+        Pad.bs2.map { |v| v.eval('self') }.should == [@o, :john_dogg]
+      end
+    end
+    describe 'when using ^D (Control-D) key press' do
+      before do
+        @control_d = "Pry::DEFAULT_CONTROL_D_HANDLER.call('', _pry_)"
+      end
+      it 'should keep correct old binding' do
+        redirect_pry_io(InputTester.new("cd :john_dogg", "cd :mon_dogg",
+                                        "cd :kyr_dogg", @control_d, @bs1,
+                                        "cd -", @bs2, "cd -", @bs3, "exit-all")) do
+          Pry.start(@o)
+        end
+        Pad.bs1.map { |v| v.eval('self') }.should == [@o, :john_dogg, :mon_dogg]
+        Pad.bs2.map { |v| v.eval('self') }.should == [@o, :john_dogg, :mon_dogg, :kyr_dogg]
+        Pad.bs3.map { |v| v.eval('self') }.should == [@o, :john_dogg, :mon_dogg]
+      end
+    end
+  end
+  it 'should cd into simple input' do
+    redirect_pry_io(InputTester.new("cd :mon_ouie", @inner, "exit-all")) do
+      Pry.start(@o)
+    end
+    Pad.inner.should == :mon_ouie
+  end
+  it 'should break out of session with cd ..' do
+    redirect_pry_io(InputTester.new("cd :inner", @inner, "cd ..", @outer, "exit-all")) do
+      Pry.start(:outer)
+    end
+    Pad.inner.should == :inner
+    Pad.outer.should == :outer
+  end
+  it "should not leave the REPL session when given 'cd ..'" do
+    redirect_pry_io(InputTester.new("cd ..", @self, "exit-all")) do
+      Pry.start(@o)
+    end
+    Pad.self.should == @o
+  end
+  it 'should break out to outer-most session with cd /' do
+    redirect_pry_io(InputTester.new("cd :inner", @inner, "cd 5", "Pad.five = self",
+                                    "cd /", @outer, "exit-all")) do
+      Pry.start(:outer)
+    end
+    Pad.inner.should == :inner
+    Pad.five.should == 5
+    Pad.outer.should == :outer
+  end
+  it 'should break out to outer-most session with just cd (no args)' do
+    redirect_pry_io(InputTester.new("cd :inner", @inner, "cd 5", "Pad.five = self",
+                                    "cd", @outer, "exit-all")) do
+      Pry.start(:outer)
+    end
+    Pad.inner.should == :inner
+    Pad.five.should == 5
+    Pad.outer.should == :outer
+  end
+  it 'should cd into an object and its ivar using cd obj/@ivar syntax' do
+    redirect_pry_io(InputTester.new("cd @obj/@x", @bs1, "exit-all")) do
+      Pry.start(@o)
+    end
+    Pad.bs1.map { |v| v.eval("self") }.should == [@o, @obj, 66]
+  end
+  it 'should cd into an object and its ivar using cd obj/@ivar/ syntax (note following /)' do
+    redirect_pry_io(InputTester.new("cd @obj/@x/", @bs1, "exit-all")) do
+      Pry.start(@o)
+    end
+    Pad.bs1.map { |v| v.eval("self") }.should == [@o, @obj, 66]
+  end
+  it 'should cd into previous object and its local using cd ../local syntax' do
+    redirect_pry_io(InputTester.new("cd @obj", "local = :local", "cd @x",
+                                    "cd ../local", @bs1, "exit-all")) do
+      Pry.start(@o)
+    end
+    Pad.bs1.map { |v| v.eval("self") }.should == [@o, @obj, :local]
+  end
+  it 'should cd into an object and its ivar and back again using cd obj/@ivar/.. syntax' do
+    redirect_pry_io(InputTester.new("cd @obj/@x/..", @bs1, "exit-all")) do
+      Pry.start(@o)
+    end
+    Pad.bs1.map { |v| v.eval("self") }.should == [@o, @obj]
+  end
+  it 'should cd into an object and its ivar and back and then into another ivar using cd obj/@ivar/../@y syntax' do
+    redirect_pry_io(InputTester.new("cd @obj/@x/../@y", @bs1, "exit-all")) do
+      Pry.start(@o)
+    end
+    Pad.bs1.map { |v| v.eval("self") }.should == [@o, @obj, 79]
+  end
+  it 'should cd back to top-level and then into another ivar using cd /@ivar/ syntax' do
+    redirect_pry_io(InputTester.new("@z = 20", "cd @obj/@x/", "cd /@z",
+                                     @bs1, "exit-all")) do
+      Pry.start(@o)
+    end
+    Pad.bs1.map { |v| v.eval("self") }.should == [@o, 20]
+  end
+  it 'should start a session on TOPLEVEL_BINDING with cd ::' do
+    redirect_pry_io(InputTester.new("cd ::", @self, "exit-all")) do
+      Pry.start(@o)
+    end
+    Pad.self.should == TOPLEVEL_BINDING.eval("self")
+  end
+  it 'should cd into complex input (with spaces)' do
+    def @o.hello(x, y, z)
+      :mon_ouie
+    end
+    redirect_pry_io(InputTester.new("cd hello 1, 2, 3", @self, "exit-all")) do
+      Pry.start(@o)
+    end
+    Pad.self.should == :mon_ouie
+  end
+  it 'should not cd into complex input when it encounters an exception' do
+    redirect_pry_io(InputTester.new("cd 1/2/swoop_a_doop/3",
+                                    @bs1, "exit-all")) do
+      Pry.start(@o)
+    end
+    Pad.bs1.map { |v| v.eval("self") }.should == [@o]
+  end
+  # Regression test for ticket #516.
+  #it 'should be able to cd into the Object BasicObject.' do
+  #  mock_pry('cd BasicObject.new').should.not =~ /\Aundefined method `__binding__'/
+  #end
+  # Regression test for ticket #516
+  # Possibly move higher up.
+  it 'should not fail with undefined BasicObject#is_a?' do
+    mock_pry('cd BasicObject.new').should.not =~ /undefined method `is_a\?'/
+  end
 end

data/test/test_default_commands/test_context.rb CHANGED Viewed

@@ -1,29 +1,40 @@
 require 'helper'
 describe "Pry::DefaultCommands::Context" do
+  before do
+    @self  = "Pad.self = self"
+    @inner = "Pad.inner = self"
+    @outer = "Pad.outer = self"
+  end
+  after do
+    Pad.clear
+  end
   describe "exit-all" do
     it 'should break out of the repl loop of Pry instance and return nil' do
-      redirect_pry_io(InputTester.new("exit-all"), StringIO.new) do
+      redirect_pry_io(InputTester.new("exit-all")) do
         Pry.new.repl(0).should == nil
       end
     end
     it 'should break out of the repl loop of Pry instance wth a user specified value' do
-      redirect_pry_io(InputTester.new("exit-all 'message'"), StringIO.new) do
+      redirect_pry_io(InputTester.new("exit-all 'message'")) do
         Pry.new.repl(0).should == 'message'
       end
     end
     it 'should break of the repl loop even if multiple bindings still on stack' do
       ins = nil
-      redirect_pry_io(InputTester.new("cd 1", "cd 2", "exit-all 'message'"), StringIO.new) do
+      redirect_pry_io(InputTester.new("cd 1", "cd 2", "exit-all 'message'")) do
         ins = Pry.new.tap { |v| v.repl(0).should == 'message' }
       end
     end
     it 'binding_stack should be empty after breaking out of the repl loop' do
       ins = nil
-      redirect_pry_io(InputTester.new("cd 1", "cd 2", "exit-all"), StringIO.new) do
+      redirect_pry_io(InputTester.new("cd 1", "cd 2", "exit-all")) do
         ins = Pry.new.tap { |v| v.repl(0) }
       end
@@ -56,259 +67,199 @@ describe "Pry::DefaultCommands::Context" do
       Cor.new.blimey!
       Object.remove_const(:Cor)
     end
-  end
-  describe "exit" do
-    it 'should pop a binding with exit' do
-      b = Pry.binding_for(:outer)
-      b.eval("x = :inner")
-      redirect_pry_io(InputTester.new("cd x", "$inner = self;", "exit", "$outer = self", "exit-all"), StringIO.new) do
-        b.pry
+    it 'should properly set _file_, _line_ and _dir_' do
+      class Cor
+        def blimey!
+          mock_pry(binding, 'whereami', '_file_') \
+            .should =~ /#{File.expand_path(__FILE__)}/
+        end
       end
-      $inner.should == :inner
-      $outer.should == :outer
-    end
-    it 'should break out of the repl loop of Pry instance when binding_stack has only one binding with exit' do
-      Pry.start(0, :input => StringIO.new("exit")).should == nil
-    end
-    it 'should break out of the repl loop of Pry instance when binding_stack has only one binding with exit, and return user-given value' do
-      Pry.start(0, :input => StringIO.new("exit :john")).should == :john
+      Cor.new.blimey!
+      Object.remove_const(:Cor)
     end
-    it 'should break out the repl loop of Pry instance even after an exception in user-given value' do
-      redirect_pry_io(InputTester.new("exit = 42", "exit"), StringIO.new) do
-        ins = Pry.new.tap { |v| v.repl(0).should == nil }
+    it 'should show description and correct code when __LINE__ and __FILE__ are outside @method.source_location' do
+      class Cor
+        def blimey!
+          eval <<-END, binding, "test/test_default_commands/example.erb", 1
+            mock_pry(binding, 'whereami')
+          END
+        end
       end
-    end
-  end
-  describe "jump-to" do
-    it 'should jump to the proper binding index in the stack' do
-      outp = StringIO.new
-      redirect_pry_io(InputTester.new("cd 1", "cd 2", "jump-to 1", "$blah = self", "exit-all"), outp) do
-        Pry.start(0)
-      end
+      Cor.instance_method(:blimey!).source.should =~ /mock_pry/
-      $blah.should == 1
+      Cor.new.blimey!.should =~ /Cor#blimey!.*Look at me/m
+      Object.remove_const(:Cor)
     end
-    it 'should print error when trying to jump to a non-existent binding index' do
-      outp = StringIO.new
-      redirect_pry_io(InputTester.new("cd 1", "cd 2", "jump-to 100", "exit-all"), outp) do
-        Pry.start(0)
+    it 'should show description and correct code when @method.source_location would raise an error' do
+      class Cor
+        eval <<-END, binding, "test/test_default_commands/example.erb", 1
+          def blimey!
+            mock_pry(binding, 'whereami')
+          end
+        END
       end
-      outp.string.should =~ /Invalid nest level/
-    end
+      lambda{
+        Cor.instance_method(:blimey!).source
+      }.should.raise(MethodSource::SourceNotFoundError)
-    it 'should print error when trying to jump to the same binding index' do
-      outp = StringIO.new
-      redirect_pry_io(InputTester.new("cd 1", "cd 2", "jump-to 2", "exit-all"), outp) do
-        Pry.new.repl(0)
-      end
+      Cor.new.blimey!.should =~ /Cor#blimey!.*Look at me/m
+      Object.remove_const(:Cor)
-      outp.string.should =~ /Already/
     end
-  end
-  describe "exit-program" do
-    it 'should raise SystemExit' do
-      redirect_pry_io(InputTester.new("exit-program"), StringIO.new) do
-        lambda { Pry.new.repl(0).should == 0 }.should.raise SystemExit
+    it 'should display a description and and error if reading the file goes wrong' do
+      class Cor
+        def blimey!
+          eval <<-END, binding, "not.found.file.erb", 7
+            mock_pry(binding, 'whereami')
+          END
+        end
       end
+      Cor.new.blimey!.should =~ /From: not.found.file.erb @ line 7 Cor#blimey!:\n\nError: Cannot open "not.found.file.erb" for reading./m
+      Object.remove_const(:Cor)
     end
-    it 'should exit the program with the provided value' do
-      redirect_pry_io(InputTester.new("exit-program 66"), StringIO.new) do
-        begin
-          Pry.new.repl(0)
-        rescue SystemExit => e
-          e.status.should == 66
+    it 'should show code window (not just method source) if parameter passed to whereami' do
+      class Cor
+        def blimey!
+          mock_pry(binding, 'whereami 3').should =~ /class Cor/
         end
       end
+      Cor.new.blimey!
+      Object.remove_const(:Cor)
     end
-  end
-  describe "cd" do
-    after do
-      $obj = nil
-    end
+    it 'should use Pry.config.default_window_size for window size when outside a method context' do
+      old_size, Pry.config.default_window_size = Pry.config.default_window_size, 1
+      :litella
+      :pig
+      out = mock_pry(binding, 'whereami')
+      :punk
+      :sanders
-    it 'should cd into simple input' do
-      b = Pry.binding_for(Object.new)
-      b.eval("x = :mon_ouie")
+      out.should.not =~ /:litella/
+      out.should =~ /:pig/
+      out.should =~ /:punk/
+      out.should.not =~ /:sanders/
-      redirect_pry_io(InputTester.new("cd x", "$obj = self", "exit-all"), StringIO.new) do
-        b.pry
-      end
+      Pry.config.default_window_size = old_size
+    end
-      $obj.should == :mon_ouie
+    it "should work at the top level" do
+      mock_pry(Pry.toplevel_binding, 'whereami').should =~ /At the top level/
     end
-    it 'should break out of session with cd ..' do
-      b = Pry.binding_for(:outer)
-      b.eval("x = :inner")
+    it "should work inside a class" do
+      mock_pry(Pry.binding_for(Pry), 'whereami').should =~ /Inside Pry/
+    end
-      redirect_pry_io(InputTester.new("cd x", "$inner = self;", "cd ..", "$outer = self", "exit-all"), StringIO.new) do
-        b.pry
-      end
-      $inner.should == :inner
-      $outer.should == :outer
+    it "should work inside an object" do
+      mock_pry(Pry.binding_for(Object.new), 'whereami').should =~ /Inside #<Object/
     end
+  end
-    it "should not leave the REPL session when given 'cd ..'" do
-      b = Pry.binding_for(Object.new)
-      input = InputTester.new "cd ..", "$obj = self", "exit-all"
-      redirect_pry_io(input, StringIO.new) do
-        b.pry
+  describe "exit" do
+    it 'should pop a binding with exit' do
+      redirect_pry_io(InputTester.new("cd :inner", @inner, "exit",
+                                       @outer, "exit-all")) do
+        Pry.start(:outer)
       end
-      $obj.should == b.eval("self")
+      Pad.inner.should == :inner
+      Pad.outer.should == :outer
     end
-    it 'should break out to outer-most session with cd /' do
-      b = Pry.binding_for(:outer)
-      b.eval("x = :inner")
-      redirect_pry_io(InputTester.new("cd x", "$inner = self;", "cd 5", "$five = self", "cd /", "$outer = self", "exit-all"), StringIO.new) do
-        b.pry
-      end
-      $inner.should == :inner
-      $five.should == 5
-      $outer.should == :outer
+    it 'should break out of the repl loop of Pry instance when binding_stack has only one binding with exit' do
+      Pry.start(0, :input => StringIO.new("exit")).should == nil
     end
-    it 'should break out to outer-most session with just cd (no args)' do
-      b = Pry.binding_for(:outer)
-      b.eval("x = :inner")
-      redirect_pry_io(InputTester.new("cd x", "$inner = self;", "cd 5", "$five = self", "cd", "$outer = self", "exit-all"), StringIO.new) do
-        b.pry
-      end
-      $inner.should == :inner
-      $five.should == 5
-      $outer.should == :outer
+    it 'should break out of the repl loop of Pry instance when binding_stack has only one binding with exit, and return user-given value' do
+      Pry.start(0, :input => StringIO.new("exit :john")).should == :john
     end
-    it 'should cd into an object and its ivar using cd obj/@ivar syntax' do
-      $obj = Object.new
-      $obj.instance_variable_set(:@x, 66)
-      redirect_pry_io(InputTester.new("cd $obj/@x", "$result = _pry_.binding_stack.dup", "exit-all"), StringIO.new) do
-        Pry.start
+    it 'should break out the repl loop of Pry instance even after an exception in user-given value' do
+      redirect_pry_io(InputTester.new("exit = 42", "exit")) do
+        ins = Pry.new.tap { |v| v.repl(0).should == nil }
       end
-      $result.size.should == 3
-      $result[1].eval('self').should == $obj
-      $result[2].eval('self').should == 66
     end
+  end
-    it 'should cd into an object and its ivar using cd obj/@ivar/ syntax (note following /)' do
-      $obj = Object.new
-      $obj.instance_variable_set(:@x, 66)
-      redirect_pry_io(InputTester.new("cd $obj/@x/", "$result = _pry_.binding_stack.dup", "exit-all"), StringIO.new) do
-        Pry.start
-      end
-      $result.size.should == 3
-      $result[1].eval('self').should == $obj
-      $result[2].eval('self').should == 66
+  describe "jump-to" do
+    before do
+      @str_output = StringIO.new
     end
-    it 'should cd into previous object and its local using cd ../local syntax' do
-      $obj = Object.new
-      $obj.instance_variable_set(:@x, 66)
-      redirect_pry_io(InputTester.new("cd $obj", "local = :local", "cd @x", "cd ../local", "$result = _pry_.binding_stack.dup", "exit-all"), StringIO.new) do
-        Pry.start
+    it 'should jump to the proper binding index in the stack' do
+      redirect_pry_io(InputTester.new("cd 1", "cd 2", "jump-to 1", @self, "exit-all")) do
+        Pry.start(0)
       end
-      $result.size.should == 3
-      $result[1].eval('self').should == $obj
-      $result[2].eval('self').should == :local
-    end
-    it 'should cd into an object and its ivar and back again using cd obj/@ivar/.. syntax' do
-      $obj = Object.new
-      $obj.instance_variable_set(:@x, 66)
-      redirect_pry_io(InputTester.new("cd $obj/@x/..", "$result = _pry_.binding_stack.dup", "exit-all"), StringIO.new) do
-        Pry.start
-      end
-      $result.size.should == 2
-      $result[1].eval('self').should == $obj
+      Pad.self.should == 1
     end
-    it 'should cd into an object and its ivar and back and then into another ivar using cd obj/@ivar/../@y syntax' do
-      $obj = Object.new
-      $obj.instance_variable_set(:@x, 66)
-      $obj.instance_variable_set(:@y, 79)
-      redirect_pry_io(InputTester.new("cd $obj/@x/../@y", "$result = _pry_.binding_stack.dup", "exit-all"), StringIO.new) do
-        Pry.start
+    it 'should print error when trying to jump to a non-existent binding index' do
+      redirect_pry_io(InputTester.new("cd 1", "cd 2", "jump-to 100", "exit-all"), @str_output) do
+        Pry.start(0)
       end
-      $result.size.should == 3
-      $result[1].eval('self').should == $obj
-      $result[2].eval('self').should == 79
-    end
-    it 'should cd back to top-level and then into another ivar using cd /@ivar/ syntax' do
-      $obj = Object.new
-      $obj.instance_variable_set(:@x, 66)
-      TOPLEVEL_BINDING.eval('@z = 20')
-      redirect_pry_io(InputTester.new("cd $obj/@x/", "cd /@z", "$result = _pry_.binding_stack.dup", "exit-all"), StringIO.new) do
-        Pry.start
-      end
-      $result.size.should == 2
-      $result[1].eval('self').should == 20
+      @str_output.string.should =~ /Invalid nest level/
     end
-    it 'should start a session on TOPLEVEL_BINDING with cd ::' do
-      redirect_pry_io(InputTester.new("cd ::", "$obj = self", "exit-all"), StringIO.new) do
-        5.pry
+    it 'should print error when trying to jump to the same binding index' do
+      redirect_pry_io(InputTester.new("cd 1", "cd 2", "jump-to 2", "exit-all"), @str_output) do
+        Pry.new.repl(0)
       end
-      $obj.should == TOPLEVEL_BINDING.eval('self')
+      @str_output.string.should =~ /Already/
     end
+  end
-    it 'should cd into complex input (with spaces)' do
-      o = Object.new
-      def o.hello(x, y, z)
-        :mon_ouie
+  describe "exit-program" do
+    it 'should raise SystemExit' do
+      redirect_pry_io(InputTester.new("exit-program")) do
+        lambda { Pry.new.repl(0).should == 0 }.should.raise SystemExit
       end
+    end
-      redirect_pry_io(InputTester.new("cd hello 1, 2, 3", "$obj = self", "exit-all"), StringIO.new) do
-        o.pry
+    it 'should exit the program with the provided value' do
+      redirect_pry_io(InputTester.new("exit-program 66")) do
+        begin
+          Pry.new.repl(0)
+        rescue SystemExit => e
+          e.status.should == 66
+        end
       end
-      $obj.should == :mon_ouie
     end
   end
   describe "raise-up" do
     it "should raise the exception with raise-up" do
-      redirect_pry_io(InputTester.new("raise NoMethodError", "raise-up NoMethodError"),StringIO.new) do
+      redirect_pry_io(InputTester.new("raise NoMethodError", "raise-up NoMethodError")) do
         lambda { Pry.new.repl(0) }.should.raise NoMethodError
       end
     end
     it "should raise an unamed exception with raise-up" do
-      redirect_pry_io(InputTester.new("raise 'stop'","raise-up 'noreally'"),StringIO.new) do
+      redirect_pry_io(InputTester.new("raise 'stop'","raise-up 'noreally'")) do
         lambda { Pry.new.repl(0) }.should.raise RuntimeError, "noreally"
       end
     end
     it "should eat the exception at the last new pry instance on raise-up" do
-      b = Pry.binding_for(:outer)
-      b.eval("x = :inner")
-      redirect_pry_io(InputTester.new("x.pry", "raise NoMethodError",
-        "$inner = self", "raise-up NoMethodError", "$outer = self", "exit-all"),StringIO.new) do
-        b.pry
+      redirect_pry_io(InputTester.new(":inner.pry", "raise NoMethodError", @inner,
+                                      "raise-up NoMethodError", @outer, "exit-all")) do
+        Pry.start(:outer)
       end
-      $inner.should == :inner
-      $outer.should == :outer
+      Pad.inner.should == :inner
+      Pad.outer.should == :outer
     end
     it "should raise the most recently raised exception" do
@@ -316,16 +267,16 @@ describe "Pry::DefaultCommands::Context" do
     end
     it "should allow you to cd up and (eventually) out" do
-      $deep = $inner = $outer = nil
-      b = Pry.binding_for(:outer)
-      b.eval("x = :inner")
-      redirect_pry_io(InputTester.new("cd x", "raise NoMethodError","$inner = self",
-        "deep = :deep", "cd deep","$deep = self","raise-up NoMethodError", "raise-up", "$outer = self", "raise-up", "exit-all"),StringIO.new) do
-        lambda { b.pry }.should.raise NoMethodError
+      redirect_pry_io(InputTester.new("cd :inner", "raise NoMethodError", @inner,
+                                      "deep = :deep", "cd deep","Pad.deep = self",
+                                      "raise-up NoMethodError", "raise-up", @outer,
+                                      "raise-up", "exit-all")) do
+        lambda { Pry.start(:outer) }.should.raise NoMethodError
       end
-      $deep.should == :deep
-      $inner.should == :inner
-      $outer.should == :outer
+      Pad.deep.should  == :deep
+      Pad.inner.should == :inner
+      Pad.outer.should == :outer
     end
   end