From 92e03e208f9d55e085ff09900517c02785776e4a Mon Sep 17 00:00:00 2001
From: Rohan Mitchell <rohan@rohanmitchell.com>
Date: Wed, 22 Apr 2015 15:53:54 +1000
Subject: [PATCH] Extract load_environment method

---
 script/ci/includes.sh  | 7 +++++++
 script/ci/run_tests.sh | 5 +----
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/script/ci/includes.sh b/script/ci/includes.sh
index 06713fc773..4b07dacfdc 100644
--- a/script/ci/includes.sh
+++ b/script/ci/includes.sh
@@ -1,3 +1,10 @@
+function load_environment {
+    source /var/lib/jenkins/.rvm/environments/ruby-1.9.3-p392
+    if [ ! -f config/application.yml ]; then
+        ln -s application.yml.example config/application.yml
+    fi
+}
+
 function exit_unless_master_merged {
     if [[ `git branch -a --merged origin/$BUILDKITE_BRANCH` != *origin/master* ]]; then
 	echo "This branch does not have the current master merged. Please merge master and push again."
diff --git a/script/ci/run_tests.sh b/script/ci/run_tests.sh
index 9fdbd11333..189875f1e1 100755
--- a/script/ci/run_tests.sh
+++ b/script/ci/run_tests.sh
@@ -4,10 +4,7 @@ set -e
 
 echo "--- Loading environment"
 source ./script/ci/includes.sh
-source /var/lib/jenkins/.rvm/environments/ruby-1.9.3-p392
-if [ ! -f config/application.yml ]; then
-    ln -s application.yml.example config/application.yml
-fi
+load_environment
 
 echo "--- Verifying branch is based on current master"
 exit_unless_master_merged