Merge branch 'master' into tdermendzhiev/objc-source-support

Author: tdermendjiev

CHANGELOG.md

@@ -1,6 +1,31 @@
 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)
+==
+
+### New
+* [Implemented #3535](https://github.com/NativeScript/nativescript-cli/pull/3535) API: Expose androidProcessService - getAppProcessId method
+
+
+### Fixed
+* [Fixed #1548](https://github.com/NativeScript/nativescript-cli/issues/1548): `--sdk` flag not working properly when starting emulators in iOS
+* [Fixed #2131](https://github.com/NativeScript/nativescript-cli/issues/2131): Simulators with `(` in name are not started after `tns run ios --device <device_name>`
+* [Fixed #2727](https://github.com/NativeScript/nativescript-cli/issues/2727): Passing more than one parameter on `tns create` returns unappropriate error message
+* [Fixed #3529](https://github.com/NativeScript/nativescript-cli/issues/3529): iOS logging does not work on multiple simulators
+* [Fixed #3536](https://github.com/NativeScript/nativescript-cli/issues/3536): Message for tracking in Google Analytics is always printed
+* [Fixed #3554](https://github.com/NativeScript/nativescript-cli/issues/3554): NativeScript is not compatible with Node.js 10.x.x
+* [Fixed #3557](https://github.com/NativeScript/nativescript-cli/pull/3557): Asset generation should not fail in case some App_Resources are missing.
+* [Fixed #3560](https://github.com/NativeScript/nativescript-cli/issues/3560): Android build fails when path to app has space and plugin should be build
+
+
 4.0.0 (2018, April 10)
 ==
 

PublicAPI.md

@@ -50,6 +50,9 @@ const tns = require("nativescript");
 	* [generateSplashScreens](#generatesplashscreens)
 * [androidProcessService](#androidprocessservice)
 	* [getAppProcessId](#getappprocessid)
+* [sysInfo](#sysinfo)
+	* [getSupportedNodeVersionRange](#getsupportednodeversionrange)
+	* [getSystemWarnings](#getsystemwarnings)
 
 ## Module projectService
 
@@ -1017,6 +1020,7 @@ tns.liveSyncService.on("debuggerDetached", debugInfo => {
 	console.log(`Detached debugger for device with id ${debugInfo.deviceIdentifier}`);
 });
 ```
+
 ## analyticsSettingsService
 Provides methods for accessing the analytics settings file data.
 
@@ -1078,6 +1082,7 @@ tns.analyticsSettingsService.getPlaygroundInfo("/my/project/path")
 		console.log(playgroundInfo.usedTutorial);
 	});
 ```
+
 ## constants
 Contains various constants related to NativeScript.
 
@@ -1151,6 +1156,47 @@ tns.androidProcessService.getAppProcessId("4df18f307d8a8f1b", "org.nativescript.
 	.catch(err => console.error(`Error while checking for PID: ${err}`));
 ```
 
+## sysInfo
+The `sysInfo` module exposes methods to get the current environment setup and warnings for it.
+
+### getSupportedNodeVersionRange
+The `getSupportedNodeVersionRange` method gives information about the supported Node.js versions for the current CLI. The result is a valid semver range, for example `>=6.0.0`.
+
+* Definition
+```TypeScript
+/**
+ * Returns the value of engines.node key from CLI's package.json file.
+ * @return {string} The range of supported Node.js versions.
+ */
+getSupportedNodeVersionRange(): string;
+```
+
+* Usage
+```JavaScript
+const nodeJsRange = tns.sysInfo.getSupportedNodeVersionRange();
+console.log(nodeJsRange);
+```
+
+### getSystemWarnings
+The `getSystemWarnings` methods returns all deprecation warnings for current environment. For example, in case the support for the current OS is deprecated by CLI, the method will return array with one message describing the deprecation.
+
+* Definition
+```TypeScript
+/**
+ * Gets all global warnings for the current environment, for example Node.js version compatibility, OS compatibility, etc.
+ * @return {Promise<string[]>} All warnings. Empty array is returned in case the system is setup correctly.
+ */
+getSystemWarnings(): Promise<string[]>;
+```
+
+* Usage
+```JavaScript
+tns.sysInfo.getSystemWarnings()
+	.then(warnings => {
+		warnings.forEach(warn => console.log(warn));
+	})
+	.catch(err => console.error(`Error while trying to get system warnings: ${err}`));
+```
 
 ## How to add a new method to Public API
 CLI is designed as command line tool and when it is used as a library, it does not give you access to all of the methods. This is mainly implementation detail. Most of the CLI's code is created to work in command line, not as a library, so before adding method to public API, most probably it will require some modification.

bin/tns

@@ -6,7 +6,7 @@ var path = require("path"),
 	pathToLib = path.join(__dirname, "..", "lib"),
 	pathToCommon = path.join(pathToLib, "common");
 
-require(path.join(pathToCommon, "verify-node-version")).verifyNodeVersion(node, "NativeScript", [ "^4.0.0" ]);
+require(path.join(pathToCommon, "verify-node-version")).verifyNodeVersion();
 
 var pathToCliExecutable = path.join(pathToLib, "nativescript-cli.js");
 

lib/bootstrap.ts

@@ -125,7 +125,7 @@ $injector.requirePublicClass("liveSyncService", "./services/livesync/livesync-se
 $injector.require("androidLiveSyncService", "./services/livesync/android-livesync-service");
 $injector.require("iOSLiveSyncService", "./services/livesync/ios-livesync-service");
 $injector.require("usbLiveSyncService", "./services/livesync/livesync-service"); // The name is used in https://github.com/NativeScript/nativescript-dev-typescript
-$injector.require("sysInfo", "./sys-info");
+$injector.requirePublic("sysInfo", "./sys-info");
 
 $injector.require("iOSNotificationService", "./services/ios-notification-service");
 $injector.require("socketProxyFactory", "./device-sockets/ios/socket-proxy-factory");
@@ -165,3 +165,5 @@ $injector.require("nativeScriptCloudExtensionService", "./services/nativescript-
 $injector.requireCommand("resources|generate|icons", "./commands/generate-assets");
 $injector.requireCommand("resources|generate|splashes", "./commands/generate-assets");
 $injector.requirePublic("assetsGenerationService", "./services/assets-generation/assets-generation-service");
+
+$injector.require("filesHashService", "./services/files-hash-service");

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 = {
@@ -170,3 +174,18 @@ export class AssetConstants {
 	public static defaultScale = 1;
 	public static defaultOverlayImageScale = 0.8;
 }
+
+// https://en.wikipedia.org/wiki/Darwin_(operating_system)#Release_history
+export class MacOSVersions {
+	public static Sierra = "10.12";
+	public static HighSierra = "10.13";
+}
+
+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/definitions/files-hash-service.d.ts

@@ -0,0 +1,4 @@
+interface IFilesHashService {
+	generateHashes(files: string[]): Promise<IStringDictionary>;
+	getChanges(files: string[], oldHashes: IStringDictionary): Promise<IStringDictionary>;
+}

lib/definitions/platform.d.ts

@@ -88,7 +88,7 @@ interface IPlatformService extends IBuildPlatformAction, NodeJS.EventEmitter {
 	 * @param {IShouldPrepareInfo} shouldPrepareInfo Options needed to decide whether to prepare.
 	 * @returns {Promise<boolean>} true indicates that the project should be prepared.
 	 */
-	shouldPrepare(shouldPrepareInfo: IShouldPrepareInfo): Promise<boolean>
+	shouldPrepare(shouldPrepareInfo: IShouldPrepareInfo): Promise<boolean>;
 
 	/**
 	 * Installs the application on specified device.
@@ -213,7 +213,7 @@ interface IPlatformService extends IBuildPlatformAction, NodeJS.EventEmitter {
 	 * @param {string} buildInfoFileDirname The directory where the build file should be written to.
 	 * @returns {void}
 	 */
-	saveBuildInfoFile(platform: string, projectDir: string, buildInfoFileDirname: string): void
+	saveBuildInfoFile(platform: string, projectDir: string, buildInfoFileDirname: string): void;
 }
 
 interface IPlatformOptions extends IPlatformSpecificData, ICreateProjectOptions { }

lib/definitions/project-changes.d.ts

@@ -1,4 +1,8 @@
-interface IPrepareInfo extends IAddedNativePlatform {
+interface IAppFilesHashes {
+	appFilesHashes: IStringDictionary;
+}
+
+interface IPrepareInfo extends IAddedNativePlatform, IAppFilesHashes {
 	time: string;
 	bundle: boolean;
 	release: boolean;

lib/nativescript-cli.ts

@@ -1,4 +1,5 @@
 require("./bootstrap");
+import { EOL } from "os";
 import * as shelljs from "shelljs";
 shelljs.config.silent = true;
 shelljs.config.fatal = true;
@@ -21,6 +22,13 @@ import { settlePromises } from "./common/helpers";
 		logger.trace("Unable to load extensions. Error is: ", err);
 	}
 
+	const $sysInfo = $injector.resolve<ISysInfo>("sysInfo");
+	const macOSWarning = await $sysInfo.getMacOSWarningMessage();
+	if (macOSWarning) {
+		const message = EOL + macOSWarning + EOL ;
+		logger.warn(message);
+	}
+
 	const commandDispatcher: ICommandDispatcher = $injector.resolve("commandDispatcher");
 
 	const messages: IMessagesService = $injector.resolve("$messagesService");

lib/services/debug-service.ts

@@ -31,7 +31,7 @@ export class DebugService extends EventEmitter implements IDebugService {
 		await this.$analyticsService.trackEventActionInGoogleAnalytics({
 			action: TrackActionNames.Debug,
 			device,
-			additionalData: this.$mobileHelper.isiOSPlatform(device.deviceInfo.platform) && (!options || !options.chrome) ? DebugTools.Inspector : DebugTools.Chrome,
+			additionalData: this.$mobileHelper.isiOSPlatform(device.deviceInfo.platform) && options && options.inspector ? DebugTools.Inspector : DebugTools.Chrome,
 			projectDir: debugData.projectDir
 		});
 

lib/services/files-hash-service.ts

@@ -0,0 +1,32 @@
+import { executeActionByChunks } from "../common/helpers";
+import { DEFAULT_CHUNK_SIZE } from "../common/constants";
+
+export class FilesHashService implements IFilesHashService {
+	constructor(private $fs: IFileSystem,
+		private $logger: ILogger) { }
+
+	public async generateHashes(files: string[]): Promise<IStringDictionary> {
+		const result: IStringDictionary = {};
+
+		const action = async (file: string) => {
+			try {
+				const isFile = this.$fs.getFsStats(file).isFile();
+				if (isFile) {
+					result[file] = await this.$fs.getFileShasum(file);
+				}
+			} catch (err) {
+				this.$logger.trace(`Unable to generate hash for file ${file}. Error is: ${err}`);
+			}
+		};
+
+		await executeActionByChunks(files, DEFAULT_CHUNK_SIZE, action);
+
+		return result;
+	}
+
+	public async getChanges(files: string[], oldHashes: IStringDictionary): Promise<IStringDictionary> {
+		const newHashes = await this.generateHashes(files);
+		return _.omitBy(newHashes, (hash: string, pathToFile: string) => !!_.find(oldHashes, (oldHash: string, oldPath: string) => pathToFile === oldPath && hash === oldHash));
+	}
+}
+$injector.register("filesHashService", FilesHashService);

lib/services/livesync/livesync-service.ts

@@ -41,8 +41,7 @@ export class LiveSyncService extends EventEmitter implements IDebugLiveSyncServi
 		super();
 	}
 
-	public async liveSync(deviceDescriptors: ILiveSyncDeviceInfo[],
-		liveSyncData: ILiveSyncInfo): Promise<void> {
+	public async liveSync(deviceDescriptors: ILiveSyncDeviceInfo[], liveSyncData: ILiveSyncInfo): Promise<void> {
 		const projectData = this.$projectDataService.getProjectData(liveSyncData.projectDir);
 		await this.$pluginsService.ensureAllDependenciesAreInstalled(projectData);
 		await this.liveSyncOperation(deviceDescriptors, liveSyncData, projectData);
@@ -318,27 +317,19 @@ export class LiveSyncService extends EventEmitter implements IDebugLiveSyncServi
 	}
 
 	@hook("liveSync")
-	private async liveSyncOperation(deviceDescriptors: ILiveSyncDeviceInfo[],
-		liveSyncData: ILiveSyncInfo, projectData: IProjectData): Promise<void> {
+	private async liveSyncOperation(deviceDescriptors: ILiveSyncDeviceInfo[], liveSyncData: ILiveSyncInfo, projectData: IProjectData): Promise<void> {
 		// In case liveSync is called for a second time for the same projectDir.
 		const isAlreadyLiveSyncing = this.liveSyncProcessesInfo[projectData.projectDir] && !this.liveSyncProcessesInfo[projectData.projectDir].isStopped;
 
-		// Prevent cases where liveSync is called consecutive times with the same device, for example [ A, B, C ] and then [ A, B, D ] - we want to execute initialSync only for D.
-		const currentlyRunningDeviceDescriptors = this.getLiveSyncDeviceDescriptors(projectData.projectDir);
-		const deviceDescriptorsForInitialSync = isAlreadyLiveSyncing ? _.differenceBy(deviceDescriptors, currentlyRunningDeviceDescriptors, deviceDescriptorPrimaryKey) : deviceDescriptors;
 		this.setLiveSyncProcessInfo(liveSyncData.projectDir, deviceDescriptors);
 
-		await this.initialSync(projectData, deviceDescriptorsForInitialSync, liveSyncData);
-
 		if (!liveSyncData.skipWatcher && this.liveSyncProcessesInfo[projectData.projectDir].deviceDescriptors.length) {
 			// Should be set after prepare
 			this.$usbLiveSyncService.isInitialized = true;
-
-			const devicesIds = deviceDescriptors.map(dd => dd.identifier);
-			const devices = _.filter(this.$devicesService.getDeviceInstances(), device => _.includes(devicesIds, device.deviceInfo.identifier));
-			const platforms = _(devices).map(device => device.deviceInfo.platform).uniq().value();
-			await this.startWatcher(projectData, liveSyncData, platforms);
+			await this.startWatcher(projectData, liveSyncData, deviceDescriptors, { isAlreadyLiveSyncing });
 		}
+
+		await this.initialSync(projectData, liveSyncData, deviceDescriptors, { isAlreadyLiveSyncing });
 	}
 
 	private setLiveSyncProcessInfo(projectDir: string, deviceDescriptors: ILiveSyncDeviceInfo[]): void {
@@ -351,6 +342,13 @@ export class LiveSyncService extends EventEmitter implements IDebugLiveSyncServi
 		this.liveSyncProcessesInfo[projectDir].deviceDescriptors = _.uniqBy(currentDeviceDescriptors.concat(deviceDescriptors), deviceDescriptorPrimaryKey);
 	}
 
+	private async initialSync(projectData: IProjectData, liveSyncData: ILiveSyncInfo, deviceDescriptors: ILiveSyncDeviceInfo[], options: { isAlreadyLiveSyncing: boolean }): Promise<void> {
+		// Prevent cases where liveSync is called consecutive times with the same device, for example [ A, B, C ] and then [ A, B, D ] - we want to execute initialSync only for D.
+		const currentlyRunningDeviceDescriptors = this.getLiveSyncDeviceDescriptors(projectData.projectDir);
+		const deviceDescriptorsForInitialSync = options.isAlreadyLiveSyncing ? _.differenceBy(deviceDescriptors, currentlyRunningDeviceDescriptors, deviceDescriptorPrimaryKey) : deviceDescriptors;
+		await this.initialSyncCore(projectData, deviceDescriptorsForInitialSync, liveSyncData);
+	}
+
 	private getLiveSyncService(platform: string): IPlatformLiveSyncService {
 		if (this.$mobileHelper.isiOSPlatform(platform)) {
 			return this.$injector.resolve("iOSLiveSyncService");
@@ -452,7 +450,7 @@ export class LiveSyncService extends EventEmitter implements IDebugLiveSyncServi
 		return null;
 	}
 
-	private async initialSync(projectData: IProjectData, deviceDescriptors: ILiveSyncDeviceInfo[], liveSyncData: ILiveSyncInfo): Promise<void> {
+	private async initialSyncCore(projectData: IProjectData, deviceDescriptors: ILiveSyncDeviceInfo[], liveSyncData: ILiveSyncInfo): Promise<void> {
 		const preparedPlatforms: string[] = [];
 		const rebuiltInformation: ILiveSyncBuildInfo[] = [];
 
@@ -483,6 +481,7 @@ export class LiveSyncService extends EventEmitter implements IDebugLiveSyncServi
 					useLiveEdit: liveSyncData.useLiveEdit,
 					watch: !liveSyncData.skipWatcher
 				});
+
 				await this.$platformService.trackActionForPlatform({ action: "LiveSync", platform: device.deviceInfo.platform, isForDevice: !device.isEmulator, deviceOsVersion: device.deviceInfo.version });
 				await this.refreshApplication(projectData, liveSyncResultInfo, deviceBuildInfoDescriptor.debugOptions, deviceBuildInfoDescriptor.outputPath);
 
@@ -525,7 +524,10 @@ export class LiveSyncService extends EventEmitter implements IDebugLiveSyncServi
 		};
 	}
 
-	private async startWatcher(projectData: IProjectData, liveSyncData: ILiveSyncInfo, platforms: string[]): Promise<void> {
+	private async startWatcher(projectData: IProjectData, liveSyncData: ILiveSyncInfo, deviceDescriptors: ILiveSyncDeviceInfo[], options: { isAlreadyLiveSyncing: boolean }): Promise<void> {
+		const devicesIds = deviceDescriptors.map(dd => dd.identifier);
+		const devices = _.filter(this.$devicesService.getDeviceInstances(), device => _.includes(devicesIds, device.deviceInfo.identifier));
+		const platforms = _(devices).map(device => device.deviceInfo.platform).uniq().value();
 		const patterns = await this.getWatcherPatterns(liveSyncData, projectData, platforms);
 
 		if (liveSyncData.watchAllFiles) {