feat(resources-update-command): introduce resources-update command

Introduce the 'tns resources-update android' command. By design, upon execution it should migrate the directory structure of App_Resources/Android to the new v4 structure - the one that supports inclusion of java source files, arbitrary assets, and any resource files in the App_Resources/Android/src/main directory structure. Additional, user-defined flavors can also be created taking advantage of the new dir structure.

Author: petekanev

lib/bootstrap.ts

@@ -102,6 +102,9 @@ $injector.requireCommand("init", "./commands/init");
 $injector.require("infoService", "./services/info-service");
 $injector.requireCommand("info", "./commands/info");
 
+$injector.require("projectV4MigrationService", "./services/project-v4-migration-service");
+$injector.requireCommand("resources-update", "./commands/resources-update");
+
 $injector.require("androidToolsInfo", "./android-tools-info");
 $injector.require("devicePathProvider", "./device-path-provider");
 

lib/commands/resources-update.ts

@@ -0,0 +1,33 @@
+export class ResourcesUpdateCommand implements ICommand {
+    public allowedParameters: ICommandParameter[] = [];
+
+    constructor(private $projectData: IProjectData,
+        private $errors: IErrors,
+        private $projectV4MigrationService: IProjectV4MigrationService) {
+        this.$projectData.initializeProjectData();
+    }
+
+    public async execute(args: string[]): Promise<void> {
+        await this.$projectV4MigrationService.migrate(this.$projectData.getAppResourcesDirectoryPath());
+    }
+
+    public async canExecute(args: string[]): Promise<boolean> {
+        if (!args || args.length === 0) {
+            this.$errors.failWithoutHelp("No platform specified. Please specify a platform to update. Valid platforms are: 'android'");
+        }
+
+        for (const platform of args) {
+            if (!this.$projectV4MigrationService.canMigrate(platform)) {
+                this.$errors.failWithoutHelp("The iOS platform does not need to have its resources updated.");
+            }
+
+            if (this.$projectV4MigrationService.hasMigrated(this.$projectData.getAppResourcesDirectoryPath())) {
+                this.$errors.failWithoutHelp("The App_Resources have already been updated for the Android platform.");
+            }
+        }
+
+        return true;
+    }
+}
+
+$injector.registerCommand("resources-update", ResourcesUpdateCommand);

lib/declarations.d.ts

@@ -432,6 +432,12 @@ interface IInfoService {
 	printComponentsInfo(): Promise<void>;
 }
 
+interface IProjectV4MigrationService {
+	canMigrate(platformString: string): boolean;
+	hasMigrated(appResourcesDir: string): boolean;
+	migrate(appResourcesDir: string): Promise<void>;
+}
+
 /**
  * Describes properties needed for uploading a package to iTunes Connect
  */

lib/services/project-v4-migration-service.ts

@@ -0,0 +1,63 @@
+import * as path from "path";
+import * as shell from "shelljs";
+
+export class ProjectV4MigrationService implements IProjectV4MigrationService {
+    private static ANDROID_DIR = "Android";
+    private static ANDROID_DIR_TEMP = "Android-Updated";
+    private static ANDROID_DIR_OLD = "Android-Pre-v4";
+
+    constructor(
+        private $fs: IFileSystem,
+        private $logger: ILogger,
+        private $devicePlatformsConstants: Mobile.IDevicePlatformsConstants
+    ) { }
+
+    canMigrate(platformString: string): boolean {
+        if (platformString.toLowerCase() === this.$devicePlatformsConstants.iOS.toLowerCase()) {
+            return false;
+        }
+
+        return true;
+    }
+
+    hasMigrated(appResourcesDir: string): boolean {
+        return this.$fs.exists(path.join(appResourcesDir, ProjectV4MigrationService.ANDROID_DIR, "src", "main"));
+    }
+
+    async migrate(appResourcesDir: string): Promise<void> {
+        const originalAppResources = path.join(appResourcesDir, ProjectV4MigrationService.ANDROID_DIR);
+        const appResourcesDestination = path.join(appResourcesDir, ProjectV4MigrationService.ANDROID_DIR_TEMP);
+        const appMainSourceSet = path.join(appResourcesDestination, "src", "main");
+        const appResourcesMainSourceSetResourcesDestination = path.join(appMainSourceSet, "res");
+
+        this.$fs.ensureDirectoryExists(appResourcesDestination);
+        this.$fs.ensureDirectoryExists(appMainSourceSet);
+        // create /java, /res and /assets in the App_Resources/Android/src/main directory
+        this.$fs.ensureDirectoryExists(appResourcesMainSourceSetResourcesDestination);
+        this.$fs.ensureDirectoryExists(path.join(appMainSourceSet, "java"));
+        this.$fs.ensureDirectoryExists(path.join(appMainSourceSet, "assets"));
+
+        const isDirectory = (source: string) => this.$fs.getLsStats(source).isDirectory()
+        const getDirectories = (source: string) =>
+            this.$fs.readDirectory(source).map(name => path.join(source, name)).filter(isDirectory)
+
+        shell.cp(path.join(originalAppResources, "app.gradle"), path.join(appResourcesDestination, "app.gradle"));
+        shell.cp(path.join(originalAppResources, "AndroidManifest.xml"), path.join(appMainSourceSet, "AndroidManifest.xml"));
+
+        let resourceDirectories = getDirectories(originalAppResources);
+
+        resourceDirectories.forEach(dir => {
+            shell.cp("-Rf", dir, appResourcesMainSourceSetResourcesDestination);
+        });
+
+        // move the pre-v4 app_resources in ANDROID_DIR_OLD
+        shell.mv(originalAppResources, path.join(appResourcesDir, ProjectV4MigrationService.ANDROID_DIR_OLD));
+        // move the new, updated app_resources to App_Resources/Android, as  the de facto resources
+        shell.mv(appResourcesDestination, originalAppResources)
+
+        this.$logger.out(`Successfully updated your project's App_Resources/Android directory structure. The previous version of App_Resources/Android has been renamed to App_Resources/${ProjectV4MigrationService.ANDROID_DIR_OLD}`);
+    }
+
+}
+
+$injector.register("projectV4MigrationService", ProjectV4MigrationService);