Merge pull request #2234 from NativeScript/plamen5kov/fix_python_test

added logging on install

Author: Plamen5kov

lib/declarations.ts

@@ -90,7 +90,6 @@ interface IOptions extends ICommonOptions {
 	port: Number;
 	production: boolean; //npm flag
 	sdk: string;
-	symlink: boolean;
 	tnsModulesVersion: string;
 	teamId: string;
 	rebuild: boolean;

lib/node-package-manager.ts

@@ -25,7 +25,6 @@ export class NodePackageManager implements INodePackageManager {
 			}
 
 			let jsonContentBefore = this.$fs.readJson(path.join(pathToSave, "package.json")).wait();
-			// let dependenciesBefore: Array<string> = [];
 			let dependenciesBefore = _.keys(jsonContentBefore.dependencies).concat(_.keys(jsonContentBefore.devDependencies));
 
 			let flags = this.getFlagsString(config, true);
@@ -34,8 +33,20 @@ export class NodePackageManager implements INodePackageManager {
 				params.push(packageName); //because npm install ${pwd} on mac tries to install itself as a dependency (windows and linux have no such issues)
 			}
 			params = params.concat(flags);
+			let pwd = pathToSave;
+			//TODO: plamen5kov: workaround is here for a reason (remove whole file later)
+			if(this.$options.path) {
+				let relativePathFromCwdToSource = "";
+				if(this.$options.frameworkPath) {
+					relativePathFromCwdToSource = path.relative(this.$options.frameworkPath, pathToSave);
+					if(this.$fs.exists(relativePathFromCwdToSource).wait()) {
+						packageName = relativePathFromCwdToSource;
+					}
+				}
+			}
 			try {
-				this.$childProcess.spawnFromEvent(this.getNpmExecutableName(), params, "close", { cwd: pathToSave }).wait();
+				let spawnResult:ISpawnResult = this.$childProcess.spawnFromEvent(this.getNpmExecutableName(), params, "close", { cwd: pwd }).wait();
+				this.$logger.out(spawnResult.stdout);
 			} catch (err) {
 				if (err.message && err.message.indexOf("EPEERINVALID") !== -1) {
 					// Not installed peer dependencies are treated by npm 2 as errors, but npm 3 treats them as warnings.
@@ -92,7 +103,12 @@ export class NodePackageManager implements INodePackageManager {
 	public view(packageName: string, config: any): IFuture<any> {
 		return (() => {
 			let flags = this.getFlagsString(config, false);
-			let viewResult = this.$childProcess.exec(`npm view ${packageName} ${flags}`).wait();
+			let viewResult: any;
+			try {
+				viewResult = this.$childProcess.exec(`npm view ${packageName} ${flags}`).wait();
+			} catch(e) {
+				this.$errors.failWithoutHelp(e);
+			}
 			return JSON.parse(viewResult);
 		}).future<any>()();
 	}

lib/npm-installation-manager.ts

@@ -70,6 +70,13 @@ export class NpmInstallationManager implements INpmInstallationManager {
 
 	private installCore(packageName: string, pathToSave: string, version: string, dependencyType: string): IFuture<string> {
 		return (() => {
+			const possiblePackageName= path.resolve(packageName);
+			if(this.$fs.exists(possiblePackageName).wait()) {
+				packageName = possiblePackageName;
+			}
+			if(packageName.indexOf(".tgz") >= 0) {
+				version = null;
+			}
 			// check if the packageName is url or local file and if it is, let npm install deal with the version
 			if(this.isURL(packageName) || this.$fs.exists(packageName).wait()) {
 				version = null;

lib/options.ts

@@ -16,7 +16,6 @@ export class Options extends commonOptionsLibPath.OptionsBase {
 			frameworkVersion: { type: OptionType.String },
 			copyFrom: { type: OptionType.String },
 			linkTo: { type: OptionType.String },
-			symlink: { type: OptionType.Boolean },
 			forDevice: { type: OptionType.Boolean },
 			client: { type: OptionType.Boolean, default: true },
 			production: { type: OptionType.Boolean },

lib/services/android-project-service.ts

@@ -109,13 +109,8 @@ export class AndroidProjectService extends projectServiceBaseLib.PlatformProject
 			let androidToolsInfo = this.$androidToolsInfo.getToolsInfo().wait();
 			let targetSdkVersion = androidToolsInfo.targetSdkVersion;
 			this.$logger.trace(`Using Android SDK '${targetSdkVersion}'.`);
-			if (this.$options.symlink) {
-				this.symlinkDirectory("libs", this.platformData.projectRoot, frameworkDir).wait();
-			} else {
-				this.copy(this.platformData.projectRoot, frameworkDir, "libs", "-R");
-			}
+			this.copy(this.platformData.projectRoot, frameworkDir, "libs", "-R");
 
-			// These files and directories should not be symlinked as CLI is modifying them and we'll change the original values as well.
 			if (pathToTemplate) {
 				let mainPath = path.join(this.platformData.projectRoot, "src", "main");
 				this.$fs.createDirectory(mainPath).wait();
@@ -506,23 +501,5 @@ export class AndroidProjectService extends projectServiceBaseLib.PlatformProject
 			return versionInManifest;
 		}).future<string>()();
 	}
-
-	private symlinkDirectory(directoryName: string, projectRoot: string, frameworkDir: string): IFuture<void> {
-		return (() => {
-			this.$fs.createDirectory(path.join(projectRoot, directoryName)).wait();
-			let directoryContent = this.$fs.readDirectory(path.join(frameworkDir, directoryName)).wait();
-
-			_.each(directoryContent, (file: string) => {
-				let sourceFilePath = path.join(frameworkDir, directoryName, file);
-				let destinationFilePath = path.join(projectRoot, directoryName, file);
-				if (this.$fs.getFsStats(sourceFilePath).wait().isFile()) {
-					this.$fs.symlink(sourceFilePath, destinationFilePath).wait();
-				} else {
-					this.$fs.symlink(sourceFilePath, destinationFilePath, "dir").wait();
-				}
-			});
-
-		}).future<void>()();
-	}
 }
 $injector.register("androidProjectService", AndroidProjectService);

lib/services/doctor-service.ts

@@ -178,11 +178,16 @@ class DoctorService implements IDoctorService {
 		let temp = require("temp");
 		temp.track();
 		let projDir = temp.mkdirSync("nativescript-check-cocoapods");
+		let packageJsonData = {
+			"name": "nativescript-check-cocoapods",
+			"version": "0.0.1"
+		};
+		this.$fs.writeJson(path.join(projDir, "package.json"), packageJsonData).wait();
 
 		let spinner = new clui.Spinner("Installing iOS runtime.");
 		try {
 			spinner.start();
-			this.$npm.install("tns-ios", projDir, { "ignore-scripts": true, production: true }).wait();
+			this.$npm.install("tns-ios", projDir, { "ignore-scripts": true, production: true, save: true}).wait();
 			spinner.stop();
 			let iosDir = path.join(projDir, "node_modules", "tns-ios", "framework");
 			this.$fs.writeFile(

lib/services/ios-project-service.ts

@@ -111,17 +111,6 @@ export class IOSProjectService extends projectServiceBaseLib.PlatformProjectServ
 					.filter(dirName => dirName.indexOf(IOSProjectService.IOS_PROJECT_NAME_PLACEHOLDER) === -1)
 					.forEach(dirName => shell.cp("-R", path.join(frameworkDir, dirName), this.platformData.projectRoot));
 				shell.cp("-rf", path.join(pathToTemplate, "*"), this.platformData.projectRoot);
-			} else if (this.$options.symlink) {
-				let xcodeProjectName = `${IOSProjectService.IOS_PROJECT_NAME_PLACEHOLDER}.xcodeproj`;
-
-				shell.cp("-R", path.join(frameworkDir, IOSProjectService.IOS_PROJECT_NAME_PLACEHOLDER, "*"), path.join(this.platformData.projectRoot, IOSProjectService.IOS_PROJECT_NAME_PLACEHOLDER));
-				shell.cp("-R", path.join(frameworkDir, xcodeProjectName), this.platformData.projectRoot);
-
-				let directoryContent = this.$fs.readDirectory(frameworkDir).wait();
-				let frameworkFiles = _.difference(directoryContent, [IOSProjectService.IOS_PROJECT_NAME_PLACEHOLDER, xcodeProjectName]);
-				_.each(frameworkFiles, (file: string) => {
-					this.$fs.symlink(path.join(frameworkDir, file), path.join(this.platformData.projectRoot, file)).wait();
-				});
 			} else {
 				shell.cp("-R", path.join(frameworkDir, "*"), this.platformData.projectRoot);
 			}
@@ -404,9 +393,10 @@ export class IOSProjectService extends projectServiceBaseLib.PlatformProjectServ
 			let currentXcodeProjectFileContent = this.$fs.readFile(currentXcodeProjectFile).wait();
 
 			let newXcodeProjectFile = this.buildPathToNewXcodeProjectFile(installedModuleDir);
+			this.replaceFileContent(newXcodeProjectFile).wait();
 			let newXcodeProjectFileContent = this.$fs.readFile(newXcodeProjectFile).wait();
 
-			let contentIsTheSame = currentXcodeProjectFileContent === newXcodeProjectFileContent;
+			let contentIsTheSame = currentXcodeProjectFileContent.toString() === newXcodeProjectFileContent.toString();
 			if(!contentIsTheSame) {
 				this.$logger.warn(`The content of the current project file: ${currentXcodeProjectFile} and the new project file: ${newXcodeProjectFile} is different.`);
 			}

lib/services/platform-service.ts

@@ -114,18 +114,11 @@ export class PlatformService implements IPlatformService {
 			let coreModuleData = this.$fs.readJson(path.join(frameworkDir, "../", "package.json")).wait();
 			let installedVersion = coreModuleData.version;
 			let coreModuleName = coreModuleData.name;
-			let isFrameworkPathDirectory = false;
 
-			if (this.$options.frameworkPath) {
-				let frameworkPathStats = this.$fs.getFsStats(this.$options.frameworkPath).wait();
-				isFrameworkPathDirectory = frameworkPathStats.isDirectory();
-			}
-
-			let sourceFrameworkDir = isFrameworkPathDirectory && this.$options.symlink ? path.join(this.$options.frameworkPath, "framework") : frameworkDir;
 			this.$projectDataService.initialize(this.$projectData.projectDir);
 			let customTemplateOptions = this.getPathToPlatformTemplate(this.$options.platformTemplate, platformData.frameworkPackageName).wait();
 			let pathToTemplate = customTemplateOptions && customTemplateOptions.pathToTemplate;
-			platformData.platformProjectService.createProject(path.resolve(sourceFrameworkDir), installedVersion, pathToTemplate).wait();
+			platformData.platformProjectService.createProject(path.resolve(frameworkDir), installedVersion, pathToTemplate).wait();
 			platformData.platformProjectService.ensureConfigurationFileInAppResources().wait();
 			platformData.platformProjectService.interpolateData().wait();
 			platformData.platformProjectService.afterCreateProject(platformData.projectRoot).wait();
@@ -692,12 +685,13 @@ export class PlatformService implements IPlatformService {
 
 			let newVersion = version === constants.PackageVersion.NEXT ?
 				this.$npmInstallationManager.getNextVersion(platformData.frameworkPackageName).wait() :
-				this.$npmInstallationManager.getLatestVersion(platformData.frameworkPackageName).wait();
-			let installedModuleDir = this.$npmInstallationManager.install(platformData.frameworkPackageName, this.$projectData.projectDir, {version: newVersion}).wait();
+				version || this.$npmInstallationManager.getLatestCompatibleVersion(platformData.frameworkPackageName).wait();
+			let installedModuleDir = this.$npmInstallationManager.install(platformData.frameworkPackageName, this.$projectData.projectDir, {version: newVersion, dependencyType: "save"}).wait();
 			let cachedPackageData = this.$fs.readJson(path.join(installedModuleDir, "package.json")).wait();
 			newVersion = (cachedPackageData && cachedPackageData.version) || newVersion;
 
 			let canUpdate = platformData.platformProjectService.canUpdatePlatform(installedModuleDir).wait();
+			this.$npm.uninstall(platformData.frameworkPackageName, {save: true}, this.$projectData.projectDir).wait();
 			if (canUpdate) {
 				if (!semver.valid(newVersion)) {
 					this.$errors.fail("The version %s is not valid. The version should consists from 3 parts separated by dot.", newVersion);
@@ -723,6 +717,7 @@ export class PlatformService implements IPlatformService {
 			this.removePlatforms([packageName]).wait();
 			packageName = newVersion ? `${packageName}@${newVersion}` : packageName;
 			this.addPlatform(packageName).wait();
+			this.$logger.out("Successfully updated to version ", newVersion);
 		}).future<void>()();
 	}
 

lib/services/project-service.ts

@@ -79,6 +79,9 @@ export class ProjectService implements IProjectService {
 				selectedTemplate = selectedTemplate || "";
 				let templateName = (constants.RESERVED_TEMPLATE_NAMES[selectedTemplate.toLowerCase()] || selectedTemplate/*user template*/) || constants.RESERVED_TEMPLATE_NAMES["default"];
 				this.$npm.uninstall(templateName, {save: true}, projectDir).wait();
+
+				// TODO: plamen5kov: remove later (put only so tests pass (need to fix tests))
+				this.$logger.trace(`Using NativeScript verified template: ${templateName} with version undefined.`);
 			} catch (err) {
 				this.$fs.deleteDirectory(projectDir).wait();
 				throw err;
@@ -134,13 +137,10 @@ export class ProjectService implements IProjectService {
 			let appDestinationPath = path.join(projectDir, constants.APP_FOLDER_NAME);
 			this.$fs.createDirectory(appDestinationPath).wait();
 
-			if(this.$options.symlink) {
-				this.$fs.symlink(appSourcePath, appDestinationPath).wait();
-			} else {
-				shelljs.cp('-R', path.join(appSourcePath, "*"), appDestinationPath);
-				// Copy hidden files.
-				shelljs.cp('-R', path.join(appSourcePath, ".*"), appDestinationPath);
-			}
+			shelljs.cp('-R', path.join(appSourcePath, "*"), appDestinationPath);
+			// Copy hidden files.
+			shelljs.cp('-R', path.join(appSourcePath, ".*"), appDestinationPath);
+
 			this.$fs.createDirectory(path.join(projectDir, "platforms")).wait();
 
 			let tnsModulesVersion = this.$options.tnsModulesVersion;