Wrap 'bundle' to run proper version

Author: kpaulisse

script/bootstrap

@@ -14,8 +14,8 @@ set +e
 echo 'Running bundler'
 cd "${DIR}" && \
   rm -f Gemfile.lock && \
-  bundle install --without='' --no-prune --path vendor/bundle --local && \
-  bundle binstubs puppet rake rspec-core rubocop parallel_tests && \
+  "$DIR/script/bundle" install --without='' --no-prune --path vendor/bundle --local && \
+  "$DIR/script/bundle" binstubs puppet rake rspec-core rubocop parallel_tests && \
   chmod 0755 bin/octocatalog-diff
 if [ $? -ne 0 ]; then
   echo 'bundle install failed - aborting bootstrap'

script/bundle

@@ -0,0 +1,8 @@
+#!/bin/bash
+
+# Wrap "bundle" as it's used in the CI build scripts.
+set -e
+DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && cd .. && pwd )"
+cd "$DIR"
+DESIRED_BUNDLER_VERSION=$(grep "add_development_dependency 'bundler'" octocatalog-diff.gemspec  | cut -d"'" -f4)
+bundle "_${DESIRED_BUNDLER_VERSION}_" "$@"

script/cibuild

@@ -49,7 +49,7 @@ if [ "$RUBOCOP_TEST" = "true" ]; then
   echo ""
 
   bootstrap
-  time bundle exec rake rubocop
+  time "$DIR/script/bundle" exec rake rubocop
   RUBOCOP_EXITCODE=$?
   echo ""
 else
@@ -90,7 +90,7 @@ if [ "$RSPEC_TEST" = "true" ]; then
 
     # Run the tests
     echo "Running tests"
-    time bundle exec rake test
+    time "$DIR/script/bundle" exec rake test
     exitcode=$?
     if [ "$exitcode" -ne 0 ]; then RSPEC_EXITCODE="$exitcode"; fi
     cat "$OUTPUT_FILE"

script/travis-before-install

@@ -1,19 +1,7 @@
 #!/bin/bash
 
-# Script runs before travis CI builds.
-
-echo "travis_fold:start:travis-before-install"
-set -ex
+set -e
 DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && cd .. && pwd )"
-
 cd "$DIR"
 DESIRED_BUNDLER_VERSION=$(grep "add_development_dependency 'bundler'" octocatalog-diff.gemspec  | cut -d"'" -f4)
 gem install bundler -v "$DESIRED_BUNDLER_VERSION"
-
-BUNDLER_VERSIONS=$(gem list bundler | grep ^bundler | cut -d'(' -f2 | cut -d')' -f1 | tr "," " ")
-for v in $BUNDLER_VERSIONS; do
-  if [ "$v" != "$DESIRED_BUNDLER_VERSION" ]; then
-    gem uninstall bundler --force -v "$v" || true
-  fi
-done
-echo "travis_fold:end:travis-before-install"