fix: update logging

fix #138

Author: Murat Mehmet

src/__tests__/unit/upgrade.spec.ts

@@ -95,11 +95,11 @@ describe('upgrade', () => {
       didRun: true,
       completedTaskCount: 1,
     });
-    mockPrompter.log.success.mockClear();
+    mockPrompter.log.info.mockClear();
 
     await upgrade();
 
-    expect(mockPrompter.log.success).toHaveBeenCalledWith(
+    expect(mockPrompter.log.info).toHaveBeenCalledWith(
       expect.stringContaining('task(s) successfully')
     );
   });

src/cli.ts

@@ -27,7 +27,7 @@ program
     try {
       progress.setOptions({
         title: 'integrating',
-        total: 8,
+        total: 4,
         step: 0,
       });
       if (!args.verbose) progress.display();

src/integrate.ts

@@ -267,11 +267,12 @@ export async function integrate(packageName?: string): Promise<void> {
         packagesToIntegrate[i];
 
       progress.setOptions({
-        step: stage++,
+        step: i + 1,
+        total: packagesToIntegrate.length,
         stage: `integrating ${color.blue(packageName)}`,
       });
-      logInfo(
-        color.bold(color.bgBlue(' new package ')) +
+      logSuccess(
+        color.bold(color.bgBlue(' integration ')) +
           color.bold(color.blue(` ${packageName} `))
       );
       if (
@@ -347,18 +348,16 @@ export async function integrate(packageName?: string): Promise<void> {
 
         if (failedTaskCount) {
           logWarning(
-            color.inverse(
-              color.bold(color.yellow(' integrated with errors '))
-            ) +
+            color.inverse(color.bold(color.yellow(' done with errors '))) +
               color.bold(color.blue(` ${packageName} `)) +
               color.yellow(
                 `failed to complete ${failedTaskCount} task(s) - please complete this integration manually`
               ),
             true
           );
         } else {
-          logSuccess(
-            color.inverse(color.bold(color.green(' integrated '))) +
+          logInfo(
+            color.inverse(color.bold(color.green(' done '))) +
               color.black(color.bold(color.blue(` ${packageName} `))) +
               color.green(
                 `completed ${completedTaskCount} task(s) successfully`
@@ -393,10 +392,6 @@ export async function integrate(packageName?: string): Promise<void> {
     });
   }
   updateIntegrationStatus(packageLockUpdates);
-
-  if (!options.get().verbose) {
-    progress.hide();
-  }
 }
 
 function checkIfJustCreatedLockFile(analyzedPackages: AnalyzedPackages) {

src/progress.ts

@@ -21,7 +21,9 @@ class Progress {
   }
 
   drawMessage() {
-    const stepRate = this.options.step / this.options.total;
+    const stepRate = !this.options.total
+      ? 0
+      : Math.min(1, Math.max(0, this.options.step / this.options.total));
     const barSize = 20;
     const scaledStep = Math.floor(stepRate * barSize);
     const completeBars = new Array(scaledStep).fill('\u2588').join('');
@@ -45,7 +47,6 @@ class Progress {
     if (this.isActive) {
       this.isActive = false;
       this.spinner?.stop();
-      process.stdout.cursorTo(0); // up one line
       process.stdout.moveCursor(0, -2); // up one line
       process.stdout.clearLine(1); // from cursor to end
     }

src/upgrade.ts

@@ -66,7 +66,7 @@ export async function upgrade(): Promise<void> {
 
     const didCreate = await createNewProject();
     if (didCreate) {
-      logSuccess(
+      logInfo(
         color.inverse(color.bold(color.green(' created '))) +
           color.green(' new project created successfully')
       );
@@ -95,7 +95,7 @@ export async function upgrade(): Promise<void> {
     oldProjectPath = path.resolve(oldProjectPath);
     const didImport = await importFromOldProject(oldProjectPath);
     if (didImport) {
-      logSuccess(
+      logInfo(
         color.inverse(color.bold(color.green(' imported '))) +
           color.green(' imported project data successfully')
       );
@@ -131,7 +131,7 @@ export async function upgrade(): Promise<void> {
         true
       );
     } else {
-      logSuccess(
+      logInfo(
         color.inverse(color.bold(color.green(' executed '))) +
           color.black(color.bold(color.blue(' upgrade.yml pre_install '))) +
           color.green(
@@ -179,6 +179,9 @@ export async function upgrade(): Promise<void> {
     }[] = [];
     let packagesToIntegrate: PackageWithConfig[] = [];
 
+    progress.setOptions({
+      stage: 'checking package configuration',
+    });
     startSpinner('checking package configuration');
     for (let i = 0; i < integratedPackages.length; i++) {
       const [packageName] = integratedPackages[i];
@@ -312,8 +315,13 @@ export async function upgrade(): Promise<void> {
         const { packageName, version, configPath, config } =
           packagesToIntegrate[i];
 
-        logInfo(
-          color.bold(color.bgBlue(' package ')) +
+        progress.setOptions({
+          step: i + 1,
+          total: packagesToIntegrate.length,
+          stage: `integrating ${color.blue(packageName)}`,
+        });
+        logSuccess(
+          color.bold(color.bgBlue(' integration ')) +
             color.bold(color.blue(` ${packageName} `))
         );
 
@@ -374,18 +382,16 @@ export async function upgrade(): Promise<void> {
 
         if (failedTaskCount) {
           logWarning(
-            color.inverse(
-              color.bold(color.yellow(' re-integrated with errors '))
-            ) +
+            color.inverse(color.bold(color.yellow(' done with errors '))) +
               color.bold(color.blue(` ${packageName} `)) +
               color.yellow(
                 `failed to complete ${failedTaskCount} task(s) - please complete this integration manually`
               ),
             true
           );
         } else {
-          logSuccess(
-            color.inverse(color.bold(color.green(' re-integrated '))) +
+          logInfo(
+            color.inverse(color.bold(color.green(' done '))) +
               color.black(color.bold(color.blue(` ${packageName} `))) +
               color.green(
                 `completed ${completedTaskCount} task(s) successfully`
@@ -418,7 +424,7 @@ export async function upgrade(): Promise<void> {
     logWarning(e.message);
   });
   if (didRestore) {
-    logSuccess(
+    logInfo(
       color.inverse(color.bold(color.green(' imported '))) +
         color.green(' files were imported successfully')
     );
@@ -449,7 +455,7 @@ export async function upgrade(): Promise<void> {
         true
       );
     } else {
-      logSuccess(
+      logInfo(
         color.inverse(color.bold(color.green(' executed '))) +
           color.black(color.bold(color.blue(' upgrade.yml '))) +
           color.green(
@@ -526,6 +532,21 @@ export async function upgrade(): Promise<void> {
       return;
     }
 
+    // push changes
+    const { exitCode: didFetchFail } = await runCommand('git fetch', {
+      silent: false,
+      progressText: 'fetching changes to current project',
+      completeText: 'fetched changes to current project',
+      cwd: variables.get('__OLD_PROJECT_DIR__'),
+    });
+    if (didFetchFail) {
+      logWarning(
+        'please fetch changes manually in ' +
+          variables.get('__OLD_PROJECT_DIR__')
+      );
+      return;
+    }
+
     logSuccess(
       color.inverse(color.bold(color.green(' committed '))) +
         color.green(` saved changes to ${color.bold(branchName)}`)
@@ -543,9 +564,5 @@ export async function upgrade(): Promise<void> {
       )
     );
     stopSpinner('cleaned up');
-
-    if (!options.get().verbose) {
-      progress.hide();
-    }
   }
 }

src/utils/getPackageConfig.ts

@@ -1,6 +1,8 @@
 import fs from 'fs';
 import path from 'path';
+import color from 'picocolors';
 import { Constants } from '../constants';
+import { progress } from '../progress';
 import { updateSpinner } from '../prompter';
 import { getMd5 } from './getMd5';
 import { getProjectPath } from './getProjectPath';
@@ -9,6 +11,13 @@ export async function getPackageConfig(
   packageName: string,
   pagination: { index: number; count: number } = { index: 0, count: 1 }
 ): Promise<string | null> {
+  progress.setOptions({
+    step: pagination.index + 1,
+    total: pagination.count,
+    stage: `[${pagination.index + 1}/${
+      pagination.count
+    }] checking ${color.blue(packageName)}`,
+  });
   updateSpinner(
     `[${pagination.index + 1}/${
       pagination.count