Merge pull request #462 from NativeScript/fatme/cherrypick-commits-1.0.1

Cherrypick commits for 1.0.1release

Author: Fatme

lib/common

@@ -24,14 +24,14 @@ export class ProjectData implements IProjectData {
 			// If no project found, projectDir should be null
 			if(projectDir) {
 				this.projectDir = projectDir;
-				this.projectName = path.basename(projectDir);
+				this.projectName = this.$projectHelper.sanitizeName(path.basename(projectDir));
 				this.platformsDir = path.join(projectDir, "platforms");
 				this.projectFilePath = path.join(projectDir, this.$staticConfig.PROJECT_FILE_NAME);
 
 				if (this.$fs.exists(this.projectFilePath).wait()) {
 					try {
-					var fileContent = this.$fs.readJson(this.projectFilePath).wait();
-					this.projectId = fileContent.id;
+						var fileContent = this.$fs.readJson(this.projectFilePath).wait();
+						this.projectId = fileContent.id;
 					} catch (err) {
 						this.$errors.fail({formatStr: "The project file %s is corrupted." + os.EOL +
 							"Consider restoring an earlier version from your source control or backup." + os.EOL +

lib/project-data.ts

@@ -156,12 +156,6 @@ class AndroidProjectService implements IPlatformProjectService {
 		return this.$fs.exists(path.join(projectRoot, "assets", constants.APP_FOLDER_NAME));
 	}
 
-	private generateBuildFile(projDir: string, targetSdk: string): void {
-		this.$logger.info("Generate build.xml for %s", projDir);
-		var cmd = util.format("android update project -p %s --target %s --subprojects", projDir, targetSdk);
-		this.$childProcess.exec(cmd).wait();
-	}
-
 	private parseProjectProperties(projDir: string, destDir: string): void {
 		var projProp = path.join(projDir, "project.properties");
 
@@ -188,7 +182,8 @@ class AndroidProjectService implements IPlatformProjectService {
 		var targetDir = path.join(destDir, path.basename(projDir));
 		// TODO: parametrize targetSdk
 		var targetSdk = "android-17";
-		this.generateBuildFile(targetDir, targetSdk);
+		this.$logger.info("Generate build.xml for %s", targetDir);
+		this.runAndroidUpdate(targetDir, targetSdk).wait();
 	}
 
 	private getProjectReferences(projDir: string): ILibRef[]{

lib/services/android-project-service.ts

@@ -66,13 +66,11 @@ class IOSDebugService implements IDebugService {
 
 	private emulatorDebugBrk(): IFuture<void> {
 		return (() => {
-			var device = this.getRunningEmulatorOrRunNew().wait();
 			var platformData = this.$platformsData.getPlatformData(this.platform);
 			this.$platformService.buildPlatform(this.platform).wait();
 			var emulatorPackage = this.$platformService.getLatestApplicationPackageForEmulator(platformData).wait();
-			device.installApp(emulatorPackage.packageName).wait();
 			this.executeOpenDebuggerClient().wait();
-			device.launchApp(this.$projectData.projectId, "--nativescript-debug-brk").wait();
+			this.$iOSEmulatorServices.startEmulator(emulatorPackage.packageName, { args: "--nativescript-debug-brk" }).wait();
 		}).future<void>()();
 	}
 

lib/services/ios-debug-service.ts

@@ -230,7 +230,7 @@ class IOSProjectService implements  IPlatformProjectService {
                 this.$errors.failWithoutHelp("The bundle at %s does not contain an Info.plist file.", libraryPath);
             }
 
-            var packageType = this.$childProcess.exec('/usr/libexec/PlistBuddy -c "Print :CFBundlePackageType" ' + infoPlistPath).wait().trim();
+            var packageType = this.$childProcess.exec(`/usr/libexec/PlistBuddy -c "Print :CFBundlePackageType" "${infoPlistPath}"`).wait().trim();
             if (packageType !== "FMWK") {
                 this.$errors.failWithoutHelp("The bundle at %s does not appear to be a dynamic framework.", libraryPath);
             }

lib/services/ios-project-service.ts

@@ -10,6 +10,8 @@ import shell = require("shelljs");
 import util = require("util");
 
 export class ProjectService implements IProjectService {
+	private static DEFAULT_APP_IDENTIFIER_PREFIX = "org.nativescript";
+
 	constructor(private $errors: IErrors,
 		private $fs: IFileSystem,
 		private $logger: ILogger,
@@ -25,7 +27,7 @@ export class ProjectService implements IProjectService {
 			}
 			this.$projectNameValidator.validate(projectName);
 
-			var projectId = options.appid || this.$projectHelper.generateDefaultAppId(projectName, "org.nativescript");
+			var projectId = options.appid || this.$projectHelper.generateDefaultAppId(projectName, ProjectService.DEFAULT_APP_IDENTIFIER_PREFIX);
 
 			var projectDir = path.join(path.resolve(options.path || "."), projectName);
 			this.$fs.createDirectory(projectDir).wait();

lib/services/project-service.ts

@@ -36,7 +36,7 @@
     "gaze": "0.5.1",
     "iconv-lite": "0.4.4",
     "inquirer": "0.8.2",
-    "ios-sim-portable": "1.0.5",
+    "ios-sim-portable": "1.0.6",
     "lockfile": "1.0.0",
     "lodash": "3.6.0",
     "log4js": "0.6.22",

package.json

@@ -321,6 +321,10 @@ export class ProjectHelperStub implements IProjectHelper {
 	generateDefaultAppId(appName: string, baseAppId: string): string {
 		return "org.nativescript";
 	}
+
+	sanitizeName(appName: string): string {
+		return "";
+	}
 }
 
 export class ProjectTemplatesService implements IProjectTemplatesService {