Merge pull request #247 from rspec/update-travis-build-scripts-2015-10-13-for-master

Updates from rspec-dev (2015-10-13)

Author: JonRowe

.rubocop_rspec_base.yml

@@ -1,4 +1,4 @@
-# This file was generated on 2015-08-13T10:40:53+01:00 from the rspec-dev repo.
+# This file was generated on 2015-10-13T18:52:09-07:00 from the rspec-dev repo.
 # DO NOT modify it by hand as your changes will get lost the next time it is generated.
 
 # This file contains defaults for RSpec projects. Individual projects
@@ -101,9 +101,9 @@ Proc:
 RedundantReturn:
   AllowMultipleReturnValues: true
 
-# We have to rescue Exception in the `raise_error` matcher for it to work properly.
+# Exceptions should be rescued with `Support::AllExceptionsExceptOnesWeMustNotRescue`
 RescueException:
-  Enabled: false
+  Enabled: true
 
 # We haven't adopted the `fail` to signal exceptions vs `raise` for re-raises convention.
 SignalException:

.travis.yml

@@ -1,4 +1,4 @@
-# This file was generated on 2015-08-13T10:40:53+01:00 from the rspec-dev repo.
+# This file was generated on 2015-10-13T18:52:09-07:00 from the rspec-dev repo.
 # DO NOT modify it by hand as your changes will get lost the next time it is generated.
 
 language: ruby
@@ -8,9 +8,8 @@ cache:
     - ../bundle
 before_install:
   - "script/clone_all_rspec_repos"
-  # Downgrade bundler to work around https://github.com/bundler/bundler/issues/3004
   # Note this doesn't work on JRUBY 2.0.0 mode so we don't do it
-  - if [ -z "$JRUBY_OPTS" ]; then gem install bundler -v=1.5.3 && alias bundle="bundle _1.5.3_"; fi
+  - if [ "jruby" != "$TRAVIS_RUBY_VERSION"  ]; then gem install bundler; fi
 bundler_args: "--binstubs --standalone --without documentation --path ../bundle"
 script: "script/run_build"
 rvm:

appveyor.yml

@@ -1,4 +1,4 @@
-# This file was generated on 2015-08-13T10:40:53+01:00 from the rspec-dev repo.
+# This file was generated on 2015-10-13T18:52:09-07:00 from the rspec-dev repo.
 # DO NOT modify it by hand as your changes will get lost the next time it is generated.
 
 version: "{build}"

lib/rspec/support.rb

@@ -51,7 +51,7 @@ def self.method_handle_for(object, method_name)
           handle = object.method(method_name)
           raise original unless handle.is_a? Method
           handle
-        rescue Exception
+        rescue Support::AllExceptionsExceptOnesWeMustNotRescue
           raise original
         end
       end
@@ -67,7 +67,7 @@ def self.method_handle_for(object, method_name)
           handle = object.method(method_name)
           raise original unless handle.is_a? Method
           handle
-        rescue Exception
+        rescue Support::AllExceptionsExceptOnesWeMustNotRescue
           raise original
         end
       end

lib/rspec/support/spec/in_sub_process.rb

@@ -16,7 +16,7 @@ def in_sub_process(prevent_warnings=true)
             begin
               yield
               warning_preventer.verify_no_warnings! if prevent_warnings
-            rescue Exception => e
+            rescue Support::AllExceptionsExceptOnesWeMustNotRescue => e
               exception = e
             end
 

script/clone_all_rspec_repos

@@ -1,5 +1,5 @@
 #!/bin/bash
-# This file was generated on 2015-08-13T10:40:53+01:00 from the rspec-dev repo.
+# This file was generated on 2015-10-13T18:52:09-07:00 from the rspec-dev repo.
 # DO NOT modify it by hand as your changes will get lost the next time it is generated.
 
 set -e

script/functions.sh

@@ -1,4 +1,4 @@
-# This file was generated on 2015-08-13T10:40:53+01:00 from the rspec-dev repo.
+# This file was generated on 2015-10-13T18:52:09-07:00 from the rspec-dev repo.
 # DO NOT modify it by hand as your changes will get lost the next time it is generated.
 
 SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"

script/predicate_functions.sh

@@ -1,4 +1,4 @@
-# This file was generated on 2015-08-13T10:40:53+01:00 from the rspec-dev repo.
+# This file was generated on 2015-10-13T18:52:09-07:00 from the rspec-dev repo.
 # DO NOT modify it by hand as your changes will get lost the next time it is generated.
 
 function is_mri {

script/run_build

@@ -1,5 +1,5 @@
 #!/bin/bash
-# This file was generated on 2015-08-13T10:40:53+01:00 from the rspec-dev repo.
+# This file was generated on 2015-10-13T18:52:09-07:00 from the rspec-dev repo.
 # DO NOT modify it by hand as your changes will get lost the next time it is generated.
 
 set -e

script/travis_functions.sh

@@ -1,4 +1,4 @@
-# This file was generated on 2015-08-13T10:40:53+01:00 from the rspec-dev repo.
+# This file was generated on 2015-10-13T18:52:09-07:00 from the rspec-dev repo.
 # DO NOT modify it by hand as your changes will get lost the next time it is generated.
 
 # Taken from: