pry-exception_explorer 0.1.3.5 → 0.1.4

data/lib/pry-exception_explorer/core_ext.rb

@@ -2,8 +2,18 @@
 class Exception
   NoContinuation = Class.new(StandardError)
 
+  # @return [Continuation] The continuation object for the exception.
+  #   Invoking this continuation will allow the program to continue
+  #   from the point the exception was raised.
   attr_accessor :continuation
+
+  # @return [Array<Binding>] The array of bindings that represent the
+  #   call stack for the exception. This is navigable inside the Pry
+  #   session with the `up` and `down` and `frame` commands.
   attr_accessor :exception_call_stack
+
+  # @return [Boolean] Whether this exception should be intercepted.
+  #   (Only relevant for wrapped exceptions).
   attr_accessor :should_intercept
 
   # This method enables us to continue an exception (using
@@ -28,47 +38,48 @@ class Object
       exception = RuntimeError
     end
 
-    if !PryExceptionExplorer.enabled?
-      if exception.is_a?(Exception) || (exception.is_a?(Class) && exception < Exception)
-        return super(*args)
-      elsif exception.nil?
-        if $!
-          return super($!)
-        else
-          return super(RuntimeError)
-        end
-      else
-        return super(*args)
-      end
-    end
-
     if exception.is_a?(Exception) || (exception.is_a?(Class) && exception < Exception)
-      if string
-        ex = exception.exception(string)
+      if PryExceptionExplorer.enabled?
+        ex = string ? exception.exception(string) : exception.exception
       else
-        ex = exception.exception
+        return super(*args)
       end
     elsif exception.nil?
       if $!
-        ex = $!.exception
+        if PryExceptionExplorer.enabled?
+          ex = $!.exception
+        else
+          return super($!)
+        end
       else
-        ex = RuntimeError.exception
+        if PryExceptionExplorer.enabled?
+          ex = RuntimeError.exception
+        else
+          return super(RuntimeError)
+        end
       end
     else
-      ex = RuntimeError.exception
+      if PryExceptionExplorer.enabled?
+        ex = RuntimeError.exception
+      else
+        return super(*args)
+      end
     end
 
     ex.set_backtrace(array ? array : caller)
 
     intercept_object = PryExceptionExplorer.intercept_object
 
+    # FIXME: CodeRay stuff is a hack because CodeRay generates a bunch of
+    # exceptions that would cause EE to infiniloop on
+    # intercept(Exception), find a better solution.
     if PryExceptionExplorer.should_intercept_exception?(binding.of_caller(1), ex) &&
         binding.of_caller(1).eval('[__method__, self.to_s]') != [:make_plugin_hash, "CodeRay::Encoders"]
 
       ex.exception_call_stack = binding.callers.tap { |v| v.shift(1 + intercept_object.skip_num) }
       PryExceptionExplorer.amend_exception_call_stack!(ex)
 
-      ex.should_intercept     = true
+      ex.should_intercept  = true
 
       if !PryExceptionExplorer.wrap_active?
         retval = PryExceptionExplorer.enter_exception(ex, :inline => true)

data/lib/pry-exception_explorer/version.rb

@@ -1,3 +1,3 @@
 module PryExceptionExplorer
-  VERSION = "0.1.3.5"
+  VERSION = "0.1.4"
 end

data/lib/pry-exception_explorer.rb

@@ -136,11 +136,14 @@ module PryExceptionExplorer
     def amend_exception_call_stack!(ex)
       call_stack = ex.exception_call_stack
 
+      # skip_until
       if intercept_object.skip_until_block
         idx = call_stack.each_with_index.find_index do |frame, idx|
           intercept_object.skip_until_block.call(LazyFrame.new(frame, idx, call_stack))
         end
         call_stack = call_stack.drop(idx) if idx
+
+      # skip_while
       elsif intercept_object.skip_while_block
         idx = call_stack.each_with_index.find_index do |frame, idx|
           intercept_object.skip_while_block.call(LazyFrame.new(frame, idx, call_stack)) == false
@@ -173,7 +176,7 @@ module PryExceptionExplorer
     #   entered inline (i.e within the `raise` method itself)
     def enter_exception(ex, options={})
       hooks = Pry.config.hooks.dup.add_hook(:before_session, :set_exception_flag) do |_, _, _pry_|
-        setup_exception_context(ex, _pry_, options) if SE.frame_manager(_pry_)
+        setup_exception_context(ex, _pry_, options)
       end.add_hook(:before_session, :manage_intercept_recurse) do
         PryExceptionExplorer.intercept_object.disable! if !PryExceptionExplorer.intercept_object.intercept_recurse?
       end.add_hook(:after_session, :manage_intercept_recurse) do
@@ -182,7 +185,6 @@ module PryExceptionExplorer
 
       #   Pry.load_plugins
       #   binding.pry    # if we have this here and step through with  pry-nav sometimes we get segfaults :/
-      # end
 
       Pry.start self, :call_stack => ex.exception_call_stack, :hooks => hooks
     end

data/pry-exception_explorer.gemspec

@@ -2,19 +2,19 @@
 
 Gem::Specification.new do |s|
   s.name = "pry-exception_explorer"
-  s.version = "0.1.3.2"
+  s.version = "0.1.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["John Mair (banisterfiend)"]
-  s.date = "2012-02-06"
+  s.date = "2012-02-08"
   s.description = "Enter the context of exceptions"
   s.email = "jrmair@gmail.com"
-  s.files = [".gemtest", ".gitignore", ".travis.yml", ".yardopts", "CHANGELOG", "Gemfile", "LICENSE", "README.md", "Rakefile", "examples/example_c_inline.rb", "examples/example_inline.rb", "examples/example_wrap.rb", "lib/pry-exception_explorer.rb", "lib/pry-exception_explorer/cli.rb", "lib/pry-exception_explorer/commands.rb", "lib/pry-exception_explorer/core_ext.rb", "lib/pry-exception_explorer/intercept.rb", "lib/pry-exception_explorer/lazy_frame.rb", "lib/pry-exception_explorer/shim_builder.rb", "lib/pry-exception_explorer/version.rb", "pry-exception_explorer.gemspec", "test/helper.rb", "test/test_exceptions_in_pry.rb", "test/test_inline_exceptions.rb", "test/test_wrapped_exceptions.rb"]
+  s.files = [".gemtest", ".gitignore", ".travis.yml", ".yardopts", "CHANGELOG", "Gemfile", "LICENSE", "README.md", "Rakefile", "examples/example_c_inline.rb", "examples/example_inline.rb", "examples/example_wrap.rb", "lib/pry-exception_explorer.rb", "lib/pry-exception_explorer/cli.rb", "lib/pry-exception_explorer/commands.rb", "lib/pry-exception_explorer/core_ext.rb", "lib/pry-exception_explorer/intercept.rb", "lib/pry-exception_explorer/lazy_frame.rb", "lib/pry-exception_explorer/shim_builder.rb", "lib/pry-exception_explorer/version.rb", "pry-exception_explorer.gemspec", "test/helper.rb", "test/test_exceptions_in_pry.rb", "test/test_inline_exceptions.rb", "test/test_raise.rb", "test/test_wrapped_exceptions.rb"]
   s.homepage = "https://github.com/banister/pry-exception_explorer"
   s.require_paths = ["lib"]
-  s.rubygems_version = "1.8.11"
+  s.rubygems_version = "1.8.15"
   s.summary = "Enter the context of exceptions"
-  s.test_files = ["test/helper.rb", "test/test_exceptions_in_pry.rb", "test/test_inline_exceptions.rb", "test/test_wrapped_exceptions.rb"]
+  s.test_files = ["test/helper.rb", "test/test_exceptions_in_pry.rb", "test/test_inline_exceptions.rb", "test/test_raise.rb", "test/test_wrapped_exceptions.rb"]
 
   if s.respond_to? :specification_version then
     s.specification_version = 3

data/test/test_raise.rb

@@ -0,0 +1,132 @@
+require 'helper'
+
+describe PryExceptionExplorer do
+
+  describe "normal raise behaviour (EE.enabled = false)" do
+    before do
+      EE.enabled = false
+    end
+
+    it 'should raise the exception that was raised' do
+      begin
+        raise ArgumentError
+      rescue => ex
+        ex.is_a?(ArgumentError).should == true
+      end
+    end
+
+    it 'should keep message' do
+      begin
+        raise ArgumentError, "hello"
+      rescue => ex
+        ex.message.should == "hello"
+      end
+    end
+
+    it 'should implicitly re-raise rescued exceptione' do
+      begin
+        raise ArgumentError
+      rescue => ex
+        begin
+          raise
+        rescue => ex2
+          ex2.is_a?(ArgumentError).should == true
+        end
+      end
+    end
+
+    it 'should implicitly raise RuntimeError (when not inside rescue)' do
+      begin
+        raise
+      rescue => ex
+        ex.is_a?(RuntimeError).should == true
+      end
+    end
+
+    it 'should re-raise raised rescued exception' do
+      begin
+        raise ArgumentError
+      rescue => ex
+        begin
+          raise ex
+        rescue
+          ex.is_a?(ArgumentError).should == true
+        end
+      end
+    end
+  end
+
+  describe "raise behaviour AFTER interception (EE.enabled = true)" do
+    before do
+      Pry.config.hooks.add_hook(:when_started, :save_caller_bindings, WhenStartedHook)
+      Pry.config.hooks.add_hook(:after_session, :delete_frame_manager, AfterSessionHook)
+
+      EE.enabled = true
+      EE.intercept(ArgumentError)
+      EE.wrap_active = false
+      Pry.config.input = StringIO.new("exit-all\n")
+      # Pry.config.input = Readline
+      # Pry.config.output = $stdout
+    end
+
+    after do
+      Pry.config.hooks.delete_hook(:when_started, :save_caller_bindings)
+      Pry.config.hooks.delete_hook(:after_session, :delete_frame_manager)
+    end
+
+    it 'should raise the exception that was raised' do
+      begin
+        raise ArgumentError
+      rescue => ex
+        ex.is_a?(ArgumentError).should == true
+      end
+    end
+
+    it 'should keep message' do
+      begin
+        raise ArgumentError, "hello"
+      rescue => ex
+        ex.message.should == "hello"
+      end
+    end
+
+    it 'should implicitly re-raise rescued exceptione' do
+      begin
+        raise ArgumentError
+      rescue => ex
+        begin
+          raise
+        rescue => ex2
+          ex2.is_a?(ArgumentError).should == true
+        end
+      end
+    end
+
+    it 'should implicitly raise RuntimeError (when not inside rescue)' do
+      begin
+        raise
+      rescue => ex
+        ex.is_a?(RuntimeError).should == true
+      end
+    end
+
+    it 'should re-raise raised rescued exception' do
+      begin
+        raise ArgumentError
+      rescue => ex
+        begin
+          raise ex
+        rescue
+          ex.is_a?(ArgumentError).should == true
+        end
+      end
+    end
+
+
+
+
+
+  end
+end
+
+

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pry-exception_explorer
 version: !ruby/object:Gem::Version
-  version: 0.1.3.5
+  version: 0.1.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-07 00:00:00.000000000 Z
+date: 2012-02-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pry-stack_explorer
-  requirement: &70111051563380 !ruby/object:Gem::Requirement
+  requirement: &70190810463180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70111051563380
+  version_requirements: *70190810463180
 - !ruby/object:Gem::Dependency
   name: bacon
-  requirement: &70111051562760 !ruby/object:Gem::Requirement
+  requirement: &70190810462680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 1.1.0
   type: :development
   prerelease: false
-  version_requirements: *70111051562760
+  version_requirements: *70190810462680
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70111051562200 !ruby/object:Gem::Requirement
+  requirement: &70190810462080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,7 +43,7 @@ dependencies:
         version: '0.9'
   type: :development
   prerelease: false
-  version_requirements: *70111051562200
+  version_requirements: *70190810462080
 description: Enter the context of exceptions
 email: jrmair@gmail.com
 executables: []
@@ -74,6 +74,7 @@ files:
 - test/helper.rb
 - test/test_exceptions_in_pry.rb
 - test/test_inline_exceptions.rb
+- test/test_raise.rb
 - test/test_wrapped_exceptions.rb
 homepage: https://github.com/banister/pry-exception_explorer
 licenses: []
@@ -103,4 +104,5 @@ test_files:
 - test/helper.rb
 - test/test_exceptions_in_pry.rb
 - test/test_inline_exceptions.rb
+- test/test_raise.rb
 - test/test_wrapped_exceptions.rb