Emit build output when necessary

Author: Dimitar Kerezov

lib/bootstrap.ts

@@ -20,7 +20,6 @@ $injector.require("tnsModulesService", "./services/tns-modules-service");
 
 $injector.require("platformsData", "./platforms-data");
 $injector.require("platformService", "./services/platform-service");
-$injector.requirePublic("localBuildService", "./services/local-build-service");
 
 $injector.require("iOSDebugService", "./services/ios-debug-service");
 $injector.require("androidDebugService", "./services/android-debug-service");

lib/common

@@ -67,3 +67,4 @@ export const ItunesConnectApplicationTypes = new ItunesConnectApplicationTypesCl
 
 export const ANGULAR_NAME = "angular";
 export const TYPESCRIPT_NAME = "typescript";
+export const BUILD_OUTPUT_EVENT_NAME = "buildOutput";

lib/constants.ts

@@ -1,4 +1,4 @@
-interface IPlatformService {
+interface IPlatformService extends NodeJS.EventEmitter {
 	addPlatforms(platforms: string[], platformTemplate: string, projectData: IProjectData): Promise<void>;
 
 	/**

lib/definitions/platform.d.ts

@@ -122,6 +122,7 @@ interface IBuildConfig extends IAndroidBuildOptionsSettings {
 	projectDir: string;
 	clean?: boolean;
 	architectures?: string[];
+	buildOutputStdio?: string;
 }
 
 /**
@@ -142,7 +143,7 @@ interface IiOSBuildConfig extends IBuildConfig, IRelease, IDeviceIdentifier, IPr
 	teamIdentifier?: string;
 }
 
-interface IPlatformProjectService {
+interface IPlatformProjectService extends NodeJS.EventEmitter {
 	getPlatformData(projectData: IProjectData): IPlatformData;
 	validate(projectData: IProjectData): Promise<void>;
 	createProject(frameworkDir: string, frameworkVersion: string, projectData: IProjectData, pathToTemplate?: string): Promise<void>;

lib/definitions/project.d.ts

@@ -8,3 +8,4 @@ $injector.overrideAlreadyRequiredModule = true;
 $injector.requirePublic("companionAppsService", "./common/appbuilder/services/livesync/companion-apps-service");
 $injector.requirePublicClass("deviceEmitter", "./common/appbuilder/device-emitter");
 $injector.requirePublicClass("deviceLogProvider", "./common/appbuilder/device-log-provider");
+$injector.requirePublicClass("localBuildService", "./services/local-build-service");

lib/nativescript-cli-lib-bootstrap.ts

@@ -250,7 +250,14 @@ export class AndroidProjectService extends projectServiceBaseLib.PlatformProject
 			if (this.$hostInfo.isWindows) {
 				gradleBin += ".bat"; // cmd command line parsing rules are weird. Avoid issues with quotes. See https://github.com/apache/cordova-android/blob/master/bin/templates/cordova/lib/builders/GradleBuilder.js for another approach
 			}
-			await this.spawn(gradleBin, buildOptions, { stdio: "inherit", cwd: this.getPlatformData(projectData).projectRoot });
+
+			this.$childProcess.on(constants.BUILD_OUTPUT_EVENT_NAME, (data: any) => {
+				this.emit(constants.BUILD_OUTPUT_EVENT_NAME, data);
+			});
+			await this.spawn(gradleBin,
+				buildOptions,
+				{ stdio: buildConfig.buildOutputStdio || "inherit", cwd: this.getPlatformData(projectData).projectRoot },
+				{ emitOptions: { shouldEmit: true, eventName: constants.BUILD_OUTPUT_EVENT_NAME }, throwError: false });
 		} else {
 			this.$errors.failWithoutHelp("Cannot complete build because this project is ANT-based." + EOL +
 				"Run `tns platform remove android && tns platform add android` to switch to Gradle and try again.");
@@ -437,8 +444,8 @@ export class AndroidProjectService extends projectServiceBaseLib.PlatformProject
 		shell.cp(cpArg, paths, projectRoot);
 	}
 
-	private async spawn(command: string, args: string[], opts?: any): Promise<ISpawnResult> {
-		return this.$childProcess.spawnFromEvent(command, args, "close", opts || { stdio: "inherit" });
+	private async spawn(command: string, args: string[], opts?: any, spawnOpts?: ISpawnFromEventOptions): Promise<ISpawnResult> {
+		return this.$childProcess.spawnFromEvent(command, args, "close", opts || { stdio: "inherit" }, spawnOpts);
 	}
 
 	private validatePackageName(packageName: string): void {

lib/services/android-project-service.ts

@@ -259,10 +259,13 @@ export class IOSProjectService extends projectServiceBaseLib.PlatformProjectServ
 		// 	}
 		// }
 
+		this.$childProcess.on(constants.BUILD_OUTPUT_EVENT_NAME, (data: any) => {
+			this.emit(constants.BUILD_OUTPUT_EVENT_NAME, data);
+		});
 		if (buildConfig.buildForDevice) {
 			await this.buildForDevice(projectRoot, basicArgs, buildConfig, projectData);
 		} else {
-			await this.buildForSimulator(projectRoot, basicArgs, buildConfig);
+			await this.buildForSimulator(projectRoot, basicArgs, projectData, buildConfig.buildOutputStdio);
 		}
 
 	}
@@ -319,10 +322,14 @@ export class IOSProjectService extends projectServiceBaseLib.PlatformProjectServ
 		}
 
 		// this.$logger.out("xcodebuild...");
-		await this.$childProcess.spawnFromEvent("xcodebuild", args, "exit", { stdio: 'inherit' });
+		await this.$childProcess.spawnFromEvent("xcodebuild",
+			args,
+			"exit",
+			{ stdio: buildConfig.buildOutputStdio || "inherit", cwd: this.getPlatformData(projectData).projectRoot },
+			{ emitOptions: { shouldEmit: true, eventName: constants.BUILD_OUTPUT_EVENT_NAME }, throwError: false });
 		// this.$logger.out("xcodebuild build succeded.");
 
-		await this.createIpa(projectRoot, projectData);
+		await this.createIpa(projectRoot, projectData, buildConfig.buildOutputStdio);
 	}
 
 	private async setupSigningFromProvision(projectRoot: string, projectData: IProjectData, provision?: any): Promise<void> {
@@ -394,7 +401,7 @@ export class IOSProjectService extends projectServiceBaseLib.PlatformProjectServ
 		}
 	}
 
-	private async buildForSimulator(projectRoot: string, args: string[], buildConfig?: IiOSBuildConfig): Promise<void> {
+	private async buildForSimulator(projectRoot: string, args: string[], projectData: IProjectData, buildOutputStdio?: string): Promise<void> {
 		args = args.concat([
 			"-sdk", "iphonesimulator",
 			"ARCHS=i386 x86_64",
@@ -404,10 +411,12 @@ export class IOSProjectService extends projectServiceBaseLib.PlatformProjectServ
 			"CODE_SIGN_IDENTITY="
 		]);
 
-		await this.$childProcess.spawnFromEvent("xcodebuild", args, "exit", { stdio: 'inherit' });
+		await this.$childProcess.spawnFromEvent("xcodebuild", args, "exit",
+			{ stdio: buildOutputStdio || "inherit", cwd: this.getPlatformData(projectData).projectRoot },
+			{ emitOptions: { shouldEmit: true, eventName: constants.BUILD_OUTPUT_EVENT_NAME }, throwError: false });
 	}
 
-	private async createIpa(projectRoot: string, projectData: IProjectData): Promise<void> {
+	private async createIpa(projectRoot: string, projectData: IProjectData, buildOutputStdio?: string): Promise<void> {
 		let buildOutputPath = path.join(projectRoot, "build", "device");
 		let xcrunArgs = [
 			"-sdk", "iphoneos",
@@ -419,7 +428,9 @@ export class IOSProjectService extends projectServiceBaseLib.PlatformProjectServ
 		xcrunArgs.push("-verbose");
 		// }
 		// this.$logger.out("Packaging project...");
-		await this.$childProcess.spawnFromEvent("xcrun", xcrunArgs, "exit", { stdio: 'inherit' });
+		await this.$childProcess.spawnFromEvent("xcrun", xcrunArgs, "exit",
+			{ stdio: buildOutputStdio || "inherit", cwd: this.getPlatformData(projectData).projectRoot },
+			{ emitOptions: { shouldEmit: true, eventName: constants.BUILD_OUTPUT_EVENT_NAME }, throwError: false });
 		// this.$logger.out("Project package succeeded.");
 	}
 
@@ -623,12 +634,12 @@ We will now place an empty obsolete compatability white screen LauncScreen.xib f
 
 	private getInfoPlistPath(projectData: IProjectData): string {
 		return path.join(
-				projectData.projectDir,
-				constants.APP_FOLDER_NAME,
-				constants.APP_RESOURCES_FOLDER_NAME,
-				this.getPlatformData(projectData).normalizedPlatformName,
-				this.getPlatformData(projectData).configurationFileName
-			);
+			projectData.projectDir,
+			constants.APP_FOLDER_NAME,
+			constants.APP_RESOURCES_FOLDER_NAME,
+			this.getPlatformData(projectData).normalizedPlatformName,
+			this.getPlatformData(projectData).configurationFileName
+		);
 	}
 
 	public ensureConfigurationFileInAppResources(): void {

lib/services/ios-project-service.ts

@@ -1,13 +1,21 @@
-import { exportedPromise } from "../common/decorators";
+// import { exportedPromise } from "../common/decorators";
+import { EventEmitter } from "events";
+import { BUILD_OUTPUT_EVENT_NAME } from "../constants";
 
-export class LocalBuildService {
+export class LocalBuildService extends EventEmitter {
 	constructor(private $projectData: IProjectData,
-	private $platformService: IPlatformService) { }
+	private $platformService: IPlatformService) {
+		super();
+	}
 
-	@exportedPromise("localBuildService")
 	public async build(platform: string, platformBuildOptions: IPlatformBuildData, platformTemplate?: string): Promise<string> {
 		this.$projectData.initializeProjectData(platformBuildOptions.projectDir);
 		await this.$platformService.preparePlatform(platform, platformBuildOptions, platformTemplate, this.$projectData, undefined);
+		this.$platformService.on(BUILD_OUTPUT_EVENT_NAME, (data: any) => {
+			data.projectDir = platformBuildOptions.projectDir;
+			this.emit(BUILD_OUTPUT_EVENT_NAME, data);
+		});
+		platformBuildOptions.buildOutputStdio = "pipe";
 		await this.$platformService.buildPlatform(platform, platformBuildOptions, this.$projectData);
 		return this.$platformService.lastOutputPath(platform, { isForDevice: platformBuildOptions.buildForDevice }, this.$projectData);
 	}

lib/services/local-build-service.ts

@@ -1,6 +1,9 @@
-export class PlatformProjectServiceBase implements IPlatformProjectServiceBase {
+import { EventEmitter } from "events";
+
+export class PlatformProjectServiceBase extends EventEmitter implements IPlatformProjectServiceBase {
 	constructor(protected $fs: IFileSystem,
 		protected $projectDataService: IProjectDataService) {
+			super();
 	}
 
 	public getPluginPlatformsFolderPath(pluginData: IPluginData, platform: string): string {

lib/services/platform-project-service-base.ts

@@ -3,14 +3,15 @@ import * as shell from "shelljs";
 import * as constants from "../constants";
 import * as helpers from "../common/helpers";
 import * as semver from "semver";
+import { EventEmitter } from "events";
 import { AppFilesUpdater } from "./app-files-updater";
 import * as temp from "temp";
 temp.track();
 let clui = require("clui");
 
 const buildInfoFileName = ".nsbuildinfo";
 
-export class PlatformService implements IPlatformService {
+export class PlatformService extends EventEmitter implements IPlatformService {
 	// Type with hooks needs to have either $hooksService or $injector injected.
 	// In order to stop TypeScript from failing for not used $hooksService, use it here.
 	private get _hooksService(): IHooksService {
@@ -39,7 +40,9 @@ export class PlatformService implements IPlatformService {
 		private $deviceAppDataFactory: Mobile.IDeviceAppDataFactory,
 		private $projectChangesService: IProjectChangesService,
 		private $emulatorPlatformService: IEmulatorPlatformService,
-		private $analyticsService: IAnalyticsService) { }
+		private $analyticsService: IAnalyticsService) {
+		super();
+	}
 
 	public async addPlatforms(platforms: string[], platformTemplate: string, projectData: IProjectData): Promise<void> {
 		let platformsDir = projectData.platformsDir;
@@ -362,6 +365,9 @@ export class PlatformService implements IPlatformService {
 		await this.trackProjectType(projectData);
 
 		let platformData = this.$platformsData.getPlatformData(platform, projectData);
+		platformData.platformProjectService.on(constants.BUILD_OUTPUT_EVENT_NAME, (data: any) => {
+			this.emit(constants.BUILD_OUTPUT_EVENT_NAME, data);
+		});
 		await platformData.platformProjectService.buildProject(platformData.projectRoot, projectData, buildConfig);
 		let prepareInfo = this.$projectChangesService.getPrepareInfo(platform, projectData);
 		let buildInfoFilePath = this.getBuildOutputPath(platform, platformData, buildConfig.buildForDevice);

lib/services/platform-service.ts

@@ -2,6 +2,7 @@
 
 import * as util from "util";
 import * as chai from "chai";
+import { EventEmitter } from "events";
 
 export class LoggerStub implements ILogger {
 	setLevel(level: string): void { }
@@ -237,12 +238,12 @@ export class ProjectDataStub implements IProjectData {
 	appResourcesDirectoryPath: string;
 	devDependencies: IStringDictionary;
 	projectType: string;
-	initializeProjectData(projectDir? :string): void {
+	initializeProjectData(projectDir?: string): void {
 		this.projectDir = this.projectDir || projectDir;
 	}
 }
 
-export class PlatformsDataStub implements IPlatformsData {
+export class PlatformsDataStub extends EventEmitter implements IPlatformsData {
 	public platformsNames: string[];
 
 	public getPlatformData(platform: string, projectData: IProjectData): IPlatformData {
@@ -266,7 +267,7 @@ export class PlatformsDataStub implements IPlatformsData {
 	}
 }
 
-export class PlatformProjectServiceStub implements IPlatformProjectService {
+export class PlatformProjectServiceStub extends EventEmitter implements IPlatformProjectService {
 	getPlatformData(projectData: IProjectData): IPlatformData {
 		return {
 			frameworkPackageName: "",
@@ -570,7 +571,7 @@ export class CommandsService implements ICommandsService {
 	}
 }
 
-export class PlatformServiceStub implements IPlatformService {
+export class PlatformServiceStub extends EventEmitter implements IPlatformService {
 
 	public validateOptions(): Promise<boolean> {
 		return Promise.resolve(true);