Merge pull request #170 from NativeScript/totev/sync-common-lib

teobugslayer · teobugslayer · commit dd071a75f1b6 · 2015-01-10T14:55:44.000+02:00
Integrate the latest changes from the common lib
diff --git a/lib/commands/emulate.ts b/lib/commands/emulate.ts
@@ -1,4 +1,5 @@
 ///<reference path="../.d.ts"/>
+"use strict";
 
 export class EmulateCommand implements ICommand {
 	constructor(private $platformService: IPlatformService,
diff --git a/lib/commands/list-devices.ts b/lib/commands/list-devices.ts
@@ -1,4 +1,6 @@
 ///<reference path="../.d.ts"/>
+"use strict";
+
 import helpers = require("./../common/helpers");
 import util = require("util")
 
diff --git a/lib/commands/list-platforms.ts b/lib/commands/list-platforms.ts
@@ -1,4 +1,6 @@
 ///<reference path="../.d.ts"/>
+"use strict";
+
 import helpers = require("./../common/helpers");
 import util = require("util")
 
diff --git a/lib/commands/prepare.ts b/lib/commands/prepare.ts
@@ -1,4 +1,5 @@
 ///<reference path="../.d.ts"/>
+"use strict";
 
 export class PrepareCommand implements ICommand {
 	constructor(private $platformService: IPlatformService,
diff --git a/lib/common b/lib/common
@@ -1 +1 @@
-Subproject commit 2b1e60abcf9b918bac1f8c47f0046dfa7171ff20
+Subproject commit e19cd4381971662dcbf61bf8c8ed2e7f3b57231c
diff --git a/lib/config.ts b/lib/config.ts
@@ -1,4 +1,5 @@
 ///<reference path=".d.ts"/>
+"use strict";
 
 import path = require("path");
 import util = require("util");
@@ -21,5 +22,9 @@ export class StaticConfig implements IStaticConfig {
 	public get adbFilePath(): string {
 		return path.join(__dirname, util.format("../resources/platform-tools/android/%s/adb", process.platform));
 	}
+
+	public get sevenZipFilePath() {
+		return path.join(__dirname, util.format("../resources/platform-tools/unzip/%s/7za", process.platform));
+	}
 }
 $injector.register("staticConfig", StaticConfig);
diff --git a/lib/node-package-manager.ts b/lib/node-package-manager.ts
@@ -1,4 +1,5 @@
 ///<reference path=".d.ts"/>
+"use strict";
 
 import Future = require("fibers/future");
 import npm = require("npm");
diff --git a/lib/options.ts b/lib/options.ts
@@ -1,4 +1,5 @@
 ///<reference path=".d.ts"/>
+"use strict";
 
 import path = require("path");
 import helpers = require("./common/helpers");
@@ -34,7 +35,7 @@ if(hostInfo.isWindows()) {
 }
 
 commonOptions.setProfileDir(defaultProfileDir);
-var parsed = helpers.getParsedOptions(knownOpts, shorthands);
+var parsed = helpers.getParsedOptions(knownOpts, shorthands, "nativescript");
 
 Object.keys(parsed).forEach((opt) => exports[opt] = parsed[opt]);
 exports.knownOpts = knownOpts;
diff --git a/lib/services/analytics-settings-service.ts b/lib/services/analytics-settings-service.ts
@@ -1,4 +1,5 @@
 ///<reference path="../.d.ts"/>
+"use strict";
 
 class AnalyticsSettingsService implements IAnalyticsSettingsService {
 	constructor(private $userSettingsService: UserSettings.IUserSettingsService,
diff --git a/lib/services/android-project-service.ts b/lib/services/android-project-service.ts
@@ -1,4 +1,5 @@
 ///<reference path="../.d.ts"/>
+"use strict";
 import path = require("path");
 import shell = require("shelljs");
 import util = require("util");
diff --git a/lib/services/emulator-settings-service.ts b/lib/services/emulator-settings-service.ts
@@ -1,4 +1,5 @@
 ///<reference path="../.d.ts"/>
+"use strict";
 
 export class EmulatorSettingsService implements Mobile.IEmulatorSettingsService {
 	private static REQURED_ANDROID_APILEVEL = 17;
diff --git a/lib/services/ios-project-service.ts b/lib/services/ios-project-service.ts
@@ -1,4 +1,5 @@
 ///<reference path="../.d.ts"/>
+"use strict";
 
 import Future = require("fibers/future");
 import path = require("path");
diff --git a/lib/services/options-service.ts b/lib/services/options-service.ts
@@ -1,5 +1,4 @@
 ///<reference path="../.d.ts"/>
-
 "use strict";
 
 import options = require("../options");
diff --git a/lib/services/platform-service.ts b/lib/services/platform-service.ts
@@ -1,4 +1,5 @@
 ///<reference path="../.d.ts"/>
+"use strict";
 
 import path = require("path");
 import shell = require("shelljs");
diff --git a/lib/services/project-data-service.ts b/lib/services/project-data-service.ts
@@ -1,4 +1,5 @@
 ///<reference path="../.d.ts"/>
+"use strict";
 
 import path = require("path");
 import assert = require("assert");
diff --git a/lib/services/project-service.ts b/lib/services/project-service.ts
@@ -1,4 +1,5 @@
 ///<reference path="../.d.ts"/>
+"use strict";
 
 import constants = require("./../constants");
 import helpers = require("./../common/helpers");
diff --git a/lib/services/project-templates-service.ts b/lib/services/project-templates-service.ts
@@ -1,4 +1,5 @@
 ///<reference path="../.d.ts"/>
+"use strict";
 
 import util = require("util");
 import path = require("path");
diff --git a/lib/services/user-settings-service.ts b/lib/services/user-settings-service.ts
@@ -1,4 +1,5 @@
 ///<reference path="../.d.ts"/>
+"use strict";
 
 import path = require("path");
 import options = require("./../options");
diff --git a/package.json b/package.json
@@ -31,6 +31,7 @@
     "filesize": "2.0.3",
     "iconv-lite": "0.4.4",
     "lockfile": "1.0.0",
+    "lodash": "2.4.1",
     "log4js": "0.6.9",
     "mkdirp": "0.3.5",
     "mute-stream": "0.0.4",
@@ -48,7 +49,6 @@
     "shelljs": "0.3.0",
     "tabtab": "https://github.com/Icenium/node-tabtab/tarball/master",
     "temp": "0.8.1",
-    "underscore": "1.5.2",
     "unzip": "0.1.9",
     "watchr": "2.4.11",
     "xmlhttprequest": "https://github.com/telerik/node-XMLHttpRequest/tarball/master",
diff --git a/resources/platform-tools/unzip/win32/7za.dll b/resources/platform-tools/unzip/win32/7za.dll
diff --git a/resources/platform-tools/unzip/win32/7za.exe b/resources/platform-tools/unzip/win32/7za.exe
diff --git a/resources/platform-tools/unzip/win32/7zxa.dll b/resources/platform-tools/unzip/win32/7zxa.dll
diff --git a/test/test-bootstrap.ts b/test/test-bootstrap.ts
@@ -1,4 +1,4 @@
-global._ = require("underscore");
+global._ = require("lodash");
 global.$injector = require("../lib/common/yok").injector;
 
 $injector.register("analyticsService", {

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`///<reference path="../.d.ts"/>`
	`2`	`+"use strict";`
`2`	`3`
`3`	`4`	`export class EmulateCommand implements ICommand {`
`4`	`5`	`constructor(private $platformService: IPlatformService,`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`///<reference path=".d.ts"/>`
	`2`	`+"use strict";`
`2`	`3`
`3`	`4`	`import path = require("path");`
`4`	`5`	`import util = require("util");`
`@@ -21,5 +22,9 @@ export class StaticConfig implements IStaticConfig {`
`21`	`22`	`public get adbFilePath(): string {`
`22`	`23`	`return path.join(__dirname, util.format("../resources/platform-tools/android/%s/adb", process.platform));`
`23`	`24`	`}`
	`25`	`+`
	`26`	`+ public get sevenZipFilePath() {`
	`27`	`+ return path.join(__dirname, util.format("../resources/platform-tools/unzip/%s/7za", process.platform));`
	`28`	`+ }`
`24`	`29`	`}`
`25`	`30`	`$injector.register("staticConfig", StaticConfig);`