Merge pull request #216 from NativeScript/totev/double-log-trace2

teobugslayer · teobugslayer · commit 24f09f5fc9d0 · 2015-02-12T19:08:59.000+02:00
Sync with the latest common lib
diff --git a/lib/bootstrap.ts b/lib/bootstrap.ts
@@ -1,5 +1,7 @@
 require("./common/bootstrap");
-
+$injector.require("config", "./config");
+require("./options");
+// note: order above is important!
 $injector.require("nativescript-cli", "./nativescript-cli");
 
 $injector.require("projectData", "./project-data");
@@ -33,5 +35,4 @@ $injector.requireCommand("emulate", "./commands/emulate");
 
 $injector.require("npm", "./node-package-manager");
 $injector.require("lockfile", "./lockfile");
-$injector.require("config", "./config");
 $injector.require("optionsService", "./services/options-service");
diff --git a/lib/common b/lib/common
@@ -1 +1 @@
-Subproject commit af1b8f4bb59e19206e2e02a5792e4ab79e77d8e8
+Subproject commit c6d535b058c8d9d537f961238506231caca19ba3
diff --git a/lib/config.ts b/lib/config.ts
@@ -5,6 +5,12 @@ import path = require("path");
 import util = require("util");
 import staticConfigBaseLibPath = require("./common/static-config-base");
 
+$injector.register("config", {
+	CI_LOGGER: false,
+	DEBUG: process.env.NATIVESCRIPT_DEBUG,
+	TYPESCRIPT_COMPILER_OPTIONS: { }
+});
+
 export class StaticConfig extends staticConfigBaseLibPath.StaticConfigBase implements IStaticConfig {
 	public PROJECT_FILE_NAME = ".tnsproject";
 	public CLIENT_NAME = "NativeScript";
diff --git a/lib/lockfile.ts b/lib/lockfile.ts
@@ -4,7 +4,7 @@
 import Future = require("fibers/future");
 import lockfile = require("lockfile");
 import path = require("path");
-import options = require("./options");
+import options = require("./common/options");
 
 export class LockFile implements ILockFile {
 	private static LOCK_FILENAME = path.join(options["profile-dir"], ".lock");
diff --git a/lib/nativescript-cli.ts b/lib/nativescript-cli.ts
@@ -1,19 +1,11 @@
 ///<reference path=".d.ts"/>
 "use strict";
 import path = require("path");
-
 require("./bootstrap");
-require("./options");
 
 import errors = require("./common/errors");
 errors.installUncaughtExceptionListener();
 
-$injector.register("config", {
-	CI_LOGGER: false,
-	DEBUG: process.env.NATIVESCRIPT_DEBUG,
-	TYPESCRIPT_COMPILER_OPTIONS: { }
-});
-
 var dispatcher = $injector.resolve("dispatcher");
 dispatcher.runMainFiber();
 
diff --git a/lib/node-package-manager.ts b/lib/node-package-manager.ts
@@ -8,7 +8,7 @@ import semver = require("semver");
 import shell = require("shelljs");
 import helpers = require("./common/helpers");
 import constants = require("./constants");
-import options = require("./options");
+import options = require("./common/options");
 
 export class NodePackageManager implements INodePackageManager {
 	private static NPM_LOAD_FAILED = "Failed to retrieve data from npm. Please try again a little bit later.";
diff --git a/lib/options.ts b/lib/options.ts
@@ -2,7 +2,6 @@
 "use strict";
 
 import path = require("path");
-import helpers = require("./common/helpers");
 import commonOptions = require("./common/options");
 import osenv = require("osenv");
 import hostInfo = require("./common/host-info");
@@ -23,8 +22,8 @@ var knownOpts:any = {
 	shorthands: IStringDictionary = {
 	};
 
-_.extend(knownOpts, commonOptions.knownOpts);
-_.extend(shorthands, commonOptions.shorthands);
+_.extend(commonOptions.knownOpts, knownOpts);
+_.extend(commonOptions.shorthands, shorthands);
 
 var defaultProfileDir = "";
 var nativeScriptCacheFolder = ".nativescript-cli";
@@ -35,15 +34,9 @@ if(hostInfo.isWindows()) {
 }
 
 commonOptions.setProfileDir(defaultProfileDir);
-var parsed = helpers.getParsedOptions(knownOpts, shorthands, "nativescript");
-
-Object.keys(parsed).forEach(opt => {
-	var key = opt;
-	if(shorthands[opt]) {
-		key = shorthands[opt];
-	}
-
-	exports[key] = parsed[opt];
+_(commonOptions.validateArgs("nativescript")).each((val,key) => {
+	key = shorthands[key] || key;
+	commonOptions[key] = val;
 });
 exports.knownOpts = knownOpts;
 
diff --git a/lib/services/android-project-service.ts b/lib/services/android-project-service.ts
@@ -4,10 +4,10 @@ import path = require("path");
 import shell = require("shelljs");
 import util = require("util");
 import Future = require("fibers/future");
-import options = require("./../options");
-import constants = require("./../constants");
+import options = require("../common/options");
+import constants = require("../constants");
 import hostInfo = require("../common/host-info");
-import helpers = require("./../common/helpers");
+import helpers = require("../common/helpers");
 
 class AndroidProjectService implements IPlatformProjectService {
 	private SUPPORTED_TARGETS = ["android-17", "android-18", "android-19", "android-21"];
diff --git a/lib/services/ios-project-service.ts b/lib/services/ios-project-service.ts
@@ -7,7 +7,7 @@ import shell = require("shelljs");
 import util = require("util");
 import constants = require("./../constants");
 import helpers = require("./../common/helpers");
-import options = require("./../options");
+import options = require("../common/options");
 
 class IOSProjectService implements  IPlatformProjectService {
 	private static XCODE_PROJECT_EXT_NAME = ".xcodeproj";
diff --git a/lib/services/options-service.ts b/lib/services/options-service.ts
@@ -1,7 +1,7 @@
 ///<reference path="../.d.ts"/>
 "use strict";
 
-import options = require("../options");
+import options = require("../common/options");
 
 export class OptionsService implements IOptionsService {
 	public getKnownOptions(): string[]{
diff --git a/lib/services/platform-service.ts b/lib/services/platform-service.ts
@@ -6,7 +6,7 @@ import shell = require("shelljs");
 import util = require("util");
 import constants = require("./../constants");
 import helpers = require("./../common/helpers");
-import options = require("./../options");
+import options = require("./../common/options");
 import semver = require("semver");
 
 export class PlatformService implements IPlatformService {
diff --git a/lib/services/project-service.ts b/lib/services/project-service.ts
@@ -2,8 +2,8 @@
 "use strict";
 
 import constants = require("./../constants");
-import helpers = require("./../common/helpers");
-import options = require("./../options");
+import helpers = require("../common/helpers");
+import options = require("../common/options");
 import osenv = require("osenv");
 import path = require("path");
 import shell = require("shelljs");
diff --git a/lib/services/project-templates-service.ts b/lib/services/project-templates-service.ts
@@ -5,8 +5,8 @@ import util = require("util");
 import path = require("path");
 import shell = require("shelljs");
 import npm = require("npm");
-var options = require("./../options");
-var helpers = require("./../common/helpers");
+var options = require("../common/options");
+var helpers = require("../common/helpers");
 import Future = require("fibers/future");
 
 export class ProjectTemplatesService implements IProjectTemplatesService {
diff --git a/lib/services/user-settings-service.ts b/lib/services/user-settings-service.ts
@@ -2,8 +2,8 @@
 "use strict";
 
 import path = require("path");
-import options = require("./../options");
-import userSettingsServiceBaseLib = require("./../common/services/user-settings-service");
+import options = require("../common/options");
+import userSettingsServiceBaseLib = require("../common/services/user-settings-service");
 
 class UserSettingsService extends userSettingsServiceBaseLib.UserSettingsServiceBase {
 	constructor($fs: IFileSystem) {
diff --git a/test/platform-commands.ts b/test/platform-commands.ts
@@ -12,7 +12,7 @@ import CommandsServiceLib = require("../lib/common/services/commands-service");
 import path = require("path");
 import Future = require("fibers/future");
 var assert = require("chai").assert;
-var options: any = require("./../lib/options");
+var options: any = require("../lib/common/options");
 var isCommandExecuted = true;
 
 class PlatformData implements IPlatformData {
@@ -47,6 +47,10 @@ class ErrorsNoFailStub implements IErrors {
 		}).future<boolean>()();
 	}
 
+	executeAction(action: Function): any {
+		return action();
+	}
+
 	verifyHeap(message: string): void { }
 }
 
diff --git a/test/platform-service.ts b/test/platform-service.ts
@@ -21,7 +21,7 @@ import path = require("path");
 import Future = require("fibers/future");
 
 var assert = require("chai").assert;
-var options: any = require("./../lib/options");
+var options: any = require("../lib/common/options");
 require('should');
 
 function createTestInjector() {
diff --git a/test/project-service.ts b/test/project-service.ts
@@ -18,7 +18,7 @@ import util = require("util");
 import helpers = require("../lib/common/helpers");
 
 var assert = require("chai").assert;
-var options: any = require("./../lib/options");
+var options: any = require("../lib/common/options");
 var mockProjectNameValidator = {
 	validate: () => { return true; }
 };
diff --git a/test/stubs.ts b/test/stubs.ts
@@ -151,9 +151,11 @@ export class ErrorsStub implements IErrors {
 		throw new Error("not supported");
 	}
 
-	verifyHeap(message: string): void {
-
+	executeAction(action: Function): any {
+		return action();
 	}
+
+	verifyHeap(message: string): void { }
 }
 
 export class NPMStub implements INodePackageManager {
