Merge pull request #484 from phatblat/ben/ios-test-target

iOS Test target

.gitmodules

@@ -16,3 +16,6 @@
 [submodule "Carthage/Checkouts/xcconfigs"]
 	path = Carthage/Checkouts/xcconfigs
 	url = https://github.com/jspahrsummers/xcconfigs.git
+[submodule "Carthage/Checkouts/ZipArchive"]
+	path = Carthage/Checkouts/ZipArchive
+	url = https://github.com/ZipArchive/ZipArchive.git

Cartfile.private

@@ -1,3 +1,4 @@
 github "jspahrsummers/xcconfigs" >= 0.7.1
 github "Quick/Quick" ~> 0.3
 github "Quick/Nimble" ~> 0.4
+github "ZipArchive/ZipArchive" ~> 0.3

Cartfile.resolved

@@ -1,3 +1,4 @@
 github "Quick/Nimble" "v0.4.2"
 github "Quick/Quick" "v0.3.1"
+github "ZipArchive/ZipArchive" "v0.3.2"
 github "jspahrsummers/xcconfigs" "0.7.2"

ObjectiveGitFramework.xcodeproj/xcshareddata/xcschemes/ObjectiveGit iOS.xcscheme

@@ -32,7 +32,7 @@
             skipped = "NO">
             <BuildableReference
                BuildableIdentifier = "primary"
-               BlueprintIdentifier = "D01B6EDC19F82E2000D411BC"
+               BlueprintIdentifier = "F879D8351B4B7F7C002D5C07"
                BuildableName = "ObjectiveGit-iOSTests.xctest"
                BlueprintName = "ObjectiveGit-iOSTests"
                ReferencedContainer = "container:ObjectiveGitFramework.xcodeproj">

ObjectiveGitTests/ObjectiveGitTests-Info.plist

@@ -7,7 +7,7 @@
 	<key>CFBundleExecutable</key>
 	<string>${EXECUTABLE_NAME}</string>
 	<key>CFBundleIdentifier</key>
-	<string>com.libgit2.${PRODUCT_NAME:rfc1034identifier}</string>
+	<string>org.libgit2.$(PRODUCT_NAME:rfc1034identifier)</string>
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
 	<key>CFBundlePackageType</key>

ObjectiveGitTests/QuickSpec+GTFixtures.m

@@ -10,6 +10,10 @@
 #import "QuickSpec+GTFixtures.h"
 #import <objc/runtime.h>
 
+#if TARGET_OS_IPHONE
+#import "SSZipArchive.h"
+#endif
+
 static const NSInteger FixturesErrorUnzipFailed = 666;
 
 static NSString * const FixturesErrorDomain = @"com.objectivegit.Fixtures";
@@ -95,6 +99,24 @@ - (NSString *)pathForFixtureRepositoryNamed:(NSString *)repositoryName {
 }
 
 - (BOOL)unzipFile:(NSString *)member fromArchiveAtPath:(NSString *)zipPath intoDirectory:(NSString *)destinationPath error:(NSError **)error {
+
+#if TARGET_OS_IPHONE
+	// iOS: unzip in-process using SSZipArchive
+	//
+	// system() and NSTask() are not available when running tests in the iOS simulator
+
+	BOOL success = [SSZipArchive unzipFileAtPath:zipPath toDestination:destinationPath overwrite:YES password:nil error:error];
+
+	if (!success) {
+		NSLog(@"Unzip failed");
+		return NO;
+	}
+
+	return YES;
+
+#else
+	// OS X: shell out to unzip using NSTask
+
 	NSTask *task = [[NSTask alloc] init];
 	task.launchPath = @"/usr/bin/unzip";
 	task.arguments = @[ @"-qq", @"-d", destinationPath, zipPath, [member stringByAppendingString:@"*"] ];
@@ -108,6 +130,9 @@ - (BOOL)unzipFile:(NSString *)member fromArchiveAtPath:(NSString *)zipPath intoD
 	}
 
 	return success;
+
+#endif
+
 }
 
 #pragma mark API

script/cibuild

@@ -123,10 +123,10 @@ build_scheme ()
     if [ "$awkstatus" -eq "1" ]
     then
         # SDK not found, try for iphonesimulator.
-        sdkflag="-sdk iphonesimulator"
+        sdkflag='-sdk iphonesimulator -destination "platform=iOS Simulator,name=iPhone 5"'
 
         # Determine whether the unit tests will run with iphonesimulator
-        run_xctool $sdkflag -scheme "$scheme" run-tests | parse_build
+        run_xctool "$sdkflag" -scheme "$scheme" run-tests | parse_build
 
         awkstatus=$?