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

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

Author: myronmarston

.rubocop_rspec_base.yml

@@ -1,4 +1,4 @@
-# This file was generated on 2015-05-05T17:56:25+10:00 from the rspec-dev repo.
+# This file was generated on 2015-07-10T08:35:29-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

.travis.yml

@@ -1,4 +1,4 @@
-# This file was generated on 2015-05-05T17:56:25+10:00 from the rspec-dev repo.
+# This file was generated on 2015-07-10T08:35:29-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

appveyor.yml

@@ -1,4 +1,4 @@
-# This file was generated on 2015-05-05T17:56:25+10:00 from the rspec-dev repo.
+# This file was generated on 2015-07-10T08:35:29-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}"

script/clone_all_rspec_repos

@@ -1,5 +1,5 @@
 #!/bin/bash
-# This file was generated on 2015-05-05T17:56:25+10:00 from the rspec-dev repo.
+# This file was generated on 2015-07-10T08:35:29-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-05-05T17:56:25+10:00 from the rspec-dev repo.
+# This file was generated on 2015-07-10T08:35:29-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 )"
@@ -67,13 +67,22 @@ function run_specs_one_by_one {
 
 function run_spec_suite_for {
   if [ ! -f ../$1/$SPECS_HAVE_RUN_FILE ]; then # don't rerun specs that have already run
-    echo "Running specs for $1"
-    pushd ../$1
-    unset BUNDLE_GEMFILE
-    bundle_install_flags=`cat .travis.yml | grep bundler_args | tr -d '"' | grep -o " .*"`
-    travis_retry eval "bundle install $bundle_install_flags"
-    run_specs_and_record_done
-    popd
+    if [ -d ../$1 ]; then
+      echo "Running specs for $1"
+      pushd ../$1
+      unset BUNDLE_GEMFILE
+      bundle_install_flags=`cat .travis.yml | grep bundler_args | tr -d '"' | grep -o " .*"`
+      travis_retry eval "bundle install $bundle_install_flags"
+      run_specs_and_record_done
+      popd
+    else
+      echo ""
+      echo "WARNING: The ../$1 directory does not exist. Usually the"
+      echo "travis build cds into that directory and run the specs to"
+      echo "ensure the specs still pass with your latest changes, but"
+      echo "we are going to skip that step."
+      echo ""
+    fi;
   fi;
 }
 
@@ -119,7 +128,6 @@ function check_style_and_lint {
 }
 
 function run_all_spec_suites {
-  fold "one-by-one specs" run_specs_one_by_one
   fold "rspec-core specs" run_spec_suite_for "rspec-core"
   fold "rspec-expectations specs" run_spec_suite_for "rspec-expectations"
   fold "rspec-mocks specs" run_spec_suite_for "rspec-mocks"

script/predicate_functions.sh

@@ -1,4 +1,4 @@
-# This file was generated on 2015-05-05T17:56:25+10:00 from the rspec-dev repo.
+# This file was generated on 2015-07-10T08:35:29-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-05-05T17:56:25+10:00 from the rspec-dev repo.
+# This file was generated on 2015-07-10T08:35:29-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
@@ -22,6 +22,7 @@ if style_and_lint_enforced; then
 fi
 
 if is_mri; then
+  fold "one-by-one specs" run_specs_one_by_one
   run_all_spec_suites
 else
   echo "Skipping the rest of the build on non-MRI rubies"

script/travis_functions.sh

@@ -1,4 +1,4 @@
-# This file was generated on 2015-05-05T17:56:25+10:00 from the rspec-dev repo.
+# This file was generated on 2015-07-10T08:35:29-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:
@@ -50,6 +50,8 @@ fold() {
   if [ -n "$TRAVIS" ]; then
     printf "travis_fold:start:%s\r\e[0m" "$name"
     travis_time_start
+  else
+    echo "============= Starting $name ==============="
   fi
 
   "$@"
@@ -60,6 +62,8 @@ fold() {
   if [ "$status" -eq 0 ]; then
     if [ -n "$TRAVIS" ]; then
       printf "travis_fold:end:%s\r\e[0m" "$name"
+    else
+      echo "============= Ending $name ==============="
     fi
   else
     STATUS="$status"