Merge pull request #24 from pcoop/branch1

Initial Deploy/Undeploy code

Author: pcoop

__tests__/__src__/TestUtils.ts

@@ -37,7 +37,7 @@ export function runCliScript(scriptPath: string, testEnvironment: ITestEnvironme
 
         fs.chmodSync(scriptPath, "755");
         // Execute the command synchronously
-        return spawnSync(scriptPath, [].concat(args), {cwd: testEnvironment.workingDir, env: childEnv, shell: true});
+        return spawnSync(scriptPath, [].concat(args), {cwd: testEnvironment.workingDir, env: childEnv, shell: true, stdio: ["pipe", "pipe", "pipe"], windowsHide: true});
     } else {
         throw new Error(`The script file  ${scriptPath} doesn't exist`);
 

__tests__/api/AutoBundler.test.ts renamed to __tests__/api/BundleContent/AutoBundler.test.ts

@@ -9,9 +9,9 @@
 *
 */
 
-import { AutoBundler } from "../../src/api/AutoBundler";
+import { AutoBundler } from "../../../src/api/BundleContent/AutoBundler";
 import { IHandlerParameters } from "@brightside/imperative";
-import * as BundleDefinition from "../../src/cli/generate/bundle/Bundle.definition";
+import * as GenerateBundleDefinition from "../../../src/cli/generate/bundle/GenerateBundle.definition";
 import * as fse from "fs-extra";
 
 
@@ -48,14 +48,14 @@ const DEFAULT_PARAMTERS: IHandlerParameters = {
             endBar: jest.fn(() => undefined)
         }
     } as any,
-    definition: BundleDefinition.BundleDefinition,
-    fullDefinition: BundleDefinition.BundleDefinition,
+    definition: GenerateBundleDefinition.GenerateBundleDefinition,
+    fullDefinition: GenerateBundleDefinition.GenerateBundleDefinition,
 };
 
 describe("AutoBundler01", () => {
 
     beforeAll(() => {
-        // Git does not commit empty dirs, so make they exist
+        // Git does not commit empty dirs, so make sure they exist
         fse.ensureDir("__tests__/__resources__/EmptyBundle01");
     });
 

__tests__/api/Bundle.test.ts renamed to __tests__/api/BundleContent/Bundle.test.ts

@@ -9,7 +9,7 @@
 *
 */
 
-import { Bundle } from "../../src/api/Bundle";
+import { Bundle } from "../../../src/api/BundleContent/Bundle";
 describe("Bundle01", () => {
     it("should read an existing bundle", () => {
 

__tests__/api/Manifest.test.ts renamed to __tests__/api/BundleContent/Manifest.test.ts

@@ -9,7 +9,7 @@
 *
 */
 
-import { Manifest } from "../../src/api/Manifest";
+import { Manifest } from "../../../src/api/BundleContent/Manifest";
 describe("Manifest01", () => {
     it("should read an existing manifest", () => {
 

__tests__/api/Nodejsapp.test.ts renamed to __tests__/api/BundleContent/Nodejsapp.test.ts

@@ -9,7 +9,7 @@
 *
 */
 
-import { NodejsappBundlePart } from "../../src/api/NodejsappBundlePart";
+import { NodejsappBundlePart } from "../../../src/api/BundleContent/NodejsappBundlePart";
 describe("NodejsappBundlePart01", () => {
     it("Create a NodejsappBundlePart", () => {
 

__tests__/cli/deploy/Deploy.definition.test.ts

@@ -0,0 +1,33 @@
+/*
+* This program and the accompanying materials are made available under the terms of the
+* Eclipse Public License v2.0 which accompanies this distribution, and is available at
+* https://www.eclipse.org/legal/epl-v20.html
+*
+* SPDX-License-Identifier: EPL-2.0
+*
+* Copyright Contributors to the Zowe Project.
+* Copyright IBM Corp, 2019
+*
+*/
+
+import * as fs from "fs";
+import { Imperative } from "@brightside/imperative";
+
+describe("Deploy definition", () => {
+    it("should match the snapshot", () => {
+
+        // Attempt to read the full file contents. We could require the module here, however there is normally non
+        // deterministic data (filepaths, etc.) that are resolved when the module is loaded, so it is simpler to
+        // check the contents for changes (sanity/protection against undesired changes to the definition)
+        let contents: string;
+        let error;
+        try {
+            contents = fs.readFileSync(__dirname + "/../../../src/cli/deploy/Deploy.definition.ts").toString();
+        } catch (e) {
+            error = e;
+            Imperative.console.error(`Error reading Deploy.definition.ts Did you move the file? Details: ${e.message}`);
+        }
+        expect(error).toBeUndefined();
+        expect(contents).toMatchSnapshot();
+    });
+});

__tests__/cli/deploy/__snapshots__/Deploy.definition.test.ts.snap

@@ -0,0 +1,34 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`Deploy definition should match the snapshot 1`] = `
+"/*
+* This program and the accompanying materials are made available under the terms of the
+* Eclipse Public License v2.0 which accompanies this distribution, and is available at
+* https://www.eclipse.org/legal/epl-v20.html
+*
+* SPDX-License-Identifier: EPL-2.0
+*
+* Copyright IBM Corp, 2019
+*
+*/
+
+import { ICommandDefinition } from \\"@brightside/imperative\\";
+import { DeployBundleDefinition } from \\"./bundle/DeployBundle.definition\\";
+/**
+ * Imperative command to \\"deploy\\" a Bundle, etc.
+ *
+ */
+const DeployDefinition: ICommandDefinition = {
+    name: \\"deploy\\",
+    aliases: [\\"d\\", \\"dep\\"],
+    summary: \\"Deploy a CICS bundle to a CPSM managed (group of) CICS region(s)\\",
+    description: \\"Deploy a CICS bundle from zFS into a CPSM managed set of CICS regions. \\" +
+                 \\"A BUNDLE resource is installed and ENABLED and made AVAILABLE in the \\" +
+                 \\"target CICSplex and scope.\\",
+    type: \\"group\\",
+    children: [DeployBundleDefinition],
+};
+
+export = DeployDefinition;
+"
+`;

__tests__/cli/generate/bundle/Bundle.definition.test.ts renamed to __tests__/cli/deploy/bundle/DeployBundle.definition.test.ts

@@ -18,14 +18,14 @@ describe("bundle definition", () => {
 
         // Attempt to read the full file contents. We could require the module here, however there is normally non
         // deterministic data (filepaths, etc.) that are resolved when the module is loaded, so it is simpler to
-        // check the contents for changes (sanity/protection agaisnt undesired changes to the definition)
+        // check the contents for changes (sanity/protection against undesired changes to the definition)
         let contents: string;
         let error;
         try {
-            contents = fs.readFileSync(__dirname + "/../../../../src/cli/generate/bundle/Bundle.definition.ts").toString();
+            contents = fs.readFileSync(__dirname + "/../../../../src/cli/deploy/bundle/DeployBundle.definition.ts").toString();
         } catch (e) {
             error = e;
-            Imperative.console.error(`Error reading Bundle.definition.ts Did you move the file? Details: ${e.message}`);
+            Imperative.console.error(`Error reading DeployBundle.definition.ts Did you move the file? Details: ${e.message}`);
         }
         expect(error).toBeUndefined();
         expect(contents).toMatchSnapshot();