From 8864e54f1f94883f3e22d7ce7ed87a699467a217 Mon Sep 17 00:00:00 2001
From: Vojta Jina
Date: Wed, 11 Dec 2013 09:56:06 -0800
Subject: chore(scripts): refactor travis scripts

Refactoring so that it's easier to use both SL/BS just depending on a global switch.---
 .travis.yml                                 |  9 ++++-----
 lib/sauce/sauce_connect_block.sh            |  7 -------
 lib/sauce/sauce_connect_setup.sh            |  4 ++--
 scripts/travis/build.sh                     | 16 ++++++++++++++++
 scripts/travis/print_logs.sh                | 11 +++++++++++
 scripts/travis/wait_for_browser_provider.sh |  7 +++++++
 travis_build.sh                             | 16 ----------------
 travis_print_logs.sh                        | 11 -----------
 8 files changed, 40 insertions(+), 41 deletions(-)
 delete mode 100755 lib/sauce/sauce_connect_block.sh
 create mode 100755 scripts/travis/build.sh
 create mode 100755 scripts/travis/print_logs.sh
 create mode 100755 scripts/travis/wait_for_browser_provider.sh
 delete mode 100755 travis_build.sh
 delete mode 100755 travis_print_logs.sh

diff --git a/.travis.yml b/.travis.yml
index 3fd054aa..bec9ce82 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -9,11 +9,10 @@ env:
   global:
     - SAUCE_USERNAME=angular-ci
     - SAUCE_ACCESS_KEY=9b988f434ff8-fbca-8aa4-4ae3-35442987
-    # rename to BROWSER_PROVIDER_READY_FILE
-    - SAUCE_CONNECT_READY_FILE=/tmp/sauce-connect-ready
     - BROWSER_STACK_USERNAME=VojtaJina
     - BROWSER_STACK_ACCESS_KEY=HAfHZaypxAc3PEUrUU9a
     - LOGS_DIR=/tmp/angular-build/logs
+    - BROWSER_PROVIDER_READY_FILE=/tmp/sauce-connect-ready
 
 before_script:
   - mkdir -p $LOGS_DIR
@@ -22,10 +21,10 @@ before_script:
   - grunt bower
   - grunt bower
   - grunt package-without-bower
-  - ./lib/sauce/sauce_connect_block.sh
+  - ./scripts/travis/wait_for_browser_provider.sh
 
 script:
-  - ./travis_build.sh
+  - ./scripts/travis/build.sh
 
 after_script:
-  - ./travis_print_logs.sh
+  - ./scripts/travis/print_logs.sh
diff --git a/lib/sauce/sauce_connect_block.sh b/lib/sauce/sauce_connect_block.sh
deleted file mode 100755
index 126d3710..00000000
--- a/lib/sauce/sauce_connect_block.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/bash
-
-
-# Wait for Connect to be ready before exiting
-while [ ! -f $SAUCE_CONNECT_READY_FILE ]; do
-  sleep .5
-done
diff --git a/lib/sauce/sauce_connect_setup.sh b/lib/sauce/sauce_connect_setup.sh
index 5e8e138d..c49cff0a 100755
--- a/lib/sauce/sauce_connect_setup.sh
+++ b/lib/sauce/sauce_connect_setup.sh
@@ -36,8 +36,8 @@ ARGS=""
 if [ ! -z "$TRAVIS_JOB_NUMBER" ]; then
   ARGS="$ARGS --tunnel-identifier $TRAVIS_JOB_NUMBER"
 fi
-if [ ! -z "$SAUCE_CONNECT_READY_FILE" ]; then
-  ARGS="$ARGS --readyfile $SAUCE_CONNECT_READY_FILE"
+if [ ! -z "$BROWSER_PROVIDER_READY_FILE" ]; then
+  ARGS="$ARGS --readyfile $BROWSER_PROVIDER_READY_FILE"
 fi
 
 
diff --git a/scripts/travis/build.sh b/scripts/travis/build.sh
new file mode 100755
index 00000000..6467bc1a
--- /dev/null
+++ b/scripts/travis/build.sh
@@ -0,0 +1,16 @@
+#!/bin/bash
+
+set -e
+
+export SAUCE_ACCESS_KEY=`echo $SAUCE_ACCESS_KEY | rev`
+
+if [ $JOB = "unit" ]; then
+  grunt ci-checks
+  grunt test:docgen
+  grunt test:promises-aplus
+  grunt test:unit --browsers SL_Chrome,SL_Safari,SL_Firefox,SL_IE_8,SL_IE_9,SL_IE_10,SL_IE_11 --reporters dots
+elif [ $JOB = "e2e" ]; then
+  grunt test:e2e --browsers SL_Chrome --reporters dots
+else
+  echo "Unknown job type. Please set JOB=unit or JOB=e2e."
+fi
diff --git a/scripts/travis/print_logs.sh b/scripts/travis/print_logs.sh
new file mode 100755
index 00000000..ec612ca1
--- /dev/null
+++ b/scripts/travis/print_logs.sh
@@ -0,0 +1,11 @@
+#!/bin/bash
+
+LOG_FILES=$LOGS_DIR/*
+
+for FILE in $LOG_FILES; do
+  echo -e "\n\n\n"
+  echo "================================================================================"
+  echo " $FILE"
+  echo "================================================================================"
+  cat $FILE
+done
diff --git a/scripts/travis/wait_for_browser_provider.sh b/scripts/travis/wait_for_browser_provider.sh
new file mode 100755
index 00000000..1e8157c2
--- /dev/null
+++ b/scripts/travis/wait_for_browser_provider.sh
@@ -0,0 +1,7 @@
+#!/bin/bash
+
+
+# Wait for Connect to be ready before exiting
+while [ ! -f $BROWSER_PROVIDER_READY_FILE ]; do
+  sleep .5
+done
diff --git a/travis_build.sh b/travis_build.sh
deleted file mode 100755
index 6467bc1a..00000000
--- a/travis_build.sh
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/bin/bash
-
-set -e
-
-export SAUCE_ACCESS_KEY=`echo $SAUCE_ACCESS_KEY | rev`
-
-if [ $JOB = "unit" ]; then
-  grunt ci-checks
-  grunt test:docgen
-  grunt test:promises-aplus
-  grunt test:unit --browsers SL_Chrome,SL_Safari,SL_Firefox,SL_IE_8,SL_IE_9,SL_IE_10,SL_IE_11 --reporters dots
-elif [ $JOB = "e2e" ]; then
-  grunt test:e2e --browsers SL_Chrome --reporters dots
-else
-  echo "Unknown job type. Please set JOB=unit or JOB=e2e."
-fi
diff --git a/travis_print_logs.sh b/travis_print_logs.sh
deleted file mode 100755
index ec612ca1..00000000
--- a/travis_print_logs.sh
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/bin/bash
-
-LOG_FILES=$LOGS_DIR/*
-
-for FILE in $LOG_FILES; do
-  echo -e "\n\n\n"
-  echo "================================================================================"
-  echo " $FILE"
-  echo "================================================================================"
-  cat $FILE
-done
-- 
cgit v1.2.3