Merge branch 'master' into release

Author: Tsvetan Raikov

.gitignore

@@ -29,9 +29,12 @@ results
 scratch/
 .idea/
 .settings/
-.vscode/
+.vscode/**
+!.vscode/launch.json
 test-reports.xml
 
 npm-debug.log
 node_modules
-docs/html
+docs/html
+
+!test-scripts/*.js

.gitmodules

@@ -1,3 +1,3 @@
 [submodule "lib/common"]
 	path = lib/common
-	url = git@github.com:telerik/mobile-cli-lib.git
+	url = https://github.com/telerik/mobile-cli-lib.git

.npmignore

@@ -21,11 +21,12 @@ lib/**/*.ts
 lib/**/*.js.map
 
 test/
+test-scripts/
 .vscode
 lib/common/test/
 coverage/
 scratch/
 *.suo
 .travis.yml
 docs/html/
-dev/
+dev/

.travis.yml

@@ -7,13 +7,10 @@ language: node_js
 node_js:
 - '4'
 git:
-  submodules: false
+  submodules: true
 before_script:
-- sed -i 's/git@github.com:/https:\/\/github.com\//' .gitmodules
-- git submodule update --init --recursive
 - npm install grunt
 - node_modules/.bin/grunt enableScripts:false
-- npm install
 - grunt rebuild
 - ./bin/nativescript error-reporting disable # force ~/.local dir creation -- some tests rely on it
 - ./bin/nativescript usage-reporting disable
@@ -44,5 +41,5 @@ deploy:
     email: nativescript@telerik.com
     on:
       branch: master
-    api_key: 
+    api_key:
       secure: Ugq6m/y4P5gF15zffYzTKhusn1Csu3ymYLdD+yXgyK3hek9Ms5PKTz4MKgPinlViRCBoQV2fGh0JsCikawIpmQyD+M+FRDKlP2GcXPhFmSN1wVEloxTCwe7H6m7Kl9mo+MJOTS0BN7waCc6yTJBJPxo5nwFgz+DT2srIYndA2h4=

.vscode/launch.json

@@ -0,0 +1,76 @@
+{
+	// Use IntelliSense to learn about possible Node.js debug attributes.
+	// Hover to view descriptions of existing attributes.
+	// For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
+	"version": "0.2.0",
+	"configurations": [
+		{
+			"type": "node",
+			"request": "launch",
+			"cwd": "${workspaceRoot}/scratch",
+			"sourceMaps": true,
+			"name": "Launch CLI (Node 6+)",
+			"program": "${workspaceRoot}/lib/nativescript-cli.js",
+
+			// example commands
+			"args": [ "create", "cliapp"]
+			// "args": [ "platform", "add", "android@1.3.0", "--path", "cliapp"]
+			// "args": [ "platform", "remove", "android", "--path", "cliapp"]
+			// "args": [ "plugin", "add", "nativescript-barcodescanner", "--path", "cliapp"]
+			// "args": [ "plugin", "remove", "nativescript-barcodescanner", "--path", "cliapp"]
+			// "args": [ "build", "android", "--path", "cliapp"]
+			// "args": [ "run", "android", "--path", "cliapp"]
+			// "args": [ "debug", "android", "--path", "cliapp"]
+			// "args": [ "livesync", "android", "--path", "cliapp"]
+			// "args": [ "livesync", "android", "--watch", "--path", "cliapp"]
+		},
+		{
+			// in case you want to debug a single test, modify it's code to be `it.only(...` instead of `it(...`
+			"type": "node",
+			"request": "launch",
+			"name": "Launch Tests (Node 6+)",
+			"program": "${workspaceRoot}/node_modules/mocha/bin/_mocha",
+			"cwd": "${workspaceRoot}",
+			"sourceMaps": true
+		},
+
+		{
+			"type": "node",
+			"runtimeArgs": [
+				"--harmony"
+			],
+			"request": "launch",
+			"name": "Launch CLI (Node 4, Node 5)",
+			"program": "${workspaceRoot}/lib/nativescript-cli.js",
+			"cwd": "${workspaceRoot}",
+			"sourceMaps": true,
+			// define the arguments that you would like to pass to CLI, for example
+			// "args": [ "build", "android", "--justlaunch" ]
+			"args": [
+
+			]
+		},
+
+		{
+			// in case you want to debug a single test, modify it's code to be `it.only(...` instead of `it(...`
+			"type": "node",
+			"runtimeArgs": [
+				"--harmony"
+			],
+			"request": "launch",
+			"name": "Launch Tests (Node 4, Node 5)",
+			"program": "${workspaceRoot}/node_modules/mocha/bin/_mocha",
+			"cwd": "${workspaceRoot}",
+			"sourceMaps": true
+		},
+
+		{
+			"type": "node",
+			"request": "attach",
+			"name": "Attach to Process",
+			"port": 5858,
+			"sourceMaps": true
+		}
+
+	]
+}

CocoaPods.md

@@ -15,7 +15,7 @@ You need to install CocoaPods. If you haven't yet, you can do so by running:
 ```bash
 $ sudo gem install cocoapods
 ```
-> **NOTE:** All operations and code in this article are verified against CocoaPods 0.38.2.
+> **NOTE:** The minimum required version of CocoaPods is 1.0.0.
 
 To check your current version, run the following command.
 

Gruntfile.js

@@ -28,15 +28,7 @@ module.exports = function(grunt) {
 
 		pkg: grunt.file.readJSON("package.json"),
 		ts: {
-			options: {
-				target: 'es5',
-				module: 'commonjs',
-				sourceMap: true,
-				declaration: false,
-				removeComments: false,
-				noImplicitAny: true,
-				experimentalDecorators: true
-			},
+			options: grunt.file.readJSON("tsconfig.json").compilerOptions,
 
 			devlib: {
 				src: ["lib/**/*.ts", "!lib/common/node_modules/**/*.ts"],
@@ -131,7 +123,18 @@ module.exports = function(grunt) {
 		},
 
 		clean: {
-			src: ["test/**/*.js*", "lib/**/*.js*", "!lib/common/vendor/*.js", "!lib/common/**/*.json", "!lib/common/Gruntfile.js", "!lib/common/node_modules/**/*", "!lib/common/hooks/**/*.js", "!lib/common/bin/*.js", "*.tgz"]
+			src: ["test/**/*.js*",
+				"lib/**/*.js*",
+				"!test-scripts/**/*",
+				"!lib/common/vendor/*.js",
+				"!lib/common/**/*.json",
+				"!lib/common/Gruntfile.js",
+				"!lib/common/node_modules/**/*",
+				"!lib/common/hooks/**/*.js",
+				"!lib/common/bin/*.js",
+				"!lib/common/test-scripts/**/*",
+				"!lib/common/scripts/**/*",
+				"*.tgz"]
 		}
 	});
 

README.md

@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 NativeScript Command-Line Interface
 ================
 Master Branch [![Build Status](https://travis-ci.org/NativeScript/nativescript-cli.svg?branch=build)][2].
@@ -629,27 +630,16 @@ License
 ===
 
 This software is licensed under the Apache 2.0 license, quoted <a href="LICENSE" target="_blank">here</a>.
+=======
+# What is NativeScript
+NativeScript is a cross-platform JavaScript framework that lets you develop native iOS and Android apps from a single code base. The framework provides JavaScript access to the native APIs, user interface, and rendering engines of iOS and Android. By using JavaScript or TypeScript, you can create one project that builds into an iOS or Android app with completely native user experience.
 
-[Back to Top][1]
+# What is NativeScript Command Line Interface (CLI)
+The NativeScript CLI lets you create, build, and deploy NativeScript-based projects on iOS and Android devices.
+>>>>>>> master
+
+# Get started
+To learn more about how to use NativeScript, please follow our [getting started article](http://docs.nativescript.org). To see what commands are available in the CLI please type `tns --help` in the console after installing the CLI.
 
-[1]: #telerik-nativescript-command-line-interface
-[2]: https://travis-ci.org/NativeScript/nativescript-cli
-[3]: http://docs.telerik.com/platform/appbuilder/nativescript/index
-[4]: http://www.telerik.com/nativescript
-[6]: https://github.com/nativescript/docs/wiki
-[7]: https://github.com/nativescript/docs
-[8]: http://www.telerik.com/nativescript/faq
-[9]: http://developer.telerik.com/featured/nativescript-a-technical-overview/
-[10]: http://developer.telerik.com/featured/nativescript-android/
-[11]: http://blogs.telerik.com/valentinstoychev/posts.aspx/14-06-12/announcing-nativescript---cross-platform-framework-for-building-native-mobile-applications
-[12]: https://developer.apple.com/xcode/downloads/
-[13]: https://rubygems.org/gems/xcodeproj/versions/0.28.2
-[Chocolatey]: https://chocolatey.org/
-[JDK 8]: http://www.oracle.com/technetwork/java/javase/downloads/index.html
-[Android SDK 22]: http://developer.android.com/sdk/index.html
-[Genymotion]: https://www.genymotion.com/#!/
-[CocoaPods]: https://guides.cocoapods.org/using/getting-started.html#getting-started
-[xcproj]: https://github.com/0xced/xcproj#installation
-[Android SDK Build-tools 23.0.0]: http://developer.android.com/sdk/index.html
-[Android Support Repository]: http://developer.android.com/sdk/index.html
-![](https://ga-beacon.appspot.com/UA-111455-24/nativescript/nativescript-cli?pixel)
+# License
+Apache 2.0

bin/nativescript

@@ -1,4 +1,3 @@
-#!/bin/sh
+#!/usr/bin/env node
 
-AB_DIR="`dirname \"$0\"`"
-node "$AB_DIR/nativescript.js" "$@"
+require("./tns");