Update: eslint --env-info ouput os info

eslint · Mar 10, 2021 · 35717b7 · 35717b7
1 parent 0eecad2
commit 35717b7
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 1 deletion.
diff --git a/lib/shared/runtime-info.js b/lib/shared/runtime-info.js
@@ -11,6 +11,7 @@
 
 const path = require("path");
 const spawn = require("cross-spawn");
+const osName = require("os-name");
 const log = require("../shared/logging");
 const packageJson = require("../../package.json");
 
@@ -140,7 +141,8 @@ function environment() {
         `Node version: ${getBinVersion("node")}`,
         `npm version: ${getBinVersion("npm")}`,
         `Local ESLint version: ${getNpmPackageVersion("eslint", { global: false })}`,
-        `Global ESLint version: ${getNpmPackageVersion("eslint", { global: true })}`
+        `Global ESLint version: ${getNpmPackageVersion("eslint", { global: true })}`,
+        `Operating System: ${osName()}`
     ].join("\n");
 }
 

diff --git a/package.json b/package.json
@@ -75,6 +75,7 @@
     "minimatch": "^3.0.4",
     "natural-compare": "^1.4.0",
     "optionator": "^0.9.1",
+    "os-name": "^4.0.0",
     "progress": "^2.0.0",
     "regexpp": "^3.1.0",
     "semver": "^7.2.1",

diff --git a/tests/lib/shared/runtime-info.js b/tests/lib/shared/runtime-info.js
@@ -12,6 +12,7 @@
 const assert = require("chai").assert;
 const sinon = require("sinon");
 const spawn = require("cross-spawn");
+const os = require("os");
 const { unIndent } = require("../../_utils");
 const RuntimeInfo = require("../../../lib/shared/runtime-info");
 const log = require("../../../lib/shared/logging");
@@ -57,6 +58,8 @@ describe("RuntimeInfo", () => {
         let spawnSyncStubArgs;
 
         beforeEach(() => {
+            os.platform = () => "darwin";
+            os.release = () => "20.3.0";
             spawnSyncStub = sinon.stub(spawn, "sync");
             logErrorStub = sinon.stub(log, "error");
             originalProcessArgv = process.argv;
@@ -109,6 +112,7 @@ describe("RuntimeInfo", () => {
                     npm version: v6.11.3
                     Local ESLint version: v6.3.0 (Currently used)
                     Global ESLint version: v5.16.0
+                    Operating System: macOS Big Sur
                 `
             );
         });
@@ -126,6 +130,7 @@ describe("RuntimeInfo", () => {
                     npm version: v6.11.3
                     Local ESLint version: v6.3.0
                     Global ESLint version: v5.16.0 (Currently used)
+                    Operating System: macOS Big Sur
                 `
             );
         });
@@ -150,6 +155,7 @@ describe("RuntimeInfo", () => {
                     npm version: v6.11.3
                     Local ESLint version: Not found
                     Global ESLint version: v5.16.0 (Currently used)
+                    Operating System: macOS Big Sur
                 `
             );
         });
@@ -167,6 +173,7 @@ describe("RuntimeInfo", () => {
                     npm version: v6.11.3
                     Local ESLint version: v6.3.0 (Currently used)
                     Global ESLint version: Not found
+                    Operating System: macOS Big Sur
                 `
             );
         });