@zowe/cli 6.40.3 → 6.40.6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zowe/cli",
-  "version": "6.40.3",
+  "version": "6.40.6",
   "description": "Zowe CLI is a command line interface (CLI) that provides a simple and streamlined way to interact with IBM z/OS.",
   "author": "Zowe",
   "license": "EPL-2.0",
@@ -55,18 +55,18 @@
     "typedocSpecifySrc": "typedoc --options ./typedoc.json"
   },
   "dependencies": {
-    "@zowe/core-for-zowe-sdk": "6.40.3",
-    "@zowe/imperative": "4.18.5",
+    "@zowe/core-for-zowe-sdk": "6.40.6",
+    "@zowe/imperative": "4.18.8",
     "@zowe/perf-timing": "1.0.7",
-    "@zowe/provisioning-for-zowe-sdk": "6.40.3",
-    "@zowe/zos-console-for-zowe-sdk": "6.40.3",
-    "@zowe/zos-files-for-zowe-sdk": "6.40.3",
-    "@zowe/zos-jobs-for-zowe-sdk": "6.40.3",
-    "@zowe/zos-logs-for-zowe-sdk": "6.40.3",
-    "@zowe/zos-tso-for-zowe-sdk": "6.40.3",
-    "@zowe/zos-uss-for-zowe-sdk": "6.40.3",
-    "@zowe/zos-workflows-for-zowe-sdk": "6.40.3",
-    "@zowe/zosmf-for-zowe-sdk": "6.40.3",
+    "@zowe/provisioning-for-zowe-sdk": "6.40.6",
+    "@zowe/zos-console-for-zowe-sdk": "6.40.6",
+    "@zowe/zos-files-for-zowe-sdk": "6.40.6",
+    "@zowe/zos-jobs-for-zowe-sdk": "6.40.6",
+    "@zowe/zos-logs-for-zowe-sdk": "6.40.6",
+    "@zowe/zos-tso-for-zowe-sdk": "6.40.6",
+    "@zowe/zos-uss-for-zowe-sdk": "6.40.6",
+    "@zowe/zos-workflows-for-zowe-sdk": "6.40.6",
+    "@zowe/zosmf-for-zowe-sdk": "6.40.6",
     "get-stdin": "7.0.0",
     "minimatch": "3.0.4"
   },

package/scripts/performanceAnalysis.js

@@ -1,85 +0,0 @@
-/*
-* 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.
-*
-*/
-
-/**
- * Read in a directory containing json files of runs of scripts/performanceTest.js
- * from different systems, and analyze the results, providing a summary
- */
-
-const fs = require("fs");
-const {TextUtils} = require("@brightside/imperative");
-const {resolve} = require("path");
-const jsonFilesDirectory = resolve(process.argv[2]);
-if (jsonFilesDirectory == null) {
-    console.error("You must specify a directory containing performance test JSON files as the " +
-        "first positional argument to this script.");
-    process.exit(1);
-}
-
-console.log("Analyzing performance test results in the directory '%s'", jsonFilesDirectory);
-const filesInDir = fs.readdirSync(jsonFilesDirectory);
-const jsonFiles = [];
-for (const file of filesInDir) {
-    if (file.indexOf(".json") >= 0) {
-        jsonFiles.push(file);
-    }
-}
-
-const finalResults = {};
-
-for (const file of jsonFiles) {
-    const jsonResult = require(resolve(jsonFilesDirectory + "/" + file));
-    for (const result of jsonResult.results) {
-        if (finalResults[result.label] == null) {
-            // if this is the first time we've seen this label, initialize the result for the task
-            finalResults[result.label] = {
-                longest: -1,
-                shortest: 99999999999999999999999999999,
-                numResults: 0,
-                total: 0,
-                average: 0
-            };
-        }
-
-        finalResults[result.label].total += result.elapsedTime;
-        finalResults[result.label].numResults++;
-        if (finalResults[result.label].longest < result.elapsedTime) {
-            finalResults[result.label].longest = result.elapsedTime;
-        }
-        if (finalResults[result.label].shortest > result.elapsedTime) {
-            finalResults[result.label].shortest = result.elapsedTime;
-        }
-    }
-}
-
-for (const label of Object.keys(finalResults)) {
-    finalResults[label].average = (finalResults[label].total / finalResults[label].numResults).toFixed(2);
-}
-
-/**
- * Get a report of the results
- *
- * First, add human-readable keys to the result object
- */
-const stringifiedResults = Object.keys(finalResults).map(function (label) {
-    const result = finalResults[label];
-    const newResult = {};
-    newResult.Task = label;
-    newResult["Shortest time (ms)"] = result.shortest;
-    newResult["Average time (ms)"] = result.average;
-    newResult["Longest time (ms)"] = result.longest;
-    newResult["Number of tests"] = result.numResults;
-    delete newResult.elapsedTime;
-    return newResult;
-});
-
-const resultTable = TextUtils.getTable(stringifiedResults, "blue", undefined, undefined, true);
-console.log("\n" + resultTable);

package/scripts/performanceTest.js

@@ -1,128 +0,0 @@
-/*
-* 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.
-*
-*/
-
-const childProcess = require("child_process");
-const moment = require("moment");
-const os = require("os");
-const {IO, TextUtils} = require("@brightside/imperative");
-const fs = require("fs");
-const {resolve, join} = require("path");
-
-const tempHomeDir = resolve(__dirname + "/../__tests__/__results__/performance");
-const resultFile = tempHomeDir + "/results.txt";
-IO.createDirsSyncFromFilePath(resultFile);
-const resultJSONFile = join(tempHomeDir, `results_${moment().format('x')}.json`);
-const packageName = "@brightside/core";
-const binName = "bright";
-
-const header = `Performance Tests\nCurrent time ${moment()}\nPlatform '${os.platform()}'. Architecture '${os.arch()}'\n` +
-    `Total Memory: ${os.totalmem()}. Free memory ${os.freemem()}\n` +
-    `Number of CPUs ${os.cpus().length}.\n` +
-    `User name: ${os.userInfo().username}\n`;
-console.log(header);
-IO.writeFile(resultFile, header);
-
-const results = [];
-
-/**
- * Set the current home directory
- */
-const env = JSON.parse(JSON.stringify(process.env)); // copy the current environmental variables
-env.ZOWE_CLI_HOME = tempHomeDir;
-deleteHomeDirectory();
-uninstallBrightside();
-
-/**
- * Execute our list of performance test tasks here
- */
-results.push(execTimed(`npm install -g ${packageName}@next`, "Install @next version of Brightside"));
-results.push(execTimed(`${binName} --help`, `Issue ${binName} --help (no plugins) `));
-results.push(execTimed(`${binName} profiles list zosmf --rfj`, "List zosmf profiles (no plugins) "));
-results.push(execTimed(`${binName} plugins install @brightside/filemasterplus`, "Install filemaster plugin "));
-results.push(execTimed(`${binName} --help`, `Issue ${binName} --help (1 plugin) `));
-results.push(execTimed(`${binName} plugins install @brightside/endevor`, "Install endevor plugin (with filemaster installed) "));
-results.push(execTimed(`${binName} --help`, `Issue ${binName} --help (2 plugins) `));
-results.push(execTimed(`${binName} profiles list zosmf --rfj`, "List zosmf profiles (2 plugins) "));
-
-/**
- * Get a report of the results
- *
- * First, add human-readable keys to the result object
- */
-const stringifiedResults = results.map(function (result) {
-    const newResult = JSON.parse(JSON.stringify(result)); // copy the result before modifying
-    if (newResult.Passed != null) {
-        newResult.Passed = newResult.Passed ? TextUtils.chalk.green(":)") : TextUtils.chalk.red("X");
-    }
-    newResult["Elapsed Time (ms)"] = newResult.elapsedTime;
-    newResult.Task = newResult.label;
-    delete newResult.label;
-    delete newResult.elapsedTime;
-    return newResult;
-});
-const resultTable = TextUtils.getTable(stringifiedResults, "blue", undefined, undefined, true);
-console.log("\n" + resultTable);
-IO.writeFile(resultFile, resultTable);
-IO.writeFile(resultJSONFile, JSON.stringify({header, results}, null, 2));
-
-/**
- * Execute a command synchronously and time how long it takes to execute
- * @param command - the command to execute
- * @param label - label for the action you are performing with this command
- * @param expectedTime - the amount of time in milliseconds you expect this command to take
- */
-function execTimed(command, label, expectedTime) {
-    console.log("Running '%s'\n", command);
-    const beforeTimeStamp = moment();
-    const outputFileName = join(tempHomeDir, "output/" + label + ".txt");
-    IO.createDirsSyncFromFilePath(outputFileName);
-    const outputFileStream = fs.openSync(outputFileName, "w+");
-
-    childProcess.execSync(command, {env, stdio: ["inherit", outputFileStream, outputFileStream]});
-    const afterTimeStamp = moment();
-    const elapsedTime = afterTimeStamp.diff(beforeTimeStamp);
-    let timeGreaterThanExpected = undefined;
-    const result = {label, elapsedTime};
-    if (expectedTime != null) {
-        timeGreaterThanExpected = elapsedTime > expectedTime;
-        if (timeGreaterThanExpected) {
-            result.Passed = false;
-        } else if (timeGreaterThanExpected === false) {
-            // don't set timeGreaterThanExpected if there's no expected time
-            result.Passed = true;
-        }
-    }
-
-    return result;
-}
-
-/**
- * Delete the temporary brightside home directory
- */
-function deleteHomeDirectory() {
-    console.log("Deleting %s...", tempHomeDir);
-    try {
-        require("rimraf").sync(tempHomeDir);
-    } catch (rimrafError) {
-        throw new Error("Failed to delete " + tempHomeDir + ". Rimraf error:" + rimrafError);
-    }
-}
-
-function uninstallBrightside() {
-    console.log("Uninstalling %s before global install\n", packageName);
-    const outputFileName = join(tempHomeDir, "output/uninstall.txt");
-    IO.createDirsSyncFromFilePath(outputFileName);
-    const outputFileStream = fs.openSync(outputFileName, "w+");
-    childProcess.execSync(`npm uninstall -g ${packageName}`, {
-        env,
-        stdio: ["inherit", outputFileStream, outputFileStream]
-    });
-}