Merge branch 'f/integrate_xcpretty/#128293477'

.ruby-version

@@ -0,0 +1 @@
+system

.travis.yml

@@ -4,9 +4,10 @@ osx_image: xcode7.3
 before_install:
 - export XCODEBUILD_PATH=$(which xcodebuild)
 - export PATH=$PATH:$XCODEBUILD_PATH
+- export PATH=$PATH:~/bin
 install:
 - git submodule init
 - git submodule update
-
+- gem install xcpretty --user-install -n~/bin
 script:
-- go run script/tests.go
+- go run Testing/tests.go

script/tests.go → Testing/tests.go

@@ -15,7 +15,7 @@ func main() {
 }
 
 func runUnitTests(stdOut io.Writer, stdErr io.Writer) {
-	runCommand := exec.Command("go", "run", "script/unittests.go")
+	runCommand := exec.Command("go", "run", "Testing/unittests.go")
 	runCommand.Stdout = stdOut
 	runCommand.Stderr = stdErr
 

script/unittests.go → Testing/unittests.go

@@ -15,11 +15,26 @@ func main() {
 	}
 
 	unitTestCommand := exec.Command("xcodebuild", "test", "-workspace", "Fleet.xcworkspace", "-scheme", "Fleet", "-destination", "platform=iOS Simulator,OS=9.3,name=iPhone 6")
-	unitTestCommand.Stdout = stdOut
-	unitTestCommand.Stderr = stdErr
-	unitTestErr := unitTestCommand.Run()
-	if unitTestErr != nil {
-		log.Fatal(unitTestErr)
+	xcprettyCommand := exec.Command("xcpretty")
+	xcprettyCommand.Stdin, err = unitTestCommand.StdoutPipe()
+	if err != nil {
+		log.Fatal(err)
+	}
+	xcprettyCommand.Stdout = stdOut
+	xcprettyCommand.Stderr = stdErr
+	err = xcprettyCommand.Start()
+	if err != nil {
+		log.Fatal(err)
+	}
+
+	err = unitTestCommand.Run()
+	if err != nil {
+		log.Fatal(err)
+	}
+
+	err = xcprettyCommand.Wait()
+	if err != nil {
+		log.Fatal(err)
 	}
 
 	_, err = stdOut.Write([]byte("Fleet unit tests passed...\n"))