Merge branch 'release' into fatme/merge-release-1.1.2-into-master

Conflicts:
	lib/bootstrap.ts
	lib/common
	lib/services/platform-service.ts

Author: Fatme

CHANGELOG.md

@@ -1,6 +1,23 @@
 NativeScript CLI Changelog
 ================
 
+1.1.2 (2015, July 2)
+==
+
+### New
+
+* [Implemented #600](https://github.com/NativeScript/nativescript-cli/issues/600): Added the `$ tns init` command. You can use it to initialize a NativeScript project for development. The command recreates or updates the `package.json` file of the project. You can then run `$ tns install` to install the platforms and dependencies described in the `package.json` file.
+* [Implemented #587](https://github.com/NativeScript/nativescript-cli/issues/587): Added the `$ tns install` command. You can use it to quickly install all platforms and dependencies described in a `package.json` file.
+
+### Fixed
+
+* [Fixed #606](https://github.com/NativeScript/nativescript-cli/issues/606): The NativeScript CLI lets you run `<Platform>`-based commands on operating systems which do not support development for this platform. For example, you can run `$ tns build ios` on a Windows system.
+* [Fixed #601](https://github.com/NativeScript/nativescript-cli/issues/601): The NativeScript CLI does not treat the dependencies of devDependencies as devDependencies.
+* [Fixed #599](https://github.com/NativeScript/nativescript-cli/issues/599): The NativeScript CLI always creates a `tmp` directory in the current directory when you run any command and modifies the `package.json` file for the project.
+* [Fixed #584](https://github.com/NativeScript/nativescript-cli/issues/584): The NativeScript CLI references the files in the project with their absolute paths instead of their relative paths. This might cause the project to stop working when transfered to another location and might cause issues with your application packages.
+* [Fixed #578](https://github.com/NativeScript/nativescript-cli/issues/578): Platform-specific files in NativeScript plugins are not processed correctly. The NativeScript CLI copies them to the correct platform-specific directory but does not rename them correctly.
+* [Fixed #520](https://github.com/NativeScript/nativescript-cli/issues/520): iOS resources from the `App_Resources` folder are not included in the native Xcode project and are not accessible in the application package.
+
 1.1.1 (2015, June 17)
 ==
 

bin/nativescript.js

@@ -28,7 +28,8 @@ Command | Description
 [emulate `<Platform>`](project/testing/emulate.html) | Deploys the project in the native emulator for the selected target platform.
 [run `<Platform>`](project/testing/run.html) | Runs your project on a connected device or in the native emulator, if configured.
 [debug `<Platform>`](project/testing/debug.html) | Debugs your project on a connected device. 
-[plugin](plugin.html) | Lists all installed plugins for your project or lets you manage the plugins for your project.
+[install](project/configuration/install.html) | Installs all platforms and dependencies described in the `package.json` file in the current directory.
+[plugin](lib-management/plugin.html) | Lets you manage the plugins for your project.
 
 ## Device Commands
 Command | Description

docs/man_pages/index.md

@@ -0,0 +1,27 @@
+install
+==========
+
+Usage | Synopsis
+---|---
+General | `$ tns install [--path]`
+
+Installs all platforms and dependencies described in the `package.json` file in the current directory.
+
+<% if(isHtml) { %> 
+The `package.json` file must be a valid `package.json` describing the configuration of a NativeScript project. If missing or corrupted, you can recreate the file by running `$ tns init` in the directory of a NativeScript project. 
+<% } %>
+
+### Options
+* `--path` - Specifies the directory which contains the `package.json` file, if different from the current directory.
+
+<% if(isHtml) { %> 
+### Related Commands
+
+Command | Description
+----------|----------
+[platform add](platform-add.html) | Configures the current project to target the selected platform.
+[platform remove](platform-remove.html) | Removes the selected platform from the platforms that the project currently targets.
+[platform update](platform-update.html) | Updates the NativeScript runtime for the specified platform.
+[platform](platform.html) | Lists all platforms that the project currently targets.
+[prepare](prepare.html) | Copies common and relevant platform-specific content from the app directory to the subdirectory for the selected target platform in the platforms directory.
+<% } %>

docs/man_pages/project/configuration/install.md

@@ -32,6 +32,7 @@ To list only experimental versions for iOS, run `$ npm view tns-ios dist-tags`
 
 Command | Description
 ----------|----------
+[install](install.html) | Installs all platforms and dependencies described in the `package.json` file in the current directory.
 [platform remove](platform-remove.html) | Removes the selected platform from the platforms that the project currently targets.
 [platform update](platform-update.html) | Updates the NativeScript runtime for the specified platform.
 [platform](platform.html) | Lists all platforms that the project currently targets.

docs/man_pages/project/configuration/platform-add.md

@@ -24,6 +24,7 @@ Removes the selected platform from the platforms that the project currently targ
 
 Command | Description
 ----------|----------
+[install](install.html) | Installs all platforms and dependencies described in the `package.json` file in the current directory.
 [platform add](platform-add.html) | Configures the current project to target the selected platform.
 [platform update](platform-update.html) | Updates the NativeScript runtime for the specified platform.
 [platform](platform.html) | Lists all platforms that the project currently targets.

docs/man_pages/project/configuration/platform-remove.md

@@ -29,6 +29,7 @@ To list only experimental versions for ios, run `$ npm view tns-ios dist-tags`
 
 Command | Description
 ----------|----------
+[install](install.html) | Installs all platforms and dependencies described in the `package.json` file in the current directory.
 [platform add](platform-add.html) | Configures the current project to target the selected platform.
 [platform remove](platform-remove.html) | Removes the selected platform from the platforms that the project currently targets.
 [platform](platform.html) | Lists all platforms that the project currently targets.

docs/man_pages/project/configuration/platform-update.md

@@ -12,6 +12,7 @@ Lists all platforms that the project currently targets. You can build and deploy
 
 Command | Description
 ----------|----------
+[install](install.html) | Installs all platforms and dependencies described in the `package.json` file in the current directory.
 [platform add](platform-add.html) | Configures the current project to target the selected platform.
 [platform remove](platform-remove.html) | Removes the selected platform from the platforms that the project currently targets.
 [platform update](platform-update.html) | Updates the NativeScript runtime for the specified platform.

docs/man_pages/project/configuration/platform.md

@@ -23,6 +23,7 @@ in the `platforms` directory. This lets you build the project with the SDK for t
 
 Command | Description
 ----------|----------
+[install](install.html) | Installs all platforms and dependencies described in the `package.json` file in the current directory.
 [platform add](platform-add.html) | Configures the current project to target the selected platform.
 [platform remove](platform-remove.html) | Removes the selected platform from the platforms that the project currently targets.
 [platform update](platform-update.html) | Updates the NativeScript runtime for the specified platform.

docs/man_pages/project/configuration/prepare.md

@@ -16,4 +16,13 @@ Creates a new project for native development with NativeScript from the default
 * `<App Name>` is the name of project. The specified name must meet the requirements of all platforms that you want to target. <% if(isConsole) { %>For more information about the `<App Name>` requirements, run `$ tns help create`<% } %><% if(isHtml) { %>For projects that target Android, you can use uppercase or lowercase letters, numbers, and underscores. The name must start with a letter.  
 For projects that target iOS, you can use uppercase or lowercase letters, numbers, and hyphens.<% } %>    
 * `<App ID>` is the application identifier for your project. It must be a domain name in reverse and must meet the requirements of all platforms that you want to target. If not specified, the application identifier is set to `org.nativescript.<App name>` <% if(isConsole) { %>For more information about the `<App ID>` requirements, run `$ tns help create`<% } %><% if(isHtml) { %>For projects that target Android, you can use uppercase or lowercase letters, numbers, and underscores in the strings of the reversed domain name, separated by a dot. Strings must be separated by a dot and must start with a letter. For example: `com.nativescript.My_Andro1d_App`  
-For projects that target iOS, you can use uppercase or lowercase letters, numbers, and hyphens in the strings of the reversed domain name. Strings must be separated by a dot. For example: `com.nativescript.My-i0s-App`.<% } %>
+For projects that target iOS, you can use uppercase or lowercase letters, numbers, and hyphens in the strings of the reversed domain name. Strings must be separated by a dot. For example: `com.nativescript.My-i0s-App`.<% } %>
+
+<% if(isHtml) { %> 
+### Related Commands
+
+Command | Description
+----------|----------
+[init](init.html) | Initializes a project for development. The command prompts you to provide your project configuration interactively and uses the information to create a new package.json file or update the existing one.
+[install](install.html) | Installs all platforms and dependencies described in the `package.json` file in the current directory.
+<% } %> 

docs/man_pages/project/creation/create.md

@@ -0,0 +1,21 @@
+init
+==========
+
+Usage | Synopsis
+---|---
+General | `$ tns init [--path <Directory>] [--force]`
+
+Initializes a project for development. The command prompts you to provide your project configuration interactively and uses the information to create a new `package.json` file or update the existing one.
+
+### Options
+* `--path` - Specifies the directory where you want to initialize the project, if different from the current directory. The directory must be empty.
+* `--force` - If set, applies the default project configuration and does not show the interactive prompt. The default project configuration targets the latest official runtimes and sets `org.nativescript.<folder_name>` for application identifier.
+
+<% if(isHtml) { %> 
+### Related Commands
+
+Command | Description
+----------|----------
+[create](create.html) | Creates a new project for native development with NativeScript from the default template or from an existing NativeScript project.
+[install](install.html) | Installs all platforms and dependencies described in the `package.json` file in the current directory.
+<% } %> 

docs/man_pages/project/creation/init.md

@@ -61,3 +61,9 @@ $injector.requireCommand("plugin|add", "./commands/plugin/add-plugin");
 $injector.requireCommand("plugin|remove", "./commands/plugin/remove-plugin");
 
 $injector.require("doctorService", "./services/doctor-service");
+$injector.requireCommand("install", "./commands/install");
+
+$injector.require("initService", "./services/init-service");
+$injector.requireCommand("init", "./commands/init");
+
+$injector.require("projectFilesManager", "./services/project-files-manager");

lib/bootstrap.ts

@@ -0,0 +1,16 @@
+///<reference path="../.d.ts"/>
+"use strict";
+
+import Future = require("fibers/future");
+
+export class InitCommand implements ICommand {
+	constructor(private $initService: IInitService) { }
+		
+	public allowedParameters: ICommandParameter[] = [];
+	public enableHooks = false;
+	
+	public execute(args: string[]): IFuture<void> {
+		return this.$initService.initialize();
+	}
+}
+$injector.registerCommand("init", InitCommand);

lib/commands/init.ts

@@ -0,0 +1,44 @@
+///<reference path="../.d.ts"/>
+"use strict";
+
+export class InstallCommand implements ICommand {
+	private _projectData: any;
+	
+	constructor(private $platformsData: IPlatformsData,
+		private $platformService: IPlatformService,
+		private $projectData: IProjectData,
+		private $projectDataService: IProjectDataService,
+		private $pluginsService: IPluginsService,
+		private $logger: ILogger) { }
+		
+	public enableHooks = false;
+		
+	public allowedParameters: ICommandParameter[] = [];
+	
+	public execute(args: string[]): IFuture<void> {
+		return (() => {
+			let error: string = "";
+			
+			this.$pluginsService.ensureAllDependenciesAreInstalled().wait();
+						
+			this.$projectDataService.initialize(this.$projectData.projectDir);
+			_.each(this.$platformsData.platformsNames, platform => {
+				let platformData = this.$platformsData.getPlatformData(platform);
+				let frameworkPackageData = this.$projectDataService.getValue(platformData.frameworkPackageName).wait();
+				if(frameworkPackageData && frameworkPackageData.version) {
+					try {
+						this.$platformService.addPlatforms([`${platform}@${frameworkPackageData.version}`]).wait();
+					} catch(err) {
+						error += err;
+					}
+				}
+			});
+			
+			if(error) {
+				this.$logger.error(error);
+			}
+			
+		}).future<void>()();
+	}
+}
+$injector.registerCommand("install", InstallCommand);

lib/commands/install.ts

@@ -6,9 +6,7 @@ export class PrepareCommand implements ICommand {
 		private $platformCommandParameter: ICommandParameter) { }
 
 	execute(args: string[]): IFuture<void> {
-		return (() => {
-			this.$platformService.preparePlatform(args[0]).wait();
-		}).future<void>()();
+		return this.$platformService.preparePlatform(args[0]);
 	}
 
 	allowedParameters = [this.$platformCommandParameter];

lib/commands/prepare.ts

@@ -28,7 +28,7 @@ export class RunAndroidCommand extends RunCommandBase implements ICommand {
 		private $platformsData: IPlatformsData) {
 		super($platformService);
 	}
-
+	
 	public allowedParameters: ICommandParameter[] = [];
 
 	public execute(args: string[]): IFuture<void> {

lib/commands/run.ts

@@ -7,6 +7,7 @@ export var NATIVESCRIPT_KEY_NAME = "nativescript";
 export var NODE_MODULES_FOLDER_NAME = "node_modules";
 export var PACKAGE_JSON_FILE_NAME = "package.json";
 export var NODE_MODULE_CACHE_PATH_KEY_NAME = "node-modules-cache-path";
+export var DEFAULT_APP_IDENTIFIER_PREFIX = "org.nativescript";
 
 export class ReleaseType {
 	static MAJOR = "major";

lib/constants.ts

@@ -50,6 +50,8 @@ interface IOpener {
 
 interface IOptions extends ICommonOptions {
 	frameworkPath: string;
+	frameworkName: string;
+	frameworkVersion: string;
 	copyFrom: string;
 	linkTo: string;
 	release: boolean;
@@ -64,3 +66,11 @@ interface IOptions extends ICommonOptions {
 	keyStoreAliasPassword: string;
 	sdk: string;
 }
+
+interface IProjectFilesManager {
+	processPlatformSpecificFiles(directoryPath: string, platform: string, excludedDirs?: string[]): IFuture<void>;
+}
+
+interface IInitService {
+	initialize(): IFuture<void>;
+}

lib/declarations.ts

@@ -27,6 +27,8 @@ interface IPlatformProjectService {
 	interpolateData(projectRoot: string): IFuture<void>;
 	afterCreateProject(projectRoot: string): IFuture<void>;
 	buildProject(projectRoot: string): IFuture<void>;
+	prepareProject(): IFuture<void>;
+	prepareAppResources(appResourcesDirectoryPath: string): IFuture<void>;
 	isPlatformPrepared(projectRoot: string): IFuture<boolean>;
 	addLibrary(platformData: IPlatformData, libraryPath: string): IFuture<void>;
 	canUpdatePlatform(currentVersion: string, newVersion: string): IFuture<boolean>;

lib/definitions/project.d.ts

@@ -13,6 +13,8 @@ export class Options extends commonOptionsLibPath.OptionsBase {
 		$hostInfo: IHostInfo) {
 		super({
 			frameworkPath: { type: OptionType.String },
+			frameworkName: { type: OptionType.String },
+			frameworkVersion: { type: OptionType.String },
 			copyFrom: { type: OptionType.String },
 			linkTo: { type: OptionType.String  },
 			release: { type: OptionType.Boolean },

lib/options.ts

@@ -51,7 +51,7 @@ class AndroidProjectService implements IPlatformProjectService {
 				frameworkFilesExtensions: [".jar", ".dat", ".so"],
 				configurationFileName: "AndroidManifest.xml",
 				configurationFilePath: path.join(this.$projectData.platformsDir, "android", "AndroidManifest.xml"),
-				mergeXmlConfig: [{ "nodename": "manifest", "attrname": "*" }]
+				mergeXmlConfig: [{ "nodename": "manifest", "attrname": "*" }, { "application": "manifest", "attrname": "*" }]
 			};
 		}
 
@@ -181,6 +181,16 @@ class AndroidProjectService implements IPlatformProjectService {
 	public isPlatformPrepared(projectRoot: string): IFuture<boolean> {
 		return this.$fs.exists(path.join(projectRoot, "assets", constants.APP_FOLDER_NAME));
 	}
+	
+	public prepareAppResources(appResourcesDirectoryPath: string): IFuture<void> {
+		return (() => {
+			let resourcesDirPath = path.join(appResourcesDirectoryPath, this.platformData.normalizedPlatformName);
+			let resourcesDirs = this.$fs.readDirectory(resourcesDirPath).wait();
+			_.each(resourcesDirs, resourceDir => {
+				this.$fs.deleteDirectory(path.join(this.platformData.appResourcesDestinationDirectoryPath, resourceDir)).wait();				
+			});	
+		}).future<void>()();
+	}
 
 	private parseProjectProperties(projDir: string, destDir: string): void {
 		let projProp = path.join(projDir, "project.properties");
@@ -273,6 +283,10 @@ class AndroidProjectService implements IPlatformProjectService {
 	public getFrameworkFilesExtensions(): string[] {
 		return [".jar", ".dat"];
 	}
+	
+	public prepareProject(): IFuture<void> {
+		return (() => { }).future<void>()();
+	}
 
 	private copy(projectRoot: string, frameworkDir: string, files: string, cpArg: string): IFuture<void> {
 		return (() => {