pry-rescue 1.5.0 → 1.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 936ad34711f6f4e6084c959c7e6e1431873cc549
-  data.tar.gz: 44befec5ee09418f9c459c8b548a5840da6c8cc0
+SHA256:
+  metadata.gz: c70d483edf7b738214f0f22aa4d9fb81909de0de007cb6e581124331d1d8eeb8
+  data.tar.gz: d9cfd93f342bfe7373ab80b83e2f7f0304ea3472037e10877b640324bf0b5fc3
 SHA512:
-  metadata.gz: 8c3e94547db32735d4f60200ad2bfa8de32427812dfa88a8db56487b7d28a7d0f5d4c5e1204f9a9016edc55957833994e6065ee3866a9c974acb8663f82dbd43
-  data.tar.gz: a8cb171f27a823a38260675a2721db15137fbb136be816ee0825cb3673f2b8fb4eb044452957b150d35164462e6842b87d672b8f97e816bc2183d52adfde99a1
+  metadata.gz: ff2b45da86ffec10f67fae0c3aa4d24270d5c907d8b3380cecb580f50ff37a0c733c2d8dd956c925081bc20d84e1b9bc9a15e10030ba49ed8bce1a83824b5732
+  data.tar.gz: 22e51ce3bcc20834edb13e115c9030d2c6945466886d85d0a9a239a69ebfdc38dde922e2968a07c0408134e00a8adc7954e071c21e1cf9b4604b2ea7073b9b8c

data/.rspec

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

data/.travis.yml

@@ -1,10 +1,9 @@
 language: ruby
 cache: bundler
 rvm:
-  - 2.2
-  - 2.3
-  - 2.4
   - 2.5
+  - 2.6
+  - 2.7
   - ruby-head
 before_install:
   - "gem update --system"

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

@@ -84,6 +84,7 @@ browser on unhandled exceptions, and [pry-rails](https://github.com/rweng/pry-ra
 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
@@ -105,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/lib/pry-rescue.rb

@@ -6,6 +6,7 @@ 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__)
@@ -103,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
@@ -113,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
@@ -170,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/rspec.rb

@@ -1,4 +1,5 @@
 require 'pry-rescue'
+require 'pry-stack_explorer'
 require 'rspec' unless defined?(RSpec)
 
 class PryRescue

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,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name          = 'pry-rescue'
-  s.version       = '1.5.0'
+  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'
@@ -20,23 +20,4 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'rspec'
   s.add_development_dependency 'redcarpet'
   s.add_development_dependency 'capybara'
-
-  # SPECIAL DEVELOPMENT GEM FOR OLD RUBY
-  # DONT USE THIS TRICK FOR RUNTIME GEM
-  if Gem::Version.create(RUBY_VERSION) < Gem::Version.create("2.2.2")
-    s.add_development_dependency 'yard', '< 0.9.6'
-    s.add_development_dependency 'rack', ['~> 1.6', '< 1.7']
-  else
-    s.add_development_dependency 'yard'
-  end
-  if Gem::Version.create(RUBY_VERSION) < Gem::Version.create("2.1")
-    # capybara > nokogiri
-    s.add_development_dependency 'nokogiri', ['~> 1.6', '< 1.7.0']
-  end
-  if Gem::Version.create(RUBY_VERSION) < Gem::Version.create("2.0")
-    # capybara > addressable > public_suffix
-    s.add_development_dependency 'public_suffix', ['~> 1.4', '< 1.5']
-    # capybara > mime-types
-    s.add_development_dependency 'mime-types', ['~> 2.6', '< 2.99']
-  end
 end

data/spec/pry_rescue_spec.rb

@@ -2,10 +2,18 @@ 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
       expect(PryRescue).to receive(:pry).once { |opts|
-        expect(opts[:call_stack].first.eval("__FILE__")).to end_with('spec/fixtures/simple.rb')
+        expect(opts[:call_stack].first.source_location[0]).to end_with('spec/fixtures/simple.rb')
       }
       expect(lambda {
         PryRescue.load("spec/fixtures/simple.rb")
@@ -14,7 +22,7 @@ describe "PryRescue.load" do
 
     it "should open above the standard library" do
       expect(PryRescue).to receive(:pry).once do |opts|
-        expect(opts[:call_stack][opts[:initial_frame]].eval("__FILE__")).to end_with('spec/fixtures/uri.rb')
+        expect(opts[:call_stack][opts[:initial_frame]].source_location[0]).to end_with('spec/fixtures/uri.rb')
       end
       expect(lambda{
         PryRescue.load("spec/fixtures/uri.rb")
@@ -23,7 +31,7 @@ describe "PryRescue.load" do
 
     it "should keep the standard library on the binding stack" do
       expect(PryRescue).to receive(:pry).once do |opts|
-        expect(opts[:call_stack].first.eval("__FILE__")).to start_with(RbConfig::CONFIG['libdir'])
+        expect(opts[:call_stack].first.source_location[0]).to start_with(RbConfig::CONFIG['libdir'])
       end
       expect(lambda{
         PryRescue.load("spec/fixtures/uri.rb")
@@ -32,7 +40,7 @@ describe "PryRescue.load" do
 
     it "should open above gems" do
       expect(PryRescue).to receive(:pry).once do |opts|
-        expect(opts[:call_stack][opts[:initial_frame]].eval("__FILE__")).to end_with('spec/fixtures/coderay.rb')
+        expect(opts[:call_stack][opts[:initial_frame]].source_location[0]).to end_with('spec/fixtures/coderay.rb')
       end
       expect(lambda{
         PryRescue.load("spec/fixtures/coderay.rb")
@@ -45,7 +53,7 @@ describe "PryRescue.load" do
                          Gem::Specification.detect{|x| x.name == 'coderay' }.full_gem_path :
                          Gem.all_load_paths.grep(/coderay/).last
 
-        expect(opts[:call_stack].first.eval("__FILE__")).to start_with(coderay_path)
+        expect(opts[:call_stack].first.source_location[0]).to start_with(coderay_path)
       end
       expect(lambda{
         PryRescue.load("spec/fixtures/coderay.rb")
@@ -67,8 +75,8 @@ describe "PryRescue.load" do
 
     it "should filter out duplicate stack frames" do
       expect(PryRescue).to receive(:pry).once do |opts|
-        expect(opts[:call_stack][0].eval("__LINE__")).to be(4)
-        expect(opts[:call_stack][1].eval("__LINE__")).to be(12)
+        expect(opts[:call_stack][0].source_location[1]).to be(4)
+        expect(opts[:call_stack][1].source_location[1]).to be(12)
       end
       expect(lambda{
         PryRescue.load("spec/fixtures/super.rb")
@@ -77,8 +85,8 @@ describe "PryRescue.load" do
 
     it "should calculate correct initial frame even when duplicates are present" do
       expect(PryRescue).to receive(:pry).once do |opts|
-        expect(opts[:call_stack][0].eval("__FILE__")).to end_with('fake.rb')
-        expect(opts[:call_stack][opts[:initial_frame]].eval("__FILE__")).to end_with('spec/fixtures/initial.rb')
+        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
       expect(lambda{
         PryRescue.load("spec/fixtures/initial.rb")
@@ -87,7 +95,7 @@ describe "PryRescue.load" do
 
     it "should skip over reraises from within gems" do
       expect(PryRescue).to receive(:pry).once do |opts|
-        expect(opts[:call_stack][0].eval("__FILE__")).to end_with('spec/fixtures/reraise.rb')
+        expect(opts[:call_stack][0].source_location[0]).to end_with('spec/fixtures/reraise.rb')
       end
       expect(lambda{
         PryRescue.load("spec/fixtures/reraise.rb")
@@ -96,7 +104,7 @@ describe "PryRescue.load" do
 
     it "should not skip over independent raises within gems" do
       expect(PryRescue).to receive(:pry).once do |opts|
-        expect(opts[:call_stack][0].eval("__FILE__")).to end_with('fake.rb')
+        expect(opts[:call_stack][0].source_location[0]).to end_with('fake.rb')
       end
       expect(lambda{
         PryRescue.load("spec/fixtures/raiseother.rb")
@@ -111,7 +119,7 @@ describe "PryRescue.load" do
   else
     it "should open at the correct point" do
       expect(Pry).to receive(:start).once { |binding, h|
-        expect(binding.eval("__FILE__")).to end_with('spec/fixtures/simple.rb')
+        expect(binding.source_location[0]).to end_with('spec/fixtures/simple.rb')
       }
       expect(lambda{
         PryRescue.load("spec/fixtures/simple.rb")

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pry-rescue
 version: !ruby/object:Gem::Version
-  version: 1.5.0
+  version: 1.5.1
 platform: ruby
 authors:
 - Conrad Irwin
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-11-13 00:00:00.000000000 Z
+date: 2020-05-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pry
@@ -110,20 +110,6 @@ dependencies:
     - - ">="
       - !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'
 description: Allows you to wrap code in Pry::rescue{ } to open a pry session at any
   unhandled exceptions
 email:
@@ -137,7 +123,9 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".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
@@ -182,6 +171,7 @@ files:
 - 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:
@@ -202,8 +192,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Open a pry session on any unhandled exceptions