Merge pull request #31 from NativeScript/fatme/fix-cocoapods

Fix isCocoaPodsWorkingCorrectly

Author: Fatme

.travis.yml

@@ -7,4 +7,5 @@ before_script:
 - npm install grunt-cli
 - npm install
 script:
+- node_modules/.bin/grunt lint
 - node_modules/.bin/grunt pack --no-color

lib/doctor.ts

@@ -1,5 +1,5 @@
 import { Constants } from "./constants";
-import { EOL, platform } from "os";
+import { EOL } from "os";
 import { HostInfo } from "./host-info";
 import { AndroidLocalBuildRequirements } from "./local-build-requirements/android-local-build-requirements";
 import { IosLocalBuildRequirements } from "./local-build-requirements/ios-local-build-requirements";
@@ -198,7 +198,7 @@ export class Doctor implements NativeScriptDoctor.IDoctor {
 				additionalInformation: data.additionalInformation,
 				platforms: data.platforms,
 				type: Constants.WARNING_TYPE_NAME
-			}
+			};
 		}
 
 		return {

lib/sys-info.ts

@@ -235,6 +235,9 @@ export class SysInfo implements NativeScriptDoctor.ISysInfo {
 	public isCocoaPodsWorkingCorrectly(): Promise<boolean> {
 		return this.getValueForProperty(() => this.isCocoaPodsWorkingCorrectlyCache, async (): Promise<boolean> => {
 			if (this.hostInfo.isDarwin) {
+				if (!this.fileSystem.exists(path.join(osenv.home(), ".cocoapods"))) {
+					return true;
+				}
 				temp.track();
 				const tempDirectory = temp.mkdirSync("nativescript-check-cocoapods");
 				const pathToXCodeProjectZip = path.join(__dirname, "..", "resources", "cocoapods-verification", "cocoapods.zip");
@@ -248,7 +251,7 @@ export class SysInfo implements NativeScriptDoctor.ISysInfo {
 					if (spawnResult.exitCode) {
 						return false;
 					} else {
-						return await this.fileSystem.exists(path.join(xcodeProjectDir, "cocoapods.xcworkspace"));
+						return this.fileSystem.exists(path.join(xcodeProjectDir, "cocoapods.xcworkspace"));
 					}
 				} catch (err) {
 					return null;

test/sys-info.ts

@@ -8,7 +8,11 @@ import { ChildProcess } from "../lib/wrappers/child-process";
 const JavaHomeName = "JAVA_HOME";
 const AndroidHomeName = "ANDROID_HOME";
 const PROGRAM_FILES = "ProgramFiles";
+const PROGRAM_FILES_X86 = "ProgramFiles(x86)";
+const LOCAL_APP_DATA = "LOCALAPPDATA";
 const PROGRAM_FILES_ENV_PATH = "C:\\Program Files";
+const PROGRAM_FILEX_X86_ENV_PATH = "C:\\Program Files(x86)";
+const LOCAL_APP_DATA_ENV_PATH = "C:\\username\\localappdata";
 
 interface IChildProcessResultDescription {
 	result?: any;
@@ -145,7 +149,7 @@ function mockSysInfo(childProcessResult: IChildProcessResults, hostInfoOptions?:
 	};
 
 	const fileSystem: any = {
-		exists: () => Promise.resolve((fileSystemOptions || {}).existsResult),
+		exists: () => (fileSystemOptions || {}).existsResult,
 		extractZip: () => Promise.resolve(),
 		readDirectory: () => Promise.resolve([])
 	};
@@ -271,7 +275,9 @@ describe("SysInfo unit tests", () => {
 			it("on Windows", async () => {
 				const originalProgramFiles = process.env[PROGRAM_FILES];
 				process.env[PROGRAM_FILES] = PROGRAM_FILES_ENV_PATH;
-				sysInfo = mockSysInfo(childProcessResult, { isWindows: true, isDarwin: false, dotNetVersion });
+				process.env[PROGRAM_FILES_X86] = PROGRAM_FILEX_X86_ENV_PATH;
+				process.env[LOCAL_APP_DATA] = LOCAL_APP_DATA_ENV_PATH;
+				sysInfo = mockSysInfo(childProcessResult, { isWindows: true, isDarwin: false, dotNetVersion }, { existsResult: true });
 				const result = await sysInfo.getSysInfo();
 				process.env[PROGRAM_FILES] = originalProgramFiles;
 				assertCommonValues(result);
@@ -517,7 +523,7 @@ ${expectedCliVersion}`;
 				assert.deepEqual(result.itunesInstalled, undefined);
 				assert.deepEqual(result.cocoaPodsVer, "0.38.2");
 				assert.deepEqual(result.xcodeprojLocation, null);
-				assert.deepEqual(result.isCocoaPodsWorkingCorrectly, undefined);
+				assert.deepEqual(result.isCocoaPodsWorkingCorrectly, true);
 				assert.deepEqual(result.xcprojInfo, undefined);
 				assert.deepEqual(result.isCocoaPodsUpdateRequired, false);
 				assert.deepEqual(result.pythonInfo, {isInstalled: false, isSixPackageInstalled: false, installationErrorMessage: "Cannot read property 'shouldThrowError' of undefined"});
@@ -538,7 +544,7 @@ ${expectedCliVersion}`;
 				assert.deepEqual(result.isAndroidSdkConfiguredCorrectly, undefined);
 			});
 			it("Android platform is specified", async () => {
-				sysInfo = mockSysInfo(childProcessResult, { isWindows: false, isDarwin: true, dotNetVersion });
+				sysInfo = mockSysInfo(childProcessResult, { isWindows: false, isDarwin: true, dotNetVersion }, { existsResult: true });
 				const result = await sysInfo.getSysInfo({platform: "Android"});
 
 				assertCommonSysInfo(result);
@@ -552,7 +558,6 @@ ${expectedCliVersion}`;
 				assert.deepEqual(result.xcprojInfo, undefined);
 				assert.deepEqual(result.isCocoaPodsUpdateRequired, undefined);
 				assert.deepEqual(result.pythonInfo, undefined);
-				
 			});
 			it("no platform is specified", async() => {
 				sysInfo = mockSysInfo(childProcessResult, { isWindows: false, isDarwin: true, dotNetVersion });