Updates build scripts.

Author: hzalaz

script/build

@@ -9,6 +9,10 @@ build_using_carthage ()
   then
     carthage_cmd="$carthage_cmd --use-ssh"
   fi
+  if [ ! -z "$VERBOSE" ]
+  then
+    echo $carthage_cmd
+  fi
   eval $carthage_cmd
 }
 
@@ -21,7 +25,7 @@ build_using_xcodebuild ()
   else
     build_command="$build_command -workspace $XCODE_WORKSPACE"
   fi
-  build_command="$build_command build"
+  build_command="$build_command -sdk iphonesimulator build -configuration Debug"
 
   if type bundle > /dev/null && bundle show xcpretty > /dev/null
   then
@@ -31,20 +35,21 @@ build_using_xcodebuild ()
   echo ""
   echo " → Building scheme '$1'"
   echo ""
+  if [ ! -z "$VERBOSE" ]
+  then
+    echo $build_command
+  fi
   eval $build_command
 }
 
-schemes ()
-{
-  xcodebuild -list | awk '{if(found) print} /Schemes/{found=1}' | awk '{$1=$1};1'
-}
-
 if [ ! -f $XCODE_WORKSPACE ] && [ -f Cartfile ] && type carthage > /dev/null
 then
   build_using_carthage
 else
   source script/.env
+  source script/script_hooks/schemes
 
+  current_schemes=$(schemes)
   if [ -z "$current_schemes" ]
   then
     echo ""

script/cibuild

@@ -35,11 +35,11 @@ main ()
       echo ""
       echo "####### Build & Test Phase #######"
       echo ""
-      script/test | tee /tmp/build.test-output.txt
+      set -o pipefail && script/test 2>&1 | tee /tmp/build.test-output.txt
       status=$?
       if [ ! $status -eq 0 ]
       then
-        log_file_path=`cat /tmp/build.test-output.txt | perl -l -ne '/(\/var\/folders.*\/com\.apple\.dt\.XCTest-status.*)\)/ && print $1'`
+        log_file_path=`cat /tmp/build.test-output.txt | tail -n 100 | perl -l -ne '/(\/var\/folders.*\/com\.apple\.dt\.XCTest-status.*)\)/ && print $1'`
         if [ ! -z "$log_file_path" ]
         then
           echo ""

script/script_hooks/destinations

@@ -0,0 +1,36 @@
+#!/bin/bash
+
+if [ -z "$DEFAULT_OSX_DESTINATION" ]; then
+  DEFAULT_OSX_DESTINATION="'platform=OS X'"
+fi
+
+if [ -z "$IOS_OS_VERSION" ]; then
+  IOS_OS_VERSION="latest"
+fi
+
+if [ -z "$IOS_SIMULATOR_NAME" ]; then
+  IOS_SIMULATOR_NAME="iPhone 6"
+fi
+
+if [ -z "$DEFAULT_IOS_DESTINATION" ]; then
+  DEFAULT_IOS_DESTINATION="'platform=iOS Simulator,name=$IOS_SIMULATOR_NAME,OS=$IOS_OS_VERSION'"
+fi
+
+scheme_destination ()
+{
+  shopt -s nocasematch
+
+  case "$1" in
+  *iOS) 
+    destination=$DEFAULT_IOS_DESTINATION
+    ;;
+  *OSX) 
+    destination=$DEFAULT_OSX_DESTINATION
+    ;;
+  *) 
+    destination=$DEFAULT_IOS_DESTINATION
+    ;;
+  esac
+
+  echo $destination
+}

script/script_hooks/schemes

@@ -0,0 +1,4 @@
+schemes ()
+{
+  xcodebuild -list | awk '{if(found) print} /Schemes/{found=1}' | awk '{$1=$1};1'
+}

script/test

@@ -3,33 +3,23 @@
 set -e
 
 source script/.env
-
-schemes ()
-{
-  xcodebuild -list | awk '{if(found) print} /Schemes/{found=1}' | awk '{$1=$1};1'
-}
+source script/script_hooks/schemes
+source script/script_hooks/destinations
 
 run_tests ()
 {
   test_command="set -o pipefail && xcodebuild -scheme $1"
+
   if [ -z "$XCODE_WORKSPACE" ]
   then
     test_command="$test_command -project $XCODE_PROJECT"
   else
     test_command="$test_command -workspace $XCODE_WORKSPACE"
   fi
-  test_command="$test_command test"
 
-  shopt -s nocasematch
+  destination=$(scheme_destination $1)
+  test_command="$test_command -destination $destination clean build test -configuration Debug"
 
-  case "$1" in
-
-  *iOS) test_command="$test_command -destination 'platform=iOS Simulator,name=iPhone 6'"
-  ;;
-  *OSX) test_command="$test_command -destination 'platform=OS X'"
-  ;;
-
-esac
   if [ ! -z "$CIRCLE_ARTIFACTS" ]
   then
     test_command="$test_command | tee $CIRCLE_ARTIFACTS/xcode_raw.log"
@@ -46,6 +36,10 @@ esac
   echo ""
   echo " → Running tests for scheme '$1'"
   echo ""
+  if [ ! -z "$VERBOSE" ]
+  then
+    echo $test_command
+  fi
   eval $test_command
 }