@getik-public/cli 1.5.3 → 1.5.5

package/CHANGELOG.md

@@ -1,3 +1,11 @@
+### v1.5.5
+- Added option `--useCommitHash` to make upload `commit` parameter optional
+
+
+### v1.5.4
+- Remove option to add entire folder(`--folder`), read file extension to be sent in request as `&type=extension`, make script more dynamic
+
+
 ### 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

package/README.md

@@ -46,8 +46,9 @@ Example: `getik-cli web-build -e getik`
 
 
 ## <a name="upload-to-getik-cloud" href="#upload-to-getik-cloud">`upload-to-getik-cloud`</a>
-### Usage: `getik-cli upload-to-getik-cloud ./path/to/my-file.apk`  
+### Usage: `getik-cli upload-to-getik-cloud ./path/to/my-file.apk --host awesome.host.net --useCommitHash`  
 Use this command to upload apk files to getik cloud. If successful, in command line you will find a direct link to fresh uploaded file alongside a link to the full list.  
 Run this command from the root of the project, as it tries to look for project name in `package.json` file. Project name will be used as file name.  
+Use `--useCommitHash` option if git hash needs to be added to the file name. This parameter is optional.  
 
 

package/package.json

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

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

@@ -4,11 +4,10 @@ import chalk from 'chalk';
 import fs from 'fs';
 import path from 'path';
 
-import { runCliCommand } from './lib.js';
 
-
-const upload = (pathToFile, host, extraUploadParams) => {
+const upload = (pathToFile, options) => {
   let projectName = '';
+  const host = options.host;
   try {
     const packageJsonBuffer = fs.readFileSync(path.join(process.cwd(), 'package.json'));
     const packageJson = JSON.parse(packageJsonBuffer);
@@ -21,7 +20,6 @@ const upload = (pathToFile, host, extraUploadParams) => {
   }
 
   const normalizedPathToFile = path.join(process.cwd(), pathToFile);
-  const commit = execSync('git rev-parse HEAD').toString().trim();
   let branch, splitBranchByFolder, splitBranchByName, issue;
   try {
     branch = execSync('git rev-parse --abbrev-ref HEAD').toString().trim();
@@ -37,8 +35,15 @@ const upload = (pathToFile, host, extraUploadParams) => {
   }
   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://${host}/upload-apk/?name=${projectName}-${fileNameOnly}&appVersion=${issue}&commit=${commit}${extraUploadParams ? extraUploadParams : ''}"`;
+  const fileNameSplit = fileNameWithExtension.split('.');
+  const fileNameOnly = fileNameSplit[0];
+  const fileExtension = fileNameSplit[fileNameSplit.length - 1];
+  let command = `curl -Ss -F "file=@${normalizedPathToFile}" "https://${host}/upload-apk/?name=${projectName}-${fileNameOnly}&appVersion=${issue}&type=${fileExtension}`;
+  if (options.useCommitHash) {
+    const commit = execSync('git rev-parse HEAD').toString().trim();
+    command += `&commit=${commit}`;
+  }
+  command += '"';
 
   console.log('COMMAND: ', '\x1b[96m', command, '\x1b[0m');
   const ls = spawn(command, [], {shell: true, env: { ...process.env, FORCE_COLOR: true }, cwd: ''});
@@ -74,20 +79,9 @@ export const uploadToGetikCloud = () => {
   program
     .command('upload-to-getik-cloud <source>')
     .requiredOption('--host <type>', 'Provide host, ex: my.host.net')
-    .option('--folder', 'Destination is a folder, so will zip and upload entire folder')
+    .option('--useCommitHash', 'Read last commit hash and add it upload command')
     .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);
-      }
+      upload(pathToBuild, options);
     });
 };