Merge branch 'quiet' of https://github.com/zowe/zowe-cli into quiet

zowe · Nov 5, 2024 · 7d2f05c · 7d2f05c
2 parents 4248c3c + 61e2b36
commit 7d2f05c
Show file tree

Hide file tree

Showing 51 changed files with 777 additions and 174 deletions.
diff --git a/__tests__/__packages__/cli-test-utils/CHANGELOG.md b/__tests__/__packages__/cli-test-utils/CHANGELOG.md
@@ -2,6 +2,10 @@
 
 All notable changes to the Zowe CLI test utils package will be documented in this file.
 
+## Recent Changes
+
+- BugFix: Improved the error message shown on MacOS when `runCliScript` method fails to run script that is missing shebang line. [#2314](https://github.com/zowe/zowe-cli/pull/2314)
+
 ## `8.1.1`
 
 - BugFix: Updated peer dependencies to `^8.0.0`, dropping support for versions tagged `next`. [#2287](https://github.com/zowe/zowe-cli/pull/2287)

diff --git a/__tests__/__packages__/cli-test-utils/package.json b/__tests__/__packages__/cli-test-utils/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@zowe/cli-test-utils",
-  "version": "8.6.2",
+  "version": "8.7.0",
   "description": "Test utilities package for Zowe CLI plug-ins",
   "author": "Zowe",
   "license": "EPL-2.0",
@@ -43,7 +43,7 @@
   "devDependencies": {
     "@types/js-yaml": "^4.0.9",
     "@types/uuid": "^10.0.0",
-    "@zowe/imperative": "8.6.2"
+    "@zowe/imperative": "8.7.0"
   },
   "peerDependencies": {
     "@zowe/imperative": "^8.0.0"

diff --git a/__tests__/__packages__/cli-test-utils/src/TestUtils.ts b/__tests__/__packages__/cli-test-utils/src/TestUtils.ts
@@ -10,6 +10,7 @@
 */
 
 import * as fs from "fs";
+import * as path from "path";
 import { spawnSync, SpawnSyncReturns, ExecFileException } from "child_process";
 import { ITestEnvironment } from "./environment/doc/response/ITestEnvironment";
 import { ICommandDefinition, IHandlerParameters } from "@zowe/imperative";
@@ -55,12 +56,16 @@ export function runCliScript(scriptPath: string, testEnvironment: ITestEnvironme
         } catch {
             fs.chmodSync(scriptPath, "755");
         }
-        return spawnSync(scriptPath, args, {
+        const response = spawnSync(scriptPath, args, {
             cwd: testEnvironment.workingDir,
             env: childEnv,
             encoding: "buffer"
         });
+        if (process.platform === "darwin" && (response.error as ExecFileException)?.errno === -8) {
+            throw new Error(`The script file ${path.basename(scriptPath)} failed to execute. Check that it starts with a shebang line.`);
+        }
 
+        return response;
     } else {
         throw new Error(`The script file ${scriptPath} doesn't exist`);
 

diff --git a/jest.config.js b/jest.config.js
@@ -133,14 +133,11 @@ module.exports = {
     ...projectConfig,
     "reporters": [
         "default",
+        "jest-stare",
         ["jest-junit", {
             "outputDirectory": "__tests__/__results__",
             "reportTestSuiteErrors": true
         }],
-        ["jest-stare", {
-            "coverageLink": "../unit/coverage/lcov-report/index.html",
-            "resultDir": "__tests__/__results__/jest-stare"
-        }],
         ["github-actions", { "silent": false } ]
     ],
     "testResultsProcessor": "jest-sonar-reporter",

diff --git a/lerna.json b/lerna.json
@@ -1,5 +1,5 @@
 {
-  "version": "8.6.2",
+  "version": "8.7.0",
   "command": {
     "publish": {
       "ignoreChanges": [

diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json
diff --git a/package.json b/package.json
@@ -82,5 +82,13 @@
   },
   "jestSonar": {
     "reportPath": "__tests__/__results__/jest-sonar"
+  },
+  "jest-stare": {
+    "additionalResultsProcessors": [
+      "jest-junit",
+      "jest-sonar-reporter"
+    ],
+    "coverageLink": "../unit/coverage/lcov-report/index.html",
+    "resultDir": "__tests__/__results__/jest-stare"
   }
 }
diff --git a/packages/cli/CHANGELOG.md b/packages/cli/CHANGELOG.md
@@ -1,6 +1,9 @@
 # Change Log
 All notable changes to the Zowe CLI package will be documented in this file.
 
+## `8.7.0`
+
+- Enhancement: Added --wait-for-active and --wait-for-output to download options on zosjobs. [#2328](https://github.com/zowe/zowe-cli/pull/2328)
 
 ## Recent Changes
 - Enhancement: Add the --ignore-not-found flag to avoid error messages potentially interrupting a script for automated batch processes. The flag bypasses warning prompts to confirm delete actions. [#2254](https://github.com/zowe/zowe-cli/pull/2254)
@@ -12,7 +15,6 @@ All notable changes to the Zowe CLI package will be documented in this file.
 
 - BugFix: Fixed an issue where the `zowe zos-logs list logs` command could fail or not return all logs if a start time was not supplied. [#2336](https://github.com/zowe/zowe-cli/pull/2336)
 
-
 ## `8.6.0`
 
 - Enhancement: Added support for running applications on TSO/E address spaces. Start applications and receive/transmit messages using the new `tso start`, `tso receive` and `tso send` commands. [#2280](https://github.com/zowe/zowe-cli/pull/2280)