pry-rescue 1.5.1 → 1.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c70d483edf7b738214f0f22aa4d9fb81909de0de007cb6e581124331d1d8eeb8
-  data.tar.gz: d9cfd93f342bfe7373ab80b83e2f7f0304ea3472037e10877b640324bf0b5fc3
+  metadata.gz: 785059388e26fc08a04afc6d370b89efdc4506f3882738444e2ab0b99c229f20
+  data.tar.gz: 11ab228ba3b614eef01ba6687c97a36c76411245fdc6bcb03aaaaf9cd2a3c59c
 SHA512:
-  metadata.gz: ff2b45da86ffec10f67fae0c3aa4d24270d5c907d8b3380cecb580f50ff37a0c733c2d8dd956c925081bc20d84e1b9bc9a15e10030ba49ed8bce1a83824b5732
-  data.tar.gz: 22e51ce3bcc20834edb13e115c9030d2c6945466886d85d0a9a239a69ebfdc38dde922e2968a07c0408134e00a8adc7954e071c21e1cf9b4604b2ea7073b9b8c
+  metadata.gz: 4ebeff09115b1ad7937b09e42ced421309b24d9674f7edab5d4f9c6acb504778de1506732220f687f81ebccdb0b16b1c34e49bed0c294b980a6eb3701e6d9d1a
+  data.tar.gz: 5c4ecf866a9d06f07447bab62cb51046e40cecbc8ad8cac796c7e40e573ce6c8ceda1a390e6d457a9eef146d9e2c8be79336025515c59188690d8567bc244f47

data/CHANGELOG.md

@@ -1,3 +1,11 @@
+## v1.5.2 (24 June 2020)
+* RSpec: Fix Rescue opening after transactional tests are rolled back.
+(issue #99 - PR #118) (@joallard)
+
+* bin/rescue: Use realpaths (issue #109 - PR #110)
+
+  *(Damien Robert)*
+
 ## v1.5.1 (22 May 2020)
 * Make Binding#source_location polyfill. (Removes deprecation warnings
     for Ruby 2.6+)

data/README.md

@@ -84,7 +84,6 @@ 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
@@ -106,26 +105,10 @@ 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

data/Rakefile

@@ -1,3 +1,4 @@
+require "bundler/gem_tasks"
 require 'rspec/core/rake_task'
 
 task :default => :test

data/bin/rescue

@@ -40,7 +40,7 @@ else
     ENV['PRY_RESCUE_RAILS'] = 'true'
     exec(*ARGV)
   when 'rake'
-    require File.expand_path('../../lib/pry-rescue.rb', __FILE__)
+    require File.realpath(File.expand_path('../../lib/pry-rescue.rb', __FILE__))
     PryRescue.load_rake ARGV[1]
     exit
   when /^re?spec$/
@@ -51,8 +51,9 @@ end
 
 if script = ARGV.shift
   $0 = File.expand_path(script)
+
   if File.exists? script
-    require File.expand_path('../../lib/pry-rescue.rb', __FILE__)
+    require File.realpath(File.expand_path('../../lib/pry-rescue.rb', __FILE__))
     PryRescue.load $0, ensure_repl
   else
     $stderr.puts "Error: #{script.inspect} not found."

data/lib/pry-rescue/rspec.rb

@@ -8,29 +8,23 @@ class PryRescue
     # Run an Rspec example within Pry::rescue{ }.
     #
     # Takes care to ensure that `try-again` will work.
+    #
+    # `example` is a RSpec::Core::Example::Procsy
     def self.run(example)
       Pry::rescue do
         begin
           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.example.instance_variable_set(:@exception, nil)
+          example.example_group_instance.instance_variable_set(:@__init_memoized, true)
+
           example.run
-          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
+
+          # Rescued will be called in :after hook, which is ran before the second
+          # :around leg
 
         ensure
-          after
+          after_outside
         end
       end
     end
@@ -39,7 +33,12 @@ class PryRescue
       monkeypatch_capybara if defined?(Capybara)
     end
 
-    def self.after
+    def self.after(example)
+      e = example.exception
+      Pry::rescued(e) if e
+    end
+
+    def self.after_outside
       after_filters.each(&:call)
     end
 
@@ -68,4 +67,8 @@ RSpec.configure do |c|
   c.around(:each) do |example|
     PryRescue::RSpec.run example
   end
+
+  c.after(:each) do |example|
+    PryRescue::RSpec.after(example)
+  end
 end

data/pry-rescue.gemspec

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pry-rescue
 version: !ruby/object:Gem::Version
-  version: 1.5.1
+  version: 1.5.2
 platform: ruby
 authors:
 - Conrad Irwin
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-05-29 00:00:00.000000000 Z
+date: 2020-06-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pry
@@ -192,7 +192,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Open a pry session on any unhandled exceptions