@oclif/plugin-version 1.2.1 → 1.3.0

package/lib/commands/version.d.ts

@@ -1,18 +1,13 @@
-import { Command } from '@oclif/core';
-export interface VersionDetail {
-    cliVersion: string;
-    architecture: string;
-    nodeVersion: string;
+import { Command, Interfaces } from '@oclif/core';
+export type VersionDetail = Omit<Interfaces.VersionDetails, 'pluginVersions'> & {
     pluginVersions?: string[];
-    osVersion?: string;
-    shell?: string;
-    rootPath?: string;
-}
+};
 export default class Version extends Command {
     static enableJsonFlag: boolean;
     static flags: {
-        verbose: import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
+        verbose: Interfaces.BooleanFlag<boolean>;
     };
     run(): Promise<VersionDetail>;
+    private formatPlugins;
     private getFriendlyName;
 }

package/lib/commands/version.js

@@ -1,40 +1,33 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+const tslib_1 = require("tslib");
 const core_1 = require("@oclif/core");
 // eslint-disable-next-line unicorn/prefer-node-protocol
 const os_1 = require("os");
 class Version extends core_1.Command {
     async run() {
+        var _a, _b;
         const { flags } = await this.parse(Version);
-        const [cliVersion, architecture, nodeVersion] = this.config.userAgent.split(' ');
-        const versionDetail = { cliVersion, architecture, nodeVersion };
+        const _c = this.config.versionDetails, { pluginVersions } = _c, theRest = tslib_1.__rest(_c, ["pluginVersions"]);
+        const versionDetail = Object.assign({}, theRest);
         let output = `${this.config.userAgent}`;
         if (flags.verbose) {
-            const pluginVersions = [];
-            for (const plugin of this.config.plugins.sort((a, b) => a.name > b.name ? 1 : -1)) {
-                if (this.config.name !== plugin.name) {
-                    pluginVersions.push(`${this.getFriendlyName(plugin.name)} ${plugin.version} (${plugin.type}) ${plugin.type === 'link' ? plugin.root : ''}`.trim());
-                }
-            }
-            const osVersion = `${(0, os_1.type)()} ${(0, os_1.release)()}`;
-            versionDetail.pluginVersions = pluginVersions;
-            versionDetail.osVersion = osVersion;
-            versionDetail.shell = this.config.shell;
-            versionDetail.rootPath = this.config.root;
+            versionDetail.pluginVersions = this.formatPlugins(pluginVersions !== null && pluginVersions !== void 0 ? pluginVersions : {});
+            (_a = versionDetail.shell) !== null && _a !== void 0 ? _a : (versionDetail.shell = 'unknown');
             output = ` CLI Version:
-\t${cliVersion}
+\t${versionDetail.cliVersion}
 
  Architecture:
-\t${architecture}
+\t${versionDetail.architecture}
 
  Node Version:
-\t${nodeVersion}
+\t${versionDetail.nodeVersion}
 
  Plugin Version:
-\t${pluginVersions.join(`${os_1.EOL}\t`)}
+\t${flags.verbose ? ((_b = versionDetail.pluginVersions) !== null && _b !== void 0 ? _b : []).join(os_1.EOL + '\t') : ''}
 
  OS and Version:
-\t${osVersion}
+\t${versionDetail.osVersion}
 
  Shell:
 \t${versionDetail.shell}
@@ -44,7 +37,19 @@ class Version extends core_1.Command {
 `;
         }
         this.log(output);
-        return versionDetail;
+        return flags.verbose ?
+            versionDetail :
+            {
+                cliVersion: versionDetail.cliVersion,
+                architecture: versionDetail.architecture,
+                nodeVersion: versionDetail.nodeVersion,
+            };
+    }
+    formatPlugins(plugins) {
+        return Object.entries(plugins)
+            .map(([name, plugin]) => (Object.assign({ name }, plugin)))
+            .sort((a, b) => (a.name > b.name ? 1 : -1))
+            .map(plugin => `${this.getFriendlyName(plugin.name)} ${plugin.version} (${plugin.type}) ${plugin.type === 'link' ? plugin.root : ''}`.trim());
     }
     getFriendlyName(name) {
         const scope = this.config.pjson.oclif.scope;

package/oclif.manifest.json

@@ -1 +1 @@
-{"version":"1.2.1","commands":{"version":{"id":"version","strict":true,"pluginName":"@oclif/plugin-version","pluginAlias":"@oclif/plugin-version","pluginType":"core","aliases":[],"flags":{"json":{"name":"json","type":"boolean","description":"Format output as json.","helpGroup":"GLOBAL","allowNo":false},"verbose":{"name":"verbose","type":"boolean","summary":"Show additional information about the CLI.","description":"Additionally shows the architecture, node version, operating system, and versions of plugins that the CLI is using.","allowNo":false}},"args":[]}}}
+{"version":"1.3.0","commands":{"version":{"id":"version","strict":true,"pluginName":"@oclif/plugin-version","pluginAlias":"@oclif/plugin-version","pluginType":"core","aliases":[],"flags":{"json":{"name":"json","type":"boolean","description":"Format output as json.","helpGroup":"GLOBAL","allowNo":false},"verbose":{"name":"verbose","type":"boolean","summary":"Show additional information about the CLI.","description":"Additionally shows the architecture, node version, operating system, and versions of plugins that the CLI is using.","allowNo":false}},"args":[]}}}

package/package.json

@@ -1,16 +1,16 @@
 {
   "name": "@oclif/plugin-version",
   "description": "A command that shows the CLI version",
-  "version": "1.2.1",
+  "version": "1.3.0",
   "author": "Salesforce",
   "bugs": "https://github.com/oclif/plugin-version/issues",
   "dependencies": {
-    "@oclif/core": "^2.0.3"
+    "@oclif/core": "^2.6.3"
   },
   "devDependencies": {
     "@commitlint/config-conventional": "^12.1.4",
     "@oclif/plugin-help": "5.1.12",
-    "@oclif/test": "^2.1.1",
+    "@oclif/test": "^2.3.10",
     "@types/chai": "^4.3.1",
     "@types/mocha": "^8.0.0",
     "@types/node": "^16",
@@ -19,6 +19,7 @@
     "eslint": "^7.3.1",
     "eslint-config-oclif": "^4",
     "eslint-config-oclif-typescript": "^1.0.2",
+    "fancy-test": "^2.0.13",
     "husky": "6",
     "mocha": "^8.2.1",
     "oclif": "^3.4.6",