Merge pull request #232 from NativeScript/totev/sync-common

Sync TNS with latest common lib

Author: teobugslayer

lib/common

@@ -125,7 +125,7 @@ export class NodePackageManager implements INodePackageManager {
 	private isPackageUnpacked(packagePath: string): IFuture<boolean> {
 		return (() => {
 			return this.$fs.getFsStats(packagePath).wait().isDirectory() &&
-				helpers.enumerateFilesInDirectorySync(packagePath).length > 1;
+				this.$fs.enumerateFilesInDirectorySync(packagePath).length > 1;
 		}).future<boolean>()();
 	}
 

lib/node-package-manager.ts

@@ -33,10 +33,11 @@ if(hostInfo.isWindows()) {
 }
 
 commonOptions.setProfileDir(defaultProfileDir);
-_(commonOptions.validateArgs("nativescript")).each((val,key) => {
+var errors: IErrors = $injector.resolve("errors");
+_(errors.validateArgs("nativescript", commonOptions.knownOpts, commonOptions.shorthands)).each((val,key) => {
 	key = shorthands[key] || key;
 	commonOptions[key] = val;
-});
+}).value();
 exports.knownOpts = knownOpts;
 
 declare var exports:any;

lib/options.ts

@@ -149,7 +149,7 @@ export class PlatformService implements IPlatformService {
 			_.each(contents, d => {
 				var fsStat = this.$fs.getFsStats(path.join(appDirectoryPath, d)).wait();
 				if(fsStat.isDirectory() && d !== constants.APP_RESOURCES_FOLDER_NAME) {
-					this.processPlatformSpecificFiles(platform, helpers.enumerateFilesInDirectorySync(path.join(appFilesLocation, d))).wait();
+					this.processPlatformSpecificFiles(platform, this.$fs.enumerateFilesInDirectorySync(path.join(appFilesLocation, d))).wait();
 				} else if(fsStat.isFile()) {
 					files.push(path.join(appFilesLocation,d));
 				}
@@ -469,7 +469,7 @@ export class PlatformService implements IPlatformService {
 	private getFrameworkFiles(platformData: IPlatformData, version: string): IFuture<string[]> {
 		return (() => {
 			var npmCacheDirectoryPath = this.getNpmCacheDirectory(platformData.frameworkPackageName, version).wait();
-			var allFiles = helpers.enumerateFilesInDirectorySync(npmCacheDirectoryPath);
+			var allFiles = this.$fs.enumerateFilesInDirectorySync(npmCacheDirectoryPath);
 			var filteredFiles = _.filter(allFiles, file => _.contains(platformData.frameworkFilesExtensions, path.extname(file)));
 			var relativeToCacheFiles = _.map(filteredFiles, file => file.substr(npmCacheDirectoryPath.length));
 

lib/services/platform-service.ts

@@ -54,6 +54,9 @@ class ErrorsNoFailStub implements IErrors {
 	}
 
 	verifyHeap(message: string): void { }
+
+	validateArgs(client: string, knownOpts: any, shorthands: any): any { return null; }
+	validateYargsArguments(parsed: any, knownOpts: any, shorthands: any, clientName?: string): void { }
 }
 
 class PlatformsData implements IPlatformsData {

test/platform-commands.ts

@@ -60,7 +60,7 @@ class ProjectIntegrationTest {
 
 	public assertProject(tempFolder: string, projectName: string, appId: string): IFuture<void> {
 		return (() => {
-			var fs = this.testInjector.resolve("fs");
+			var fs: IFileSystem = this.testInjector.resolve("fs");
 			var projectDir = path.join(tempFolder, projectName);
 			var appDirectoryPath = path.join(projectDir, "app");
 			var platformsDirectoryPath = path.join(projectDir, "platforms");
@@ -77,8 +77,8 @@ class ProjectIntegrationTest {
 			var expectedAppId = appId;
 			assert.equal(actualAppId, expectedAppId);
 
-			var actualFiles = helpers.enumerateFilesInDirectorySync(options["copy-from"]);
-			var expectedFiles = helpers.enumerateFilesInDirectorySync(appDirectoryPath);
+			var actualFiles = fs.enumerateFilesInDirectorySync(options["copy-from"]);
+			var expectedFiles = fs.enumerateFilesInDirectorySync(appDirectoryPath);
 
 			assert.equal(actualFiles.length, expectedFiles.length);
 			_.each(actualFiles, file => {

test/project-service.ts

@@ -25,6 +25,11 @@ export class LoggerStub implements ILogger {
 	prepare(item: any): string {
 		return "";
 	}
+
+	printInfoMessageOnSameLine(message: string): void { }
+	printMsgWithTimeout(message: string, timeout: number): IFuture<void> {
+		return null;
+	}
 }
 
 export class FileSystemStub implements IFileSystem {
@@ -132,6 +137,14 @@ export class FileSystemStub implements IFileSystem {
 	setCurrentUserAsOwner(path: string, owner: string): IFuture<void> {
 		return undefined;
 	}
+
+	enumerateFilesInDirectorySync(directoryPath: string, filterCallback?: (file: string, stat: IFsStats) => boolean): string[] {
+		return [];
+	}
+
+	isRelativePath(path: string): boolean {
+		return false;
+	}
 }
 
 export class ErrorsStub implements IErrors {
@@ -159,6 +172,9 @@ export class ErrorsStub implements IErrors {
 	verifyHeap(message: string): void { }
 
 	printCallStack: boolean = false;
+
+	validateArgs(client: string, knownOpts: any, shorthands: any): any { return null; }
+	validateYargsArguments(parsed: any, knownOpts: any, shorthands: any, clientName?: string): void { }
 }
 
 export class NPMStub implements INodePackageManager {