Merge pull request #193 from NativeScript/slavchev/debug-command

Author: Mihail Slavchev

lib/bootstrap.ts

@@ -25,6 +25,7 @@ $injector.requireCommand("platform|add", "./commands/add-platform");
 $injector.requireCommand("platform|remove", "./commands/remove-platform");
 $injector.requireCommand("platform|update", "./commands/update-platform");
 $injector.requireCommand("run", "./commands/run");
+$injector.requireCommand("debug", "./commands/debug");
 $injector.requireCommand("prepare", "./commands/prepare");
 $injector.requireCommand("build", "./commands/build");
 $injector.requireCommand("deploy", "./commands/deploy");

lib/commands/debug.ts

@@ -0,0 +1,18 @@
+///<reference path="../.d.ts"/>
+"use strict";
+
+import helpers = require("./../common/helpers");
+import util = require("util")
+
+export class DebugCommand implements ICommand {
+    constructor(private $platformService: IPlatformService,
+        private $platformCommandParameter: ICommandParameter) { }
+
+    execute(args: string[]): IFuture<void> {
+        return this.$platformService.debugPlatform(args[0]);
+    }
+
+    allowedParameters = [this.$platformCommandParameter];
+}
+$injector.registerCommand("debug", DebugCommand);
+ 

lib/common

@@ -24,4 +24,8 @@ interface IApplicationPackage {
 interface ILockFile {
 	lock(): IFuture<void>;
 	unlock(): IFuture<void>;
-}
+}
+
+interface IOpener {
+    open(target: string, appname: string): void;
+}

lib/declarations.ts

@@ -5,7 +5,8 @@ interface IPlatformService {
 	getPreparedPlatforms(): IFuture<string[]>;
 	removePlatforms(platforms: string[]): IFuture<void>;
 	updatePlatforms(platforms: string[]): IFuture<void>;
-	runPlatform(platform: string): IFuture<void>;
+    runPlatform(platform: string): IFuture<void>;
+    debugPlatform(platform: string): IFuture<void>;
 	preparePlatform(platform: string): IFuture<void>;
 	buildPlatform(platform: string): IFuture<void>;
 	deployOnDevice(platform: string): IFuture<void>;

lib/definitions/platform.d.ts

@@ -177,13 +177,60 @@ export class PlatformService implements IPlatformService {
 			platform = platform.toLowerCase();
 
 			this.preparePlatform(platform).wait();
-			if(options.emulator) {
+      if (options.emulator) {
 				this.deployOnEmulator(platform).wait();
 			} else {
 				this.deployOnDevice(platform).wait();
 			}
 		}).future<void>()();
-	}
+    }
+
+    public debugPlatform(platform: string): IFuture<void> {
+      platform = platform.toLowerCase();
+
+      var ret = options.emulator
+        ? this.debugOnEmulator(platform)
+        : this.debugOnDevice(platform);
+        
+      return ret;
+    }
+
+    public debugOnEmulator(platform: string): IFuture<void> {
+        return (() => {
+
+            // a bit redundant
+            this.deployOnEmulator(platform).wait();
+
+            this.debugOnDevice(platform).wait();
+        }).future<void>()();
+    }
+
+    public debugOnDevice(platform: string): IFuture<void> {
+        return (() => {
+            platform = platform.toLowerCase();
+
+            var packageFile = "";
+
+            if (options["debug-brk"]) {
+                this.preparePlatform(platform).wait();
+
+                var platformData = this.$platformsData.getPlatformData(platform);
+
+                var cachedDeviceOption = options.device;
+                options.device = true;
+                this.buildPlatform(platform).wait();
+                options.device = cachedDeviceOption;
+
+                packageFile = this.getLatestApplicationPackageForDevice(platformData).wait().packageName;
+                this.$logger.out("Using ", packageFile);
+            }
+
+            this.$devicesServices.initialize(platform, options.device).wait();
+            var action = (device: Mobile.IDevice): IFuture<void> => { return device.debug(packageFile, this.$projectData.projectId); };
+            this.$devicesServices.execute(action).wait();
+
+        }).future<void>()();
+    }
 
 	public removePlatforms(platforms: string[]): IFuture<void> {
 		return (() => {

lib/services/platform-service.ts

@@ -39,6 +39,7 @@
     "node-uuid": "1.4.1",
     "npm": "1.4.26",
     "osenv": "0.1.0",
+    "open": "0.0.4",
     "plistlib": "0.2.1",
     "progress-stream": "0.5.0",
     "prompt": "https://github.com/Icenium/prompt/tarball/master",
@@ -53,7 +54,8 @@
     "unzip": "0.1.9",
     "watchr": "2.4.11",
     "xmlhttprequest": "https://github.com/telerik/node-XMLHttpRequest/tarball/master",
-    "yargs": "1.2.2"
+    "yargs": "1.2.2",
+    "node-inspector":  "0.7.4"
   },
   "analyze": true,
   "devDependencies": {

package.json

@@ -20,6 +20,7 @@ General commands:
     emulate                         Deploys the project in the native emulator for the selected target platform.
     run                             Runs your project on a connected device or in the native emulator, if configured. 
                                     This is shorthand for prepare, build, and deploy.
+    debug                           Debugs your project on a connected device or in the native emulator, if configured. 
     device                          Lists all recognized connected physical or virtual device.
     feature-usage-tracking          Configures anonymous feature usage tracking.
 
@@ -235,6 +236,40 @@ Options:
 
 --[/]--
 
+--[debug]--
+
+Usage:
+    $ tns debug <Platform> [--device <Device ID>] [--debug-brk | --start | --stop | --get-port] [--debug-port <port>]
+    $ nativescript debug <Platform> [--device <Device ID>] [--debug-brk | --start | --stop | --get-port] [--debug-port <port>]
+
+Platform-specific usage:
+    $ tns debug android --get-port
+    $ tns debug android --debug-brk
+    $ tns debug ios --debug-brk --debug-port 12345
+    $ nativescript debug android --debug-brk
+    $ nativescript debug ios --start --debug-port 12345
+
+TODO: add proper help content
+
+Debugs your project on a connected device or in the native emulator, if configured. This is shorthand for prepare, build, and deploy.
+<Device ID> is the index or name of the target device as listed by $ tns list-devices.
+
+Before building for the Android emulator, verify that you have met the following requirements.
+    You have added the file paths to the following directories from the Android SDK to your PATH environment variable.
+        tools
+        platform-tools
+    You have created at least one device with the Android Virtual Device manager.
+
+Before building for the iOS simulator, verify that you have installed the ios-sim npm package.
+
+Before building for iOS device, verify that you have configured a valid pair of certificate and provisioning profile on your OS X system.
+
+Options:
+    --device - Specifies a connected device on which to run the app.
+    --emulator - If set, runs the app in the native emulator for the target platform, if configured.
+
+--[/]--
+
 --[emulate]--
 
 Usage: