contensis-cli 1.0.0-beta.94 → 1.0.0-beta.96

package/src/services/ContensisDevService.ts

@@ -21,10 +21,12 @@ import { mergeDotEnvFileContents } from '~/util/dotenv';
 import { findByIdOrName } from '~/util/find';
 import { GitHelper } from '~/util/git';
 import { jsonFormatter } from '~/util/json.formatter';
-import { normaliseLineEndings } from '~/util/os';
+import { normaliseLineEndings, winSlash } from '~/util/os';
 import { stringifyYaml } from '~/util/yaml';
 
 class ContensisDev extends ContensisRole {
+  git!: GitHelper;
+
   constructor(
     args: string[],
     outputOpts?: OutputOptionsConstructorArg,
@@ -52,7 +54,7 @@ class ContensisDev extends ContensisRole {
         );
 
       // Retrieve git info
-      const git = new GitHelper(projectHome);
+      const git = this.git = new GitHelper(projectHome);
 
       // Retrieve ci workflow info
       const workflowFiles = git.workflows;
@@ -103,6 +105,7 @@ class ContensisDev extends ContensisRole {
         ({ ciFileName } = await inquirer.prompt([
           {
             type: 'list',
+            prefix: '⧰',
             message: messages.devinit.ciMultipleChoices(),
             name: 'ciFileName',
             choices: workflowFiles,
@@ -116,7 +119,7 @@ class ContensisDev extends ContensisRole {
       log.raw(log.infoText(messages.devinit.ciDetails(ciFileName)));
 
       // Look at the workflow file content and make updates
-      const mappedWorkflow = mapCIWorkflowContent(this, git);
+      const mappedWorkflow = await mapCIWorkflowContent(this);
 
       log.help(messages.devinit.ciIntro(git));
 
@@ -138,6 +141,7 @@ class ContensisDev extends ContensisRole {
       const { accessToken }: { accessToken: string } = await inquirer.prompt([
         {
           type: 'input',
+          prefix: '🛡️',
           message: messages.devinit.accessTokenPrompt(),
           name: 'accessToken',
         },
@@ -219,34 +223,41 @@ class ContensisDev extends ContensisRole {
 
       if (dryRun) {
         if (envDiff) {
-          log.info(`updating .env file ${envFilePath}: ${envDiff}`);
+          log.info(`Updating .env file ${winSlash(envFilePath)}:\n${envDiff}`);
           log.raw('');
         }
         checkpoint('skip .env file update (dry-run)');
       } else {
-        if (envDiff) log.info(`updating .env file ${envFilePath}`);
+        if (envDiff) log.info(`updating .env file ${winSlash(envFilePath)}`);
         writeFile(envFilePath, envFileLines.join('\n'));
         checkpoint('.env file updated');
         log.success(messages.devinit.writeEnvFile());
         // log.help(messages.devinit.useEnvFileTip());
       }
 
-      // Update CI file -- different for GH/GL -- create a sample one with build?
+      // Update CI file -- different for GH/GL
+      if (mappedWorkflow?.diff) {
+        log.info(
+          `Updating ${winSlash(ciFileName)} file:\n${mappedWorkflow.diff}`
+        );
+        log.raw('');
+      }
       if (dryRun) {
-        if (mappedWorkflow?.diff) {
-          log.info(`updating${ciFileName} file: ${mappedWorkflow.diff}`);
-          log.raw('');
-        }
         checkpoint('skip CI file update (dry-run)');
         //log.object(ciFileLines);
       } else {
-        if (mappedWorkflow?.diff) log.info(`updating${ciFileName} file`);
-        writeFile(git.ciFilePath, [].join('\n'));
-        log.success(messages.devinit.writeCiFile(`./${ciFileName}`));
-        log.info(
-          messages.devinit.ciBlockTip(blockId, currentEnv, currentProject)
-        );
-        checkpoint('CI file updated');
+        if (mappedWorkflow?.newWorkflow) {
+          if (mappedWorkflow?.diff) {
+            writeFile(git.ciFilePath, mappedWorkflow.newWorkflow);
+            log.success(messages.devinit.writeCiFile(`./${ciFileName}`));
+            log.info(
+              messages.devinit.ciBlockTip(blockId, currentEnv, currentProject)
+            );
+          } else {
+            log.info(messages.devinit.ciFileNoChanges(`./${ciFileName}`));
+          }
+          checkpoint('CI file updated');
+        }
       }
 
       // Echo Deployment API key to console, ask user to add secrets to repo

package/src/util/diff.ts

@@ -40,12 +40,17 @@ export const diffFileContent = (
 
   const lnSpaces = Array(lnSpaceLength).join(' ');
 
+  let needsNewLine = false;
   for (let i = 0; i < diffRanges.length; i++) {
     const part = diffRanges[i];
     if (part.added || part.removed) {
       const colour = part.added ? 'green' : part.removed ? 'red' : 'grey';
 
-      if (part.value !== '\n')
+      if (part.value !== '\n') {
+        if (needsNewLine) {
+          output.push('\n### --');
+          needsNewLine = false;
+        }
         output.push(
           `\n${part.value
             .split('\n')
@@ -60,11 +65,11 @@ export const diffFileContent = (
             )
             .join('\n')}`
         );
-    }
+      } else needsNewLine = true;
+    } else needsNewLine = true;
   }
 
   return output.join('');
-  // return retOutput.endsWith('\n') ? retOutput : `${retOutput}\n`;
 };
 
 const addDiffPositionInfo = (diff: Change[]) => {

package/src/version.ts

@@ -1 +1 @@
-export const LIB_VERSION = "1.0.0-beta.94";
+export const LIB_VERSION = "1.0.0-beta.96";