pry-rescue 0.8 → 0.9.pre.1

data/README.md

@@ -1,5 +1,5 @@
 
-**pry-rescue** super-fast, painless, debugging for the (ruby) masses. (See [Pry to the rescue!](https://cirw.in/blog/pry-to-the-rescue))
+**pry-rescue** super-fast, painless, debugging for the (ruby) masses. (See [Pry to the rescue!](http://cirw.in/blog/pry-to-the-rescue))
 
 Usage
 =====

data/lib/pry-rescue.rb

@@ -24,11 +24,12 @@ class PryRescue
     # Start a Pry session in the context of the exception.
     # @param [Array<Exception, Array<Binding>>] raised  The exceptions raised
     def enter_exception_context(raised)
+      @exception_context_depth ||= 0
+      @exception_context_depth += 1
 
       raised = raised.map do |e, bs|
         [e, without_bindings_below_raise(bs)]
       end
-      raised = without_gem_reraises(raised)
 
       raised.pop if phantom_load_raise?(*raised.last)
       exception, bindings = raised.last
@@ -41,6 +42,8 @@ class PryRescue
       else
         Pry.start bindings.first, :hooks => pry_hooks(exception, raised)
       end
+    ensure
+      @exception_context_depth -= 1
     end
 
     # Load a script wrapped in Pry::rescue{ }
@@ -49,6 +52,12 @@ class PryRescue
       Pry::rescue{ Kernel.load script }
     end
 
+    # Is the user currently inside pry rescue?
+    # @return [Boolean]
+    def in_exception_context?
+      @exception_context_depth && @exception_context_depth > 0
+    end
+
     private
 
     # Did this raise happen within pry-rescue?
@@ -81,7 +90,8 @@ class PryRescue
     # @return [Boolean]
     def user_path?(file)
       !file.start_with?(RbConfig::CONFIG['libdir']) &&
-      !Gem::Specification.any?{ |gem| file.start_with?(gem.full_gem_path) }
+      !Gem::Specification.any?{ |gem| file.start_with?(gem.full_gem_path) } &&
+      !(file == '<internal:prelude>')
     end
 
     # Remove bindings that are part of Interception/Pry.rescue's internal
@@ -105,28 +115,11 @@ class PryRescue
       bindings.zip([nil] + bindings).reject do |b, c|
         # The eval('__method__') is there as a shortcut as loading a method
         # from a binding is very slow.
-        c && (b.eval("__method__") == c.eval("__method__")) &&
+        c && (b.eval("::Kernel.__method__") == c.eval("::Kernel.__method__")) &&
                     Pry::Method.from_binding(b) == Pry::Method.from_binding(c)
       end.map(&:first)
     end
 
-    # Remove any re-raises of the exact exception object that happened from within
-    # a gem, and show you only the raise that happened in your code.
-    #
-    # @param [Array<Exception, Array<Binding>>] raised  The exceptions raised
-    def without_gem_reraises(raised)
-      seen = {}
-      raised.select do |(e, bindings)|
-        if seen[e] && !user_path?(bindings.first.eval("__FILE__"))
-          false
-        elsif user_path?(bindings.first.eval("__FILE__"))
-          seen[e] = true
-        else
-          true
-        end
-      end
-    end
-
     # Define the :before_session hook for the Pry instance.
     # This ensures that the `_ex_` and `_raised_` sticky locals are
     # properly set.

data/lib/pry-rescue/commands.rb

@@ -12,15 +12,15 @@ Pry::Commands.create_command "cd-cause", "Move to the previously raised exceptio
       5.    def foo
       6.      raise "one"
       7.    rescue
-      8. =>    raise "two"
+      8. =>   raise "two"
       9.    end
 
       pry> cd-cause
 
       5.    def foo
-      6. =>    raise "one"
+      6. =>   raise "one"
       7.    rescue
-      8.       raise "two"
+      8.      raise "two"
       9.    end
 
     Once you have finished with the internal exception type <ctrl+d> or cd .. to
@@ -60,6 +60,7 @@ Pry::Commands.create_command "try-again", "Re-try the code that caused this exce
   BANNER
 
   def process
+    raise Pry::CommandError, "try-again only works in a pry session created by Pry::rescue{}" unless PryRescue.in_exception_context?
     throw :try_again
   end
 end

data/lib/pry-rescue/core_ext.rb

@@ -1,5 +1,5 @@
 # Additional methods provided by pry-rescue.
-class Pry
+class << Pry
   # Start a pry session on any unhandled exceptions within this block.
   #
   # @example
@@ -8,29 +8,18 @@ class Pry
   #   end
   #
   # @return [Object] The return value of the block
-  def self.rescue(&block)
-    raised = []
-    (@raised_stack ||= []) << raised
-
+  def rescue(&block)
     loop do
       catch(:try_again) do
-        raised.clear
+        @raised = []
         begin
-          return Interception.listen(block) do |exception, binding|
-                    if defined?(PryStackExplorer)
-                      raised << [exception, binding.callers]
-                    else
-                      raised << [exception, Array(binding)]
-                    end
-                  end
+          return with_rescuing(&block)
         rescue Exception => e
-          PryRescue.enter_exception_context(raised)
+          rescued e
           raise e
         end
       end
     end
-  ensure
-    @raised_stack.pop
   end
 
   # Start a pry session on an exception that you rescued within a Pry::rescue{ }.
@@ -44,13 +33,38 @@ class Pry
   #     end
   #   end
   #
-  def self.rescued(e=$!)
-    raise "Tried to inspect rescued exception outside Pry::rescue{ } block" unless @raised_stack.any?
+  def rescued(e=$!)
+    if i = (@raised || []).index{ |(ee, _)| ee == e }
+      PryRescue.enter_exception_context(@raised[0..i])
+    else
+      raise "Tried to inspect an exception that was not raised in a Pry::rescue{ } block"
+    end
+
+  ensure
+    @raised = []
+  end
 
-    raised = @raised_stack.last.dup
-    raised.pop until raised.empty? || raised.last.first == e
-    raise "Tried to inspect an exception that was not raised in this Pry::rescue{ } block" unless raised.any?
+  private
 
-    PryRescue.enter_exception_context(raised)
+  # Ensure that Interception is active while running this block
+  #
+  # @param [Proc] &block  the block
+  def with_rescuing(&block)
+    if @rescuing
+      block.call
+    else
+      begin
+        @rescuing = true
+        Interception.listen(block) do |exception, binding|
+          if defined?(PryStackExplorer)
+            @raised << [exception, binding.callers]
+          else
+            @raised << [exception, Array(binding)]
+          end
+        end
+      ensure
+        @rescuing = false
+      end
+    end
   end
 end

data/lib/pry-rescue/rails.rb

@@ -0,0 +1,33 @@
+require 'pry-rescue'
+class PryRescue
+  class Railtie < ::Rails::Railtie
+
+    initializer "pry_rescue" do |app|
+      if Rails.env.development?
+        app.config.middleware.use PryRescue::Rack
+
+        if defined?(::ActionDispatch::DebugExceptions)
+          monkeypatch(::ActionDispatch::DebugExceptions)
+
+        elsif defined?(::ActionDispatch::ShowExceptions)
+          monkeypatch(::ActionDispatch::ShowExceptions)
+
+        else
+          raise LoadError, "Sorry, your version of rails is not supported."
+        end
+      end
+    end
+
+    def monkeypatch(middleware)
+      middleware.class_eval do
+
+        def render_exception_with_pry_rescue(env, exception)
+          Pry::rescued(exception)
+          render_exception_without_pry_rescue(env, exception)
+        end
+
+        alias_method_chain :render_exception, :pry_rescue
+      end
+    end
+  end
+end

data/pry-rescue.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name          = 'pry-rescue'
-  s.version       = '0.8'
+  s.version       = '0.9.pre.1'
   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

@@ -0,0 +1,60 @@
+describe "pry-rescue commands" do
+  describe "try-again" do
+    it "should throw try_again" do
+      PryRescue.should_receive(:in_exception_context?).and_return{ true }
+
+      lambda{
+        Pry.new.process_command "try-again", '', TOPLEVEL_BINDING
+      }.should throw_symbol :try_again
+    end
+
+    it "should raise a CommandError if not in Pry::rescue" do
+      PryRescue.should_receive(:in_exception_context?).and_return{ false }
+
+      lambda{
+        Pry.new.process_command "try-again", '', TOPLEVEL_BINDING
+      }.should raise_error Pry::CommandError
+    end
+  end
+
+  describe "cd-cause" do
+    it "should enter the next exception's context" do
+      begin
+        begin
+          b1 = binding
+          raise "original"
+        rescue => e1
+          b2 = binding
+          raise
+        end
+      rescue => e2
+        _raised_ = [[e1, [b1]], [e2, [b2]]]
+      end
+
+      PryRescue.should_receive(:enter_exception_context).once.with{ |raised|
+        raised.should == [[e1, [b1]]]
+      }
+
+      Pry.new.process_command 'cd-cause', '', binding
+    end
+
+    it "should raise a CommandError if no previous commands" do
+      begin
+        b1 = binding
+        raise "original"
+      rescue => e1
+        _raised_ = [[e1, [b1]]]
+      end
+
+      lambda{
+        Pry.new.process_command 'cd-cause', '', binding
+      }.should raise_error Pry::CommandError, /No previous exception/
+    end
+
+    it "should raise a CommandError if not in Pry::rescue" do
+      lambda{
+        Pry.new.process_command 'cd-cause', '', binding
+      }.should raise_error Pry::CommandError, /Pry::rescue/
+    end
+  end
+end

data/spec/core_ext_spec.rb

@@ -46,11 +46,11 @@ describe 'Pry.rescue' do
     end
   end
 
-  it "should preserve exceptions between retrys at a higher level" do
+  it "should clear out exceptions between retrys at a higher level" do
     @outer = @inner = 0
     PryRescue.should_receive(:enter_exception_context).once{ |raised| raised.size.should == 1; throw :try_again }
     PryRescue.should_receive(:enter_exception_context).once{ |raised| raised.size.should == 1; throw :try_again }
-    PryRescue.should_receive(:enter_exception_context).once{ |raised| raised.size.should == 3; throw :try_again }
+    PryRescue.should_receive(:enter_exception_context).once{ |raised| raised.size.should == 1; throw :try_again }
     Pry::rescue do
       @outer += 1
       Pry::rescue do
@@ -60,6 +60,19 @@ describe 'Pry.rescue' do
       raise "foops" if @outer == 1
     end
   end
+
+  it "should enter the first occurence of an exception that is re-raised" do
+    PryRescue.should_receive(:enter_exception_context).once{ |raised| raised.size.should == 1 }
+    lambda do
+      Pry::rescue do
+        begin
+          raise "first_occurance"
+        rescue => e
+          raise
+        end
+      end
+    end.should  raise_error /first_occurance/
+  end
 end
 
 describe "Pry.rescued" do
@@ -70,7 +83,7 @@ describe "Pry.rescued" do
     rescue => e
       lambda{
         Pry.rescued(e)
-      }.should raise_error(/outside Pry::rescue/)
+      }.should raise_error(/Pry::rescue/)
     end
   end
 

metadata

@@ -1,109 +1,97 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: pry-rescue
-version: !ruby/object:Gem::Version
-  version: '0.8'
-  prerelease: 
+version: !ruby/object:Gem::Version 
+  prerelease: true
+  segments: 
+  - 0
+  - 9
+  - pre
+  - 1
+  version: 0.9.pre.1
 platform: ruby
-authors:
+authors: 
 - Conrad Irwin
 - banisterfiend
 - epitron
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-31 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
+
+date: 2012-09-30 00:00:00 -07:00
+default_executable: 
+dependencies: 
+- !ruby/object:Gem::Dependency 
   name: pry
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: interception
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
   type: :runtime
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: interception
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
+  type: :runtime
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
   name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: yard
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
   type: :development
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: yard
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: redcarpet
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
   type: :development
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
+  name: redcarpet
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-description: Allows you to wrap code in Pry::rescue{ } to open a pry session at any
-  unhandled exceptions
-email:
+  requirement: &id005 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id005
+description: Allows you to wrap code in Pry::rescue{ } to open a pry session at any unhandled exceptions
+email: 
 - conrad.irwin@gmail.com
 - jrmair@gmail.com
 - chris@ill-logic.com
-executables:
+executables: 
 - rescue
 extensions: []
+
 extra_rdoc_files: []
-files:
+
+files: 
 - .gitignore
 - Gemfile
 - LICENSE.MIT
@@ -118,8 +106,10 @@ files:
 - lib/pry-rescue/commands.rb
 - lib/pry-rescue/core_ext.rb
 - lib/pry-rescue/rack.rb
+- lib/pry-rescue/rails.rb
 - lib/pry/rescue.rb
 - pry-rescue.gemspec
+- spec/commands_spec.rb
 - spec/core_ext_spec.rb
 - spec/fixtures/coderay.rb
 - spec/fixtures/initial.rb
@@ -129,29 +119,37 @@ files:
 - spec/fixtures/super.rb
 - spec/fixtures/uri.rb
 - spec/pry_rescue_spec.rb
+has_rdoc: true
 homepage: https://github.com/ConradIrwin/pry-rescue
 licenses: []
+
 post_install_message: 
 rdoc_options: []
-require_paths:
+
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
+required_ruby_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      segments: 
+      - 0
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - - ">"
+    - !ruby/object:Gem::Version 
+      segments: 
+      - 1
+      - 3
+      - 1
+      version: 1.3.1
 requirements: []
+
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: Open a pry session on any unhandled exceptions
 test_files: []
-has_rdoc: 
+