chore: Merge release in master

Author: rosen-vladimirov

CHANGELOG.md

@@ -1,6 +1,13 @@
 NativeScript CLI Changelog
 ================
 
+4.0.2 (2018, May 18)
+==
+
+### Fixed
+* [Fixed #3595](https://github.com/NativeScript/nativescript-cli/issues/3595): Do not track local paths in Analytics
+* [Fixed #3597](https://github.com/NativeScript/nativescript-cli/issues/3597): Users who subscribe to Progess Newsletter are not informed for the privacy policy
+
 4.0.1 (2018, May 11)
 ==
 

lib/constants.ts

@@ -1,3 +1,5 @@
+require("colors");
+
 export const APP_FOLDER_NAME = "app";
 export const APP_RESOURCES_FOLDER_NAME = "App_Resources";
 export const PROJECT_FRAMEWORK_FOLDER_NAME = "framework";
@@ -78,6 +80,8 @@ export const RESERVED_TEMPLATE_NAMES: IStringDictionary = {
 	"angular": "tns-template-hello-world-ng"
 };
 
+export const ANALYTICS_LOCAL_TEMPLATE_PREFIX = "localTemplate_";
+
 export class ITMSConstants {
 	static ApplicationMetadataFile = "metadata.xml";
 	static VerboseLoggingLevels = {
@@ -178,3 +182,10 @@ export class MacOSVersions {
 }
 
 export const MacOSDeprecationStringFormat = "Support for macOS %s is deprecated and will be removed in one of the next releases of NativeScript. Please, upgrade to the latest macOS version.";
+export const PROGRESS_PRIVACY_POLICY_URL = "https://www.progress.com/legal/privacy-policy";
+export class SubscribeForNewsletterMessages {
+	public static AgreeToReceiveEmailMsg = "I agree to receive email communications from Progress Software or its Partners (`https://www.progress.com/partners/partner-directory`)," +
+		"containing information about Progress Software's products. Consent may be withdrawn at any time.";
+	public static ReviewPrivacyPolicyMsg = `You can review the Progress Software Privacy Policy at \`${PROGRESS_PRIVACY_POLICY_URL}\``;
+	public static PromptMsg = "Input your e-mail address to agree".green + " or " + "leave empty to decline".red.bold + ":";
+}

lib/services/project-templates-service.ts

@@ -18,15 +18,18 @@ export class ProjectTemplatesService implements IProjectTemplatesService {
 
 		const templateName = constants.RESERVED_TEMPLATE_NAMES[name.toLowerCase()] || name;
 
-		await this.$analyticsService.track("Template used for project creation", templateName);
+		const realTemplatePath = await this.prepareNativeScriptTemplate(templateName, version, projectDir);
 
-		await this.$analyticsService.trackEventActionInGoogleAnalytics({
-			action: constants.TrackActionNames.CreateProject,
-			isForDevice: null,
-			additionalData: templateName
-		});
+		await this.$analyticsService.track("Template used for project creation", templateName);
 
-		const realTemplatePath = await this.prepareNativeScriptTemplate(templateName, version, projectDir);
+		const templateNameToBeTracked = this.getTemplateNameToBeTracked(templateName, realTemplatePath);
+		if (templateNameToBeTracked) {
+			await this.$analyticsService.trackEventActionInGoogleAnalytics({
+				action: constants.TrackActionNames.CreateProject,
+				isForDevice: null,
+				additionalData: templateNameToBeTracked
+			});
+		}
 
 		// this removes dependencies from templates so they are not copied to app folder
 		this.$fs.deleteDirectory(path.join(realTemplatePath, constants.NODE_MODULES_FOLDER_NAME));
@@ -46,5 +49,25 @@ export class ProjectTemplatesService implements IProjectTemplatesService {
 		this.$logger.trace(`Using NativeScript verified template: ${templateName} with version ${version}.`);
 		return this.$npmInstallationManager.install(templateName, projectDir, { version: version, dependencyType: "save" });
 	}
+
+	private getTemplateNameToBeTracked(templateName: string, realTemplatePath: string): string {
+		try {
+			if (this.$fs.exists(templateName)) {
+				// local template is used
+				const pathToPackageJson = path.join(realTemplatePath, constants.PACKAGE_JSON_FILE_NAME);
+				let templateNameToTrack = path.basename(templateName);
+				if (this.$fs.exists(pathToPackageJson)) {
+					const templatePackageJsonContent = this.$fs.readJson(pathToPackageJson);
+					templateNameToTrack = templatePackageJsonContent.name;
+				}
+
+				return `${constants.ANALYTICS_LOCAL_TEMPLATE_PREFIX}${templateNameToTrack}`;
+			}
+
+			return templateName;
+		} catch (err) {
+			this.$logger.trace(`Unable to get template name to be tracked, error is: ${err}`);
+		}
+	}
 }
 $injector.register("projectTemplatesService", ProjectTemplatesService);

lib/services/subscription-service.ts

@@ -1,6 +1,7 @@
 import * as emailValidator from "email-validator";
 import * as queryString from "querystring";
 import * as helpers from "../common/helpers";
+import { SubscribeForNewsletterMessages } from "../constants";
 
 export class SubscriptionService implements ISubscriptionService {
 	constructor(private $httpClient: Server.IHttpClient,
@@ -11,8 +12,10 @@ export class SubscriptionService implements ISubscriptionService {
 
 	public async subscribeForNewsletter(): Promise<void> {
 		if (await this.shouldAskForEmail()) {
-			this.$logger.out("Enter your e-mail address to subscribe to the NativeScript Newsletter and hear about product updates, tips & tricks, and community happenings:");
-			const email = await this.getEmail("(press Enter for blank)");
+			this.$logger.printMarkdown(SubscribeForNewsletterMessages.AgreeToReceiveEmailMsg);
+			this.$logger.printMarkdown(SubscribeForNewsletterMessages.ReviewPrivacyPolicyMsg);
+
+			const email = await this.getEmail(SubscribeForNewsletterMessages.PromptMsg);
 			await this.$userSettingsService.saveSetting("EMAIL_REGISTERED", true);
 			await this.sendEmail(email);
 		}