Add SysInfo implementation

Add SysInfo class that extends the base SysInfoBase class by calling `getSysInfo` method with correct paths to android and adb.

Author: rosen-vladimirov

lib/android-tools-info.ts

@@ -180,7 +180,7 @@ export class AndroidToolsInfo implements IAndroidToolsInfo {
 	public getPathToAdbFromAndroidHome(): IFuture<string> {
 		return (() => {
 			if(this.androidHome) {
-				let pathToAdb = path.join(this.androidHome, "platform-tools", "adb") + (this.$hostInfo.isWindows ? ".exe" : "");
+				let pathToAdb = path.join(this.androidHome, "platform-tools", "adb");
 				try {
 					this.$childProcess.execFile(pathToAdb, ["help"]).wait();
 					return pathToAdb;

lib/bootstrap.ts

@@ -84,3 +84,4 @@ $injector.require("androidToolsInfo", "./android-tools-info");
 
 $injector.require("iosUsbLiveSyncServiceLocator", "./services/usb-livesync-service");
 $injector.require("androidUsbLiveSyncServiceLocator", "./services/usb-livesync-service");
+$injector.require("sysInfo", "./sys-info");

lib/common

@@ -81,7 +81,7 @@ export class AndroidProjectService extends projectServiceBaseLib.PlatformProject
 
 			// this call will fail in case `android` is not set correctly.
 			this.$androidToolsInfo.getPathToAndroidExecutable().wait();
-			this.$androidToolsInfo.validateJavacVersion(this.$sysInfo.getSysInfo().javacVersion, {showWarningsAsErrors: true}).wait();
+			this.$androidToolsInfo.validateJavacVersion(this.$sysInfo.getSysInfo().wait().javacVersion, {showWarningsAsErrors: true}).wait();
 		}).future<void>()();
 	}
 

lib/services/android-project-service.ts

@@ -13,11 +13,7 @@ class DoctorService implements IDoctorService {
 
 	public printWarnings(): boolean {
 		let result = false;
-		let androidToolsInfo = {
-			pathToAdb: this.$androidToolsInfo.getPathToAdbFromAndroidHome().wait(),
-			pathToAndroid: this.$androidToolsInfo.getPathToAndroidExecutable().wait()
-		};
-		let sysInfo = this.$sysInfo.getSysInfo(androidToolsInfo);
+		let sysInfo = this.$sysInfo.getSysInfo().wait();
 
 		if (!sysInfo.adbVer) {
 			this.$logger.warn("WARNING: adb from the Android SDK is not installed or is not configured properly.");

lib/services/doctor-service.ts

@@ -0,0 +1,25 @@
+///<reference path=".d.ts"/>
+"use strict";
+
+import {SysInfoBase} from "./common/sys-info-base";
+
+export class SysInfo extends SysInfoBase {
+	constructor(protected $childProcess: IChildProcess,
+				protected $hostInfo: IHostInfo,
+				protected $iTunesValidator: Mobile.IiTunesValidator,
+				protected $logger: ILogger,
+				private $androidToolsInfo: IAndroidToolsInfo) {
+		super($childProcess, $hostInfo, $iTunesValidator, $logger);
+	}
+
+	public getSysInfo(androidToolsInfo?: {pathToAdb: string, pathToAndroid: string}): IFuture<ISysInfoData> {
+		return ((): ISysInfoData => {
+			let defaultAndroidToolsInfo = {
+				pathToAdb: this.$androidToolsInfo.getPathToAdbFromAndroidHome().wait(),
+				pathToAndroid: this.$androidToolsInfo.getPathToAndroidExecutable().wait()
+			};
+			return super.getSysInfo(androidToolsInfo || defaultAndroidToolsInfo).wait();
+		}).future<ISysInfoData>()();
+	}
+}
+$injector.register("sysInfo", SysInfo);