Merge pull request #1131 from NativeScript/vladimirov/integrate-proton-branch

rosen-vladimirov · rosen-vladimirov · commit 696a28b83086 · 2015-11-03T09:14:28.000+02:00
Integrate latest common changes
diff --git a/lib/bootstrap.ts b/lib/bootstrap.ts
@@ -61,7 +61,7 @@ $injector.require("mobilePlatformsCapabilities", "./mobile-platforms-capabilitie
 $injector.require("commandsServiceProvider", "./providers/commands-service-provider");
 $injector.require("deviceAppDataProvider", "./providers/device-app-data-provider");
 
-$injector.require("logcatPrinter", "./providers/logcat-printer");
+$injector.require("deviceLogProvider", "./providers/device-log-provider");
 
 $injector.require("broccoliBuilder", "./tools/broccoli/builder");
 $injector.require("nodeModulesTree", "./tools/broccoli/trees/node-modules-tree");
diff --git a/lib/common b/lib/common
@@ -1 +1 @@
-Subproject commit 9223ee8990d44142ff70499859442c6419f0cd9c
+Subproject commit 0a39e470ec3245aaeccae219f697cf4404ad0254
diff --git a/lib/config.ts b/lib/config.ts
@@ -73,5 +73,9 @@ export class StaticConfig extends staticConfigBaseLibPath.StaticConfigBase imple
 	public get pathToPackageJson(): string {
 		return path.join(__dirname, "..", "package.json");
 	}
+
+	public get PATH_TO_BOOTSTRAP() : string {
+		return path.join(__dirname, "bootstrap");
+	}
 }
 $injector.register("staticConfig", StaticConfig);
diff --git a/lib/nativescript-cli.ts b/lib/nativescript-cli.ts
@@ -4,12 +4,12 @@ require("./bootstrap");
 
 import fiber = require("fibers");
 import Future = require("fibers/future");
-import errors = require("./common/errors");
-errors.installUncaughtExceptionListener();
+import {installUncaughtExceptionListener} from "./common/errors";
+installUncaughtExceptionListener(process.exit);
 
 fiber(() => {
-	let config = <Config.IConfig>$injector.resolve("$config");
-	let err = <IErrors>$injector.resolve("$errors");
+	let config: Config.IConfig = $injector.resolve("$config");
+	let err: IErrors = $injector.resolve("$errors");
 	err.printCallStack = config.DEBUG;
 
 	let commandDispatcher: ICommandDispatcher = $injector.resolve("commandDispatcher");
diff --git a/lib/providers/device-log-provider.ts b/lib/providers/device-log-provider.ts
@@ -0,0 +1,11 @@
+///<reference path="../.d.ts"/>
+"use strict";
+
+export class DeviceLogProvider implements Mobile.IDeviceLogProvider {
+	constructor(private $logger: ILogger) { }
+
+	public logData(line: string, platform: string, deviceIdentifier: string): void {
+		this.$logger.out(line);
+	}
+}
+$injector.register("deviceLogProvider", DeviceLogProvider);
diff --git a/lib/providers/logcat-printer.ts b/lib/providers/logcat-printer.ts
diff --git a/lib/services/android-debug-service.ts b/lib/services/android-debug-service.ts
@@ -12,7 +12,7 @@ class AndroidDebugService implements IDebugService {
 
 	private _device: Mobile.IAndroidDevice = null;
 
-	constructor(private $devicesServices: Mobile.IDevicesServices,
+	constructor(private $devicesService: Mobile.IDevicesService,
 		private $platformService: IPlatformService,
 		private $platformsData: IPlatformsData,
 		private $projectData: IProjectData,
@@ -70,9 +70,9 @@ class AndroidDebugService implements IDebugService {
 				this.$logger.out("Using ", packageFile);
 			}
 
-			this.$devicesServices.initialize({ platform: this.platform, deviceId: this.$options.device}).wait();
+			this.$devicesService.initialize({ platform: this.platform, deviceId: this.$options.device}).wait();
 			let action = (device: Mobile.IAndroidDevice): IFuture<void> => { return this.debugCore(device, packageFile, this.$projectData.projectId); };
-			this.$devicesServices.execute(action).wait();
+			this.$devicesService.execute(action).wait();
 
 		}).future<void>()();
 	}
@@ -141,12 +141,12 @@ class AndroidDebugService implements IDebugService {
 
     public debugStart(): IFuture<void> {
         return (() => {
-            this.$devicesServices.initialize({ platform: this.platform, deviceId: this.$options.device}).wait();
+            this.$devicesService.initialize({ platform: this.platform, deviceId: this.$options.device}).wait();
             let action = (device: Mobile.IAndroidDevice): IFuture<void> => {
                 this.device = device;
                 return this.debugStartCore();
             };
-            this.$devicesServices.execute(action).wait();
+            this.$devicesService.execute(action).wait();
         }).future<void>()();
     }
 
diff --git a/lib/services/ios-debug-service.ts b/lib/services/ios-debug-service.ts
@@ -69,7 +69,7 @@ class IOSDebugService implements IDebugService {
     constructor(
         private $platformService: IPlatformService,
         private $iOSEmulatorServices: Mobile.IEmulatorPlatformServices,
-        private $devicesServices: Mobile.IDevicesServices,
+        private $devicesService: Mobile.IDevicesService,
         private $platformsData: IPlatformsData,
         private $projectData: IProjectData,
         private $childProcess: IChildProcess,
@@ -151,8 +151,8 @@ class IOSDebugService implements IDebugService {
 
     private deviceDebugBrk(): IFuture<void> {
         return (() => {
-            this.$devicesServices.initialize({ platform: this.platform, deviceId: this.$options.device }).wait();
-            this.$devicesServices.execute((device: iOSDevice.IOSDevice) => (() => {
+            this.$devicesService.initialize({ platform: this.platform, deviceId: this.$options.device }).wait();
+            this.$devicesService.execute((device: iOSDevice.IOSDevice) => (() => {
                 // we intentionally do not wait on this here, because if we did, we'd miss the AppLaunching notification
                 let deploy = this.$platformService.deployOnDevice(this.platform);
                 this.debugBrkCore(device).wait();
@@ -163,8 +163,8 @@ class IOSDebugService implements IDebugService {
 
     public debugStart(): IFuture<void> {
         return (() => {
-            this.$devicesServices.initialize({ platform: this.platform, deviceId: this.$options.device }).wait();
-            this.$devicesServices.execute((device: iOSDevice.IOSDevice) => this.debugBrkCore(device)).wait();
+            this.$devicesService.initialize({ platform: this.platform, deviceId: this.$options.device }).wait();
+            this.$devicesService.execute((device: iOSDevice.IOSDevice) => this.debugBrkCore(device)).wait();
         }).future<void>()();
     }
 
@@ -193,8 +193,8 @@ class IOSDebugService implements IDebugService {
 
     private deviceStart(): IFuture<void> {
         return (() => {
-            this.$devicesServices.initialize({ platform: this.platform, deviceId: this.$options.device }).wait();
-            this.$devicesServices.execute(device => (() => {
+            this.$devicesService.initialize({ platform: this.platform, deviceId: this.$options.device }).wait();
+            this.$devicesService.execute(device => (() => {
                 let iosDevice = <iOSDevice.IOSDevice>device;
                 let projectId = this.$projectData.projectId;
                 let npc = new iOSProxyServices.NotificationProxyClient(iosDevice, this.$injector);
diff --git a/lib/services/platform-service.ts b/lib/services/platform-service.ts
@@ -10,7 +10,7 @@ import * as semver from "semver";
 export class PlatformService implements IPlatformService {
 	private static TNS_MODULES_FOLDER_NAME = "tns_modules";
 
-	constructor(private $devicesServices: Mobile.IDevicesServices,
+	constructor(private $devicesService: Mobile.IDevicesService,
 		private $errors: IErrors,
 		private $fs: IFileSystem,
 		private $logger: ILogger,
@@ -317,7 +317,7 @@ export class PlatformService implements IPlatformService {
 			let packageFile = this.getLatestApplicationPackageForDevice(platformData).wait().packageName;
 			this.$logger.out("Using ", packageFile);
 
-			this.$devicesServices.initialize({platform: platform, deviceId: this.$options.device}).wait();
+			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();
@@ -328,7 +328,7 @@ export class PlatformService implements IPlatformService {
 					}
 				}).future<void>()();
 			};
-			this.$devicesServices.execute(action).wait();
+			this.$devicesService.execute(action).wait();
 		}).future<void>()();
 	}
 
diff --git a/lib/services/usb-livesync-service.ts b/lib/services/usb-livesync-service.ts
@@ -13,7 +13,7 @@ export class UsbLiveSyncService extends usbLivesyncServiceBaseLib.UsbLiveSyncSer
 		"**/*.ts",
 	];
 
-	constructor($devicesServices: Mobile.IDevicesServices,
+	constructor($devicesService: Mobile.IDevicesService,
 		$fs: IFileSystem,
 		$mobileHelper: Mobile.IMobileHelper,
 		$localToDevicePathDataFactory: Mobile.ILocalToDevicePathDataFactory,
@@ -31,7 +31,7 @@ export class UsbLiveSyncService extends usbLivesyncServiceBaseLib.UsbLiveSyncSer
 		private $projectDataService: IProjectDataService,
 		private $prompter: IPrompter,
 		$hostInfo: IHostInfo) {
-			super($devicesServices, $mobileHelper, $localToDevicePathDataFactory, $logger, $options,
+			super($devicesService, $mobileHelper, $localToDevicePathDataFactory, $logger, $options,
 				$deviceAppDataFactory, $fs, $dispatcher, $injector, $childProcess, $iOSEmulatorServices, $hostInfo);
 	}
 
@@ -72,7 +72,7 @@ export class UsbLiveSyncService extends usbLivesyncServiceBaseLib.UsbLiveSyncSer
 			};
 
 			let beforeLiveSyncAction = (device: Mobile.IDevice, deviceAppData: Mobile.IDeviceAppData): IFuture<void> => {
-				let platformSpecificUsbLiveSyncService = this.resolveUsbLiveSyncService(platform || this.$devicesServices.platform, device);
+				let platformSpecificUsbLiveSyncService = this.resolveUsbLiveSyncService(platform || this.$devicesService.platform, device);
 				if (platformSpecificUsbLiveSyncService.beforeLiveSyncAction) {
 					return platformSpecificUsbLiveSyncService.beforeLiveSyncAction(deviceAppData);
 				}
diff --git a/package.json b/package.json
@@ -35,7 +35,7 @@
     "cli-table": "https://github.com/telerik/cli-table/tarball/v0.3.1.1",
     "colors": "1.1.2",
     "ffi": "https://github.com/icenium/node-ffi/tarball/v2.0.0.0",
-    "fibers": "https://github.com/icenium/node-fibers/tarball/v1.0.6.1",
+    "fibers": "https://github.com/icenium/node-fibers/tarball/v1.0.6.2",
     "filesize": "3.1.2",
     "gaze": "0.5.1",
     "gulp": "3.9.0",
diff --git a/test/npm-support.ts b/test/npm-support.ts
@@ -44,7 +44,7 @@ function createTestInjector(): IInjector {
 	testInjector.register("prompter", {});
 	testInjector.register("androidProjectService", {});
 	testInjector.register("iOSProjectService", {});
-	testInjector.register("devicesServices", {});
+	testInjector.register("devicesService", {});
 	testInjector.register("resources", {});
 	testInjector.register("projectData", ProjectDataLib.ProjectData);
 	testInjector.register("projectHelper", ProjectHelperLib.ProjectHelper);
diff --git a/test/platform-commands.ts b/test/platform-commands.ts
@@ -92,7 +92,7 @@ function createTestInjector() {
 	testInjector.register('npmInstallationManager', stubs.NpmInstallationManagerStub);
 	testInjector.register('projectData', stubs.ProjectDataStub);
 	testInjector.register('platformsData', PlatformsData);
-	testInjector.register('devicesServices', {});
+	testInjector.register('devicesService', {});
 	testInjector.register('projectDataService', stubs.ProjectDataService);
 	testInjector.register('prompter', {});
 	testInjector.register('commands-service', CommandsServiceLib.CommandsService);
diff --git a/test/platform-service.ts b/test/platform-service.ts
@@ -25,7 +25,7 @@ function createTestInjector() {
 	testInjector.register('npmInstallationManager', stubs.NpmInstallationManagerStub);
 	testInjector.register('projectData', stubs.ProjectDataStub);
 	testInjector.register('platformsData', stubs.PlatformsDataStub);
-	testInjector.register('devicesServices', {});
+	testInjector.register('devicesService', {});
 	testInjector.register('androidEmulatorServices', {});
 	testInjector.register('projectDataService', stubs.ProjectDataService);
 	testInjector.register('prompter', {});
diff --git a/test/plugins-service.ts b/test/plugins-service.ts
@@ -51,7 +51,7 @@ function createTestInjector() {
 	testInjector.register("mobileHelper", {});
 	testInjector.register("androidProjectService", AndroidProjectService);
 	testInjector.register("iOSProjectService", {});
-	testInjector.register("devicesServices", {});
+	testInjector.register("devicesService", {});
 	testInjector.register("projectDataService", ProjectDataService);
 	testInjector.register("prompter", {});
 	testInjector.register("resources", ResourceLoader);

Original file line number	Diff line number	Diff line change
`@@ -73,5 +73,9 @@ export class StaticConfig extends staticConfigBaseLibPath.StaticConfigBase imple`
`73`	`73`	`public get pathToPackageJson(): string {`
`74`	`74`	`return path.join(__dirname, "..", "package.json");`
`75`	`75`	`}`
	`76`	`+`
	`77`	`+ public get PATH_TO_BOOTSTRAP() : string {`
	`78`	`+ return path.join(__dirname, "bootstrap");`
	`79`	`+ }`
`76`	`80`	`}`
`77`	`81`	`$injector.register("staticConfig", StaticConfig);`