pry-rescue 1.4.1 → 1.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 04027ae7cb39da3c8dd9b75ba3f9e66a354bad63
-  data.tar.gz: ea1a1b6249256fe3ddd37d602f17465e22a5badb
+SHA256:
+  metadata.gz: c70d483edf7b738214f0f22aa4d9fb81909de0de007cb6e581124331d1d8eeb8
+  data.tar.gz: d9cfd93f342bfe7373ab80b83e2f7f0304ea3472037e10877b640324bf0b5fc3
 SHA512:
-  metadata.gz: 5e716ea90f3d98a65a6fd10ea31784cd86d238fa0e6419813166fdcd94e0743bb7738b7174d1ca05ff4892ca078293a001e1e7cfdc18c685f8aecc80f0209391
-  data.tar.gz: 80b9ef7e49860c211ccbf35e2d4aea851b2aa747e2c3f0ac6cd610b284526f80b063fd78c42c4cd374c5f1b8afcc4f9bc161584c0ef8f1f1090a733cc15d0aab
+  metadata.gz: ff2b45da86ffec10f67fae0c3aa4d24270d5c907d8b3380cecb580f50ff37a0c733c2d8dd956c925081bc20d84e1b9bc9a15e10030ba49ed8bce1a83824b5732
+  data.tar.gz: 22e51ce3bcc20834edb13e115c9030d2c6945466886d85d0a9a239a69ebfdc38dde922e2968a07c0408134e00a8adc7954e071c21e1cf9b4604b2ea7073b9b8c

data/.rspec

@@ -0,0 +1 @@
+--require spec_helper

data/.travis.yml

@@ -1,7 +1,10 @@
 language: ruby
 cache: bundler
 rvm:
-  - 1.9.3
-  - 2.0.0
-  - 2.1.0
-  - rbx
+  - 2.5
+  - 2.6
+  - 2.7
+  - ruby-head
+before_install:
+  - "gem update --system"
+  - "gem update bundler"

data/CHANGELOG.md

@@ -0,0 +1,3 @@
+## v1.5.1 (22 May 2020)
+* Make Binding#source_location polyfill. (Removes deprecation warnings
+    for Ruby 2.6+)

data/README.md

@@ -2,7 +2,7 @@
 
 Super-fast debugging for Ruby. (See [Pry to the rescue!](http://cirw.in/blog/pry-to-the-rescue))
 <a href="https://travis-ci.org/ConradIrwin/pry-rescue">
-<img src="https://secure.travis-ci.org/ConradIrwin/pry-rescue.png?branch=master" alt="Build status">
+<img src="https://secure.travis-ci.org/ConradIrwin/pry-rescue.svg?branch=master" alt="Build status">
 </a>
 
 ## Introduction
@@ -69,12 +69,22 @@ Then whenever an unhandled exception happens inside Rails, a Pry console will op
 stdout. This is the same terminal that you see the Rails logs on, so if you're
 using something like [pow](https://pow.cx) then you will run into difficulties.
 
+If you are using non-default http servers like Unicorn or Thin, you can also trigger
+this behavior via (after including pry-rescue in your Gemfile):
+
+```
+PRY_RESCUE_RAILS=1 bundle exec unicorn
+```
+
+
+
 You might also be interested in
 [better_errors](https://github.com/charliesome/better_errors) which opens consoles in your
 browser on unhandled exceptions, and [pry-rails](https://github.com/rweng/pry-rails) which
 adds some Rails specific helpers to Pry, and replaces `rails console` by Pry.
 
 ### RSpec
+**ActiveRecord users: see below caveat**
 
 If you're using [RSpec](https://rspec.org) or
 [respec](https://github.com/oggy/respec), you can open a Pry session on
@@ -96,10 +106,32 @@ RSpec::Expectations::ExpectationNotMetError: expected: 0.3
 [1] pry(main)>
 ```
 
+### Important caveat when using with Rails/ActiveRecord and transactional fixtures
+> Records are missing but should be there! Am I losing track of reality?
+
+You are not. (Probably.)
+
+By default, RSpec runs test examples in a transaction, and rolls it back when done.
+By the time Pry-Rescue fires, the transaction has already been rolled back and records are gone!
+
+A good sanity check is to call `Model.all`. It will usually be empty. However, at the time of the test, they were truly there.
+
+This bug is currently tracked at [#99](https://github.com/ConradIrwin/pry-rescue/issues/99).
+
+Current workaround: Pry-Rescue can't be used, but you can use `binding.pry` inside the test. You'll have access to all records you need there.
+
+### Using pry `edit`
 Unfortunately using `edit -c` to edit `_spec.rb` files does not yet reload the
 code in a way that the `try-again` command can understand. You can still use
 `try-again` if you edit code that is not in spec files.
 
+### Always enabled
+If you want pry-rescue to *always* be enabled when you run tests, simply add this line to your `test_helper.rb`:
+
+```ruby
+require 'pry-rescue/rspec'
+```
+
 ### Minitest
 
 Add the following to your `test_helper.rb` or to the top of your test file.

data/bin/rescue

@@ -34,12 +34,19 @@ when '-i'
 when /\A-/
   puts USAGE
   exit
-when 'rails'
-  ENV['PRY_RESCUE_RAILS'] = 'true'
-  exec(*ARGV)
-when /^re?spec|rake$/
-  ENV['SPEC_OPTS'] = "#{ENV['SPEC_OPTS']} -r pry-rescue/rspec"
-  exec(*ARGV)
+else
+  case File.basename(ARGV[0] || "")
+  when 'rails'
+    ENV['PRY_RESCUE_RAILS'] = 'true'
+    exec(*ARGV)
+  when 'rake'
+    require File.expand_path('../../lib/pry-rescue.rb', __FILE__)
+    PryRescue.load_rake ARGV[1]
+    exit
+  when /^re?spec$/
+    ENV['SPEC_OPTS'] = "#{ENV['SPEC_OPTS']} -r pry-rescue/rspec"
+    exec(*ARGV)
+  end
 end
 
 if script = ARGV.shift

data/lib/pry-rescue.rb

@@ -6,13 +6,14 @@ require File.expand_path('../pry-rescue/core_ext', __FILE__)
 require File.expand_path('../pry-rescue/commands', __FILE__)
 require File.expand_path('../pry-rescue/rack', __FILE__)
 require File.expand_path('../pry-rescue/peek.rb', __FILE__)
+require File.expand_path('../pry-rescue/source_location.rb', __FILE__)
 
 if ENV['PRY_RESCUE_RAILS']
   require File.expand_path('../pry-rescue/rails', __FILE__)
 end
 case ENV['PRY_PEEK']
 when nil
-  PryRescue.peek_on_signal('QUIT') unless Pry::Helpers::BaseHelpers.windows?
+  PryRescue.peek_on_signal('QUIT') unless Pry::Helpers::Platform.windows?
 when ''
   # explicitly disable QUIT.
 else
@@ -79,6 +80,14 @@ class PryRescue
       end
     end
 
+    def load_rake(task)
+      require 'rake'
+      Pry::rescue do
+        load "#{Dir.pwd}/Rakefile"
+        Rake::Task[task].invoke
+      end
+    end
+
     # Is the user currently inside pry rescue?
     # @return [Boolean]
     def in_exception_context?
@@ -95,7 +104,7 @@ class PryRescue
     # @param [Exception] e  The raised exception
     def phantom_load_raise?(e)
       bindings = e.instance_variable_get(:@rescue_bindings)
-      bindings.any? && bindings.first.eval("__FILE__") == __FILE__
+      bindings.any? && SourceLocation.call(bindings.first)[0] == __FILE__
     end
 
     # When using pry-stack-explorer we want to start the rescue session outside of gems
@@ -105,7 +114,7 @@ class PryRescue
     # @return [Fixnum]  The offset of the first binding of user code
     def initial_frame(bindings)
       bindings.each_with_index do |binding, i|
-        return i if user_path?(binding.eval("__FILE__"))
+        return i if user_path?(SourceLocation.call(binding)[0])
       end
 
       0
@@ -162,7 +171,7 @@ class PryRescue
     def without_bindings_below_raise(bindings)
       return bindings if bindings.size <= 1
       bindings.drop_while do |b|
-        b.eval("__FILE__") == File.expand_path("../pry-rescue/core_ext.rb", __FILE__)
+        SourceLocation.call(b)[0] == File.expand_path("../pry-rescue/core_ext.rb", __FILE__)
       end.drop_while do |b|
         Interception == b.eval("self")
       end

data/lib/pry-rescue/commands.rb

@@ -47,6 +47,8 @@ Pry::Commands.create_command "cd-cause", "Move to the exception that caused this
     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
 
+    ex = ex.cause if ex.respond_to?(:cause) && !ex.cause.nil?
+
     Pry.rescued ex
   end
 end

data/lib/pry-rescue/kernel_exit_hooks.rb

@@ -7,7 +7,10 @@ class << PryRescue
     Pry::rescue do
       exit_callbacks.dup.each(&:call)
     end
-    TOPLEVEL_BINDING.pry unless any_exception_captured
+    unless any_exception_captured
+      print "\n"
+      TOPLEVEL_BINDING.pry
+    end
   end
 end
 

data/lib/pry-rescue/minitest.rb

@@ -2,7 +2,9 @@ require 'pry-rescue'
 
 # Minitest 5 handles all unknown exceptions, so to get them out of
 # minitest, we need to add Exception to its passthrough types
-if defined? Minitest::Test
+# Note: We need to check the explicit minitest version because the minitest ecosystem
+# may redefine Minitest::Test for Minitest versions < 5.
+if defined?(Minitest::Test) && Minitest::Unit::VERSION.split('.').first.to_i >= 5
 
   class Minitest::Test
     alias_method :run_without_rescue, :run
@@ -22,7 +24,7 @@ else
   # Unfortunately the version of minitest bundled with ruby seems to
   # take precedence over the new gem, so we can't do this and still
   # support ruby-1.9.3
-  
+
   class MiniTest::Unit::TestCase
     alias_method :run_without_rescue, :run
 

data/lib/pry-rescue/rails.rb

@@ -6,9 +6,11 @@ class PryRescue
   # Just adding 'use PryRescue::Rack' inside your rails app will add
   # the middleware above the rails exception handling middleware,
   # and so it will not work.
-  class Railtie < ::Rails::Railtie
-    initializer "pry_rescue" do |app|
-      app.config.middleware.use PryRescue::Rack
+  if defined?(::Rails)
+    class Railtie < ::Rails::Railtie
+      initializer "pry_rescue" do |app|
+        app.config.middleware.use PryRescue::Rack
+      end
     end
   end
 end

data/lib/pry-rescue/rspec.rb

@@ -1,4 +1,7 @@
 require 'pry-rescue'
+require 'pry-stack_explorer'
+require 'rspec' unless defined?(RSpec)
+
 class PryRescue
   class RSpec
 
@@ -11,8 +14,18 @@ class PryRescue
           before
 
           example.binding.eval('@exception = nil; @example && @example.instance_variable_set(:@exception, nil)')
+          example.binding.eval('example.instance_variable_set(:@exception, nil) if defined?(example)')
+          if example.example_group_instance.respond_to?(:__init_memoized, true)
+            example.binding.eval('@example && @example.example_group_instance.instance_variable_set(:@__init_memoized, true)')
+            example.binding.eval('example.example_group_instance.instance_variable_set(:@__init_memoized, true) if defined?(example)')
+          else
+            example.binding.eval('@example && @example.example_group_instance.instance_variable_set(:@__memoized, {})')
+            example.binding.eval('example.example_group_instance.instance_variable_set(:@__memoized, {}) if defined?(example)')
+          end
           example.run
-          if e = example.binding.eval('@exception || @example && @example.instance_variable_get(:@exception)')
+          e = example.binding.eval('@exception || @example && @example.instance_variable_get(:@exception)')
+          e ||= example.binding.eval('example.instance_variable_get(:@exception) if defined?(example)')
+          if e
             Pry::rescued(e)
           end
 

data/lib/pry-rescue/source_location.rb

@@ -0,0 +1,13 @@
+class PryRescue
+  module SourceLocation
+    DEPRECATION_TIME = Time.new(2021,4,1)
+
+    WithRuby2_5 = ->(b){ [b.eval("__FILE__"), b.eval("__LINE__")] }
+    WithRuby2_6 = ->(b){ b.source_location }
+
+    define_singleton_method(
+      :call,
+      (RUBY_VERSION < "2.6.0") ? WithRuby2_5 : WithRuby2_6
+    )
+  end
+end

data/pry-rescue.gemspec

@@ -1,23 +1,23 @@
 Gem::Specification.new do |s|
   s.name          = 'pry-rescue'
-  s.version       = '1.4.1'
+  s.version       = '1.5.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'
   s.email         = ['conrad.irwin@gmail.com', 'jrmair@gmail.com', 'chris@ill-logic.com']
   s.authors       = ['Conrad Irwin', 'banisterfiend', 'epitron']
   s.files         = `git ls-files`.split("\n")
+  s.license       = 'MIT'
   s.require_paths = ['lib']
   s.executables   = s.files.grep(%r{^bin/}).map{|f| File.basename f}
 
-  s.add_dependency 'pry'
+  s.add_dependency 'pry', '>= 0.12.0'
   s.add_dependency 'interception', '>= 0.5'
 
   s.add_development_dependency 'pry-stack_explorer' # upgrade to regular dep?
 
   s.add_development_dependency 'rake'
   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

@@ -1,21 +1,22 @@
 require './spec/spec_helper'
+require './spec/fixtures/template_error'
 
 describe "pry-rescue commands" do
   describe "try-again" do
     it "should throw try_again" do
-      PryRescue.should_receive(:in_exception_context?).and_return{ true }
+      expect(PryRescue).to receive(:in_exception_context?).and_return(true)
 
-      lambda{
-        Pry.new.process_command "try-again", '', TOPLEVEL_BINDING
-      }.should throw_symbol :try_again
+      expect {
+        Pry.new.process_command("try-again")
+      }.to 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 }
+      expect(PryRescue).to receive(:in_exception_context?).and_return(false)
 
-      lambda{
-        Pry.new.process_command "try-again", '', TOPLEVEL_BINDING
-      }.should raise_error Pry::CommandError
+      expect {
+        Pry.new.process_command "try-again"
+      }.to raise_error Pry::CommandError
     end
   end
 
@@ -28,11 +29,11 @@ describe "pry-rescue commands" do
         b2 = binding
       end
 
-      Pry.should_receive(:rescued).once.with{ |raised|
-        raised.should == e1
-      }
+      allow(Pry).to receive(:rescued).once do |raised|
+        expect(raised).to eq e1
+      end
 
-      Pry.new.process_command 'cd-cause e1', '', binding
+      Pry.new.tap{ |p| p.push_binding(binding) }.process_command 'cd-cause e1'
     end
 
     it "should enter the context of _ex_ if no exception is given" do
@@ -47,15 +48,39 @@ describe "pry-rescue commands" do
         end
       end
 
-      Pry.should_receive(:rescued).once.with{ |raised|
-        raised.should == _ex_
-      }
+      allow(Pry).to receive(:rescued).once do |raised|
+        expect(raised).to eq _ex_
+      end
 
-      Pry.new.process_command 'cd-cause', '', b2
+      Pry.new.tap{ |p| p.push_binding(b2) }.process_command 'cd-cause'
     end
   end
 
   describe "cd-cause" do
+    context 're-raising with custom Exception' do
+      it "should not loop through same context" do
+        _ex_ = nil
+        e1 = nil
+        Pry::rescue do
+          begin
+            begin
+              _b1 = binding
+              raise "original"
+            rescue => e1
+              _b2 = binding
+              raise TemplateError.new(e1)
+            end
+          rescue => e2
+            _ex_ = e2
+          end
+        end
+
+        expect(PryRescue).to receive(:enter_exception_context).once.with(e1)
+
+        Pry.new.tap{ |p| p.push_binding(binding) }.process_command 'cd-cause'
+      end
+    end
+
     it "should enter the next exception's context" do
       _ex_ = nil
       e1 = nil
@@ -73,9 +98,10 @@ describe "pry-rescue commands" do
         end
       end
 
-      PryRescue.should_receive(:enter_exception_context).once.with(e1)
+      expect(PryRescue).to receive(:enter_exception_context).once.with(e1)
 
-      Pry.new.process_command 'cd-cause', '', binding
+      Pry.new.tap{ |p| p.push_binding(binding) }.process_command 'cd-cause'
+      # PryTester.new(binding).process_command 'cd-cause'
     end
 
     it "should raise a CommandError if no previous commands" do
@@ -88,9 +114,9 @@ describe "pry-rescue commands" do
         _ex_ = e1
       end
 
-      lambda{
-        Pry.new.process_command 'cd-cause', '', binding
-      }.should raise_error Pry::CommandError, /No previous exception/
+      expect {
+        Pry.new.tap{ |p| p.push_binding(binding) }.process_command 'cd-cause'
+      }.to raise_error Pry::CommandError, /No previous exception/
     end
 
     it "should raise a CommandError on a re-raise" do
@@ -107,15 +133,15 @@ describe "pry-rescue commands" do
       end
       _rescued_ = _ex_
 
-      lambda{
-        Pry.new.process_command 'cd-cause', '', binding
-      }.should raise_error Pry::CommandError, /No previous exception/
+      expect {
+        Pry.new.tap{ |p| p.push_binding(binding) }.process_command 'cd-cause'
+      }.to 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, /No previous exception/
+      expect {
+        Pry.new.tap{ |p| p.push_binding(binding) }.process_command 'cd-cause'
+      }.to raise_error Pry::CommandError, /No previous exception/
     end
   end
 end

data/spec/core_ext_spec.rb

@@ -2,25 +2,25 @@ require File.expand_path('../../lib/pry-rescue.rb', __FILE__)
 
 describe 'Pry.rescue' do
   it 'should call PryRescue.enter_exception_context' do
-    lambda{
-      PryRescue.should_receive(:enter_exception_context).once
+    expect(lambda {
+      expect(PryRescue).to receive(:enter_exception_context).once
       Pry::rescue{ raise "foobar" }
-    }.should raise_error(/foobar/)
+    }).to raise_error(/foobar/)
   end
 
   it "should retry on try-again" do
     @called = 0
-    PryRescue.should_receive(:enter_exception_context).once{ throw :try_again }
+    expect(PryRescue).to receive(:enter_exception_context).once{ throw :try_again }
     Pry::rescue do
       @called += 1
       raise "foobar" if @called == 1
     end
-    @called.should == 2
+    expect(@called).to be(2)
   end
 
   it "should try-again from innermost block" do
     @outer = @inner = 0
-    PryRescue.should_receive(:enter_exception_context).once{ throw :try_again }
+    expect(PryRescue).to receive(:enter_exception_context).once{ throw :try_again }
     Pry::rescue do
       @outer += 1
       Pry::rescue do
@@ -29,13 +29,13 @@ describe 'Pry.rescue' do
       end
     end
 
-    @outer.should == 1
-    @inner.should == 2
+    expect(@outer).to be(1)
+    expect(@inner).to be(2)
   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
+    expect(PryRescue).to receive(:enter_exception_context).once{ |raised| raised.size.should == 1 }
+    expect(lambda do
       Pry::rescue do
         begin
           raise "first_occurance"
@@ -43,26 +43,26 @@ describe 'Pry.rescue' do
           raise
         end
       end
-    end.should raise_error(/first_occurance/)
+    end).to raise_error(/first_occurance/)
   end
 
   it "should not catch SystemExit" do
-    PryRescue.should_not_receive(:enter_exception_context)
+    expect(PryRescue).to_not receive(:enter_exception_context)
 
-    lambda do
+    expect(lambda do
       Pry::rescue do
         exit
       end
-    end.should raise_error SystemExit
+    end).to raise_error SystemExit
   end
 
   it 'should not catch Ctrl+C' do
-    PryRescue.should_not_receive(:enter_exception_context)
-    lambda do
+    expect(PryRescue).to_not receive(:enter_exception_context)
+    expect(lambda do
       Pry::rescue do
         raise Interrupt, "ctrl+c (fake)"
       end
-    end.should raise_error Interrupt
+    end).to raise_error Interrupt
   end
 end
 
@@ -72,15 +72,15 @@ describe "Pry.rescued" do
     begin
       raise "foo"
     rescue => e
-      Pry.should_receive(:warn)
+      expect(Pry).to receive(:warn)
       Pry.rescued(e)
     end
   end
 
   it "should raise an error if used on an exception not raised" do
     Pry::rescue do
-      Pry.should_receive(:warn) do |message|
-        message.should =~ /^WARNING: Tried to inspect exception outside of Pry::rescue/
+      expect(Pry).to receive(:warn) do |message|
+        expect(message).to match(/^WARNING: Tried to inspect exception outside of Pry::rescue/)
       end
       Pry.rescued(RuntimeError.new("foo").exception)
     end
@@ -91,7 +91,7 @@ describe "Pry.rescued" do
       begin
         raise "foo"
       rescue => e
-        PryRescue.should_receive(:enter_exception_context).once
+        expect(PryRescue).to receive(:enter_exception_context).once
         Pry::rescued(e)
       end
     end

data/spec/fixtures/template_error.rb

@@ -0,0 +1,13 @@
+# This Exception Class behaves same as ActionView::Template::Error
+# https://github.com/rails/rails/blob/master/actionview/lib/action_view/template/error.rb#L68
+#
+# It encapsulates an Exception and stores the latest Exception raised in its
+# `cause` attribute
+class TemplateError < StandardError
+  attr_reader :cause
+
+  def initialize(cause)
+    @cause = $!
+  end
+end
+

data/spec/peek_spec.rb

@@ -6,9 +6,9 @@ describe "PryRescue.peek!" do
     Pry.config.output = StringIO.new
     foo = 5
 
-    lambda do
+    expect(lambda do
       PryRescue.peek!
-    end.should change{ foo }.from(5).to(6)
+    end).to change{ foo }.from(5).to(6)
   end
 
   # this will fail, or not?
@@ -22,8 +22,8 @@ describe "PryRescue.peek!" do
 
     foo = 5
 
-    lambda do
+    expect(lambda do
       PryRescue.peek!
-    end.should change{ foo }.from(5).to(6)
+    end).to change{ foo }.from(5).to(6)
   end
 end

data/spec/pry_rescue_spec.rb

@@ -2,113 +2,128 @@ require File.expand_path('../../lib/pry-rescue.rb', __FILE__)
 require 'uri'
 
 describe "PryRescue.load" do
+  before :all do
+    if !binding.respond_to?(:source_location)
+      Binding.define_method :source_location do
+        PryRescue::SourceLocation.call(self)
+      end
+    end
+  end
+
   if defined?(PryStackExplorer)
     it "should open at the correct point" do
-      PryRescue.should_receive(:pry).once{ |opts|
-        opts[:call_stack].first.eval("__FILE__").should end_with('spec/fixtures/simple.rb')
+      expect(PryRescue).to receive(:pry).once { |opts|
+        expect(opts[:call_stack].first.source_location[0]).to end_with('spec/fixtures/simple.rb')
       }
-      lambda{
+      expect(lambda {
         PryRescue.load("spec/fixtures/simple.rb")
-      }.should raise_error(/simple-exception/)
+      }).to raise_error(/simple-exception/)
     end
 
     it "should open above the standard library" do
-      PryRescue.should_receive(:pry).once do |opts|
-        opts[:call_stack][opts[:initial_frame]].eval("__FILE__").should end_with('spec/fixtures/uri.rb')
+      expect(PryRescue).to receive(:pry).once do |opts|
+        expect(opts[:call_stack][opts[:initial_frame]].source_location[0]).to end_with('spec/fixtures/uri.rb')
       end
-      lambda{
+      expect(lambda{
         PryRescue.load("spec/fixtures/uri.rb")
-      }.should raise_error(URI::InvalidURIError)
+      }).to raise_error(URI::InvalidURIError)
     end
 
     it "should keep the standard library on the binding stack" do
-      PryRescue.should_receive(:pry).once do |opts|
-        opts[:call_stack].first.eval("__FILE__").should start_with(RbConfig::CONFIG['libdir'])
+      expect(PryRescue).to receive(:pry).once do |opts|
+        expect(opts[:call_stack].first.source_location[0]).to start_with(RbConfig::CONFIG['libdir'])
       end
-      lambda{
+      expect(lambda{
         PryRescue.load("spec/fixtures/uri.rb")
-      }.should raise_error(URI::InvalidURIError)
+      }).to raise_error(URI::InvalidURIError)
     end
 
     it "should open above gems" do
-      PryRescue.should_receive(:pry).once do |opts|
-        opts[:call_stack][opts[:initial_frame]].eval("__FILE__").should end_with('spec/fixtures/coderay.rb')
+      expect(PryRescue).to receive(:pry).once do |opts|
+        expect(opts[:call_stack][opts[:initial_frame]].source_location[0]).to end_with('spec/fixtures/coderay.rb')
       end
-      lambda{
+      expect(lambda{
         PryRescue.load("spec/fixtures/coderay.rb")
-      }.should raise_error(ArgumentError)
+      }).to raise_error(ArgumentError)
     end
 
     it "should open above gems" do
-      PryRescue.should_receive(:pry).once do |opts|
+      expect(PryRescue).to receive(:pry).once do |opts|
         coderay_path = Gem::Specification.respond_to?(:detect) ?
                          Gem::Specification.detect{|x| x.name == 'coderay' }.full_gem_path :
                          Gem.all_load_paths.grep(/coderay/).last
 
-        opts[:call_stack].first.eval("__FILE__").should start_with(coderay_path)
+        expect(opts[:call_stack].first.source_location[0]).to start_with(coderay_path)
       end
-      lambda{
+      expect(lambda{
         PryRescue.load("spec/fixtures/coderay.rb")
-      }.should raise_error(ArgumentError)
+      }).to raise_error(ArgumentError)
     end
 
     it "should skip pwd, even if it is a gem (but not vendor stuff)" do
-      Gem::Specification.stub :any? do true end
-      PryRescue.send(:user_path?, Dir.pwd + '/asdf.rb').should be_true
-      PryRescue.send(:user_path?, Dir.pwd + '/vendor/asdf.rb').should be_false
+      # Gem::Specification.stub :any? do true end
+      allow(Gem::Specification).to receive(:any?).and_return(true)
+
+      expect(
+        PryRescue.send(:user_path?, Dir.pwd + '/asdf.rb')
+      ).to be true
+
+      expect(
+        PryRescue.send(:user_path?, Dir.pwd + '/vendor/asdf.rb')
+      ).to be false
     end
 
     it "should filter out duplicate stack frames" do
-      PryRescue.should_receive(:pry).once do |opts|
-        opts[:call_stack][0].eval("__LINE__").should == 4
-        opts[:call_stack][1].eval("__LINE__").should == 12
+      expect(PryRescue).to receive(:pry).once do |opts|
+        expect(opts[:call_stack][0].source_location[1]).to be(4)
+        expect(opts[:call_stack][1].source_location[1]).to be(12)
       end
-      lambda{
+      expect(lambda{
         PryRescue.load("spec/fixtures/super.rb")
-      }.should raise_error(/super-exception/)
+      }).to raise_error(/super-exception/)
     end
 
     it "should calculate correct initial frame even when duplicates are present" do
-      PryRescue.should_receive(:pry).once do |opts|
-        opts[:call_stack][0].eval("__FILE__").should end_with('fake.rb')
-        opts[:call_stack][opts[:initial_frame]].eval("__FILE__").should end_with('spec/fixtures/initial.rb')
+      expect(PryRescue).to receive(:pry).once do |opts|
+        expect(opts[:call_stack][0].source_location[0]).to end_with('fake.rb')
+        expect(opts[:call_stack][opts[:initial_frame]].source_location[0]).to end_with('spec/fixtures/initial.rb')
       end
-      lambda{
+      expect(lambda{
         PryRescue.load("spec/fixtures/initial.rb")
-      }.should raise_error(/no :baz please/)
+      }).to raise_error(/no :baz please/)
     end
 
     it "should skip over reraises from within gems" do
-      PryRescue.should_receive(:pry).once do |opts|
-        opts[:call_stack][0].eval("__FILE__").should end_with('spec/fixtures/reraise.rb')
+      expect(PryRescue).to receive(:pry).once do |opts|
+        expect(opts[:call_stack][0].source_location[0]).to end_with('spec/fixtures/reraise.rb')
       end
-      lambda{
+      expect(lambda{
         PryRescue.load("spec/fixtures/reraise.rb")
-      }.should raise_error(/reraise-exception/)
+      }).to raise_error(/reraise-exception/)
     end
 
     it "should not skip over independent raises within gems" do
-      PryRescue.should_receive(:pry).once do |opts|
-        opts[:call_stack][0].eval("__FILE__").should end_with('fake.rb')
+      expect(PryRescue).to receive(:pry).once do |opts|
+        expect(opts[:call_stack][0].source_location[0]).to end_with('fake.rb')
       end
-      lambda{
+      expect(lambda{
         PryRescue.load("spec/fixtures/raiseother.rb")
-      }.should raise_error(/raiseother_exception/)
+      }).to 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
+      expect(PryRescue).to_not receive(:enter_exception_context)
+      expect(Pry).to 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|
-        binding.eval("__FILE__").should end_with('spec/fixtures/simple.rb')
+      expect(Pry).to receive(:start).once { |binding, h|
+        expect(binding.source_location[0]).to end_with('spec/fixtures/simple.rb')
       }
-      lambda{
+      expect(lambda{
         PryRescue.load("spec/fixtures/simple.rb")
-      }.should raise_error(/simple-exception/)
+      }).to raise_error(/simple-exception/)
     end
   end
 end

data/spec/source_location_spec.rb

@@ -0,0 +1,19 @@
+describe PryRescue::SourceLocation do
+  describe ".call" do
+    subject{ described_class.call(binding) }
+
+    it "matches [file, line]" do
+      is_expected.to match([__FILE__, be_between(2,30)])
+    end
+  end
+
+  it "will be removed when Ruby 2.5 is EOL" do
+    time = Time.now
+
+    if time >= described_class::DEPRECATION_TIME
+      expect(
+        defined?(PryRescue::SourceLocation)
+      ).to be false
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -1,6 +1,3 @@
 require 'rspec'
-require 'rspec/autorun'
-
-require 'pry/test/helper'
 
 require './lib/pry-rescue'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pry-rescue
 version: !ruby/object:Gem::Version
-  version: 1.4.1
+  version: 1.5.1
 platform: ruby
 authors:
 - Conrad Irwin
@@ -10,118 +10,104 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-22 00:00:00.000000000 Z
+date: 2020-05-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.12.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.12.0
 - !ruby/object:Gem::Dependency
   name: interception
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0.5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0.5'
 - !ruby/object:Gem::Dependency
   name: pry-stack_explorer
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: yard
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: redcarpet
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: capybara
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: Allows you to wrap code in Pry::rescue{ } to open a pry session at any
@@ -136,8 +122,10 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .travis.yml
+- ".gitignore"
+- ".rspec"
+- ".travis.yml"
+- CHANGELOG.md
 - Gemfile
 - LICENSE.MIT
 - README.md
@@ -168,6 +156,7 @@ files:
 - lib/pry-rescue/rack.rb
 - lib/pry-rescue/rails.rb
 - lib/pry-rescue/rspec.rb
+- lib/pry-rescue/source_location.rb
 - lib/pry/rescue.rb
 - pry-rescue.gemspec
 - spec/commands_spec.rb
@@ -178,12 +167,15 @@ files:
 - spec/fixtures/reraise.rb
 - spec/fixtures/simple.rb
 - spec/fixtures/super.rb
+- spec/fixtures/template_error.rb
 - spec/fixtures/uri.rb
 - spec/peek_spec.rb
 - spec/pry_rescue_spec.rb
+- spec/source_location_spec.rb
 - spec/spec_helper.rb
 homepage: https://github.com/ConradIrwin/pry-rescue
-licenses: []
+licenses:
+- MIT
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -191,19 +183,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Open a pry session on any unhandled exceptions
 test_files: []
-has_rdoc: