From d27bdda0ee655da152fdbb181a35dfa1473be4d6 Mon Sep 17 00:00:00 2001
From: Mark Yoon <yoon@northwestern.edu>
Date: Mon, 1 Jul 2013 10:09:56 -0500
Subject: [PATCH] dropping 1.8.7 support

---
 CHANGELOG.md  |  4 ++++
 README.md     |  5 ++++-
 stacktests.sh | 21 +++++++++++++++++----
 3 files changed, 25 insertions(+), 5 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index fe3a908e..78902ea2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -10,6 +10,10 @@ History for Surveyor
   (#450)
 - Handle `nil` datetime values in `ResponseMethods#to_formatted_s`.  (#459)
 
+### Dependencies
+
+- Removing support for Ruby 1.8.7. Applications requiring Ruby 1.8.7 should use Surveyor v1.4.0
+
 1.4.0
 -----
 ### Features
diff --git a/README.md b/README.md
index 2bf55a8a..838e4c67 100644
--- a/README.md
+++ b/README.md
@@ -19,9 +19,11 @@ without maintaining a fork.
 
 Surveyor works with:
 
-* Ruby 1.8.7, 1.9.2, and 1.9.3
+* Ruby 1.9.2, and 1.9.3
 * Rails 3.1-3.2
 
+In keeping with the Rails team maintenance [policy] we no longer support Rails 3.0 (stick with v1.3.0 if you need Rails 3.0) or Ruby 1.8.7 (stick with v1.4.0 if you need Ruby 1.8.7).
+
 Some key dependencies are:
 
 * HAML
@@ -31,6 +33,7 @@ Some key dependencies are:
 A more exhaustive list can be found in the [gemspec][].
 
 [gemspec]: https://github.com/NUBIC/surveyor/blob/master/surveyor.gemspec
+[policy]: http://weblog.rubyonrails.org/2013/2/24/maintenance-policy-for-ruby-on-rails/
 
 ## Install
 
diff --git a/stacktests.sh b/stacktests.sh
index e472bc9a..b30bdaf8 100755
--- a/stacktests.sh
+++ b/stacktests.sh
@@ -4,9 +4,12 @@ echo ""
 
 # Set the prompt for the select command
 PS3="Choose a stack or 'q' to quit: "
+export CUCUMBER_OPTS="--format CucumberSpinner::ProgressBarFormatter"
+export SPEC_OPTS="--format Fuubar --color spec"
+export BUNDLER_VERSION=1.3.1
 
 options=""
-rubies=(ree 1.9.3)
+rubies=(1.9.3)
 rails_versions=(rails_3.1 rails_3.2)
 
 for i in "${rubies[@]}"
@@ -22,7 +25,6 @@ options+="all"
 select combo in $options; do
   case $combo in
   all)
-    read -p "Press [Enter] to run tests on all..."
     for i in "${rubies[@]}"
     do
       for j in "${rails_versions[@]}"
@@ -31,7 +33,13 @@ select combo in $options; do
         export RAILS_VERSION=$j
         source ~/.rvm/scripts/rvm
         rvm use $CI_RUBY@surveyor-$RAILS_VERSION --create
-        ./ci-exec.sh
+        read -p "Press [Enter] to run tests on $CI_RUBY@$RAILS_VERSION..."
+        gem list -i bundler -v $BUNDLER_VERSION
+        if [ $? -ne 0 ]; then
+          gem install bundler -v $BUNDLER_VERSION
+        fi
+        bundle _${BUNDLER_VERSION}_ update
+        bundle _${BUNDLER_VERSION}_ exec rake testbed spec cucumber cucumber:wip
       done
     done
     ;;
@@ -45,7 +53,12 @@ select combo in $options; do
     source ~/.rvm/scripts/rvm
     rvm use $CI_RUBY@surveyor-$RAILS_VERSION --create
     read -p "Press [Enter] to run tests on $CI_RUBY@$RAILS_VERSION..."
-    ./ci-exec.sh
+    gem list -i bundler -v $BUNDLER_VERSION
+    if [ $? -ne 0 ]; then
+      gem install bundler -v $BUNDLER_VERSION
+    fi
+    bundle _${BUNDLER_VERSION}_ update
+    bundle _${BUNDLER_VERSION}_ exec rake testbed spec cucumber cucumber:wip
     ;;
   esac
   break