Merge pull request #1107 from Icenium/vladimirov/merge-2.10

Merge release in master (for 2.10.0)

Author: rosen-vladimirov

README.md

@@ -22,10 +22,10 @@ The Telerik AppBuilder CLI lets you build, test, deploy, and publish cross-platf
 Installation
 ===
 
-Latest version: Telerik AppBuilder 2.9.3  
-Release date: 2015, May 22
+Latest version: Telerik AppBuilder 2.10  
+Release date: 2015, June 8
 
-> Telerik AppBuilder 2.9.3 is a maintenance release. For a complete list of the updates available in Telerik AppBuilder 2.9.3, see <a href="http://docs.telerik.com/platform/appbuilder/release-notes/v2-9-3" target="_blank">Telerik AppBuilder 2.9.3 Release Notes</a>.<br/>For a complete list of the features available in the earlier major release Telerik AppBuilder 2.9, see <a href="http://docs.telerik.com/platform/appbuilder/release-notes/v2-9" target="_blank">Telerik AppBuilder 2.9 Release Notes</a>.
+> For a complete list of the improvements and updates available in Telerik AppBuilder 2.10, see <a href="http://docs.telerik.com/platform/appbuilder/release-notes/v2-10" target="_blank">Telerik AppBuilder 2.10 Release Notes</a>.
 
 ### System Requirements
 
@@ -326,10 +326,10 @@ $ appbuilder create --help
 Features
 ===
 
-Latest version: Telerik AppBuilder 2.9.3  
-Release date: 2015, May 22
+Latest version: Telerik AppBuilder 2.10  
+Release date: 2015, June 8
 
-> Telerik AppBuilder 2.9.3 is a maintenance release. For a complete list of the updates available in Telerik AppBuilder 2.9.3, see <a href="http://docs.telerik.com/platform/appbuilder/release-notes/v2-9-3" target="_blank">Telerik AppBuilder 2.9.3 Release Notes</a>.<br/>For a complete list of the features available in the earlier major release Telerik AppBuilder 2.9, see <a href="http://docs.telerik.com/platform/appbuilder/release-notes/v2-9" target="_blank">Telerik AppBuilder 2.9 Release Notes</a>.
+> For a complete list of the improvements and updates available in Telerik AppBuilder 2.10, see <a href="http://docs.telerik.com/platform/appbuilder/release-notes/v2-10" target="_blank">Telerik AppBuilder 2.10 Release Notes</a>.
 
 #### What you can do with this version of the Telerik AppBuilder CLI
 

lib/commands/dev/prepackage.ts

@@ -26,15 +26,15 @@ export class PrePackageCommand implements ICommand {
 			this.$templatesService.downloadItemTemplates().wait();
 			this.$logger.info("Downloading project schemas.");
 			this.$jsonSchemaLoader.downloadSchemas().wait();
-			this.$logger.info("Unpacking app resources.");
-			this.$templatesService.unpackAppResources().wait();
 			this.$logger.info("Downloading Cordova migration data.");
 			this.$cordovaMigrationService.downloadMigrationData().wait();
 			// Cordova files have to be downloaded after cordova migration data so we know which cordova versions we support
 			this.$logger.info("Downloading cordova.js files.");
 			this.$resourceDownloader.downloadCordovaJsFiles().wait();
 			this.$logger.info("Downloading NativeScript migration data.")
 			this.$nativeScriptMigrationService.downloadMigrationData().wait();
+			this.$logger.info("Unpacking app resources.");
+			this.$templatesService.unpackAppResources().wait();
 			this.$serviceProxy.setShouldAuthenticate(true);
 		}).future<void>()();
 	}

lib/common

@@ -310,11 +310,11 @@ interface IPackageDownloadViewModel {
 }
 
 interface IResourceLoader {
-	appResourcesDir: string;
 	resolvePath(path: string): string;
 	openFile(path: string): any;
 	readJson(path: string): IFuture<any>;
 	buildCordovaJsFilePath(version: string, platform: string): string;
+	getPathToAppResources(framework: string): string;
 }
 
 interface IResourceDownloader {

lib/declarations.d.ts

@@ -141,11 +141,11 @@ export class CordovaProject extends frameworkProjectBaseLib.FrameworkProjectBase
 			let platforms = this.$mobileHelper.platformNames;
 			_.each(platforms, (platform: string) => this.ensureCordovaJs(platform, projectDir, frameworkVersion).wait());
 
-			let appResourcesDir = this.$resources.appResourcesDir;
+			let appResourcesDir = this.$resources.getPathToAppResources(this.$projectConstants.TARGET_FRAMEWORK_IDENTIFIERS.Cordova);
 			let appResourceFiles = this.$fs.enumerateFilesInDirectorySync(appResourcesDir);
 			appResourceFiles.forEach((appResourceFile) => {
 				let relativePath = path.relative(appResourcesDir, appResourceFile);
-				let targetFilePath = path.join(projectDir, relativePath);
+				let targetFilePath = path.join(projectDir, this.$projectConstants.APP_RESOURCES_DIR_NAME, relativePath);
 				this.$logger.trace("Checking app resources: %s must match %s", appResourceFile, targetFilePath);
 				if (!this.$fs.exists(targetFilePath).wait()) {
 					this.printAssetUpdateMessage();

lib/project/cordova-project.ts

@@ -105,18 +105,18 @@ export class NativeScriptProject extends frameworkProjectBaseLib.FrameworkProjec
 
 	public ensureAllPlatformAssets(projectDir: string, frameworkVersion: string): IFuture<void> {
 		return (() => {
-			let appResourcesDir = this.$resources.appResourcesDir;
+			let appResourcesDir = this.$resources.getPathToAppResources(this.$projectConstants.TARGET_FRAMEWORK_IDENTIFIERS.NativeScript);
 			let appResourceFiles = this.$fs.enumerateFilesInDirectorySync(appResourcesDir);
 			// In 0.10.0 original template, App_Resources directory is not included in app directory.
 			let appResourcesHolderDirectory = path.join(projectDir, this.$projectConstants.NATIVESCRIPT_APP_DIR_NAME);
 			if(semver.eq(frameworkVersion, "0.9.0")  
-				|| (!this.$fs.exists(path.join(appResourcesHolderDirectory, this.$projectConstants.NATIVESCRIPT_APP_RESOURCES_DIR_NAME)).wait() 
-				&& this.$fs.exists(path.join(projectDir, this.$projectConstants.NATIVESCRIPT_APP_RESOURCES_DIR_NAME)).wait())) {
+				|| (!this.$fs.exists(path.join(appResourcesHolderDirectory, this.$projectConstants.APP_RESOURCES_DIR_NAME)).wait() 
+				&& this.$fs.exists(path.join(projectDir, this.$projectConstants.APP_RESOURCES_DIR_NAME)).wait())) {
 				appResourcesHolderDirectory = projectDir;
 			}
 			appResourceFiles.forEach((appResourceFile) => {
 				let relativePath = path.relative(appResourcesDir, appResourceFile);
-				let targetFilePath = path.join(appResourcesHolderDirectory, relativePath);
+				let targetFilePath = path.join(appResourcesHolderDirectory,this.$projectConstants.APP_RESOURCES_DIR_NAME, relativePath);
 				this.$logger.trace("Checking app resources: %s must match %s", appResourceFile, targetFilePath);
 				if (!this.$fs.exists(targetFilePath).wait()) {
 					this.printAssetUpdateMessage();

lib/project/nativescript-project.ts

@@ -11,7 +11,7 @@ export class ProjectConstants implements Project.IProjectConstants {
 	public CORDOVA_PLUGIN_VARIABLES_PROPERTY_NAME = "CordovaPluginVariables";
 	public APPIDENTIFIER_PROPERTY_NAME = "AppIdentifier";
 	public EXPERIMENTAL_TAG = "Experimental";
-	public NATIVESCRIPT_APP_RESOURCES_DIR_NAME = "App_Resources";
+	public APP_RESOURCES_DIR_NAME = "App_Resources";
 	public NATIVESCRIPT_APP_DIR_NAME = "app";
 
 	public TARGET_FRAMEWORK_IDENTIFIERS = {

lib/project/project-constants.ts

@@ -126,7 +126,7 @@ declare module Project {
 		TARGET_FRAMEWORK_IDENTIFIERS: ITargetFrameworkIdentifiers;
 		APPIDENTIFIER_PROPERTY_NAME: string;
 		EXPERIMENTAL_TAG: string;
-		NATIVESCRIPT_APP_RESOURCES_DIR_NAME: string;
+		APP_RESOURCES_DIR_NAME: string;
 		NATIVESCRIPT_APP_DIR_NAME: string;
 	}
 

lib/project/project.d.ts

@@ -6,7 +6,8 @@ import helpers = require("./helpers");
 import util = require("util");
 
 export class ResourceLoader implements IResourceLoader {
-	constructor(private $fs: IFileSystem) { }
+	constructor(private $fs: IFileSystem, 
+		private $projectConstants: Project.IProjectConstants) { }
 
 	resolvePath(resourcePath: string): string {
 		return path.join(__dirname, "../resources", resourcePath);
@@ -20,13 +21,13 @@ export class ResourceLoader implements IResourceLoader {
 		return this.$fs.readJson(this.resolvePath(resourcePath));
 	}
 
-	public get appResourcesDir(): string {
-		return this.resolvePath("App_Resources");
-	}
-
 	public buildCordovaJsFilePath(version: string, platform: string): string {
 		return path.join(this.resolvePath("Cordova"), version, util.format("cordova.%s.js", platform).toLowerCase());
 	}
+
+	public getPathToAppResources(framework: string) {
+		return path.join(this.resolvePath(framework), this.$projectConstants.APP_RESOURCES_DIR_NAME);
+	}
 }
 $injector.register("resources", ResourceLoader);
 

lib/resource-loader.ts

@@ -89,8 +89,8 @@ export class NativeScriptMigrationService implements IFrameworkMigrationService
 
 			let projectDir = this.$project.getProjectDir().wait();
 			let tnsModulesProjectPath = path.join(projectDir, this.$projectConstants.NATIVESCRIPT_APP_DIR_NAME, "tns_modules");
-			let appResourcesRequiredPath = path.join(projectDir, this.$projectConstants.NATIVESCRIPT_APP_DIR_NAME, this.$projectConstants.NATIVESCRIPT_APP_RESOURCES_DIR_NAME);
-			let appResourcesObsoletePath = path.join(projectDir, this.$projectConstants.NATIVESCRIPT_APP_RESOURCES_DIR_NAME);
+			let appResourcesRequiredPath = path.join(projectDir, this.$projectConstants.NATIVESCRIPT_APP_DIR_NAME, this.$projectConstants.APP_RESOURCES_DIR_NAME);
+			let appResourcesObsoletePath = path.join(projectDir, this.$projectConstants.APP_RESOURCES_DIR_NAME);
 			let backupName = `${tnsModulesProjectPath}.backup`;
 			let shouldRollBackAppResources = false;
 			// Check if current version is supported one. We cannot migrate ObsoleteVersions

lib/services/nativescript-migration-service.ts

@@ -60,7 +60,7 @@ export class WebViewService implements IWebViewService {
 		return (() => {
 			if(!this.$pluginsService.isPluginInstalled(webView.pluginIdentifier)) {
 				this.$options.default = true;				
-				this.$pluginsService.configurePlugin(webView.pluginIdentifier).wait();
+				this.$pluginsService.addPlugin(webView.pluginIdentifier).wait();
 			}
 		}).future<void>()();
 	}

lib/services/web-view-service.ts

@@ -70,19 +70,27 @@ export class TemplatesService implements ITemplatesService {
 
 	public unpackAppResources(): IFuture<void> {
 		return (() => {
-			let appResourcesDir = this.$resources.appResourcesDir;
-			this.$fs.deleteDirectory(appResourcesDir).wait();
-
-			let assetsZipFileName = path.join(this.projectTemplatesDir, "Telerik.Mobile.Cordova.Blank.zip");
+			let cordovaAssetsZipFileName = path.join(this.projectTemplatesDir, "Telerik.Mobile.Cordova.Blank.zip");
+			this.unpackAppResourcesCore(this.$resources.resolvePath("Cordova"), cordovaAssetsZipFileName).wait();
+			let nsAssetsZipFileName = path.join(this.projectTemplatesDir, "Telerik.Mobile.NS.Blank.zip");
+			this.unpackAppResourcesCore(this.$resources.resolvePath("NativeScript"), nsAssetsZipFileName).wait();
+		}).future<void>()();
+	}
+	
+	private unpackAppResourcesCore(appResourcesDir: string, assetsZipFileName: string): IFuture<void> {
+		return (() => {
 			let unzipOps:IFuture<any>[] = [];
 			let unzipStream = this.$fs.createReadStream(assetsZipFileName)
 				.pipe(unzip.Parse())
 				.on("entry", (entry: ZipEntry) => {
-					if (entry.type !== "File" || !_.startsWith(entry.path.toLowerCase(), "app_resources/")) {
+					let indexOfAppResources = entry.path.toLowerCase().indexOf("app_resources/")
+					if (entry.type !== "File" || indexOfAppResources === -1) {
 						entry.autodrain();
 						return;
 					}
-					let assetTargetFileName = path.join(appResourcesDir, entry.path);
+
+					let entryPath = entry.path.substr(indexOfAppResources);
+					let assetTargetFileName = path.join(appResourcesDir, entryPath);
 					let mkdirFuture = this.$fs.createDirectory(path.dirname(assetTargetFileName));
 					mkdirFuture.resolve((err) => {
 						if (err) {