WIP

Author: Dimitar Kerezov

docs/man_pages/project/testing/publish-ios.md

@@ -4,12 +4,12 @@ publish ios
 <% if((isConsole && isMacOS) || isHtml) { %>
 Usage | Synopsis
 ---|---
-General | `$ tns publish ios <Apple ID> [<Username> [<Password> [<Mobile Provisioning Profile Identifier> [<Code Sign Identity>]]]]`
+General | `$ tns publish ios [<Application Name> [<Username> [<Password> [<Mobile Provisioning Profile Identifier> [<Code Sign Identity>]]]]]`
 
-Builds the project and uploads it to iTunesConnect. `Username` and `Password` parameters are required but if not provided, the CLI will ask for them.
+Builds the project and uploads it to iTunesConnect. `Application Name`, `Username` and `Password` parameters are required but if not provided, the CLI will ask for them.
 
 ### Attributes
-`<Apple ID>` the Apple ID of the application created at itunesconnect.apple.com
+`<Application Name>` the name of the application created at itunesconnect.apple.com
 `<Username>` the Username for authentiation with iTunesConnect
 `<Password>` the Password for authentiation with iTunesConnect
 `<Mobile Provisioning Profile Identifier>` the identifier of the mobile provision which will be used for building. This can easily be acquired through the iPhone Configuration Utility

lib/commands/publish-ios.ts

@@ -11,17 +11,21 @@ export class PublishIOS implements ICommand {
 		private $prompter: IPrompter,
 		private $stringParameterBuilder: IStringParameterBuilder) { }
 
-	public allowedParameters: ICommandParameter[] = [this.$stringParameterBuilder.createMandatoryParameter("Missing required Apple ID parameter."),
-		new StringCommandParameter(this.$injector), new StringCommandParameter(this.$injector), new StringCommandParameter(this.$injector), new StringCommandParameter(this.$injector)];
+	public allowedParameters: ICommandParameter[] = [new StringCommandParameter(this.$injector), new StringCommandParameter(this.$injector),
+			new StringCommandParameter(this.$injector), new StringCommandParameter(this.$injector), new StringCommandParameter(this.$injector)];
 
 	public execute(args: string[]): IFuture<void> {
 		return (() => {
-			let app_id = args[0],
+			let applicationName = args[0],
 				userName = args[1],
 				password = args[2],
 				mobileProvisionIdentifier = args[3],
 				codeSignIdentity = args[4];
 
+			if(!applicationName) {
+				applicationName = this.$prompter.getString("Application Name", { allowEmpty: false }).wait();
+			}
+
 			if(!userName) {
 				userName = this.$prompter.getString("Apple ID", { allowEmpty: false }).wait();
 			}
@@ -39,7 +43,7 @@ export class PublishIOS implements ICommand {
 			}
 
 			this.$options.release = true;
-			this.$itmsTransporterService.upload(app_id, userName, password, mobileProvisionIdentifier, codeSignIdentity).wait();
+			this.$itmsTransporterService.upload(applicationName, userName, password, mobileProvisionIdentifier, codeSignIdentity).wait();
 		}).future<void>()();
 	}
 }

lib/common

@@ -96,14 +96,14 @@ interface IITMSTransporterService {
 	/**
 	 * Builds and uploads an .ipa package to itunesconnect.
 	 * Note that if mobileProvisionIdentifier and/or codeSignIdentity are passed to this method they will override any options set through .xcconfig files.
-	 * @param  {string} appId	The application's Apple ID. It can be found on itunesconnect.apple.com.
+	 * @param  {string} applicationName	The application's name as specified on itunesconnect.apple.com.
 	 * @param  {string} username	Username for authentication with itunesconnect.
 	 * @param  {string} password	Password for authentication with itunesconnect.
 	 * @param  {string} mobileProvisionIdentifier?	The identifier of the mobile provision used for building.
 	 * @param  {string} codeSignIdentity?	The Code Sign Identity used for building.
 	 * @returns IFuture<void>
 	 */
-	upload(appId: string, username: string, password: string, mobileProvisionIdentifier?: string, codeSignIdentity?: string): IFuture<void>;
+	upload(applicationName: string, username: string, password: string, mobileProvisionIdentifier?: string, codeSignIdentity?: string): IFuture<void>;
 }
 
 /**

lib/declarations.ts

@@ -11,14 +11,17 @@ export class ITMSTransporterService implements IITMSTransporterService {
 		private $devicePlatformsConstants: Mobile.IDevicePlatformsConstants,
 		private $errors: IErrors,
 		private $fs: IFileSystem,
+		private $httpClient: Server.IHttpClient,
 		private $platformService: IPlatformService,
 		private $staticConfig: IStaticConfig,
-		private $sysInfo: ISysInfo) { }
+		private $sysInfo: ISysInfo
+		/*private $xcodeSelectService: IXcodeSelectService*/) { }
 
-	public upload(appId: string, username: string, password: string, mobileProvisionIdentifier?: string, codeSignIdentity?: string): IFuture<void> {
+	public upload(applicationName: string, username: string, password: string, mobileProvisionIdentifier?: string, codeSignIdentity?: string): IFuture<void> {
 		return (() => {
 			temp.track();
-			let itmsTransporterPath = this.getITMSTransporterPath().wait(),
+			let appId = this.getAppId(applicationName, username, password).wait(),
+				itmsTransporterPath = this.getITMSTransporterPath().wait(),
 				ipaFileName = "app.ipa",
 				itmsDirectory = temp.mkdirSync("itms-"),
 				innerDirectory = path.join(itmsDirectory, "mybundle.itmsp"),
@@ -31,39 +34,63 @@ export class ITMSTransporterService implements IITMSTransporterService {
 					codeSignIdentity: codeSignIdentity
 				};
 
-			this.$fs.createDirectory(innerDirectory).wait();
+// 			this.$fs.createDirectory(innerDirectory).wait();
 
-			this.$platformService.preparePlatform(platform).wait();
-			this.$platformService.buildPlatform(platform, iosBuildConfig).wait();
-			this.$platformService.copyLastOutput(platform, ipaFileLocation, { isForDevice: forDevice }).wait();
+// 			this.$platformService.preparePlatform(platform).wait();
+// 			this.$platformService.buildPlatform(platform, iosBuildConfig).wait();
+// 			this.$platformService.copyLastOutput(platform, ipaFileLocation, { isForDevice: forDevice }).wait();
 
-			let ipaFileHash = md5(this.$fs.readFile(ipaFileLocation).wait()),
-				ipaFileSize = this.$fs.getFileSize(ipaFileLocation).wait(),
-				metadata = `<?xml version="1.0" encoding="UTF-8"?>
-<package version="software4.7" xmlns="http://apple.com/itunes/importer">
-    <software_assets apple_id="${appId}">
-        <asset type="bundle">
-            <data_file>
-                <file_name>${ipaFileName}</file_name>
-                <checksum type="md5">${ipaFileHash}</checksum>
-                <size>${ipaFileSize}</size>
-            </data_file>
-        </asset>
-    </software_assets>
-</package>`;
+// 			let ipaFileHash = md5(this.$fs.readFile(ipaFileLocation).wait()),
+// 				ipaFileSize = this.$fs.getFileSize(ipaFileLocation).wait(),
+// 				metadata = `<?xml version="1.0" encoding="UTF-8"?>
+// <package version="software4.7" xmlns="http://apple.com/itunes/importer">
+//     <software_assets apple_id="${appId}">
+//         <asset type="bundle">
+//             <data_file>
+//                 <file_name>${ipaFileName}</file_name>
+//                 <checksum type="md5">${ipaFileHash}</checksum>
+//                 <size>${ipaFileSize}</size>
+//             </data_file>
+//         </asset>
+//     </software_assets>
+// </package>`;
 
-			this.$fs.writeFile(path.join(innerDirectory, "metadata.xml"), metadata).wait();
+// 			this.$fs.writeFile(path.join(innerDirectory, "metadata.xml"), metadata).wait();
 
-			this.$childProcess.spawnFromEvent(itmsTransporterPath, ["-m", "upload", "-f", itmsDirectory, "-u", username, "-p", password, "-v", "informational"], "close", { stdio: "inherit" }).wait();
+// 			this.$childProcess.spawnFromEvent(itmsTransporterPath, ["-m", "upload", "-f", itmsDirectory, "-u", username, "-p", password, "-v", "informational"], "close", { stdio: "inherit" }).wait();
 		}).future<void>()();
 	}
 
+	private getAppId(applicationName: string, username: string, password: string): IFuture<string> {
+		return (() => {
+			let result = this.$httpClient.httpRequest({
+				url: "https://contentdelivery.itunes.apple.com/WebObjects/MZLabelService.woa/json/MZITunesProducerService",
+				method: "POST",
+				body: JSON.stringify({
+					id: 1, // magic number
+					jsonrpc: "2.0",
+					method: "lookupSoftwareApplications",
+					params: {
+						Username: username,
+						Password: password,
+						Version: "2.9.1(441)",
+						Application: "Application Loader",
+						OSIdentifier: "Mac OS X 10.8.5 (x86_64)"
+					}
+				})
+			}).wait().body.result;
+
+			console.log(json.result);
+			return "5";
+		}).future<string>()();
+	}
+
 	private getITMSTransporterPath(): IFuture<string> {
 		return (() => {
 			if (!this._itmsTransporterPath) {
 				let sysInfo = this.$sysInfo.getSysInfo(path.join(__dirname, "..", "..", this.$staticConfig.PROJECT_FILE_NAME)).wait(),
 					xcodeVersionMatch = sysInfo.xcodeVer.match(/Xcode (.*)/),
-					result = path.join("/Applications", "Xcode.app", "Contents", "Applications", "Application Loader.app", "Contents");
+					result = path.join("this.$xcodeSelectService.getContentsDirectoryPath().wait()", "Applications", "Application Loader.app", "Contents");
 
 				if (xcodeVersionMatch && xcodeVersionMatch[1]) {
 					let [major, minor] = xcodeVersionMatch[1].split(".");