Merge pull request #1516 from rspec/update-travis-build-scripts-2016-01-01-for-master

Updates from rspec-dev (2016-01-01)

Author: yujinakayama

.rubocop_rspec_base.yml

@@ -1,4 +1,4 @@
-# This file was generated on 2015-08-11T23:21:08+01:00 from the rspec-dev repo.
+# This file was generated on 2016-01-01T10:42:22+09: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

@@ -33,6 +33,7 @@ script: "script/run_build 2>&1"
 
 rvm:
   - 1.8.7
+  - 2.3.0
   - 2.2
   - 2.1
   - 2.0.0
@@ -53,11 +54,15 @@ env:
 
 matrix:
   include:
-    # Rails 5.x only supports 2.2
+    # Rails 5.x only supports 2.2+
     - rvm: 2.2.2
       env: RAILS_VERSION=master
     - rvm: 2.2.2
       env: RAILS_VERSION=5.0.0.beta1
+    - rvm: 2.3.0
+      env: RAILS_VERSION=master
+    - rvm: 2.3.0
+      env: RAILS_VERSION=5.0.0.beta1
   exclude:
     # 3.0.x is not supported on MRI 2.0+
     - rvm: 2.0.0
@@ -66,6 +71,8 @@ matrix:
       env: RAILS_VERSION='~> 3.0.20'
     - rvm: 2.2
       env: RAILS_VERSION='~> 3.0.20'
+    - rvm: 2.3.0
+      env: RAILS_VERSION='~> 3.0.20'
     # 4.x is not supported on MRI ruby-1.8.7 or 1.9.2
     - rvm: 1.8.7
       env: RAILS_VERSION='~> 4.0.4'
@@ -91,12 +98,16 @@ matrix:
       env: RAILS_VERSION=4-2-stable
     - rvm: 1.9.2
       env: RAILS_VERSION=4-2-stable
-    # MRI 2.2 is not supported on a few versions
+    # MRI 2.2+ is not supported on a few versions
     - rvm: 2.2
       env: RAILS_VERSION='~> 3.1.12'
+    - rvm: 2.3.0
+      env: RAILS_VERSION='~> 3.1.12'
   allow_failures:
     - rvm: 2.2.2
       env: RAILS_VERSION=master
+    - rvm: 2.3.0
+      env: RAILS_VERSION=master
   fast_finish: true
 
 branches:

Gemfile

@@ -32,7 +32,7 @@ if RUBY_VERSION < '1.9.2'
 elsif RUBY_VERSION < '1.9.3'
   gem 'nokogiri', '1.5.2'
 else
-  gem 'nokogiri', ['~> 1.5', '!= 1.6.6.3', '!= 1.6.6.4', "!= 1.6.7.1", "!= 1.6.7"]
+  gem 'nokogiri', '1.6.7.1'
 end
 
 if RUBY_VERSION <= '1.8.7'

appveyor.yml

@@ -1,4 +1,4 @@
-# This file was generated on 2015-08-11T23:21:08+01:00 from the rspec-dev repo.
+# This file was generated on 2016-01-01T10:42:22+09: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}"

example_app_generator/generate_app.rb

@@ -15,6 +15,7 @@
   # edge branches
   gsub_file 'Gemfile', /^.*\bgem 'rails.*$/, ''
   gsub_file "Gemfile", /.*web-console.*/, ''
+  gsub_file "Gemfile", /.*debugger.*/, ''
 
   if Rails::VERSION::STRING >= '5.0.0'
     append_to_file('Gemfile', "gem 'rails-controller-testing', :git => 'https://github.com/rails/rails-controller-testing'")

script/clone_all_rspec_repos

@@ -1,5 +1,5 @@
 #!/bin/bash
-# This file was generated on 2015-08-11T23:21:08+01:00 from the rspec-dev repo.
+# This file was generated on 2016-01-01T10:42:22+09: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-11T23:21:08+01:00 from the rspec-dev repo.
+# This file was generated on 2016-01-01T10:42:22+09: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 )"
@@ -52,6 +52,11 @@ function run_cukes {
       # the bin/cucumber approach below. That approach is faster
       # (as it avoids the bundler tax), so we use it on rubies where we can.
       bundle exec cucumber --strict
+    elif is_jruby; then
+      # For some reason JRuby doesn't like our improved bundler setup
+      RUBYOPT="-I${PWD}/../bundle -rbundler/setup" \
+         PATH="${PWD}/bin:$PATH" \
+         bin/cucumber --strict
     else
       # Prepare RUBYOPT for scenarios that are shelling out to ruby,
       # and PATH for those that are using `rspec` or `rake`.

script/predicate_functions.sh

@@ -1,4 +1,4 @@
-# This file was generated on 2015-08-11T23:21:08+01:00 from the rspec-dev repo.
+# This file was generated on 2016-01-01T10:42:22+09: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 {
@@ -11,6 +11,16 @@ function is_mri {
   fi;
 }
 
+function is_jruby {
+  if ruby -e "exit(defined?(RUBY_PLATFORM) && RUBY_PLATFORM == 'java')"; then
+    # RUBY_ENGINE only returns 'ruby' on MRI.
+    # MRI 1.8.7 lacks the constant but all other rubies have it (including JRuby in 1.8 mode)
+    return 0
+  else
+    return 1
+  fi;
+}
+
 function is_mri_192 {
   if is_mri; then
     if ruby -e "exit(RUBY_VERSION == '1.9.2')"; then
@@ -25,7 +35,7 @@ function is_mri_192 {
 
 function is_mri_192_plus {
   if is_mri; then
-    if ruby -e "exit(RUBY_VERSION.to_f > 1.9)"; then
+    if ruby -e "exit(RUBY_VERSION.to_f > 1.8)"; then
       return 0
     else
       return 1

script/run_build

@@ -1,5 +1,5 @@
 #!/bin/bash
-# This file was generated on 2015-08-11T23:21:08+01:00 from the rspec-dev repo.
+# This file was generated on 2016-01-01T10:42:22+09: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-11T23:21:08+01:00 from the rspec-dev repo.
+# This file was generated on 2016-01-01T10:42:22+09: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: