more merges

Author: pcoop

.gitignore

@@ -6,4 +6,5 @@ results/
 __results__/
 __tests__/__results__/
 /__tests__/__resources__/properties/**
-!/__tests__/__resources__/properties/example_properties.yaml
+!/__tests__/__resources__/properties/example_properties.yaml
+package-lock.json

__tests__/api/BundleDeploy/BundleDeployer.test.ts

@@ -313,7 +313,6 @@ describe("BundleDeployer01", () => {
         expect(err.message).toMatchSnapshot();
     });
     it("should support long bundledir", async () => {
-
         let parms: IHandlerParameters;
         parms = DEFAULT_PARAMTERS;
         setCommonParmsForDeployTests(parms);
@@ -325,6 +324,13 @@ describe("BundleDeployer01", () => {
                                     "1234567890123456789012345678901234567890123456789012345";
         await testDeployJCL(parms);
     });
+    it("should tolerate bundledir with extra slasshes", async () => {
+        let parms: IHandlerParameters;
+        parms = DEFAULT_PARAMTERS;
+        setCommonParmsForDeployTests(parms);
+        parms.arguments.bundledir = "//bundledir/with/extra//slashes";
+        await testDeployJCL(parms);
+    });
     it("should generate deploy JCL for AVAILABLE", async () => {
 
         let parms: IHandlerParameters;

__tests__/api/BundleDeploy/__snapshots__/BundleDeployer.test.ts.snap

@@ -540,6 +540,24 @@ UNDEPLOY BUNDLE(12345678)
 "
 `;
 
-exports[`BundleDeployer01 should tolerate empty output from DFHDPLOY 1`] = `"DFHDPLOY did not generate any output. Most recent status update: 'Submitting DFHDPLOY JCL for the DEPLOY action'."`;
+exports[`BundleDeployer01 should tolerate bundledir with extra slasshes 1`] = `
+"//DFHDPLOY JOB DFHDPLOY,CLASS=A,MSGCLASS=X,TIME=NOLIMIT
+//DFHDPLOY EXEC PGM=DFHDPLOY,REGION=100M
+//STEPLIB  DD DISP=SHR,DSN=12345678901234567890123456789012345.SDFHLOAD
+//         DD DISP=SHR,DSN=abcde12345abcde12345abcde12345abcde.SEYUAUTH
+//SYSTSPRT DD SYSOUT=*
+//SYSIN    DD *
+*
+SET CICSPLEX(12345678);
+*
+DEPLOY BUNDLE(12345678)
+       BUNDLEDIR(/bundledir/with/extra/slashes)
+       SCOPE(12345678)
+       STATE(ENABLED)
+/*
+"
+`;
+
+exports[`BundleDeployer01 should tolerate empty output from DFHDPLOY 1`] = `"DFHDPLOY did not generate any output. Most recent status update: 'Submitting DFHDPLOY JCL'."`;
 
 exports[`BundleDeployer01 should undeploy successfully 1`] = `"Bundle undeployment successful."`;

src/api/BundleDeploy/BundleDeployer.ts

@@ -15,6 +15,7 @@ import { IHandlerParameters, Logger, ImperativeError, AbstractSession, ITaskWith
          TaskStage , TaskProgress} from "@zowe/imperative";
 import { ZosmfSession, SubmitJobs, List } from "@zowe/cli";
 import { ParmValidator } from "./ParmValidator";
+import * as path from "path";
 
 /**
  * Class to represent a CICS Bundle Deployer.
@@ -140,9 +141,12 @@ export class BundleDeployer {
    * @memberof BundleDeployer
    */
   private getDeployJCL(): string {
+    // Get rid of any extra slashes which may be needed on git-bash to avoid path munging
+    const bundledir = path.posix.normalize(this.params.arguments.bundledir);
+
     const jcl = this.generateCommonJCLHeader() +
       this.wrapLongLineForJCL("DEPLOY BUNDLE(" + this.params.arguments.name + ")\n") +
-      this.wrapLongLineForJCL("       BUNDLEDIR(" + this.params.arguments.bundledir + ")\n") +
+      this.wrapLongLineForJCL("       BUNDLEDIR(" + bundledir + ")\n") +
       this.generateCommonJCLFooter();
 
     return jcl;