From e00318435fd8478234acca3f6da142c41b3d01e1 Mon Sep 17 00:00:00 2001
From: Myron Marston <myron.marston@gmail.com>
Date: Tue, 13 Oct 2015 18:52:08 -0700
Subject: [PATCH] Updated travis build scripts (from rspec-dev)

---
 .rubocop_rspec_base.yml       | 2 +-
 .travis.yml                   | 5 ++---
 appveyor.yml                  | 3 ++-
 script/clone_all_rspec_repos  | 2 +-
 script/functions.sh           | 2 +-
 script/predicate_functions.sh | 2 +-
 script/run_build              | 2 +-
 script/travis_functions.sh    | 2 +-
 8 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/.rubocop_rspec_base.yml b/.rubocop_rspec_base.yml
index 5f567125a..b2dd87abb 100644
--- a/.rubocop_rspec_base.yml
+++ b/.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:08-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
diff --git a/.travis.yml b/.travis.yml
index 7ab202ec6..b21b3185d 100644
--- a/.travis.yml
+++ b/.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:08-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:
diff --git a/appveyor.yml b/appveyor.yml
index e25705238..001e1bddd 100644
--- a/appveyor.yml
+++ b/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:08-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}"
@@ -21,6 +21,7 @@ install:
   - gem install bundler
   - bundler --version
   - bundle install
+  - cinst ansicon
 
 test_script:
   - bundle exec rspec --backtrace
diff --git a/script/clone_all_rspec_repos b/script/clone_all_rspec_repos
index a8e2fe4d9..5ae735d27 100755
--- a/script/clone_all_rspec_repos
+++ b/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:08-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
diff --git a/script/functions.sh b/script/functions.sh
index 524631bd5..ce3ffca3f 100644
--- a/script/functions.sh
+++ b/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:08-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 )"
diff --git a/script/predicate_functions.sh b/script/predicate_functions.sh
index aa75e0b7f..a7d95d817 100644
--- a/script/predicate_functions.sh
+++ b/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:08-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 {
diff --git a/script/run_build b/script/run_build
index e458d6573..c508ef29f 100755
--- a/script/run_build
+++ b/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:08-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
diff --git a/script/travis_functions.sh b/script/travis_functions.sh
index de693f1a4..bc12598d0 100644
--- a/script/travis_functions.sh
+++ b/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:08-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: