Merge pull request #1678 from NativeScript/milanov/add-adb-errors-check

Add Android debug bridge result handler

Author: TsvetanMilanov

lib/android-tools-info.ts

@@ -46,7 +46,7 @@ export class StaticConfig extends StaticConfigBase implements IStaticConfig {
 
 	public get SYS_REQUIREMENTS_LINK(): string {
 		let linkToSysRequirements: string;
-		switch(process.platform) {
+		switch (process.platform) {
 			case "linux":
 				linkToSysRequirements = "http://docs.nativescript.org/setup/ns-cli-setup/ns-setup-linux.html#system-requirements";
 				break;
@@ -77,13 +77,13 @@ export class StaticConfig extends StaticConfigBase implements IStaticConfig {
 		return path.join(__dirname, "..", "package.json");
 	}
 
-	public get PATH_TO_BOOTSTRAP() : string {
+	public get PATH_TO_BOOTSTRAP(): string {
 		return path.join(__dirname, "bootstrap");
 	}
 
 	public getAdbFilePath(): IFuture<string> {
 		return (() => {
-			if(!this._adbFilePath) {
+			if (!this._adbFilePath) {
 				let androidToolsInfo: IAndroidToolsInfo = this.$injector.resolve("androidToolsInfo");
 				this._adbFilePath = androidToolsInfo.getPathToAdbFromAndroidHome().wait() || super.getAdbFilePath().wait();
 			}

lib/common

@@ -4,7 +4,7 @@ import * as deviceAppDataBaseLib from "../common/mobile/device-app-data/device-a
 import Future = require("fibers/future");
 import * as path from "path";
 import {AndroidDeviceHashService} from "../common/mobile/android/android-device-hash-service";
-import {AndroidDebugBridge} from "../common/mobile/android/android-debug-bridge";
+import {DeviceAndroidDebugBridge} from "../common/mobile/android/device-android-debug-bridge";
 
 const SYNC_DIR_NAME = "sync";
 const FULLSYNC_DIR_NAME = "fullsync";
@@ -64,7 +64,7 @@ export class AndroidAppIdentifier extends deviceAppDataBaseLib.DeviceAppDataBase
 
 	private getSyncFolderName(): IFuture<string> {
 		return ((): string =>{
-			let adb =  this.$injector.resolve(AndroidDebugBridge, { identifier: this.device.deviceInfo.identifier });
+			let adb =  this.$injector.resolve(DeviceAndroidDebugBridge, { identifier: this.device.deviceInfo.identifier });
 			let deviceHashService = this.$injector.resolve(AndroidDeviceHashService, {adb: adb, appIdentifier: this.appIdentifier});
 			let hashFile = this.$options.force ? null : deviceHashService.doesShasumFileExistsOnDevice().wait();
 			return this.$options.watch || hashFile ? SYNC_DIR_NAME : FULLSYNC_DIR_NAME;

lib/config.ts

@@ -6,7 +6,7 @@ import Future = require("fibers/future");
 import * as constants from "../constants";
 import * as semver from "semver";
 import * as projectServiceBaseLib from "./platform-project-service-base";
-import * as androidDebugBridgePath from "../common/mobile/android/android-debug-bridge";
+import {DeviceAndroidDebugBridge} from "../common/mobile/android/device-android-debug-bridge";
 import {AndroidDeviceHashService} from "../common/mobile/android/android-device-hash-service";
 import {EOL} from "os";
 import { createGUID } from "../common/helpers";
@@ -393,7 +393,7 @@ export class AndroidProjectService extends projectServiceBaseLib.PlatformProject
 
 	public deploy(deviceIdentifier: string): IFuture<void> {
 		return (() => {
-			let adb = this.$injector.resolve(androidDebugBridgePath.AndroidDebugBridge, { identifier: deviceIdentifier });
+			let adb = this.$injector.resolve(DeviceAndroidDebugBridge, { identifier: deviceIdentifier });
 			let deviceRootPath = `/data/local/tmp/${this.$projectData.projectId}`;
 			adb.executeShellCommand(["rm", "-rf", this.$mobileHelper.buildDevicePath(deviceRootPath, "fullsync"),
 				this.$mobileHelper.buildDevicePath(deviceRootPath, "sync"),

lib/providers/device-app-data-provider.ts

@@ -1,7 +1,7 @@
 ///<reference path="../../.d.ts"/>
 "use strict";
 
-import {AndroidDebugBridge} from "../../common/mobile/android/android-debug-bridge";
+import {DeviceAndroidDebugBridge} from "../../common/mobile/android/device-android-debug-bridge";
 import {AndroidDeviceHashService} from "../../common/mobile/android/android-device-hash-service";
 import Future = require("fibers/future");
 import * as helpers from "../../common/helpers";
@@ -102,7 +102,7 @@ class AndroidLiveSyncService extends liveSyncServiceBaseLib.LiveSyncServiceBase<
 	private _deviceHashService: Mobile.IAndroidDeviceHashService;
 	private get deviceHashService(): Mobile.IAndroidDeviceHashService {
 		if (!this._deviceHashService) {
-			let adb = this.$injector.resolve(AndroidDebugBridge, { identifier: this.device.deviceInfo.identifier });
+			let adb = this.$injector.resolve(DeviceAndroidDebugBridge, { identifier: this.device.deviceInfo.identifier });
 			this._deviceHashService = this.$injector.resolve(AndroidDeviceHashService, { adb: adb, appIdentifier: this.$projectData.projectId });
 		}
 

lib/services/android-project-service.ts

@@ -45,6 +45,7 @@ function createTestInjector(projectPath: string, projectName: string): IInjector
 	testInjector.register("config", ConfigLib.Configuration);
 	testInjector.register("errors", ErrorsLib.Errors);
 	testInjector.register("fs", FileSystemLib.FileSystem);
+	testInjector.register("adb", {});
 	testInjector.register("hostInfo", HostInfoLib.HostInfo);
 	testInjector.register("injector", testInjector);
 	testInjector.register("iOSEmulatorServices", {});

lib/services/livesync/android-livesync-service.ts

@@ -41,6 +41,7 @@ let assert = require("chai").assert;
 function createTestInjector(): IInjector {
 	let testInjector = new yok.Yok();
 	testInjector.register("fs", FsLib.FileSystem);
+	testInjector.register("adb", {});
 	testInjector.register("options", OptionsLib.Options);
 	testInjector.register("errors", ErrorsLib.Errors);
 	testInjector.register("staticConfig", StaticConfigLib.StaticConfig);

test/ios-project-service.ts

@@ -47,6 +47,8 @@ function createTestInjector() {
 	testInjector.register("messagesService", MessagesService);
 	testInjector.register("npm", NodePackageManager);
 	testInjector.register("fs", FileSystem);
+	testInjector.register("adb", {});
+	testInjector.register("androidDebugBridgeResultHandler", {});
 	testInjector.register("projectData", ProjectData);
 	testInjector.register("platforsmData", stubs.PlatformsDataStub);
 	testInjector.register("childProcess", ChildProcess);