pry-rescue 0.15 → 0.16

data/README.md

@@ -75,6 +75,30 @@ end
 Pry::rescue{ test }
 ```
 
+cd-raise
+========
+
+If you've run some code in Pry, and an exception was raised, you can use the `cd-raise`
+command:
+
+```
+[1] pry(main)> foo
+RuntimeError: two
+from a.rb:4:in `rescue in foo'
+[2] pry(main)> cd-raise
+From: a.rb @ line 4 Object#foo:
+
+    1: def foo
+    2:   raise "one"
+    3: rescue => e
+ => 4:   raise "two"
+    5: end
+
+[1] pry(main)>
+```
+
+To get back from `cd-raise` you can either type `<ctrl+d>` or `cd ..`.
+
 cd-cause
 ========
 

data/lib/pry-rescue.rb

@@ -24,6 +24,11 @@ begin
 rescue LoadError
 end
 
+# Ensure that any exceptions raised within pry are available
+Pry.config.hooks.add_hook :before_session, :enable_rescuing do
+  Pry.enable_rescuing!
+end
+
 # PryRescue provides the ability to open a Pry shell whenever an unhandled exception is
 # raised in your code.
 #
@@ -104,11 +109,21 @@ class PryRescue
     # @param [String] file  the absolute path
     # @return [Boolean]
     def user_path?(file)
-      return false if file.match(%r(/vendor/))
-      return true if file.match(Dir.pwd)
-      !file.start_with?(RbConfig::CONFIG['libdir']) &&
-      !gem_path?(file) &&
-      !%w( (eval) <internal:prelude> ).include?(file)
+      return true  if current_path?(file)
+      return false if stdlib_path?(file) || gem_path?(file)
+      true
+    end
+
+    # Is this file definitely part of the codebase the user is working on?
+    #
+    # This function exists because sometimes Dir.pwd can be a gem_path?,
+    # and the user expects to be able to debug a gem when they're cd'd
+    # into it.
+    #
+    # @param [String] file  the absolute path
+    # @return [Boolean]
+    def current_path?(file)
+      file.start_with?(Dir.pwd) && !file.match(%r(/vendor/))
     end
 
     # Is this path included in a gem?
@@ -125,6 +140,14 @@ class PryRescue
       end
     end
 
+    # Is this path in the ruby standard library?
+    #
+    # @param [String] file  the absolute path
+    # @return [Boolean]
+    def stdlib_path?(file)
+      file.start_with?(RbConfig::CONFIG['libdir']) || %w( (eval) <internal:prelude> ).include?(file)
+    end
+
     # Remove bindings that are part of Interception/Pry.rescue's internal
     # event handling that happens as part of the exception hooking process.
     #

data/lib/pry-rescue/commands.rb

@@ -1,4 +1,4 @@
-Pry::Commands.create_command "cd-cause", "Move to the previously raised exception"  do
+Pry::Commands.create_command "cd-cause", "Move to the exception that caused this exception to happen"  do
 
   banner <<-BANNER
     Usage: cd-cause
@@ -43,6 +43,36 @@ Pry::Commands.create_command "cd-cause", "Move to the previously raised exceptio
   end
 end
 
+Pry::Commands.create_command "cd-raise", "Move to the point at which an exception was raised" do
+  banner <<-BANNER
+    Usage: cd-raise [_ex_]
+
+    Starts a new pry session at the point that the given exception was raised.
+
+    If no exception is given, defaults to _ex_, the most recent exception that
+    was raised by code you ran from within pry.
+
+    @example
+
+      [2] pry(main)> foo
+      RuntimeError: two
+      from /home/conrad/0/ruby/pry-rescue/a.rb:4:in `rescue in foo'
+      [3] pry(main)> cd-raise
+
+          1: def foo
+          2:   raise "one"
+          3: rescue => e
+       => 4:   raise "two"
+          5: end
+  BANNER
+
+  def process
+    ex = target.eval(args.first || "_ex_")
+    raise Pry::CommandError, "No most recent exception" unless ex
+    Pry.rescued(ex)
+  end
+end
+
 Pry::Commands.create_command "try-again", "Re-try the code that caused this exception" do
 
   banner <<-BANNER

data/lib/pry-rescue/core_ext.rb

@@ -74,7 +74,7 @@ class << Pry
   #   end
   #
   def enable_rescuing!
-    @raised = []
+    @raised ||= []
     @rescuing = true
     Interception.listen do |exception, binding|
       if defined?(PryStackExplorer)

data/pry-rescue.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name          = 'pry-rescue'
-  s.version       = '0.15'
+  s.version       = '0.16'
   s.summary       = 'Open a pry session on any unhandled exceptions'
   s.description   = 'Allows you to wrap code in Pry::rescue{ } to open a pry session at any unhandled exceptions'
   s.homepage      = 'https://github.com/ConradIrwin/pry-rescue'

data/spec/commands_spec.rb

@@ -17,6 +17,38 @@ describe "pry-rescue commands" do
     end
   end
 
+  describe "cd-raise" do
+    it "should enter the context of an explicit exception" do
+      begin
+        b1 = binding
+        raise "original"
+      rescue => e1
+        b2 = binding
+      end
+
+      Pry.should_receive(:rescued).once.with{ |raised|
+        raised.should == e1
+      }
+
+      Pry.new.process_command 'cd-raise e1', '', binding
+    end
+
+    it "should enter the context of _ex_ if no exception is given" do
+      begin
+        b1 = binding
+        raise "original"
+      rescue => _ex_
+        b2 = binding
+      end
+
+      Pry.should_receive(:rescued).once.with{ |raised|
+        raised.should == _ex_
+      }
+
+      Pry.new.process_command 'cd-raise', '', binding
+    end
+  end
+
   describe "cd-cause" do
     it "should enter the next exception's context" do
       begin

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pry-rescue
 version: !ruby/object:Gem::Version
-  version: '0.15'
+  version: '0.16'
   prerelease: 
 platform: ruby
 authors:
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-07 00:00:00.000000000 Z
+date: 2013-01-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pry