Merge pull request #1208 from NativeScript/vladimirov/merge-rel-master-pre-150-2

Merge release in master pre 1.5.0 (second time) and fix master

Author: rosen-vladimirov

lib/bootstrap.ts

@@ -90,3 +90,4 @@ $injector.require("iOSNotificationService", "./services/ios-notification-service
 $injector.require("socketProxyFactory", "./device-sockets/ios/socket-proxy-factory");
 $injector.require("iOSNotification", "./device-sockets/ios/notification");
 $injector.require("iOSSocketRequestExecutor", "./device-sockets/ios/socket-request-executor");
+$injector.require("messages", "./messages");

lib/common

@@ -45,15 +45,22 @@ class DoctorService implements IDoctorService {
 				result = true;
 			}
 
-			if(!sysInfo.cocoapodVer ) {
+			if(!sysInfo.cocoapodVer) {
 				this.$logger.warn("WARNING: CocoaPod is not installed or is not configured properly.");
 				this.$logger.out("You will not be able to build your projects for iOS if they contain plugin with CocoaPod file." + EOL
 					+ "To be able to build such projects, verify that you have installed CocoaPod.");
 				result = true;
 			}
 
-			if(sysInfo.cocoapodVer && semver.lt(sysInfo.cocoapodVer, DoctorService.MIN_SUPPORTED_POD_VERSION)) {
-				this.$logger.warn(`WARNING: CocoaPods version is lower than ${DoctorService.MIN_SUPPORTED_POD_VERSION}`);
+			if (sysInfo.cocoapodVer && semver.valid(sysInfo.cocoapodVer) === null) {
+				this.$logger.warn(`WARNING: CocoaPods version is not a valid semver version.`);
+				this.$logger.out("You will not be able to build your projects for iOS if they contain plugin with CocoaPod file." + EOL
+					+ `To be able to build such projects, verify that you have at least ${DoctorService.MIN_SUPPORTED_POD_VERSION} version installed.`);
+				result = true;
+			}
+
+			if (sysInfo.cocoapodVer && semver.valid(sysInfo.cocoapodVer) && semver.lt(sysInfo.cocoapodVer, DoctorService.MIN_SUPPORTED_POD_VERSION)) {
+				this.$logger.warn(`WARNING: CocoaPods version is lower than ${DoctorService.MIN_SUPPORTED_POD_VERSION}.`);
 				this.$logger.out("You will not be able to build your projects for iOS if they contain plugin with CocoaPod file." + EOL
 					+ `To be able to build such projects, verify that you have at least ${DoctorService.MIN_SUPPORTED_POD_VERSION} version installed.`);
 				result = true;

lib/services/doctor-service.ts

@@ -16,7 +16,6 @@ export class InitService implements IInitService {
 	private _projectFilePath: string;
 
 	constructor(private $fs: IFileSystem,
-		private $errors: IErrors,
 		private $logger: ILogger,
 		private $options: IOptions,
 		private $injector: IInjector,

lib/services/init-service.ts

@@ -335,6 +335,11 @@ export class PlatformService implements IPlatformService {
 			this.ensurePlatformInstalled(platform).wait();
 			let platformData = this.$platformsData.getPlatformData(platform);
 
+			this.$devicesService.initialize({platform: platform, deviceId: this.$options.device}).wait();
+			if (this.$devicesService.deviceCount < 1) {
+				this.$errors.failWithoutHelp("Cannot find connected devices. Reconnect any connected devices, verify that your system recognizes them, and run this command again.");
+			}
+
 			let cachedDeviceOption = this.$options.forDevice;
 			this.$options.forDevice = true;
 			this.buildPlatform(platform, buildConfig).wait();
@@ -344,7 +349,6 @@ export class PlatformService implements IPlatformService {
 			let packageFile = this.getLatestApplicationPackageForDevice(platformData).wait().packageName;
 			this.$logger.out("Using ", packageFile);
 
-			this.$devicesService.initialize({platform: platform, deviceId: this.$options.device}).wait();
 			let action = (device: Mobile.IDevice): IFuture<void> => {
 				return (() => {
 					platformData.platformProjectService.deploy(device.deviceInfo.identifier).wait();

lib/services/platform-service.ts

@@ -162,11 +162,7 @@ export class PluginsService implements IPluginsService {
 			let packageJsonContent = this.$fs.readJson(this.getPackageJsonFilePath()).wait();
 			let allDependencies = _.keys(packageJsonContent.dependencies).concat(_.keys(packageJsonContent.devDependencies));
 			if(this.$options.force || _.difference(allDependencies, installedDependencies).length) {
-				let command = "npm install ";
-				if(this.$options.ignoreScripts) {
-					command += "--ignore-scripts";
-				}
-				this.$childProcess.exec(command, { cwd: this.$projectData.projectDir }).wait();
+				this.$npm.install(this.$projectData.projectDir, this.$projectData.projectDir, { "ignore-scripts": this.$options.ignoreScripts }).wait();
 			}
 		}).future<void>()();
 	}

lib/services/plugins-service.ts

@@ -217,6 +217,14 @@ export class IOSUsbLiveSyncService implements IiOSUsbLiveSyncService {
 		return this.$iOSEmulatorServices.postDarwinNotification(this.$iOSNotification.attachRequest);
 	}
 
+	public removeFile(appIdentifier: string, localToDevicePaths: Mobile.ILocalToDevicePathData[]): IFuture<void> {
+		return (() => {
+			_.each(localToDevicePaths, localToDevicePathData => {
+				this.device.fileSystem.deleteFile(localToDevicePathData.getDevicePath(), appIdentifier);
+			});
+		}).future<void>()();
+	}
+
 	private sendPageReloadMessage(socket: net.Socket): void {
 		try {
 			this.sendPageReloadMessageCore(socket);
@@ -265,7 +273,7 @@ export class AndroidUsbLiveSyncService extends androidLiveSyncServiceLib.Android
 
 	public beforeLiveSyncAction(deviceAppData: Mobile.IDeviceAppData): IFuture<void> {
 		return (() => {
-			let deviceRootPath = `/data/local/tmp/${deviceAppData.appIdentifier}`;
+			let deviceRootPath = this.getDeviceRootPath(deviceAppData.appIdentifier);
 			this.device.adb.executeShellCommand(["rm", "-rf", this.$mobileHelper.buildDevicePath(deviceRootPath, "fullsync"),
 				this.$mobileHelper.buildDevicePath(deviceRootPath, "sync"),
 				this.$mobileHelper.buildDevicePath(deviceRootPath, "removedsync")]).wait();
@@ -279,6 +287,21 @@ export class AndroidUsbLiveSyncService extends androidLiveSyncServiceLib.Android
 		}).future<void>()();
 	}
 
+	public removeFile(appIdentifier: string, localToDevicePaths: Mobile.ILocalToDevicePathData[]): IFuture<void> {
+		return (() => {
+			let deviceRootPath = this.getDeviceRootPath(appIdentifier);
+			_.each(localToDevicePaths, localToDevicePathData => {
+				let relativeUnixPath = _.trimLeft(helpers.fromWindowsRelativePathToUnix(localToDevicePathData.getRelativeToProjectBasePath()), "/");
+				let deviceFilePath = this.$mobileHelper.buildDevicePath(deviceRootPath, "removedsync", relativeUnixPath);
+				this.device.adb.executeShellCommand(["mkdir", "-p", path.dirname(deviceFilePath), "&&", "touch", deviceFilePath]).wait();
+			});
+		}).future<void>()();
+	}
+
+	private getDeviceRootPath(appIdentifier: string): string {
+		return `/data/local/tmp/${appIdentifier}`;
+	}
+
 	private sendPageReloadMessage(): IFuture<void> {
 		let future = new Future<void>();
 

lib/services/usb-livesync-service.ts

@@ -7,6 +7,8 @@ import * as semver from "semver";
 import * as shelljs from "shelljs";
 import {wrapBroccoliPlugin} from './broccoli-plugin-wrapper-factory';
 import * as constants from "../../constants";
+import * as minimatch from "minimatch";
+import Future = require("fibers/future");
 
 /**
  * Intercepts each directory as it is copied to the destination tempdir,
@@ -79,6 +81,12 @@ export class DestCopy implements IBroccoliPlugin {
 
 		if (dependency.name === constants.TNS_CORE_MODULES_NAME) {
 			let tnsCoreModulesResourcePath = path.join(this.outputRoot, constants.TNS_CORE_MODULES_NAME);
+
+			// Remove .ts files
+			let allFiles = this.$fs.enumerateFilesInDirectorySync(tnsCoreModulesResourcePath);
+			let deleteFilesFutures = allFiles.filter(file => minimatch(file, "**/*.ts", {nocase: true})).map(file => this.$fs.deleteFile(file));
+			Future.wait(deleteFilesFutures);
+
 			shelljs.cp("-Rf", path.join(tnsCoreModulesResourcePath, "*"), this.outputRoot);
 			this.$fs.deleteDirectory(tnsCoreModulesResourcePath).wait();
 		}