Merge pull request #1806 from NativeScript/cankov/xcarchive-publish

Add archive and exportArchive for iOS.

Author: PanayotCankov

.npmignore

@@ -28,3 +28,4 @@ scratch/
 *.suo
 .travis.yml
 docs/html/
+dev/

Gruntfile.js

@@ -39,17 +39,17 @@ module.exports = function(grunt) {
 			},
 
 			devlib: {
-				src: ["lib/**/*.ts", "!lib/common/node_modules/**/*.ts", "!lib/common/messages/**/*.ts"],
+				src: ["lib/**/*.ts", "!lib/common/node_modules/**/*.ts"],
 				reference: "lib/.d.ts"
 			},
 
 			devall: {
-				src: ["lib/**/*.ts", "test/**/*.ts", "!lib/common/node_modules/**/*.ts", "!lib/common/messages/**/*.ts", "lib/common/test/unit-tests/**/*.ts", "definitions/**/*.ts", "!lib/common/test/.d.ts"],
+				src: ["lib/**/*.ts", "test/**/*.ts", "!lib/common/node_modules/**/*.ts", "lib/common/test/unit-tests/**/*.ts", "definitions/**/*.ts", "!lib/common/test/.d.ts"],
 				reference: "lib/.d.ts"
 			},
 
 			release_build: {
-				src: ["lib/**/*.ts", "test/**/*.ts", "!lib/common/node_modules/**/*.ts", "!lib/common/messages/**/*.ts"],
+				src: ["lib/**/*.ts", "test/**/*.ts", "!lib/common/node_modules/**/*.ts"],
 				reference: "lib/.d.ts",
 				options: {
 					sourceMap: false,

dev/tsc-to-mocha-watch.js

@@ -0,0 +1,57 @@
+// Run "tsc" with watch, upon successful compilation run mocha tests.
+
+var child_process = require("child_process");
+var spawn = child_process.spawn;
+var readline = require("readline");
+var chalk = require("chalk");
+
+var mocha = null;
+var mochal = null;
+var errors = 0;
+
+function compilationStarted() {
+    if (mocha) {
+        mocha.kill('SIGINT');
+    }
+    mocha = null;
+    mochal = null;
+    errors = 0;
+}
+function foundErrors() {
+    errors ++;
+}
+function compilationComplete() {
+    if (errors) {
+        console.log("       " + chalk.red("TS errors. Will not start mocha."));
+        return;
+    } else {
+        console.log("       " + chalk.gray("Run mocha."));
+    }
+    mocha = spawn("./node_modules/.bin/mocha", ["--colors"]);
+    mocha.on('close', code => {
+        if (code) {
+            console.log(chalk.gray("mocha: ") + "Exited with " + code);
+        } else {
+            console.log(chalk.gray("mocha: ") + chalk.red("Exited with " + code));
+        }
+        mocha = null;
+        mochal = null;
+    });
+    mochal = readline.createInterface({ input: mocha.stdout });
+    mochal.on('line', line => {
+        console.log(chalk.gray('mocha: ') + line);
+    });
+}
+
+var tsc = spawn("./node_modules/.bin/tsc", ["--watch"]);
+var tscl = readline.createInterface({ input: tsc.stdout });
+tscl.on('line', line => {
+    console.log(chalk.gray("  tsc: ") + line);
+    if (line.indexOf("Compilation complete.") >= 0) {
+        compilationComplete();
+    } else if (line.indexOf("File change detected.") >= 0) {
+        compilationStarted();
+    } else if (line.indexOf(": error TS") >= 0) {
+        foundErrors();
+    }
+});

docs/man_pages/publishing/appstore.md

@@ -12,6 +12,9 @@ Lists all application records in iTunes Connect. The list contains name, version
 <% if(isHtml) { %>
 `<Apple ID>` and `<Password>` are your credentials for logging in iTunes Connect. If you do not provide them when running the command, the NativeScript CLI will prompt you to provide them.
 
+### Options
+* `--team-id` - Specified the team id for which Xcode will try to find distribution certificate and provisioning profile when exporting for AppStore submission.
+
 ### Command Limitations
 
 * You can run `$ tns appstore upload` only on OS X systems.

docs/man_pages/publishing/publish-ios.md

@@ -13,6 +13,7 @@ Uploads project to iTunes Connect. The command either issues a production build
 
 ### Options
 * `--ipa` - If set, will use provided .ipa file instead of building the project.
+* `--team-id` - Specified the team id for which Xcode will try to find distribution certificate and provisioning profile when exporting for AppStore submission.
 
 ### Attributes
 * `<Apple ID>` and `<Password>` are your credentials for logging into iTunes Connect.

lib/android-tools-info.ts

@@ -1,6 +1,3 @@
-///<reference path=".d.ts"/>
-"use strict";
-
 import * as path from "path";
 import * as semver from "semver";
 import {EOL} from "os";

lib/bootstrap.ts

@@ -108,5 +108,5 @@ $injector.require("iOSNotificationService", "./services/ios-notification-service
 $injector.require("socketProxyFactory", "./device-sockets/ios/socket-proxy-factory");
 $injector.require("iOSNotification", "./device-sockets/ios/notification");
 $injector.require("iOSSocketRequestExecutor", "./device-sockets/ios/socket-request-executor");
-$injector.require("messages", "./messages");
+$injector.require("messages", "./common/messages/messages");
 $injector.require("xmlValidator", "./xml-validator");

lib/commands/add-platform.ts

@@ -1,6 +1,3 @@
-///<reference path="../.d.ts"/>
-"use strict";
-
 export class AddPlatformCommand implements ICommand {
 	constructor(private $platformService: IPlatformService,
 		private $errors: IErrors) { }

lib/commands/appstore-list.ts

@@ -1,6 +1,3 @@
-///<reference path="../.d.ts"/>
-"use strict";
-
 import { createTable } from "../common/helpers";
 import {StringCommandParameter} from "../common/command-params";
 

lib/commands/appstore-upload.ts

@@ -1,8 +1,6 @@
-///<reference path="../.d.ts"/>
-"use strict";
-
 import {StringCommandParameter} from "../common/command-params";
 import * as path from "path";
+import {IOSProjectService} from "../services/ios-project-service";
 
 export class PublishIOS implements ICommand {
 	constructor(private $errors: IErrors,
@@ -13,17 +11,29 @@ export class PublishIOS implements ICommand {
 		private $logger: ILogger,
 		private $options: IOptions,
 		private $prompter: IPrompter,
-		private $stringParameterBuilder: IStringParameterBuilder) { }
+		private $stringParameterBuilder: IStringParameterBuilder,
+		private $devicePlatformsConstants: Mobile.IDevicePlatformsConstants) { }
 
 	public allowedParameters: ICommandParameter[] = [new StringCommandParameter(this.$injector), new StringCommandParameter(this.$injector),
 			new StringCommandParameter(this.$injector), new StringCommandParameter(this.$injector)];
 
+	private get $platformsData(): IPlatformsData {
+		return this.$injector.resolve("platformsData");
+	}
+
+	// This property was introduced due to the fact that the $platformService dependency
+	// ultimately tries to resolve the current project's dir and fails if not executed from within a project
+	private get $platformService(): IPlatformService {
+		return this.$injector.resolve("platformService");
+	}
+
 	public execute(args: string[]): IFuture<void> {
 		return (() => {
 			let username = args[0],
 				password = args[1],
 				mobileProvisionIdentifier = args[2],
 				codeSignIdentity = args[3],
+				teamID = this.$options.teamId,
 				ipaFilePath = this.$options.ipa ? path.resolve(this.$options.ipa) : null;
 
 			if(!username) {
@@ -42,12 +52,42 @@ export class PublishIOS implements ICommand {
 				this.$logger.warn("No code sign identity set. A default code sign identity will be used. You can set one in app/App_Resources/iOS/build.xcconfig");
 			}
 
+			if (!ipaFilePath) {
+				let platform = this.$devicePlatformsConstants.iOS;
+				// No .ipa path provided, build .ipa on out own.
+				if (mobileProvisionIdentifier || codeSignIdentity) {
+					let iOSBuildConfig: IiOSBuildConfig = {
+						buildForDevice: true,
+						mobileProvisionIdentifier,
+						codeSignIdentity
+					};
+					this.$logger.info("Building .ipa with the selected mobile provision and/or certificate.");
+					// This is not very correct as if we build multiple targets we will try to sign all of them using the signing identity here.
+					this.$platformService.buildPlatform(platform, iOSBuildConfig).wait();
+					ipaFilePath = this.$platformService.lastOutputPath(platform, { isForDevice: iOSBuildConfig.buildForDevice });
+				} else {
+					this.$logger.info("No .ipa, mobile provision or certificate set. Perfect! Now we'll build .xcarchive and let Xcode pick the distribution certificate and provisioning profile for you when exporting .ipa for AppStore submission.");
+					if (!this.$platformService.preparePlatform(platform).wait()) {
+						this.$errors.failWithoutHelp("Failed to prepare project.");
+					}
+
+					let platformData = this.$platformsData.getPlatformData(platform);
+					let iOSProjectService = <IOSProjectService>platformData.platformProjectService;
+
+					let archivePath = iOSProjectService.archive(platformData.projectRoot).wait();
+					this.$logger.info("Archive at: " + archivePath);
+
+					let exportPath = iOSProjectService.exportArchive({ archivePath, teamID }).wait();
+					this.$logger.info("Export at: " + exportPath);
+
+					ipaFilePath = exportPath;
+				}
+			}
+
 			this.$options.release = true;
 			this.$itmsTransporterService.upload({
 				username,
 				password,
-				mobileProvisionIdentifier,
-				codeSignIdentity,
 				ipaFilePath,
 				verboseLogging: this.$logger.getLevel() === "TRACE"
 			}).wait();

lib/commands/build.ts

@@ -1,6 +1,3 @@
-///<reference path="../.d.ts"/>
-"use strict";
-
 export class BuildCommandBase {
 	constructor(protected $options: IOptions,
 		private $platformService: IPlatformService) { }

lib/commands/create-project.ts

@@ -1,6 +1,3 @@
-///<reference path="../.d.ts"/>
-"use strict";
-
 import * as constants from "../constants";
 
 export class CreateProjectCommand implements ICommand {

lib/commands/debug.ts

@@ -1,7 +1,4 @@
-///<reference path="../.d.ts"/>
-"use strict";
-
-export class DebugPlatformCommand implements ICommand {
+export class DebugPlatformCommand implements ICommand {
 	constructor(private debugService: IDebugService,
 		private $devicesService: Mobile.IDevicesService,
 		private $errors: IErrors,

lib/commands/deploy.ts

@@ -1,6 +1,3 @@
-///<reference path="../.d.ts"/>
-"use strict";
-
 export class DeployOnDeviceCommand implements ICommand {
 	constructor(private $platformService: IPlatformService,
 		private $platformCommandParameter: ICommandParameter,

lib/commands/emulate.ts

@@ -1,6 +1,3 @@
-///<reference path="../.d.ts"/>
-"use strict";
-
 export class EmulateCommandBase {
 	constructor(private $platformService: IPlatformService) { }
 

lib/commands/generate-help.ts

@@ -1,6 +1,3 @@
-///<reference path="../.d.ts"/>
-"use strict";
-
 export class GenerateHelpCommand implements ICommand {
 	constructor(private $htmlHelpService: IHtmlHelpService) {
 	}

lib/commands/info.ts

@@ -1,6 +1,3 @@
-///<reference path="../.d.ts"/>
-"use strict";
-
 export class InfoCommand implements ICommand {
 	constructor(private $infoService: IInfoService) { }
 

lib/commands/init.ts

@@ -1,6 +1,3 @@
-///<reference path="../.d.ts"/>
-"use strict";
-
 export class InitCommand implements ICommand {
 	constructor(private $initService: IInitService) { }
 

lib/commands/install.ts

@@ -1,5 +1,3 @@
-///<reference path="../.d.ts"/>
-"use strict";
 import {EOL} from "os";
 
 export class InstallCommand implements ICommand {

lib/commands/list-platforms.ts

@@ -1,6 +1,3 @@
-///<reference path="../.d.ts"/>
-"use strict";
-
 import * as helpers from "../common/helpers";
 
 export class ListPlatformsCommand implements ICommand {

lib/commands/livesync.ts

@@ -1,6 +1,3 @@
-///<reference path="../.d.ts"/>
-"use strict";
-
 export class LivesyncCommand implements ICommand {
 	constructor(private $logger: ILogger,
 		private $usbLiveSyncService: ILiveSyncService,

lib/commands/plugin/add-plugin.ts

@@ -1,6 +1,3 @@
-///<reference path="../../.d.ts"/>
-"use strict";
-
 export class AddPluginCommand implements ICommand {
 	constructor(private $pluginsService: IPluginsService,
 		private $errors: IErrors) { }

lib/commands/plugin/find-plugins.ts

@@ -1,5 +1,3 @@
-///<reference path="../../.d.ts"/>
-"use strict";
 import { createTable, isInteractive } from "../../common/helpers";
 import { NATIVESCRIPT_KEY_NAME } from "../../constants";
 import Future = require("fibers/future");

lib/commands/plugin/list-plugins.ts

@@ -1,5 +1,3 @@
-///<reference path="../../.d.ts"/>
-"use strict";
 import { createTable } from "../../common/helpers";
 
 export class ListPluginsCommand implements ICommand {

lib/commands/plugin/remove-plugin.ts

@@ -1,6 +1,3 @@
-///<reference path="../../.d.ts"/>
-"use strict";
-
 export class RemovePluginCommand implements ICommand {
 	constructor(private $pluginsService: IPluginsService,
 		private $errors: IErrors,

lib/commands/prepare.ts

@@ -1,6 +1,3 @@
-///<reference path="../.d.ts"/>
-"use strict";
-
 export class PrepareCommand implements ICommand {
 	constructor(private $errors: IErrors,
 		private $platformService: IPlatformService,

lib/commands/remove-platform.ts

@@ -1,6 +1,3 @@
-///<reference path="../.d.ts"/>
-"use strict";
-
 export class RemovePlatformCommand implements ICommand {
 	constructor(private $platformService: IPlatformService,
 		private $errors: IErrors) { }

lib/commands/run.ts

@@ -1,6 +1,3 @@
-///<reference path="../.d.ts"/>
-"use strict";
-
 export class RunCommandBase {
 	constructor(private $platformService: IPlatformService) { }
 

lib/commands/test-init.ts

@@ -1,7 +1,3 @@
-///<reference path="../.d.ts"/>
-
-"use strict";
-
 import * as path from 'path';
 import * as util from 'util';
 import {TESTING_FRAMEWORKS} from '../constants';

lib/commands/test.ts

@@ -1,7 +1,3 @@
-///<reference path="../.d.ts"/>
-
-"use strict";
-
 function RunTestCommandFactory(platform: string) {
 	return function RunTestCommand($testExecutionService: ITestExecutionService) {
 		this.execute = (args: string[]): IFuture<void> => $testExecutionService.startTestRunner(platform);

lib/commands/update-platform.ts

@@ -1,6 +1,3 @@
-///<reference path="../.d.ts"/>
-"use strict";
-
 export class UpdatePlatformCommand implements ICommand {
 	constructor(private $platformService: IPlatformService,
 		private $errors:IErrors) { }

lib/common

@@ -1,6 +1,3 @@
-///<reference path=".d.ts"/>
-"use strict";
-
 import * as path from "path";
 import {StaticConfigBase} from "./common/static-config-base";
 import {ConfigBase} from "./common/config-base";

lib/config.ts

@@ -1,6 +1,3 @@
-///<reference path=".d.ts"/>
-"use strict";
-
 export let APP_FOLDER_NAME = "app";
 export let APP_RESOURCES_FOLDER_NAME = "App_Resources";
 export let PROJECT_FRAMEWORK_FOLDER_NAME = "framework";