Merge branch 'release' into fatme/merge-release-0.9.2

Conflicts:
	lib/definitions/project.d.ts
	lib/services/android-project-service.ts
	lib/services/ios-project-service.ts
	test/stubs.ts

Author: Fatme Havaluova

CHANGELOG.md

@@ -0,0 +1,16 @@
+NativeScript CLI Changelog
+================
+
+0.9.2 (2015, March 17)
+===
+
+### New
+
+* [Implemented #305](https://github.com/NativeScript/nativescript-cli/issues/305), [#322](https://github.com/NativeScript/nativescript-cli/issues/322): You can quickly add or update your platform runtime to a specific version by running `tns platform update platform@version`<br/>For example: `tns platform update ios@0.9.2-beta`<br/>The NativeScript team will publish experimental support for the latest versions of iOS and Android.<br/>To list all available versions for android, run $ npm view tns-android versions<br/>To list only experimental versions for android, run $ npm view tns-android dist-tags
+To list all available versions for ios, run $ npm view tns-ios versions<br/>To list only experimental versions for ios, run $ npm view tns-ios dist-tags 
+* [Implemented #302](https://github.com/NativeScript/nativescript-cli/issues/302): You can configure proxy settings for the NativeScript CLI.
+
+### Fixed
+
+* [Fixed #299](https://github.com/NativeScript/nativescript-cli/issues/299): You cannot build the default `Hello World` app for Android on OS X systems.
+* [Fixed #297](https://github.com/NativeScript/nativescript-cli/issues/297): You cannot install the NativeScript CLI.

README.md

@@ -10,6 +10,8 @@ The NativeScript CLI lets you create, build, and deploy NativeScript-based proje
 * [Supported Platforms](#supported-platforms "The mobile platforms you can target with NativeScript")
 * [System Requirements](#system-requirements "The hardware and software requirements for setting up and working with the NativeScript CLI")
 * [Installation](#installation "How to configure and install the NativeScript CLI")
+	* [Install the NativeScript CLI](#install-the-nativescript-cli)
+	* [Configure Proxy Usage](#configure-proxy-usage)
 * [Quick Start](#quick-start "Get started with the NativeScript CLI")
 	* [The Commands](#the-commands)
 	* [Create Project](#create-project)
@@ -203,6 +205,8 @@ export PATH=${PATH}:/ant/apache-ant-1.9.4/bin:/Applications/Android Studio.app/s
 Installation
 ===
 
+## Install the NativeScript CLI
+
 The NativeScript CLI is available for installing as an npm package.
 
 In the command prompt, run the following command.
@@ -213,6 +217,18 @@ npm install nativescript -g
 
 > On OS X and Linux systems, you might need to run this command using sudo.
 
+## Configure Proxy Usage
+
+If you are working with the NativeScript CLI behind a web proxy, you might need to configure your proxy settings.
+
+1. On your file system, locate the directory where the **nativescript** npm package is installed.
+1. In a text editor, open `config` → `config.json`.
+1. Set `USE_PROXY` to `true`.
+1. Set `PROXY_PORT`.
+1. Set `PROXY_HOSTNAME`.
+
+> Make sure to preserve the quotation marks and commas as in the initial `config.json` file.
+
 [Back to Top][1]
 
 Quick Start
@@ -334,6 +350,9 @@ For more information about the structure of Android native projects, see [Androi
 
 For more information about the structure iOS native projects, see [Code Organization in Xcode Projects](http://akosma.com/2009/07/28/code-organization-in-xcode-projects/).
 
+> **TIP:** The NativeScript team provides experimental support for the latest versions of iOS and Android. You can choose which platform runtime to use in your project by running `tns platform add <platform>@<Version>`<br/>To list all available versions for android, run $ npm view tns-android versions<br/>To list only experimental versions for android, run $ npm view tns-android dist-tags
+To list all available versions for ios, run $ npm view tns-ios versions<br/>To list only experimental versions for ios, run $ npm view tns-ios dist-tags
+
 [Back to Top][1]
 
 ## Develop Your Project

lib/services/android-project-service.ts

@@ -14,6 +14,10 @@ import os = require("os");
 class AndroidProjectService implements IPlatformProjectService {
 	private SUPPORTED_TARGETS = ["android-17", "android-18", "android-19", "android-21"];
 	private static METADATA_DIRNAME = "__metadata";
+	private static RES_DIRNAME = "res";
+	private static VALUES_DIRNAME = "values";
+	private static VALUES_VERSION_DIRNAME_PREFIX = AndroidProjectService.VALUES_DIRNAME + "-v";
+
 	private targetApi: string;
 
 	constructor(private $androidEmulatorServices: Mobile.IEmulatorPlatformServices,
@@ -53,19 +57,20 @@ class AndroidProjectService implements IPlatformProjectService {
 	public createProject(projectRoot: string, frameworkDir: string): IFuture<void> {
 		return (() => {
 			this.$fs.ensureDirectoryExists(projectRoot).wait();
-
+			var newTarget = this.getLatestValidAndroidTarget(frameworkDir).wait();
+			var versionNumber = _.last(newTarget.split("-"));
 			if(options.symlink) {
-				this.copy(projectRoot, frameworkDir, "res", "-R").wait();
+				this.copyResValues(projectRoot, frameworkDir, versionNumber).wait();
 				this.copy(projectRoot, frameworkDir, ".project AndroidManifest.xml project.properties", "-f").wait();
 
 				this.symlinkDirectory("assets", projectRoot, frameworkDir).wait();
 				this.symlinkDirectory("libs", projectRoot, frameworkDir).wait();
 			} else {
-				this.copy(projectRoot, frameworkDir, "assets libs res", "-R").wait();
+				this.copyResValues(projectRoot, frameworkDir, versionNumber).wait();
+				this.copy(projectRoot, frameworkDir, "assets libs", "-R").wait();
 				this.copy(projectRoot, frameworkDir, ".project AndroidManifest.xml project.properties", "-f").wait();
 			}
 
-			var newTarget = this.getLatestValidAndroidTarget(frameworkDir).wait();
 			if(newTarget) {
 				this.updateTarget(projectRoot, newTarget).wait();
 			}
@@ -79,6 +84,21 @@ class AndroidProjectService implements IPlatformProjectService {
 		}).future<any>()();
 	}
 
+	private copyResValues(projectRoot: string, frameworkDir: string, versionNumber: string): IFuture<void> {
+		return (() => {
+			var resSourceDir = path.join(frameworkDir, AndroidProjectService.RES_DIRNAME);
+			var resDestinationDir = path.join(projectRoot, AndroidProjectService.RES_DIRNAME);
+			this.$fs.createDirectory(resDestinationDir).wait();
+			var versionDirName = AndroidProjectService.VALUES_VERSION_DIRNAME_PREFIX + versionNumber;
+			var directoriesToCopy = [AndroidProjectService.VALUES_DIRNAME];
+			if(this.$fs.exists(path.join(resSourceDir, versionDirName)).wait()) {
+				directoriesToCopy.push(versionDirName);
+			}
+
+			this.copy(resDestinationDir, resSourceDir, directoriesToCopy.join(" "), "-R").wait();
+		}).future<void>()();
+	}
+
 	public interpolateData(projectRoot: string): IFuture<void> {
 		return (() => {
 			// Interpolate the activity name and package

lib/services/ios-project-service.ts

@@ -89,12 +89,16 @@ class IOSProjectService implements  IPlatformProjectService {
 
 	public interpolateData(projectRoot: string): IFuture<void> {
 		return (() => {
+			var infoPlistFilePath = path.join(projectRoot, IOSProjectService.IOS_PROJECT_NAME_PLACEHOLDER, util.format("%s-%s", IOSProjectService.IOS_PROJECT_NAME_PLACEHOLDER, "Info.plist"));
+			shell.sed('-i', "__CFBundleIdentifier__", this.$projectData.projectId, infoPlistFilePath);
+
 			this.replaceFileName("-Info.plist", path.join(projectRoot, IOSProjectService.IOS_PROJECT_NAME_PLACEHOLDER)).wait();
 			this.replaceFileName("-Prefix.pch", path.join(projectRoot, IOSProjectService.IOS_PROJECT_NAME_PLACEHOLDER)).wait();
 			this.replaceFileName(IOSProjectService.XCODE_PROJECT_EXT_NAME, projectRoot).wait();
 
 			var pbxprojFilePath = path.join(projectRoot, this.$projectData.projectName + IOSProjectService.XCODE_PROJECT_EXT_NAME, "project.pbxproj");
 			this.replaceFileContent(pbxprojFilePath).wait();
+
 		}).future<void>()();
 	}
 

package.json

@@ -1,7 +1,7 @@
 {
   "name": "nativescript",
   "preferGlobal": true,
-  "version": "0.9.1",
+  "version": "0.9.2",
   "author": "Telerik <support@telerik.com>",
   "description": "Command-line interface for building NativeScript projects",
   "bin": {

resources/help.txt

@@ -108,14 +108,20 @@ Lists all platforms that the project currently targets. You can build and deploy
 --[platform|add]--
 
 Usage:
-    $ tns platform add <Platform> [--frameworkPath <File Path>] [--symlink]
+    $ tns platform add <Platform>[@<Version>] [--frameworkPath <File Path>] [--symlink]
 
 Platform-specific usage:
     $ tns platform add android [--frameworkPath <File Path>] [--symlink]
-    $ tns platform add ios [--frameworkPath <File Path>] [--symlink] 
+    $ tns platform add android[@<Version>] [--frameworkPath <File Path>] [--symlink]
+    $ tns platform add ios [--frameworkPath <File Path>] [--symlink]
+    $ tns platform add ios[@<Version>] [--frameworkPath <File Path>] [--symlink]
 
 Configures the current project to target the selected platform. 
 
+<Version> is any available version of the respective platform runtime published in npm. If @<Version> is not specified, the NativeScript CLI installs the latest stable runtime for the selected platform.
+To list all available versions for android, run $ npm view tns-android versions. To list only experimental versions for android, run $ npm view tns-android dist-tags.
+To list all available versions for ios, run $ npm view tns-ios versions. To list only experimental versions for ios, run $ npm view tns-ios dist-tags.
+
 <File Path> is the complete path to a valid npm package or a directory that contains a NativeScript runtime for the selected platform. 
 
 When you add a target platform, the NativeScript CLI adds a corresponding platform-specific subdirectory under the platforms directory. This platform-specific directory contains the necessary files to let you build your project for the target platform.
@@ -152,11 +158,15 @@ This operation deletes the subdirectory for the selected platform from the platf
 --[platform|update]--
 
 Usage:
-    $ tns platform update <Platform>
+    $ tns platform update <Platform>[@<Version>]
 
 Platform-specific usage:
-    $ tns platform update android
-    $ tns platform update ios
+    $ tns platform update android[@<Version>]
+    $ tns platform update ios[@<Version>]
+
+<Version> is any available version of the respective platform runtime published in npm. If @<Version> is not specified, the NativeScript CLI installs the latest stable runtime for the selected platform.
+To list all available versions for android, run $ npm view tns-android versions. To list only experimental versions for android, run $ npm view tns-android dist-tags.
+To list all available versions for ios, run $ npm view tns-ios versions. To list only experimental versions for ios, run $ npm view tns-ios dist-tags.
 
 Updates the NativeScript runtime for the specified platform.
 --[/]--