pry 0.9.8pre5-i386-mingw32 → 0.9.8pre6-i386-mingw32

data/lib/pry/version.rb

@@ -1,3 +1,3 @@
 class Pry
-  VERSION = "0.9.8pre5"
+  VERSION = "0.9.8pre6"
 end

data/pry.gemspec

@@ -1,35 +1,35 @@
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
-  s.name = %q{pry}
-  s.version = "0.9.8pre5"
+  s.name = "pry"
+  s.version = "0.9.8pre4"
 
   s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
-  s.authors = [%q{John Mair (banisterfiend)}]
-  s.date = %q{2012-01-19}
-  s.description = %q{An IRB alternative and runtime developer console}
-  s.email = %q{jrmair@gmail.com}
-  s.executables = [%q{pry}]
-  s.files = [%q{.document}, %q{.gemtest}, %q{.gitignore}, %q{.travis.yml}, %q{.yardopts}, %q{CHANGELOG}, %q{CONTRIBUTORS}, %q{Gemfile}, %q{LICENSE}, %q{README.markdown}, %q{Rakefile}, %q{TODO}, %q{bin/pry}, %q{examples/example_basic.rb}, %q{examples/example_command_override.rb}, %q{examples/example_commands.rb}, %q{examples/example_hooks.rb}, %q{examples/example_image_edit.rb}, %q{examples/example_input.rb}, %q{examples/example_input2.rb}, %q{examples/example_output.rb}, %q{examples/example_print.rb}, %q{examples/example_prompt.rb}, %q{examples/helper.rb}, %q{lib/pry.rb}, %q{lib/pry/cli.rb}, %q{lib/pry/command.rb}, %q{lib/pry/command_set.rb}, %q{lib/pry/commands.rb}, %q{lib/pry/completion.rb}, %q{lib/pry/config.rb}, %q{lib/pry/core_extensions.rb}, %q{lib/pry/custom_completions.rb}, %q{lib/pry/default_commands/basic.rb}, %q{lib/pry/default_commands/context.rb}, %q{lib/pry/default_commands/documentation.rb}, %q{lib/pry/default_commands/easter_eggs.rb}, %q{lib/pry/default_commands/gems.rb}, %q{lib/pry/default_commands/input.rb}, %q{lib/pry/default_commands/introspection.rb}, %q{lib/pry/default_commands/ls.rb}, %q{lib/pry/default_commands/shell.rb}, %q{lib/pry/extended_commands/experimental.rb}, %q{lib/pry/extended_commands/user_command_api.rb}, %q{lib/pry/helpers.rb}, %q{lib/pry/helpers/base_helpers.rb}, %q{lib/pry/helpers/command_helpers.rb}, %q{lib/pry/helpers/options_helpers.rb}, %q{lib/pry/helpers/text.rb}, %q{lib/pry/history.rb}, %q{lib/pry/history_array.rb}, %q{lib/pry/hooks.rb}, %q{lib/pry/indent.rb}, %q{lib/pry/method.rb}, %q{lib/pry/plugins.rb}, %q{lib/pry/pry_class.rb}, %q{lib/pry/pry_instance.rb}, %q{lib/pry/rbx_method.rb}, %q{lib/pry/rbx_path.rb}, %q{lib/pry/version.rb}, %q{lib/pry/wrapped_module.rb}, %q{man/pry.1}, %q{man/pry.1.html}, %q{man/pry.1.ronn}, %q{pry.gemspec}, %q{test/helper.rb}, %q{test/test_cli.rb}, %q{test/test_command.rb}, %q{test/test_command_helpers.rb}, %q{test/test_command_integration.rb}, %q{test/test_command_set.rb}, %q{test/test_completion.rb}, %q{test/test_default_commands.rb}, %q{test/test_default_commands/test_context.rb}, %q{test/test_default_commands/test_documentation.rb}, %q{test/test_default_commands/test_gems.rb}, %q{test/test_default_commands/test_input.rb}, %q{test/test_default_commands/test_introspection.rb}, %q{test/test_default_commands/test_ls.rb}, %q{test/test_default_commands/test_shell.rb}, %q{test/test_exception_whitelist.rb}, %q{test/test_history_array.rb}, %q{test/test_hooks.rb}, %q{test/test_indent.rb}, %q{test/test_input_stack.rb}, %q{test/test_method.rb}, %q{test/test_pry.rb}, %q{test/test_pry_defaults.rb}, %q{test/test_pry_history.rb}, %q{test/test_pry_output.rb}, %q{test/test_special_locals.rb}, %q{test/test_syntax_checking.rb}, %q{test/test_wrapped_module.rb}, %q{test/testrc}, %q{test/testrcbad}, %q{wiki/Customizing-pry.md}, %q{wiki/Home.md}]
-  s.homepage = %q{http://pry.github.com}
-  s.require_paths = [%q{lib}]
-  s.rubygems_version = %q{1.8.6}
-  s.summary = %q{An IRB alternative and runtime developer console}
-  s.test_files = [%q{test/helper.rb}, %q{test/test_cli.rb}, %q{test/test_command.rb}, %q{test/test_command_helpers.rb}, %q{test/test_command_integration.rb}, %q{test/test_command_set.rb}, %q{test/test_completion.rb}, %q{test/test_default_commands.rb}, %q{test/test_default_commands/test_context.rb}, %q{test/test_default_commands/test_documentation.rb}, %q{test/test_default_commands/test_gems.rb}, %q{test/test_default_commands/test_input.rb}, %q{test/test_default_commands/test_introspection.rb}, %q{test/test_default_commands/test_ls.rb}, %q{test/test_default_commands/test_shell.rb}, %q{test/test_exception_whitelist.rb}, %q{test/test_history_array.rb}, %q{test/test_hooks.rb}, %q{test/test_indent.rb}, %q{test/test_input_stack.rb}, %q{test/test_method.rb}, %q{test/test_pry.rb}, %q{test/test_pry_defaults.rb}, %q{test/test_pry_history.rb}, %q{test/test_pry_output.rb}, %q{test/test_special_locals.rb}, %q{test/test_syntax_checking.rb}, %q{test/test_wrapped_module.rb}, %q{test/testrc}, %q{test/testrcbad}]
+  s.authors = ["John Mair (banisterfiend)"]
+  s.date = "2012-01-16"
+  s.description = "An IRB alternative and runtime developer console"
+  s.email = "jrmair@gmail.com"
+  s.executables = ["pry"]
+  s.files = [".document", ".gemtest", ".gitignore", ".travis.yml", ".yardopts", "CHANGELOG", "CONTRIBUTORS", "Gemfile", "LICENSE", "README.markdown", "Rakefile", "TODO", "bin/pry", "examples/example_basic.rb", "examples/example_command_override.rb", "examples/example_commands.rb", "examples/example_hooks.rb", "examples/example_image_edit.rb", "examples/example_input.rb", "examples/example_input2.rb", "examples/example_output.rb", "examples/example_print.rb", "examples/example_prompt.rb", "examples/helper.rb", "lib/pry.rb", "lib/pry/cli.rb", "lib/pry/code.rb", "lib/pry/command.rb", "lib/pry/command_set.rb", "lib/pry/commands.rb", "lib/pry/completion.rb", "lib/pry/config.rb", "lib/pry/core_extensions.rb", "lib/pry/custom_completions.rb", "lib/pry/default_commands/basic.rb", "lib/pry/default_commands/context.rb", "lib/pry/default_commands/documentation.rb", "lib/pry/default_commands/easter_eggs.rb", "lib/pry/default_commands/gems.rb", "lib/pry/default_commands/input.rb", "lib/pry/default_commands/introspection.rb", "lib/pry/default_commands/ls.rb", "lib/pry/default_commands/shell.rb", "lib/pry/extended_commands/experimental.rb", "lib/pry/helpers.rb", "lib/pry/helpers/base_helpers.rb", "lib/pry/helpers/command_helpers.rb", "lib/pry/helpers/options_helpers.rb", "lib/pry/helpers/text.rb", "lib/pry/history.rb", "lib/pry/history_array.rb", "lib/pry/hooks.rb", "lib/pry/indent.rb", "lib/pry/method.rb", "lib/pry/plugins.rb", "lib/pry/pry_class.rb", "lib/pry/pry_instance.rb", "lib/pry/rbx_method.rb", "lib/pry/rbx_path.rb", "lib/pry/version.rb", "lib/pry/wrapped_module.rb", "man/pry.1", "man/pry.1.html", "man/pry.1.ronn", "pry.gemspec", "test/helper.rb", "test/test_cli.rb", "test/test_code.rb", "test/test_command.rb", "test/test_command_helpers.rb", "test/test_command_integration.rb", "test/test_command_set.rb", "test/test_completion.rb", "test/test_default_commands.rb", "test/test_default_commands/test_context.rb", "test/test_default_commands/test_documentation.rb", "test/test_default_commands/test_gems.rb", "test/test_default_commands/test_input.rb", "test/test_default_commands/test_introspection.rb", "test/test_default_commands/test_ls.rb", "test/test_default_commands/test_shell.rb", "test/test_exception_whitelist.rb", "test/test_history_array.rb", "test/test_hooks.rb", "test/test_indent.rb", "test/test_input_stack.rb", "test/test_method.rb", "test/test_pry.rb", "test/test_pry_defaults.rb", "test/test_pry_history.rb", "test/test_pry_output.rb", "test/test_special_locals.rb", "test/test_syntax_checking.rb", "test/test_wrapped_module.rb", "test/testrc", "test/testrcbad", "wiki/Customizing-pry.md", "wiki/Home.md"]
+  s.homepage = "http://pry.github.com"
+  s.require_paths = ["lib"]
+  s.rubygems_version = "1.8.11"
+  s.summary = "An IRB alternative and runtime developer console"
+  s.test_files = ["test/helper.rb", "test/test_cli.rb", "test/test_code.rb", "test/test_command.rb", "test/test_command_helpers.rb", "test/test_command_integration.rb", "test/test_command_set.rb", "test/test_completion.rb", "test/test_default_commands.rb", "test/test_default_commands/test_context.rb", "test/test_default_commands/test_documentation.rb", "test/test_default_commands/test_gems.rb", "test/test_default_commands/test_input.rb", "test/test_default_commands/test_introspection.rb", "test/test_default_commands/test_ls.rb", "test/test_default_commands/test_shell.rb", "test/test_exception_whitelist.rb", "test/test_history_array.rb", "test/test_hooks.rb", "test/test_indent.rb", "test/test_input_stack.rb", "test/test_method.rb", "test/test_pry.rb", "test/test_pry_defaults.rb", "test/test_pry_history.rb", "test/test_pry_output.rb", "test/test_special_locals.rb", "test/test_syntax_checking.rb", "test/test_wrapped_module.rb", "test/testrc", "test/testrcbad"]
 
   if s.respond_to? :specification_version then
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<coderay>, ["~> 1.0.5"])
-      s.add_runtime_dependency(%q<slop>, ["< 3", ">= 2.4.1"])
+      s.add_runtime_dependency(%q<slop>, ["< 3", ">= 2.4.3"])
       s.add_runtime_dependency(%q<method_source>, ["~> 0.7"])
       s.add_development_dependency(%q<bacon>, ["~> 1.1"])
       s.add_development_dependency(%q<open4>, ["~> 1.3"])
       s.add_development_dependency(%q<rake>, ["~> 0.9"])
     else
       s.add_dependency(%q<coderay>, ["~> 1.0.5"])
-      s.add_dependency(%q<slop>, ["< 3", ">= 2.4.1"])
+      s.add_dependency(%q<slop>, ["< 3", ">= 2.4.3"])
       s.add_dependency(%q<method_source>, ["~> 0.7"])
       s.add_dependency(%q<bacon>, ["~> 1.1"])
       s.add_dependency(%q<open4>, ["~> 1.3"])
@@ -37,7 +37,7 @@ Gem::Specification.new do |s|
     end
   else
     s.add_dependency(%q<coderay>, ["~> 1.0.5"])
-    s.add_dependency(%q<slop>, ["< 3", ">= 2.4.1"])
+    s.add_dependency(%q<slop>, ["< 3", ">= 2.4.3"])
     s.add_dependency(%q<method_source>, ["~> 0.7"])
     s.add_dependency(%q<bacon>, ["~> 1.1"])
     s.add_dependency(%q<open4>, ["~> 1.3"])

data/test/helper.rb

@@ -30,23 +30,12 @@ class << Pry
   end
 end
 
-class MockPryException
-  attr_accessor :bt_index
-  attr_accessor :backtrace
-
-  def initialize(*backtrace)
-    @backtrace = backtrace
-    @bt_index = 0
-  end
-
-  def message
-    "mock exception"
-  end
-
-  def bt_source_location_for(index)
-    backtrace[index] =~ /(.*):(\d+)/
-    [$1, $2.to_i]
+def mock_exception(*mock_backtrace)
+  e = StandardError.new("mock exception")
+  (class << e; self; end).class_eval do
+    define_method(:backtrace) { mock_backtrace }
   end
+  e
 end
 
 Pry.reset_defaults
@@ -132,15 +121,12 @@ end
 
 class InputTester
   def initialize(*actions)
-    if actions.last.is_a?(Hash) && actions.last.keys == [:history]
-      @hist = actions.pop[:history]
-    end
     @orig_actions = actions.dup
     @actions = actions
   end
 
   def readline(*)
-    @actions.shift.tap{ |line| @hist << line if @hist }
+    @actions.shift
   end
 
   def rewind
@@ -159,11 +145,11 @@ end
 
 # Open a temp file and yield it to the block, closing it after
 # @return [String] The path of the temp file
-def temp_file
-  file = Tempfile.new('pry')
+def temp_file(ext='.rb')
+  file = Tempfile.new(['pry', ext])
   yield file
 ensure
-  file.close(true)
+  file.close(true) if file
 end
 
 

data/test/test_code.rb

@@ -0,0 +1,201 @@
+require 'helper'
+
+describe Pry::Code do
+  describe '.from_file' do
+    should 'read lines from a file on disk' do
+      Pry::Code.from_file('lib/pry.rb').length.should > 0
+    end
+
+    should 'read lines from Pry\'s line buffer' do
+      mock_pry(':hay_guys')
+      Pry::Code.from_file('(pry)').grep(/:hay_guys/).length.should == 1
+    end
+
+    should 'default to Ruby' do
+      temp_file('') do |f|
+        Pry::Code.from_file(f.path).code_type.should == :ruby
+      end
+    end
+
+    should 'check the extension' do
+      temp_file('.c') do |f|
+        Pry::Code.from_file(f.path).code_type.should == :c
+      end
+    end
+
+    should 'raise an error if the file doesn\'t exist' do
+      proc do
+        Pry::Code.from_file('/knalkjsdnalsd/alkjdlkq')
+      end.should.raise(Pry::CommandError)
+    end
+  end
+
+  describe '.from_method' do
+    should 'read lines from a method\'s definition' do
+      m = Pry::Method.from_obj(Pry, :load_history)
+      Pry::Code.from_method(m).length.should > 0
+    end
+  end
+
+  describe '#initialize' do
+    before do
+      @str = Pry::Helpers::CommandHelpers.unindent <<-CODE
+        def hay
+          :guys
+        end
+      CODE
+
+      @array = ['def hay', '  :guys', 'end']
+    end
+
+    should 'break a string into lines' do
+      Pry::Code.new(@str).length.should == 3
+    end
+
+    should 'accept an array' do
+      Pry::Code.new(@array).length.should == 3
+    end
+
+    it 'an array or string should produce an equivalent object' do
+      Pry::Code.new(@str).should == Pry::Code.new(@array)
+    end
+  end
+
+  describe 'filters and formatters' do
+    before do
+      @code = Pry::Code(Pry::Helpers::CommandHelpers.unindent <<-STR)
+        class MyProgram
+          def self.main
+            puts 'Hello, world!'
+          end
+        end
+      STR
+    end
+
+    describe 'filters' do
+      describe '#between' do
+        should 'work with an inclusive range' do
+          @code = @code.between(1..3)
+          @code.length.should == 3
+          @code.should =~ /\Aclass MyProgram/
+          @code.should =~ /world!'\Z/
+        end
+
+        should 'default to an inclusive range' do
+          @code = @code.between(3, 5)
+          @code.length.should == 3
+        end
+
+        should 'work with an exclusive range' do
+          @code = @code.between(2...4)
+          @code.length.should == 2
+          @code.should =~ /\A  def self/
+          @code.should =~ /world!'\Z/
+        end
+
+        should 'use real line numbers for positive indices' do
+          @code = @code.after(3, 3)
+          @code = @code.between(4, 4)
+          @code.length.should == 1
+          @code.should =~ /\A  end\Z/
+        end
+      end
+
+      describe '#before' do
+        should 'work' do
+          @code = @code.before(3, 1)
+          @code.should =~ /\A  def self\.main\Z/
+        end
+      end
+
+      describe '#around' do
+        should 'work' do
+          @code = @code.around(3, 1)
+          @code.length.should == 3
+          @code.should =~ /\A  def self/
+          @code.should =~ /  end\Z/
+        end
+      end
+
+      describe '#after' do
+        should 'work' do
+          @code = @code.after(3, 1)
+          @code.should =~ /\A  end\Z/
+        end
+      end
+
+      describe '#grep' do
+        should 'work' do
+          @code = @code.grep(/end/)
+          @code.length.should == 2
+        end
+      end
+    end
+
+    describe 'formatters' do
+      describe '#with_line_numbers' do
+        should 'show line numbers' do
+          @code = @code.with_line_numbers
+          @code.should =~ /1:/
+        end
+
+        should 'disable line numbers when falsy' do
+          @code = @code.with_line_numbers
+          @code = @code.with_line_numbers(false)
+          @code.should.not =~ /1:/
+        end
+      end
+
+      describe '#with_marker' do
+        should 'show a marker in the right place' do
+          @code = @code.with_marker(2)
+          @code.should =~ /^ =>   def self/
+        end
+
+        should 'disable the marker when falsy' do
+          @code = @code.with_marker(2)
+          @code = @code.with_marker(false)
+          @code.should =~ /^  def self/
+        end
+      end
+
+      describe '#with_indentation' do
+        should 'indent the text' do
+          @code = @code.with_indentation(2)
+          @code.should =~ /^    def self/
+        end
+
+        should 'disable the indentation when falsy' do
+          @code = @code.with_indentation(2)
+          @code = @code.with_indentation(false)
+          @code.should =~ /^  def self/
+        end
+      end
+    end
+
+    describe 'composition' do
+      describe 'grep and with_line_numbers' do
+        should 'work' do
+          @code = @code.grep(/end/).with_line_numbers
+          @code.should =~ /\A4:   end/
+          @code.should =~ /5: end\Z/
+        end
+      end
+
+      describe 'grep and before and with_line_numbers' do
+        should 'work' do
+          @code = @code.grep(/e/).before(5, 5).with_line_numbers
+          @code.should =~ /\A2:   def self.main\n3:/
+          @code.should =~ /4:   end\Z/
+        end
+      end
+
+      describe 'before and after' do
+        should 'work' do
+          @code = @code.before(4, 2).after(2)
+          @code.should == "    puts 'Hello, world!'"
+        end
+      end
+    end
+  end
+end

data/test/test_command.rb

@@ -223,6 +223,16 @@ describe "Pry::Command" do
 
       mock_command(cmd, %w(--four 4 four))
     end
+
+    it 'should allow overriding options after definition' do
+      cmd = @set.command_class /number-(one|two)/, "Lieutenants of the Golgafrinchan Captain", :shellwords => false do
+
+        command_options :listing => 'number-one'
+      end
+
+      cmd.command_options[:shellwords].should == false
+      cmd.command_options[:listing].should == 'number-one'
+    end
   end
 
   describe 'tokenize' do

data/test/test_default_commands/test_input.rb

@@ -235,7 +235,7 @@ 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/
@@ -246,7 +246,7 @@ describe "Pry::DefaultCommands::Input" do
       @hist.push ":bucket"
       @hist.push ":ostrich"
       str_output = StringIO.new
-      redirect_pry_io(InputTester.new("hist --replay -1", "exit-all", :history => @hist), str_output) do
+      redirect_pry_io(InputTester.new("hist --replay -1", "exit-all"), str_output) do
         pry
       end
       str_output.string.should =~ /ostrich/
@@ -256,7 +256,7 @@ describe "Pry::DefaultCommands::Input" do
       @hist.push ":hello"
       @hist.push ":carl"
       str_output = StringIO.new
-      redirect_pry_io(InputTester.new("hist --replay 0..2", "exit-all", :history => @hist), str_output) do
+      redirect_pry_io(InputTester.new("hist --replay 0..2", "exit-all"), str_output) do
         pry
       end
       str_output.string.should =~ /:hello\n.*:carl/
@@ -274,21 +274,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 +300,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 +316,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 +332,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 +342,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 +351,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

@@ -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