Merge pull request #76 from NativeScript/fatme/fixes

Fixes and improvements

Author: Fatme

lib/common

@@ -46,7 +46,7 @@ class AndroidProjectService implements IPlatformProjectService {
 			this.validateAndroidTarget(frameworkDir); // We need framework to be installed to validate android target so we can't call this method in validate()
 
 			var paths = "assets gen libs res".split(' ').map(p => path.join(frameworkDir, p));
-			shell.cp("-r", paths, projectRoot);
+			shell.cp("-R", paths, projectRoot);
 
 			paths = ".project AndroidManifest.xml project.properties".split(' ').map(p => path.join(frameworkDir, p));
 			shell.cp("-f", paths, projectRoot);
@@ -91,11 +91,11 @@ class AndroidProjectService implements IPlatformProjectService {
 			var assetsDirectory = path.join(platformData.projectRoot, "assets");
 			var resDirectory = path.join(platformData.projectRoot, "res");
 
-			shell.cp("-r", path.join(appSourceDirectory, "*"), assetsDirectory);
+			shell.cp("-Rf", path.join(appSourceDirectory, "*"), assetsDirectory);
 
 			var appResourcesDirectoryPath = path.join(assetsDirectory, constants.APP_RESOURCES_FOLDER_NAME);
 			if (this.$fs.exists(appResourcesDirectoryPath).wait()) {
-				shell.cp("-r", path.join(appResourcesDirectoryPath, platformData.normalizedPlatformName, "*"), resDirectory);
+				shell.cp("-Rf", path.join(appResourcesDirectoryPath, platformData.normalizedPlatformName, "*"), resDirectory);
 				this.$fs.deleteDirectory(appResourcesDirectoryPath).wait();
 			}
 
@@ -118,12 +118,12 @@ class AndroidProjectService implements IPlatformProjectService {
 			command = 'cmd';
 		}
 
-		var child = this.$childProcess.spawn(command, args, {stdio: "inherit"});
-		return this.$fs.futureFromEvent(child, "close");
+		return this.$childProcess.spawnFromEvent(command, args, "close", {stdio: "inherit"});
 	}
 
 	private getAntArgs(configuration: string, projectRoot: string): string[] {
 		var args = [configuration, "-f", path.join(projectRoot, "build.xml")];
+
 		return args;
 	}
 

lib/services/android-project-service.ts

@@ -61,7 +61,7 @@ class IOSProjectService implements  IPlatformProjectService {
 
 	public createProject(projectRoot: string, frameworkDir: string): IFuture<void> {
 		return (() => {
-			shell.cp("-r", path.join(frameworkDir, "*"), projectRoot);
+			shell.cp("-R", path.join(frameworkDir, "*"), projectRoot);
 		}).future<void>()();
 	}
 
@@ -89,11 +89,11 @@ class IOSProjectService implements  IPlatformProjectService {
 			var appDestinationDirectory = path.join(platformData.projectRoot, this.$projectData.projectName);
 			var resDirectory = path.join(platformData.projectRoot, this.$projectData.projectName, "Resources", "icons");
 
-			shell.cp("-r", path.join(appSourceDirectory, "*"), appDestinationDirectory);
+			shell.cp("-Rf", path.join(appSourceDirectory, "*"), appDestinationDirectory);
 
 			var appResourcesDirectoryPath = path.join(appDestinationDirectory, constants.APP_RESOURCES_FOLDER_NAME);
 			if (this.$fs.exists(appResourcesDirectoryPath).wait()) {
-				shell.cp("-r", path.join(appResourcesDirectoryPath, platformData.normalizedPlatformName, "*"), resDirectory);
+				shell.cp("-Rf", path.join(appResourcesDirectoryPath, platformData.normalizedPlatformName, "*"), resDirectory);
 				this.$fs.deleteDirectory(appResourcesDirectoryPath).wait();
 			}
 
@@ -128,7 +128,7 @@ class IOSProjectService implements  IPlatformProjectService {
 				]);
 			}
 
-			this.spawn("xcodebuild", args, "exit", {cwd: options, stdio: 'inherit'}).wait();
+			this.$childProcess.spawnFromEvent("xcodebuild", args, "exit", {cwd: options, stdio: 'inherit'}).wait();
 
 			if(options.device) {
 				var buildOutputPath = path.join(projectRoot, "build", options.device ? "device" : "emulator");
@@ -141,29 +141,11 @@ class IOSProjectService implements  IPlatformProjectService {
 					"-o", path.join(buildOutputPath, this.$projectData.projectName + ".ipa")
 				];
 
-				this.spawn("xcrun", xcrunArgs, "exit", {cwd: options, stdio: 'inherit'}).wait();
+				this.$childProcess.spawnFromEvent("xcrun", xcrunArgs, "exit", {cwd: options, stdio: 'inherit'}).wait();
 			}
 		}).future<void>()();
 	}
 
-	private spawn(command: string, args: string[], event: string, options?: any): IFuture<void> { // event should be exit or close
-		var future = new Future<void>();
-		var childProcess = this.$childProcess.spawn(command, args, options);
-		childProcess.once(event, () => {
-			var args = _.toArray(arguments);
-			var statusCode = args[0];
-			var signal = args[1];
-
-			if(statusCode !== 0) {
-				future.throw(util.format("Command %s exited with code %s", command, statusCode));
-			} else {
-				future.return();
-			}
-		});
-
-		return future;
-	}
-
 	private replaceFileContent(file: string): IFuture<void> {
 		return (() => {
 			var fileContent = this.$fs.readText(file).wait();

lib/services/ios-project-service.ts

@@ -143,14 +143,19 @@ export class PlatformService implements IPlatformService {
 
 			var appDirectoryPath = path.join(this.$projectData.projectDir, constants.APP_FOLDER_NAME);
 			var contents = this.$fs.readDirectory(appDirectoryPath).wait();
+			var files: string[] = [];
 
 			_.each(contents, d => {
 				var fsStat = this.$fs.getFsStats(path.join(appDirectoryPath, d)).wait();
 				if(fsStat.isDirectory() && d !== constants.APP_RESOURCES_FOLDER_NAME) {
 					this.processPlatformSpecificFiles(platform, helpers.enumerateFilesInDirectorySync(path.join(appFilesLocation, d))).wait();
+				} else if(fsStat.isFile()) {
+					files.push(path.join(appFilesLocation,d));
 				}
 			});
 
+			this.processPlatformSpecificFiles(platform, files).wait();
+
 			this.$logger.out("Project successfully prepared");
 
 		}).future<void>()();
@@ -236,7 +241,9 @@ export class PlatformService implements IPlatformService {
 			var packageFile = this.getLatestApplicationPackageForEmulator(platformData).wait().packageName;
 			this.$logger.out("Using ", packageFile);
 
-			emulatorServices.startEmulator(packageFile, options.emulator).wait();
+			var logFilePath = path.join(platformData.projectRoot, this.$projectData.projectName, "emulator.log");
+
+			emulatorServices.startEmulator(packageFile, {image: options.emulator, stderrFilePath: logFilePath, stdoutFilePath: logFilePath }).wait();
 		}).future<void>()();
 	}
 

lib/services/platform-service.ts

@@ -15,6 +15,7 @@ General commands:
                                     This lets you build the project with the SDK for the selected platform and deploy it on device.
     build                           Builds the project for the selected target platform and produces an application package.
     deploy                          Deploys the project to a connected device.
+    emulate                         Deploys the project on emulator.
     run                             Runs your project on a connected device. This is shorthand for prepare, build, and deploy.
     list-devices                    Lists all recognized connected devices.
     feature-usage-tracking          Configures anonymous feature usage tracking.
@@ -177,6 +178,8 @@ Runs your project on a connected device. This is shorthand for prepare, build, a
 Usage:
     $ tns emulate [<platform>]
 
+Deploys the project on emulator.
+
 --[/]--
 
 --[list-devices]--