pry-rescue 1.0.0 → 1.1.0

data/Rakefile

@@ -11,6 +11,12 @@ task :example2 do
   sh "ruby -I./lib/ ./examples/example2.rb "
 end
 
+desc 'Run syntax-err example'
+task :sintax do
+  ENV['RUBYLIB'] = 'lib'
+  sh 'bin/rescue examples/syntax-err.rb'
+end
+
 desc "Run tests"
 task :test do
   sh 'rspec spec'

data/examples/capybara_spec.rb

@@ -0,0 +1,15 @@
+#!/usr/bin/env ruby
+require 'rspec'
+require 'rspec/autorun'
+
+$:.unshift File.expand_path '../../lib', __FILE__
+require 'pry-rescue/rspec'
+
+require 'capybara/rspec'
+
+describe "Google", :type => :feature, :driver => :selenium do
+  it "should make a nice bell-like sound" do
+    visit 'http://google.com/'
+    page.should have_content 'Bing'
+  end
+end

data/examples/example_spec.rb

@@ -1,8 +1,9 @@
+#!/usr/bin/env ruby
 require 'rspec'
 require 'rspec/autorun'
 
 $:.unshift File.expand_path '../../lib', __FILE__
-require 'pry-rescue'
+require 'pry-rescue/rspec'
 
 describe "Float" do
   it "should be able to add" do

data/examples/loop.rb

@@ -5,7 +5,9 @@ require 'pry-rescue'
 #
 # rescue --peek example/loop.rb
 #
-# Then hit <ctrl-c>, and be able to see what's going on.
+# Then hit <ctrl-/>, and be able to see what's going on.
+#
+puts "Hit <ctrl-/> to peek with Pry, or <ctrl+c> to quit."
 
 def r
   some_var = 13

data/examples/syntax-err.rb

@@ -0,0 +1 @@
+def initely not Ruby

data/lib/pry-rescue/commands.rb

@@ -41,19 +41,13 @@ Pry::Commands.create_command "cd-cause", "Move to the exception that caused this
   def process
     return Pry.rescued target.eval(args.first) if args.any?
 
-    # TODO: better understand why !defined?(_ex_)
     ex = target.eval("defined?(_ex_) && _ex_")
-    raised = target.eval("_raised_.dup rescue nil")
-
-    ex_was_raised = raised && raised.last.first == ex
-    if ex && !ex_was_raised
-      Pry.rescued(ex)
-    elsif ex_was_raised && raised.size > 1
-      raised.pop
-      PryRescue.enter_exception_context(raised)
-    else
-      raise Pry::CommandError, "No previous exception detected"
-    end
+    rescued = target.eval("defined?(_rescued_) && _rescued_")
+
+    ex = ex.instance_variable_get(:@rescue_cause) if rescued == ex
+    raise Pry::CommandError, "No previous exception to cd-cause into" if ex.nil? || ex == rescued
+
+    Pry.rescued ex
   end
 end
 

data/lib/pry-rescue/core_ext.rb

@@ -11,7 +11,6 @@ class << Pry
   def rescue(&block)
     loop do
       catch(:try_again) do
-        @raised = []
         begin
           return with_rescuing(&block)
         rescue Exception => e
@@ -34,8 +33,8 @@ class << Pry
   #   end
   #
   def rescued(e=$!)
-    if i = (@raised || []).index{ |(ee, _)| ee == e }
-      PryRescue.enter_exception_context(@raised[0..i])
+    if e.instance_variable_get(:@rescue_bindings)
+      PryRescue.enter_exception_context(e)
     else
       stack = ''
       stack = "\n" + e.backtrace.join("\n") if e.backtrace
@@ -58,8 +57,6 @@ class << Pry
       end
     end
 
-  ensure
-    @raised = []
   end
 
   # Allow Pry::rescued(e) to work at any point in your program.
@@ -73,14 +70,12 @@ class << Pry
   #     Pry::rescued(e)
   #   end
   #
-  def enable_rescuing!
-    @raised ||= []
-    @rescuing = true
-    Interception.listen do |exception, binding|
-      if defined?(PryStackExplorer)
-        @raised << [exception, binding.callers]
-      else
-        @raised << [exception, Array(binding)]
+  def enable_rescuing!(block=nil)
+    Interception.listen(block) do |exception, binding|
+      bindings = binding.respond_to?(:callers) ? binding.callers : [binding]
+      unless exception.instance_variable_get(:@rescue_bindings)
+        exception.instance_variable_set(:@rescue_bindings, bindings)
+        exception.instance_variable_set(:@rescue_cause, $!)
       end
     end
   end
@@ -96,13 +91,7 @@ class << Pry
     else
       begin
         @rescuing = true
-        Interception.listen(block) do |exception, binding|
-          if defined?(PryStackExplorer)
-            @raised << [exception, binding.callers]
-          else
-            @raised << [exception, Array(binding)]
-          end
-        end
+        enable_rescuing!(block)
       ensure
         @rescuing = false
       end

data/lib/pry-rescue/rspec.rb

@@ -1,12 +1,58 @@
 require 'pry-rescue'
-RSpec.configure do |c|
-  c.around(:each) do |example|
-    Pry::rescue do
-      example.binding.eval('@exception = nil')
-      example.run
-      if e = example.binding.eval('@exception')
-        Pry::rescued(e)
+class PryRescue
+  class RSpec
+
+    # Run an Rspec example within Pry::rescue{ }.
+    #
+    # Takes care to ensure that `try-again` will work.
+    def self.run(example)
+      Pry::rescue do
+        begin
+          before
+
+          example.binding.eval('@exception = nil')
+          example.run
+          if e = example.binding.eval('@exception')
+            Pry::rescued(e)
+          end
+
+        ensure
+          after
+        end
+      end
+    end
+
+    def self.before
+      monkeypatch_capybara if defined?(Capybara)
+    end
+
+    def self.after
+      after_filters.each(&:call)
+    end
+
+    # Shunt Capybara's after filter from before Pry::rescued to after.
+    #
+    # The after filter navigates to 'about:blank', but people debugging
+    # tests probably want to see the page that failed.
+    def self.monkeypatch_capybara
+      unless Capybara.respond_to?(:reset_sessions_after_rescue!)
+        class << Capybara
+          alias_method :reset_sessions_after_rescue!, :reset_sessions!
+          def reset_sessions!; end
+        end
+
+        after_filters << Capybara.method(:reset_sessions_after_rescue!)
       end
     end
+
+    def self.after_filters
+      @after_filters ||= []
+    end
+  end
+end
+
+RSpec.configure do |c|
+  c.around(:each) do |example|
+    PryRescue::RSpec.run example
   end
 end

data/lib/pry-rescue.rb

@@ -41,25 +41,23 @@ 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)
+    def enter_exception_context(exception)
       @exception_context_depth ||= 0
       @exception_context_depth += 1
 
-      raised = raised.map do |e, bs|
-        [e, without_bindings_below_raise(bs)]
-      end
+      exception = exception.instance_variable_get(:@rescue_cause) if phantom_load_raise?(exception)
+      bindings = exception.instance_variable_get(:@rescue_bindings)
 
-      raised.pop if phantom_load_raise?(*raised.last)
-      exception, bindings = raised.last
+      bindings = without_bindings_below_raise(bindings)
       bindings = without_duplicates(bindings)
 
       with_program_name "#$PROGRAM_NAME [in pry-rescue @ #{Dir.pwd}]" do
         if defined?(PryStackExplorer)
           pry :call_stack => bindings,
-              :hooks => pry_hooks(exception, raised),
+              :hooks => pry_hooks(exception),
               :initial_frame => initial_frame(bindings)
         else
-          Pry.start bindings.first, :hooks => pry_hooks(exception, raised)
+          Pry.start bindings.first, :hooks => pry_hooks(exception)
         end
       end
     ensure
@@ -87,7 +85,8 @@ class PryRescue
     #
     # @param [Exception] e  The raised exception
     # @param [Array<Binding>] bindings  The call stack
-    def phantom_load_raise?(e, bindings)
+    def phantom_load_raise?(e)
+      bindings = e.instance_variable_get(:@rescue_bindings)
       bindings.any? && bindings.first.eval("__FILE__") == __FILE__
     end
 
@@ -180,12 +179,12 @@ class PryRescue
     #
     # @param [Exception] ex  The exception we're currently looking at
     # @param [Array<Exception, Array<Binding>>] raised  The exceptions raised
-    def pry_hooks(ex, raised)
+    def pry_hooks(ex)
       hooks = Pry.config.hooks.dup
       hooks.add_hook(:before_session, :save_captured_exception) do |_, _, _pry_|
         _pry_.last_exception = ex
         _pry_.backtrace = ex.backtrace
-        _pry_.sticky_locals.merge!({ :_raised_ => raised })
+        _pry_.sticky_locals.merge!(:_rescued_ => ex)
         _pry_.exception_handler.call(_pry_.output, ex, _pry_)
       end
 

data/pry-rescue.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name          = 'pry-rescue'
-  s.version       = '1.0.0'
+  s.version       = '1.1.0'
   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'
@@ -18,4 +18,5 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'rspec'
   s.add_development_dependency 'yard'
   s.add_development_dependency 'redcarpet'
+  s.add_development_dependency 'capybara'
 end

data/spec/commands_spec.rb

@@ -36,40 +36,44 @@ describe "pry-rescue commands" do
     end
 
     it "should enter the context of _ex_ if no exception is given" do
-      begin
-        b1 = binding
-        raise "original"
-      rescue => _ex_
-        b2 = binding
+      b2 = nil
+      _ex_ = nil
+      Pry::rescue do
+        begin
+          b1 = binding
+          raise "original"
+        rescue => _ex_
+          b2 = binding
+        end
       end
 
       Pry.should_receive(:rescued).once.with{ |raised|
         raised.should == _ex_
       }
 
-      Pry.new.process_command 'cd-cause', '', binding
+      Pry.new.process_command 'cd-cause', '', b2
     end
   end
 
   describe "cd-cause" do
     it "should enter the next exception's context" do
-      begin
+      _ex_ = nil
+      e1 = nil
+      Pry::rescue do
         begin
-          b1 = binding
-          raise "original"
-        rescue => e1
-          b2 = binding
-          raise # similar to dubious re-raises you'll find in the wild
+          begin
+            b1 = binding
+            raise "original"
+          rescue => e1
+            b2 = binding
+            raise # similar to dubious re-raises you'll find in the wild
+          end
+        rescue => e2
+          _ex_ = e2
         end
-      rescue => e2
-        # Hacks due to us not really entering a pry session here
-        _raised_ = [[e1, [b1]], [e2, [b2]]]
-        _ex_ = e2
       end
 
-      PryRescue.should_receive(:enter_exception_context).once.with{ |raised|
-        raised.should == [[e1, [b1]]]
-      }
+      PryRescue.should_receive(:enter_exception_context).once.with(e1)
 
       Pry.new.process_command 'cd-cause', '', binding
     end
@@ -80,7 +84,7 @@ describe "pry-rescue commands" do
         raise "original"
       rescue => e1
         # Hacks due to us not really entering a pry session here
-        _raised_ = [[e1, [b1]]]
+        _rescued_ = e1
         _ex_ = e1
       end
 
@@ -89,6 +93,25 @@ describe "pry-rescue commands" do
       }.should raise_error Pry::CommandError, /No previous exception/
     end
 
+    it "should raise a CommandError on a re-raise" do
+      _ex_ = nil
+      Pry::rescue do
+        begin
+          begin
+            raise "oops"
+          rescue => e
+            raise e
+          end
+        rescue => _ex_
+        end
+      end
+      _rescued_ = _ex_
+
+      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

data/spec/core_ext_spec.rb

@@ -33,34 +33,6 @@ describe 'Pry.rescue' do
     @inner.should == 2
   end
 
-  it "should clear out exceptions between retrys at the same 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 }
-    Pry::rescue do
-      @outer += 1
-      Pry::rescue do
-        @inner += 1
-        raise "oops" if @inner <= 2
-      end
-    end
-  end
-
-  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 == 1; throw :try_again }
-    Pry::rescue do
-      @outer += 1
-      Pry::rescue do
-        @inner += 1
-        raise "oops" if @inner <= 2
-      end
-      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
@@ -71,7 +43,7 @@ describe 'Pry.rescue' do
           raise
         end
       end
-    end.should  raise_error /first_occurance/
+    end.should raise_error(/first_occurance/)
   end
 
   it "should not catch SystemExit" do

data/spec/pry_rescue_spec.rb

@@ -95,6 +95,12 @@ describe "PryRescue.load" do
         PryRescue.load("spec/fixtures/raiseother.rb")
       }.should raise_error(/raiseother_exception/)
     end
+
+    it "should output a warning if the exception was not raised" do
+      PryRescue.should_not_receive(:enter_exception_context)
+      Pry.should_receive(:warn).once
+      Pry.rescued(RuntimeError.new("foo"))
+    end
   else
     it "should open at the correct point" do
       Pry.should_receive(:start).once{ |binding, h|

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pry-rescue
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -11,104 +11,120 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-17 00:00:00.000000000 Z
+date: 2013-03-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  type: :runtime
+  name: pry
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
+  type: :runtime
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
-  prerelease: false
-  name: pry
 - !ruby/object:Gem::Dependency
-  type: :runtime
+  name: interception
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0.3'
-    none: false
+  type: :runtime
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0.3'
-    none: false
-  prerelease: false
-  name: interception
 - !ruby/object:Gem::Dependency
-  type: :development
+  name: pry-stack_explorer
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
+  type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
-  prerelease: false
-  name: pry-stack_explorer
 - !ruby/object:Gem::Dependency
-  type: :development
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
+  type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
-  prerelease: false
-  name: rspec
 - !ruby/object:Gem::Dependency
-  type: :development
+  name: yard
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
+  type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
-  prerelease: false
-  name: yard
 - !ruby/object:Gem::Dependency
-  type: :development
+  name: redcarpet
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
+  type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: capybara
+  requirement: !ruby/object:Gem::Requirement
     none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
   prerelease: false
-  name: redcarpet
+  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:
@@ -128,6 +144,7 @@ files:
 - Rakefile
 - bin/kill-pry-rescue
 - bin/rescue
+- examples/capybara_spec.rb
 - examples/example.rb
 - examples/example2.rb
 - examples/example_spec.rb
@@ -135,6 +152,7 @@ files:
 - examples/random-exit.rb
 - examples/rescue.rb
 - examples/sigsegv.rb
+- examples/syntax-err.rb
 - lib/pry-rescue.rb
 - lib/pry-rescue/cli.rb
 - lib/pry-rescue/commands.rb
@@ -170,20 +188,20 @@ rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-  none: false
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-  none: false
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.25
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Open a pry session on any unhandled exceptions