update git service to build demo for ios as well

Author: lini

lib/checker.ts

@@ -9,7 +9,7 @@ interface ResultsInterface {
     name: string;
     webpack: any;
     webpackTime: number;
-    demosBuild: boolean;
+    demos: any;
     demoTime: number;
 }
 
@@ -62,7 +62,7 @@ export async function run() {
             name: plugin.name,
             webpack: resultWP,
             webpackTime: Math.round((midDate - startDate) / 1000),
-            demosBuild: !!resultD,
+            demos: resultD,
             demoTime: Math.round((endDate - midDate) / 1000)
         });
         Logger.log(JSON.stringify(results[results.length - 1]));

lib/execPromise.ts

@@ -42,7 +42,7 @@ export function execPromise(cwd: string, command: string, returnOutput = false)
 }
 
 export function dirNameFromPluginName(name: string): string {
-    let dirName = 'test' + name;
+    let dirName = name;
     // remove / and other invalid chars from plugin name
     dirName = sanitize(dirName);
     // NativeScript max project name length

lib/github.service.ts

@@ -9,27 +9,41 @@ const testDirectory = 'testGit';
 export namespace GithubService {
 
     export async function testPlugin(plugin: MarketplaceService.PluginModel) {
+        const result = { android: false, ios: false, demoDirectory: '' };
+        let hasPlatform = false;
         if (!plugin || !plugin.badges || !plugin.badges.demos) {
             Logger.error('plugin has no demos badge');
-            return false;
+            return result;
         }
 
         try {
             await _checkTestDirectory();
             const projectName = dirNameFromPluginName(plugin.name);
             await _cloneProject(plugin.repositoryUrl, projectName);
-            const platform = _getPlatform(plugin);
             const demoDir = _getDemoDir(path.join(testDirectory, projectName), plugin);
-            if (platform) {
-                const result = await _buildProject(demoDir, platform);
-                return result;
-            } else {
+            result.demoDirectory = demoDir;
+
+            // if there is a plugin build script, execute it
+            await execPromise(name, `npm run build.plugin --if-present`);
+
+            if (plugin.badges.androidVersion) {
+                result.android = !!(await _buildProject(demoDir, 'android'));
+                hasPlatform = true;
+            }
+
+            if (plugin.badges.iosVersion) {
+                result.ios = !!(await _buildProject(demoDir, 'ios'));
+                hasPlatform = true;
+            }
+
+            if (!hasPlatform) {
                 Logger.error('plugin has no platform');
             }
         } catch (errExec) {
             Logger.error(JSON.stringify(errExec));
         }
-        return false;
+
+        return result;
     }
 
     function _getDemoDir(name: string, plugin: MarketplaceService.PluginModel) {
@@ -48,24 +62,11 @@ export namespace GithubService {
     async function _buildProject(name: string, platform: string) {
         // TODO: run 'tns update' / detect and build webpack
         Logger.debug(`building project in ${name} for ${platform} ...`);
-        // let pkgFile: any;
-        // const pkgFileStr = readFileSync(path.join(name, 'package.json'), 'utf8');
-        // pkgFile = JSON.parse(pkgFileStr);
-        // if (!pkgFile) return false;
-
-        // if there is a plugin build script, execute it
-        await execPromise(name, `npm run build.plugin --if-present`);
-
         await execPromise(name, 'npm i');
         const result = await execPromise(name, `tns build ${platform}`);
         return result;
     }
 
-    function _getPlatform(plugin: MarketplaceService.PluginModel): string {
-        const platform = plugin.badges && plugin.badges.androidVersion ? 'android' : plugin.badges && plugin.badges.iosVersion ? 'ios' : '';
-        return platform;
-    }
-
     async function _cloneProject(repositoryUrl: string, name: string) {
         Logger.debug(`cloning into ${name} ...`);
         await execPromise(testDirectory, `git clone ${repositoryUrl} ${name}`);

lib/project.service.ts

@@ -4,7 +4,7 @@ import * as path from 'path';
 import * as rimraf from 'rimraf';
 import { ncp } from 'ncp';
 import { Logger } from './log.service';
-import { execPromise, dirNameFromPluginName } from './execPromise';
+import { execPromise } from './execPromise';
 
 const testDirectory = 'test';
 const testProject = 'baseTS';