Merge pull request #90 from pcoop/branch1

More for #82

Author: matthewpwilson

src/api/BundleDeploy/BundleDeployer.ts

@@ -31,6 +31,7 @@ export class BundleDeployer {
   private parmsValidated: boolean = false;
   private hlqsValidated: boolean = false;
   private jobId: string;
+  private progressBar: ITaskWithStatus;
 
   /**
    * Constructor for a BundleDeployer.
@@ -249,66 +250,66 @@ export class BundleDeployer {
     this.hlqsValidated = true;
   }
 
-  private updateProgressBar(status: ITaskWithStatus, action: string) {
+  private updateProgressBar(action: string) {
     // Increment the progress by 1%. This will refresh what the user sees
     // on the console.
-    status.percentComplete = status.percentComplete + 1;
+    this.progressBar.percentComplete += 1;
 
     // Have a look at the status message for the progress bar, has it been updated with
     // the jobid yet? If so, parse it out and refresh the message.
     if (this.jobId === "UNKNOWN") {
-      const statusWords = status.statusMessage.split(" ");
+      const statusWords = this.progressBar.statusMessage.split(" ");
       if (statusWords.length >= 2) {
         if (statusWords[2] !== undefined && statusWords[2].indexOf("JOB") === 0) {
            this.jobId = statusWords[2];
-           status.statusMessage += " (Processing DFHDPLOY " + action + " action)";
+           this.progressBar.statusMessage += " (Processing DFHDPLOY " + action + " action)";
 
-           this.params.response.progress.endBar();
+           this.endProgressBar();
            // log the jobid for posterity
            if (this.params.arguments.verbose) {
-             this.params.response.console.log(status.statusMessage + "\n");
+             this.params.response.console.log(this.progressBar.statusMessage + "\n");
            }
            if (this.params.arguments.silent === undefined) {
              const logger = Logger.getAppLogger();
-             logger.debug(status.statusMessage);
+             logger.debug(this.progressBar.statusMessage);
            }
-           this.params.response.progress.startBar({task: status});
+           this.startProgressBar();
         }
       }
     }
 
     // Continue iterating on progress updates until we've reached the max value,
     // or until the processing has completed.
-    if (status.percentComplete < this.PROGRESS_BAR_MAX &&
-        status.stageName === TaskStage.IN_PROGRESS) {
-      setTimeout(this.updateProgressBar.bind(this), this.PROGRESS_BAR_INTERVAL, status, action);
+    if (this.progressBar.percentComplete < this.PROGRESS_BAR_MAX &&
+        this.progressBar.stageName === TaskStage.IN_PROGRESS) {
+      setTimeout(this.updateProgressBar.bind(this), this.PROGRESS_BAR_INTERVAL, action);
     }
   }
 
   private async submitJCL(jcl: string, action: string, session: any): Promise<string> {
     let spoolOutput: any;
-    const status: ITaskWithStatus = { percentComplete: TaskProgress.TEN_PERCENT,
-                                      statusMessage: "Submitting DFHDPLOY JCL for the " + action + " action",
-                                      stageName: TaskStage.IN_PROGRESS };
-    this.params.response.progress.startBar({task: status});
+    this.progressBar = { percentComplete: TaskProgress.TEN_PERCENT,
+                         statusMessage: "Submitting DFHDPLOY JCL for the " + action + " action",
+                         stageName: TaskStage.IN_PROGRESS };
+    this.startProgressBar();
     this.jobId = "UNKNOWN";
 
     // Refresh the progress bar by 1% every second or so up to a max of 67%.
     // SubmitJobs will initialise it to 30% and set it to 70% when it
     // completes, we tweak it every so often until then for purely cosmetic purposes.
-    setTimeout(this.updateProgressBar.bind(this), this.PROGRESS_BAR_INTERVAL, status, action);
+    setTimeout(this.updateProgressBar.bind(this), this.PROGRESS_BAR_INTERVAL, action);
 
     try {
       spoolOutput = await SubmitJobs.submitJclString(session, jcl, {
                              jclSource: "",
-                             task: status,
+                             task: this.progressBar,
                              viewAllSpoolContent: true
                            });
     }
     catch (error) {
-      status.stageName = TaskStage.FAILED;
+      this.progressBar.stageName = TaskStage.FAILED;
       throw new Error("Failure occurred submitting DFHDPLOY JCL for JOBID " + this.jobId + ": '" + error.message +
-                      "'. Most recent status update: '" + status.statusMessage + "'.");
+                      "'. Most recent status update: '" + this.progressBar.statusMessage + "'.");
     }
 
     // Find the output
@@ -317,9 +318,9 @@ export class BundleDeployer {
       if (file.ddName === "SYSTSPRT" && file.stepName === "DFHDPLOY") {
 
         if (file.data === undefined || file.data.length === 0) {
-          status.stageName = TaskStage.FAILED;
+          this.progressBar.stageName = TaskStage.FAILED;
           throw new Error("DFHDPLOY did not generate any output for JOBID " + this.jobId +
-            ". Most recent status update: '" + status.statusMessage + "'.");
+            ". Most recent status update: '" + this.progressBar.statusMessage + "'.");
         }
 
         // log the full output for serviceability to the log
@@ -329,40 +330,40 @@ export class BundleDeployer {
         }
 
         // Finish the progress bar
-        status.statusMessage = "Completed DFHDPLOY";
-        this.params.response.progress.endBar();
+        this.progressBar.statusMessage = "Completed DFHDPLOY";
+        this.endProgressBar();
 
         // Did DFHDPLOY fail?
         if (file.data.indexOf("DFHRL2055I") > -1) {
-          status.stageName = TaskStage.FAILED;
+          this.progressBar.stageName = TaskStage.FAILED;
           // log the error output to the console
           this.params.response.console.log(file.data);
           throw new Error("DFHDPLOY stopped processing for JOBID " + this.jobId + " due to an error.");
         }
         if (file.data.indexOf("DFHRL2043I") > -1) {
-          status.stageName = TaskStage.COMPLETE;
+          this.progressBar.stageName = TaskStage.COMPLETE;
           // log the error output to the console
           this.params.response.console.log(file.data);
           return "DFHDPLOY completed with warnings.";
         }
         if (file.data.indexOf("DFHRL2012I") > -1) {
-          status.stageName = TaskStage.COMPLETE;
+          this.progressBar.stageName = TaskStage.COMPLETE;
           // only log the output to the console if verbose output is enabled
           if (this.params.arguments.verbose) {
             this.params.response.console.log(file.data);
           }
           return "Bundle deployment successful.";
         }
         if (file.data.indexOf("DFHRL2037I") > -1) {
-          status.stageName = TaskStage.COMPLETE;
+          this.progressBar.stageName = TaskStage.COMPLETE;
           // only log the output to the console if verbose output is enabled
           if (this.params.arguments.verbose) {
             this.params.response.console.log(file.data);
           }
           return "Bundle undeployment successful.";
         }
 
-        status.stageName = TaskStage.FAILED;
+        this.progressBar.stageName = TaskStage.FAILED;
         // log the error output to the console
         this.params.response.console.log(file.data);
         throw new Error("DFHDPLOY command completed for JOBID " + this.jobId + ", but status cannot be determined.");
@@ -372,15 +373,27 @@ export class BundleDeployer {
     // If we haven't found SYSTSPRT then echo JESMSGLG instead
     for (const file of spoolOutput) {
       if (file.ddName === "JESMSGLG") {
-        status.stageName = TaskStage.FAILED;
+        this.progressBar.stageName = TaskStage.FAILED;
         // log the error output to the console
         this.params.response.console.log(file.data);
         throw new Error("DFHDPLOY command completed in error for JOBID " + this.jobId + " without generating SYSTSPRT output.");
       }
     }
 
-    status.stageName = TaskStage.FAILED;
+    this.progressBar.stageName = TaskStage.FAILED;
     throw new Error("SYSTSPRT and JESMSGLG output from DFHDPLOY not found for JOBID " + this.jobId +
-                    ". Most recent status update: '" + status.statusMessage + "'.");
+                    ". Most recent status update: '" + this.progressBar.statusMessage + "'.");
+  }
+
+  private startProgressBar() {
+    if (this.params.arguments.verbose !== true) {
+      this.params.response.progress.startBar({task: this.progressBar});
+    }
+  }
+
+  private endProgressBar() {
+    if (this.params.arguments.verbose !== true) {
+      this.params.response.progress.endBar();
+    }
   }
 }

src/cli/shared/BundleParent.handler.ts

@@ -54,6 +54,11 @@ export abstract class BundleParentHandler implements ICommandHandler {
           // either throw an Exception or return a success message.
           msg = await this.performAction(params);
 
+          // Add a newline char if its needed
+          if (msg.slice(-1) !== "\n") {
+            msg += "\n";
+          }
+
           // Issue the success message
           params.response.console.log(Buffer.from(msg));
           if (params.arguments.silent === undefined) {