@getik-public/cli 1.5.1 → 1.5.3

package/CHANGELOG.md

@@ -1,3 +1,12 @@
+### v1.5.3
+- Added option to upload a folder to cloud, script will zip entire folder then upload it
+- Remove actual host and added it as a required input parameter as path to upload
+
+
+### v1.5.2
+- Added new parameters to include different types of build for the same environment: `--includeDemo` and `--includeFallback`
+
+
 ### v1.5.1
 - Fixed typo: changed `sync` to `syncOnly`
 

package/README.md

@@ -37,10 +37,12 @@ Example: `getik-cli mobile-build --platform ios --environment getik --upload`
 Example: `getik-cli web-build -e getik --syncOnly`  
 Example: `getik-cli web-build -e getik`  
 
-| Option              | Required | Values                      | Description                                                                                                                                                                                                                                                                         |
-|---------------------|----------|-----------------------------|-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
-| `-e`, `--environment` | YES      | `<string>` | While environment can be any name, be consistent and use these: `getik`, `vbox`, `qa`, `preprod`, `prod`.                                                                                                                                                                           |
-| `--syncOnly`        | NO       | `-`                         | For development only, it will create a file named `version.ts` with version found in `package.json`. Use this version in all `environment.ts` files. This will not go further to trigger the actual build script. |
+| Option                | Required | Values                      | Description                                                                                                                                                                                                       |
+|-----------------------|----------|-----------------------------|-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
+| `-e`, `--environment` | YES      | `<string>` | While environment can be any name, be consistent and use these: `getik`, `vbox`, `qa`, `preprod`, `prod`.                                                                                                         |
+| `--syncOnly`          | NO       | `-`                         | For development only, it will create a file named `version.ts` with version found in `package.json`. Use this version in all `environment.ts` files. This will not go further to trigger the actual build script. |
+| `--includeDemo`       | NO       | `-`                         | Use this flag to also include the demo build variant for the selected environment.                                                                                                                                |
+| `--includeFallback`   | NO       | `-`                         | Use this flag to also include the fallback build variant for the selected environment.                                                                                                                            |
 
 
 ## <a name="upload-to-getik-cloud" href="#upload-to-getik-cloud">`upload-to-getik-cloud`</a>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@getik-public/cli",
-  "version": "1.5.1",
+  "version": "1.5.3",
   "publishConfig": {
     "access": "public"
   },

package/src/upload-to-getik-cloud.js

@@ -4,8 +4,10 @@ import chalk from 'chalk';
 import fs from 'fs';
 import path from 'path';
 
+import { runCliCommand } from './lib.js';
 
-const upload = (pathToFile) => {
+
+const upload = (pathToFile, host, extraUploadParams) => {
   let projectName = '';
   try {
     const packageJsonBuffer = fs.readFileSync(path.join(process.cwd(), 'package.json'));
@@ -36,7 +38,7 @@ const upload = (pathToFile) => {
   const splitFileName = normalizedPathToFile.split(path.sep);
   const fileNameWithExtension = splitFileName[splitFileName.length - 1];
   const fileNameOnly = fileNameWithExtension.split('.')[0];
-  const command = `curl -Ss -F "file=@${normalizedPathToFile}" "https://devs.getik.net/upload-apk/?name=${projectName}-${fileNameOnly}&appVersion=${issue}&commit=${commit}"`;
+  const command = `curl -Ss -F "file=@${normalizedPathToFile}" "https://${host}/upload-apk/?name=${projectName}-${fileNameOnly}&appVersion=${issue}&commit=${commit}${extraUploadParams ? extraUploadParams : ''}"`;
 
   console.log('COMMAND: ', '\x1b[96m', command, '\x1b[0m');
   const ls = spawn(command, [], {shell: true, env: { ...process.env, FORCE_COLOR: true }, cwd: ''});
@@ -46,8 +48,8 @@ const upload = (pathToFile) => {
     try {
       const parsedResponse = JSON.parse(data.toString());
       if (parsedResponse && parsedResponse.status === 'success' && parsedResponse.fileName) {
-        console.log(chalk.green(`Link to uploaded file: https://devs.getik.net/vbox/apk/${parsedResponse.fileName}`));
-        console.log(chalk.green('Link to list: https://devs.getik.net/vbox/apk/?C=M;O=D'));
+        console.log(chalk.green(`Link to uploaded file: https://${host}/vbox/apk/${parsedResponse.fileName}`));
+        console.log(chalk.green(`Link to list: https://${host}/vbox/apk/?C=M;O=D`));
       }
     } catch (e) {
       // console.log(e);
@@ -71,8 +73,21 @@ const upload = (pathToFile) => {
 export const uploadToGetikCloud = () => {
   program
     .command('upload-to-getik-cloud <source>')
-    .action((options) => {
-      console.log('INPUT OPTIONS: ', options);
-      upload(options);
+    .requiredOption('--host <type>', 'Provide host, ex: my.host.net')
+    .option('--folder', 'Destination is a folder, so will zip and upload entire folder')
+    .action((pathToBuild, options) => {
+      console.log('INPUT OPTIONS: ', pathToBuild, options);
+      if (options.folder) {
+        const finalZipName = 'grouped.zip';
+        const pathToZip = path.join(pathToBuild, finalZipName);
+        if (fs.existsSync(pathToZip)) {
+          fs.rmSync(pathToZip);
+        }
+        runCliCommand(`zip -q -r ./${finalZipName} .`, function() {
+          upload(`${pathToBuild}/${finalZipName}`, options.host, '&type=zip');
+        }, pathToBuild);
+      } else {
+        upload(pathToBuild, options.host);
+      }
     });
 };

package/src/web-build.js

@@ -20,7 +20,7 @@ function applyVersion(versions) {
   }
 
   fs.writeFileSync(pathToVersionsProperties, (
-`export const version = {
+    `export const version = {
   name: '${versions.versionName}',
   code: ${versions.versionCode},
 };
@@ -37,10 +37,15 @@ function cleanBuildFolder(folder) {
 }
 
 
-function buildApp(environmentName, callback) {
+function buildApp(environmentName, versions, callback, extraConfig) {
+  if (extraConfig?.falltrough) {
+    callback();
+
+    return;
+  }
   cleanBuildFolder('dist');
   runCliCommand(`ng build --configuration=${environmentName}`, function() {
-    runCliCommand(`zip -q -r ../../${buildFolder}/${environmentName}.zip .`, function() {
+    runCliCommand(`zip -q -r ../../${buildFolder}/${environmentName}-${versions.versionName}.zip .`, function() {
       callback();
     }, './dist/browser');
   });
@@ -52,6 +57,8 @@ export const webBuild = () => {
     .command('web-build')
     .option('-e, --environment <type>', 'Environment: getik, vbox, qa, preprod, prod')
     .option('--syncOnly', 'Generates the version.ts file only so no errors when running app locally')
+    .option('--includeDemo', 'Also builds and zips the Demo variant for the selected environment')
+    .option('--includeFallback', 'Also builds and zips the Fallback variant for the selected environment')
     .option('--force', 'Skip all checks for builds of type release')
     .action((options) => {
       console.log('INPUT OPTIONS: ', options);
@@ -62,11 +69,14 @@ export const webBuild = () => {
         return;
       }
       applyReleaseBuildChecks(versions, options, () => {
-        buildApp(options.environment, () => {
-          const demoEnvName = `${options.environment}Demo`;
-          buildApp(demoEnvName, () => {
-            console.log('\x1b[32m SUCCESS! \x1b[0m');
-          });
+        buildApp(options.environment, versions, () => {
+          const fallbackEnvName = `${options.environment}Fallback`;
+          buildApp(fallbackEnvName, versions, () => {
+            const demoEnvName = `${options.environment}Demo`;
+            buildApp(demoEnvName, versions, () => {
+              console.log('\x1b[32m SUCCESS! \x1b[0m');
+            }, {falltrough: !options.includeDemo});
+          }, {falltrough: !options.includeFallback});
         });
       });
     });