pry-rescue 1.4.5 → 1.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f8498adfc62776fab874402fd91ff59f7a0b3811
-  data.tar.gz: 2efe1214b7acb9361f5c84754bad36aebfc769bd
+  metadata.gz: 936ad34711f6f4e6084c959c7e6e1431873cc549
+  data.tar.gz: 44befec5ee09418f9c459c8b548a5840da6c8cc0
 SHA512:
-  metadata.gz: a60814bf969deba350559387f5a11c79fa6b03e86bb90656cee06f1ec26dd52e3db99ea815dbe033cb10fd65dcce59a932959c838a2b1b70a40d238057f2be54
-  data.tar.gz: 94c9e761195dcd0c7eb01c17af7670b0eea83fa9d59e36d4b24a1612f4b49807f6f12f0463072c4f5a7838d5ff256f54fb2d4629fb896d8edc9cfc37ea8e1121
+  metadata.gz: 8c3e94547db32735d4f60200ad2bfa8de32427812dfa88a8db56487b7d28a7d0f5d4c5e1204f9a9016edc55957833994e6065ee3866a9c974acb8663f82dbd43
+  data.tar.gz: a8cb171f27a823a38260675a2721db15137fbb136be816ee0825cb3673f2b8fb4eb044452957b150d35164462e6842b87d672b8f97e816bc2183d52adfde99a1

data/.travis.yml

@@ -1,10 +1,10 @@
 language: ruby
 cache: bundler
 rvm:
-  - 1.9.3
-  - 2.0.0
-  - 2.1.0
-  - 2.2.2
+  - 2.2
+  - 2.3
+  - 2.4
+  - 2.5
   - ruby-head
 before_install:
   - "gem update --system"

data/bin/rescue

@@ -39,7 +39,11 @@ else
   when 'rails'
     ENV['PRY_RESCUE_RAILS'] = 'true'
     exec(*ARGV)
-  when /^re?spec|rake$/
+  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

data/lib/pry-rescue.rb

@@ -12,7 +12,7 @@ if ENV['PRY_RESCUE_RAILS']
 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 +79,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?

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/pry-rescue.gemspec

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

data/spec/commands_spec.rb

@@ -1,4 +1,5 @@
 require './spec/spec_helper'
+require './spec/fixtures/template_error'
 
 describe "pry-rescue commands" do
   describe "try-again" do
@@ -56,6 +57,30 @@ describe "pry-rescue commands" do
   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

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

@@ -4,52 +4,52 @@ require 'uri'
 describe "PryRescue.load" do
   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.eval("__FILE__")).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]].eval("__FILE__")).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.eval("__FILE__")).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]].eval("__FILE__")).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.eval("__FILE__")).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
@@ -66,56 +66,56 @@ describe "PryRescue.load" do
     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].eval("__LINE__")).to be(4)
+        expect(opts[:call_stack][1].eval("__LINE__")).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].eval("__FILE__")).to end_with('fake.rb')
+        expect(opts[:call_stack][opts[:initial_frame]].eval("__FILE__")).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].eval("__FILE__")).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].eval("__FILE__")).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.eval("__FILE__")).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/spec_helper.rb

@@ -1,5 +1,3 @@
 require 'rspec'
 
-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.5
+  version: 1.5.0
 platform: ruby
 authors:
 - Conrad Irwin
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-16 00:00:00.000000000 Z
+date: 2018-11-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pry
@@ -18,14 +18,14 @@ dependencies:
     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
@@ -178,6 +178,7 @@ 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
@@ -202,7 +203,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: Open a pry session on any unhandled exceptions