pry-exception_explorer 0.2.0pre1 → 0.2.0pre2

data/lib/pry-exception_explorer.rb

@@ -62,31 +62,15 @@ module PryExceptionExplorer
       !!local_hash[:enabled]
     end
 
-    # @param [Boolean] v Whether to intercept only those exceptions that bubble out of
-    #   `EE.wrap` block.
-    def wrap_active=(v)
-      local_hash[:wrap_active] = v
-    end
-
-    # @return [Boolean] Whether to intercept only those exceptions that bubble out of
-    #   `EE.wrap` block.
-    def wrap_active
-      !!local_hash[:wrap_active]
-    end
-
-    alias_method :wrap_active?, :wrap_active
     alias_method :enabled?, :enabled
 
-
     # Wrap the provided block - intercepting all exceptions
     # that bubble out, provided they satisfy the
     # assertion in `PryExceptionExplorer.intercept`.
     # @yield The block to wrap.
     def wrap
-      old_enabled, old_wrap_active = enabled, wrap_active
-      old_inline = inline
+      old_enabled, old_inline = enabled, inline
       self.enabled     = true
-      self.wrap_active = true
       self.inline      = false
       yield
     rescue Exception => ex
@@ -96,9 +80,8 @@ module PryExceptionExplorer
         raise ex
       end
     ensure
-      self.enabled     = old_enabled
-      self.wrap_active = old_wrap_active
-      self.inline      = old_inline
+      self.enabled = old_enabled
+      self.inline  = old_inline
     end
 
     # This method allows the user to assert the situations where an
@@ -222,16 +205,17 @@ module PryExceptionExplorer
 
     # Set initial state
     def init
-      PryExceptionExplorer.post_mortem = true
+
+      # enable EE
       PryExceptionExplorer.enabled = true
-      
-      # disable by default (intercept exceptions inline)
-      PryExceptionExplorer.wrap_active = true
+
+      # auto-start sessions on exceptions that would kill the program
+      PryExceptionExplorer.post_mortem = true
 
       # default is to capture all exceptions
-      PryExceptionExplorer.intercept { true }
+      PryExceptionExplorer.intercept(Exception)
 
-      # disable by default
+      # disable inline sessions by defulat
       PryExceptionExplorer.inline = false
       at_exit do
         ex = $!
@@ -250,7 +234,6 @@ end
 
 # Add a hook to enable EE when invoked via `pry` executable
 Pry.config.hooks.add_hook(:when_started, :try_enable_exception_explorer) do
-  PryExceptionExplorer.wrap_active = true
   PryExceptionExplorer.enabled     = true
   PryExceptionExplorer.inline      = false
 end

data/lib/pry-exception_explorer/commands.rb

@@ -18,8 +18,8 @@ module PryExceptionExplorer
       _pry_.last_exception
     end
 
-    def enterable_exception?
-      PryExceptionExplorer.enabled && last_exception && last_exception.exception_call_stack
+    def enterable_exception?(ex=last_exception)      
+      PryExceptionExplorer.enabled && ex && ex.exception_call_stack
     end
 
     def inline_exception?
@@ -46,21 +46,34 @@ module PryExceptionExplorer
       BANNER
 
       def process
-        if enterable_exception?
-          PryStackExplorer.create_and_push_frame_manager(last_exception.exception_call_stack, _pry_)
-          PryExceptionExplorer.setup_exception_context(last_exception, _pry_)
+        ex = extract_exception
+        if enterable_exception?(ex)
+          PryStackExplorer.create_and_push_frame_manager(ex.exception_call_stack, _pry_)
+          PryExceptionExplorer.setup_exception_context(ex, _pry_)
 
           # have to use _pry_.run_command instead of 'run' here as
           # 'run' works on the current target which hasnt been updated
           # yet, whereas _pry_.run_command operates on the newly
           # updated target (the context of the exception)
           _pry_.run_command "whereami"
-        elsif last_exception
-          raise Pry::CommandError, "Current exception can't be entered! (perhaps a C exception)"
+        elsif ex
+          raise Pry::CommandError, "Current exception can't be entered! (perhaps an internal exception)"
         else
           raise Pry::CommandError,  "No exception to enter!"
         end
       end
+
+      def extract_exception
+        if !arg_string.empty?
+          ex = target.eval(arg_string)
+          raise if !ex.is_a?(Exception)
+          ex
+        else
+          last_exception
+        end
+      rescue
+        raise Pry::CommandError, "Parameter must be a valid exception object."
+      end
     end
 
     create_command "exit-exception", "Leave the context of the current exception." do

data/lib/pry-exception_explorer/core_ext.rb

@@ -31,7 +31,6 @@ class Exception
   alias_method :old_exception, :exception
 
   def exception(*args, &block)
-    $e = binding.callers.drop(1)
     if PryExceptionExplorer.enabled? &&
         PryExceptionExplorer.should_intercept_exception?(binding.of_caller(1), self) &&
         !caller.any? { |t| t.include?("raise") } && !exception_call_stack

data/lib/pry-exception_explorer/version.rb

@@ -1,3 +1,3 @@
 module PryExceptionExplorer
-  VERSION = "0.2.0pre1"
+  VERSION = "0.2.0pre2"
 end

data/test/test_exceptions_in_pry.rb

@@ -6,7 +6,6 @@ describe PryExceptionExplorer do
 
   before do
     PryExceptionExplorer.intercept { true }
-    PryExceptionExplorer.wrap_active = true
     PryExceptionExplorer.enabled = true
   end
 
@@ -77,6 +76,19 @@ describe PryExceptionExplorer do
         O.method_name.should == :toad
       end
 
+      it  "should be able to enter an explicitly provided exception (even if _ex_ has changed)" do
+        redirect_pry_io(InputTester.new("Ratty.new.ratty",
+                                        "ex = _ex_",
+                                        "AnotherException",
+                                        "enter-exception ex",
+                                        "O.method_name = __method__",
+                                        "exit", StringIO.new)) do
+          Pry.start
+        end
+
+        O.method_name.should == :toad
+      end      
+
       it "should have access to exception's caller" do
         mock_pry("Ratty.new.ratty", "enter-exception", "show-stack", "exit").should =~ /toad.*?weasel.*?ratty/m
       end

data/test/test_inline_exceptions.rb

@@ -4,8 +4,6 @@ require 'ostruct'
 # globally accessible state
 O = OpenStruct.new
 
-prev_wrap_state = PryExceptionExplorer.wrap_active
-PryExceptionExplorer.wrap_active = false
 PryExceptionExplorer.inline!
 
 prev_intercept_state = PryExceptionExplorer.intercept_object
@@ -15,7 +13,6 @@ PryExceptionExplorer.enabled = true
 describe PryExceptionExplorer do
 
   before do
-    PryExceptionExplorer.wrap_active = false
     O.exception_intercepted = false
 
     # Ensure that when an exception is intercepted (a pry session
@@ -434,7 +431,6 @@ describe PryExceptionExplorer do
 end
 
 # restore to default
-PryExceptionExplorer.wrap_active = prev_wrap_state
 PryExceptionExplorer.intercept_object = prev_intercept_state
 
 Object.send(:remove_const, :O)

data/test/test_raise.rb

@@ -63,10 +63,7 @@ describe PryExceptionExplorer do
 
       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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pry-exception_explorer
 version: !ruby/object:Gem::Version
-  version: 0.2.0pre1
+  version: 0.2.0pre2
   prerelease: 5
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-29 00:00:00.000000000 Z
+date: 2012-09-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pry-stack_explorer
-  requirement: &70293402053520 !ruby/object:Gem::Requirement
+  requirement: &70215832457180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 0.4.6
   type: :runtime
   prerelease: false
-  version_requirements: *70293402053520
+  version_requirements: *70215832457180
 - !ruby/object:Gem::Dependency
   name: bacon
-  requirement: &70293401916160 !ruby/object:Gem::Requirement
+  requirement: &70215832456340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 1.1.0
   type: :development
   prerelease: false
-  version_requirements: *70293401916160
+  version_requirements: *70215832456340
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70293401915540 !ruby/object:Gem::Requirement
+  requirement: &70215832455760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,7 +43,7 @@ dependencies:
         version: '0.9'
   type: :development
   prerelease: false
-  version_requirements: *70293401915540
+  version_requirements: *70215832455760
 description: Enter the context of exceptions
 email: jrmair@gmail.com
 executables: