Merge branch 'dev' of https://github.com/cxharris/zowe-cli-cics-deploy-plugin into dev

Author: cxharris

CONTRIBUTING.md

@@ -93,6 +93,14 @@ To save you having to type the above for every commit, Git can add the `Signed-o
 
 If you haven't signed each commit, then the pull request will fail to pass all checks.
 
+### Build and install the cics-deploy plugin
+```console
+git clone https://github.com/IBM/zowe-cli-cics-deploy-plugin
+cd zowe-cli-cics-deploy-plugin
+npm install
+npm run build
+zowe plugins install .
+```
 
 ## Developing Zowe CLI plug-ins
 

__tests__/api/BundleDeploy/BundleDeployer.test.ts

@@ -391,6 +391,14 @@ describe("BundleDeployer01", () => {
         parms.arguments.jobcard = "'//DFHDPLOY JOB DFHDPLOY,'some text',CLASS=A,MSGCLASS=X,TIME=NOLIMIT'";
         await testDeployJCL(parms);
     });
+    it("should tolerate a single leading slash for jobcard", async () => {
+
+        let parms: IHandlerParameters;
+        parms = DEFAULT_PARAMTERS;
+        setCommonParmsForDeployTests(parms);
+        parms.arguments.jobcard = "/DFHDPLOY JOB DFHDPLOY,CLASS=A,MSGCLASS=X,TIME=NOLIMIT";
+        await testDeployJCL(parms);
+    });
     it("should support long bundledir", async () => {
         let parms: IHandlerParameters;
         parms = DEFAULT_PARAMTERS;

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

@@ -578,6 +578,24 @@ UNDEPLOY BUNDLE(12345678)
 "
 `;
 
+exports[`BundleDeployer01 should tolerate a single leading slash for jobcard 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(1234567890)
+       SCOPE(12345678)
+       STATE(ENABLED)
+/*
+"
+`;
+
 exports[`BundleDeployer01 should tolerate bundledir with extra slasshes 1`] = `
 "//DFHDPLOY JOB DFHDPLOY,CLASS=A,MSGCLASS=X,TIME=NOLIMIT
 //DFHDPLOY EXEC PGM=DFHDPLOY,REGION=100M

docs/pages/cdp/cdp-Installing.md

@@ -21,26 +21,19 @@ toc: false
 2. Install [Zowe CLI](https://zowe.github.io/docs-site/latest/user-guide/cli-installcli.html). For example, to install using npm:
 
     ```console
-    sudo npm install -g @brightside/core
+    npm install -g @brightside/core
     ```
 
-3. Build and install the cics-deploy plug-in as described in [Setting up your development environment](https://github.com/IBM/zowe-cli-cics-deploy-plugin/blob/master/docs-internal/tutorials/Setup.md). For example:
+3. Install the cics plugin:
 
     ```console
-    mkdir ~/cics-deploy
-    cd ~/cics-deploy
-    rm -Rf *
-    git clone https://github.com/IBM/zowe-cli-cics-deploy-plugin
-    cd zowe-cli-cics-deploy-plugin
-    npm install
-    npm run build
-    zowe plugins install .
+    zowe plugins install @brightside/cics@lts-incremental
     ```
 
-4. Install the cics plugin:
+4. Install the cics-deploy plugin:
 
     ```console
-    zowe plugins install @brightside/cics
+    zowe plugins install zowe-cli-cics-deploy-plugin
     ```
 
 5. Verify the plug-ins are installed:
@@ -49,15 +42,16 @@ toc: false
     zowe plugins list
     ```
 
-    Displays a list of the installed plug-ins:
+    Displays a list of the installed plugins:
 
-   <pre class="messageText">
-   -- pluginName: zowe-cli-cics-deploy-plugin
-   -- package: zowe-cli-cics-deploy-plugin
-   -- version: 0.5.0
-   -- registry: https://eu.artifactory.swg-devops.com/artifactory/api/npm/cicsts-npm-virtual
+    <pre class="messageText">
+    Installed plugins:
 
-   -- pluginName: @zowe/cics
-   -- package: @zowe/cics
-   -- version: 2.0.1
-   -- registry: https://eu.artifactory.swg-devops.com/artifactory/api/npm/cicsts-npm-virtual</pre>
+    -- pluginName: @brightside/cics
+    -- package: @brightside/cics@lts-incremental
+    -- version: 1.1.1
+    -- registry: https://registry.npmjs.org/<br>
+    -- pluginName: zowe-cli-cics-deploy-plugin
+    -- package: zowe-cli-cics-deploy-plugin
+    -- version: 0.5.0
+    -- registry: https://registry.npmjs.org/ </pre>

src/api/BundleDeploy/ParmValidator.ts

@@ -309,11 +309,19 @@ export class ParmValidator {
 
     // split the jobcard into a comma separated list
     const jobcardParts = params.arguments.jobcard.split(",");
-    const firstPart = jobcardParts[0].trim();
+    let firstPart = jobcardParts[0].trim();
 
     // check that it starts with '//'
     if (firstPart.indexOf("//") !== 0) {
-      throw new Error("--jobcard parameter does not start with //");
+
+      // gitbash can swallow a '/' character. If we only have one then add another.
+      if (firstPart.startsWith("/")) {
+        params.arguments.jobcard = "/" + params.arguments.jobcard;
+        firstPart = "/" + firstPart;
+      }
+      else {
+        throw new Error("--jobcard parameter does not start with //");
+      }
     }
 
     // split the first section of the jobcard into chunks