Merge pull request #160 from github/kpaulisse-bundler-install-bootstrap

When running under travis install our version of the bundler gem

Author: kpaulisse

.travis.yml

@@ -4,9 +4,6 @@ language: ruby
 install: true
 script: "script/cibuild"
 
-before_install:
-  - gem install bundler -v 1.15.4
-
 matrix:
   include:
     # Build with latest ruby

octocatalog-diff.gemspec

@@ -29,7 +29,6 @@ EOF
   s.add_runtime_dependency 'hashdiff', '>= 0.3.0'
   s.add_runtime_dependency 'rugged', '>= 0.25.0b2'
 
-  s.add_development_dependency 'bundler', '1.15.4'
   s.add_development_dependency 'rspec', '~> 3.4.0'
   s.add_development_dependency 'rake', '11.2.2'
   s.add_development_dependency 'parallel_tests', '2.7.1'

script/cibuild

@@ -13,7 +13,10 @@
 echo 'Starting script/cibuild'
 
 DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && cd .. && pwd )"
+
+echo "travis_fold:start:cibuild-environment-dump"
 env
+echo "travis_fold:end:cibuild-environment-dump"
 
 # Create a temporary file to capture output of various steps.
 export OUTPUT_FILE="$(mktemp)"
@@ -28,16 +31,19 @@ trap cleanup EXIT
 ruby -e "print RUBY_VERSION" > "${DIR}/.ruby-version"
 
 # Bootstrapping
+BOOTSTRAPPING_COUNTER=0
 function bootstrap() {
-  echo "Bootstrapping..."
-  time "${DIR}/script/bootstrap" >"$OUTPUT_FILE" 2>&1
+  echo "travis_fold:start:bootstrap.${BOOTSTRAPPING_COUNTER}"
+  time "${DIR}/script/bootstrap"
+  bootstrap_exitcode=$?
+  echo "travis_fold:end:bootstrap.${BOOTSTRAPPING_COUNTER}"
+
   if [ $? -ne 0 ]; then
     echo "Bootstrap failed!"
-    cat "$OUTPUT_FILE"
     exit 1
   fi
-  echo ""
-  > "$OUTPUT_FILE"
+
+  let BOOTSTRAPPING_COUNTER=BOOTSTRAPPING_COUNTER+1
 }
 
 # This runs rubocop