From 0026b99577debb1078711918defe42f5b5753a56 Mon Sep 17 00:00:00 2001 From: Blake Watters Date: Fri, 14 Mar 2014 10:52:33 -0400 Subject: [PATCH] Swap xctool for xcpretty --- Gemfile | 5 +++-- Gemfile.lock | 2 ++ Rakefile | 8 +++++--- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/Gemfile b/Gemfile index 64c8e19..be0df72 100644 --- a/Gemfile +++ b/Gemfile @@ -1,4 +1,5 @@ -source "http://rubygems.org" +source 'http://rubygems.org' -gem "rake", "~> 10.1.0" +gem 'rake', '~> 10.1.0' gem 'cocoapods', '~> 0.29.0' +gem 'xcpretty', '~> 0.1.3' diff --git a/Gemfile.lock b/Gemfile.lock index ba268e1..a43bae7 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -37,6 +37,7 @@ GEM activesupport (~> 3.0) colored (~> 1.2) rake + xcpretty (0.1.3) PLATFORMS ruby @@ -44,3 +45,4 @@ PLATFORMS DEPENDENCIES cocoapods (~> 0.29.0) rake (~> 10.1.0) + xcpretty (~> 0.1.3) diff --git a/Rakefile b/Rakefile index fd0267b..586ca87 100644 --- a/Rakefile +++ b/Rakefile @@ -1,16 +1,18 @@ +require 'rubygems' + namespace :spec do task :prepare do system("mkdir -p TransitionKit.xcodeproj/xcshareddata/xcschemes && cp Specs/Schemes/*.xcscheme TransitionKit.xcodeproj/xcshareddata/xcschemes/") end desc "Run the TransitionKit Specs for iOS" - task :ios => :prepare do - $ios_success = system("xctool -workspace TransitionKit.xcworkspace -scheme 'iOS Specs' -sdk iphonesimulator test -test-sdk iphonesimulator -arch i386 ONLY_ACTIVE_ARCH=NO") + task :ios => :prepare do + $ios_success = system("xcodebuild -workspace TransitionKit.xcworkspace -scheme 'iOS Specs' -sdk iphonesimulator clean test | xcpretty -c ; exit ${PIPESTATUS[0]}") end desc "Run the TransitionKit Specs for Mac OS X" task :osx => :prepare do - $osx_success = system("xctool -workspace TransitionKit.xcworkspace -scheme 'OS X Specs' -sdk macosx test -test-sdk macosx") + $osx_success = system("xcodebuild -workspace TransitionKit.xcworkspace -scheme 'OS X Specs' -sdk macosx clean test | xcpretty -c ; exit ${PIPESTATUS[0]}") end end