Add versions to lerna ls. Fixes #603. (#624)

lerna · Feb 28, 2017 · 3ace547 · 3ace547
1 parent b595884
commit 3ace547
Show file tree

Hide file tree

Showing 4 changed files with 112 additions and 71 deletions.
diff --git a/package.json b/package.json
@@ -27,6 +27,7 @@
     "async": "^1.5.0",
     "chalk": "^1.1.1",
     "cmd-shim": "^2.0.2",
+    "columnify": "^1.5.4",
     "command-join": "^2.0.0",
     "cross-spawn": "^4.0.0",
     "glob": "^7.0.6",

diff --git a/src/commands/LsCommand.js b/src/commands/LsCommand.js
@@ -1,5 +1,6 @@
 import Command from "../Command";
 import chalk from "chalk";
+import columnify from "columnify";
 
 export default class LsCommand extends Command {
   initialize(callback) {
@@ -9,10 +10,15 @@ export default class LsCommand extends Command {
 
   execute(callback) {
     const formattedPackages = this.filteredPackages
-      .map((pkg) => `- ${pkg.name}${pkg.isPrivate() ? ` (${chalk.red("private")})` : ""}`)
-      .join("\n");
+      .map((pkg) => {
+        return {
+          name: pkg.name,
+          version: chalk.grey(`v${pkg.version}`),
+          private: pkg.isPrivate() ? `(${chalk.red("private")})` : ""
+        };
+      });
 
-    this.logger.info(formattedPackages);
+    this.logger.info(columnify(formattedPackages, {showHeaders: false}));
     callback(null, true);
   }
 }
diff --git a/test/LsCommand.js b/test/LsCommand.js
@@ -7,6 +7,18 @@ import LsCommand from "../src/commands/LsCommand";
 import logger from "../src/logger";
 import stub from "./_stub";
 
+function formatPrivate (pkg) {
+  return `${pkg} ${chalk.grey("v1.0.0")} (${chalk.red("private")})`;
+}
+
+function formatPublic (pkg) {
+  return `${pkg} ${chalk.grey("v1.0.0")}          `;
+}
+
+function formatOnlyPublic (pkg) {
+  return `${pkg} ${chalk.grey("v1.0.0")} `;
+}
+
 describe("LsCommand", () => {
 
   describe("in a basic repo", () => {
@@ -21,7 +33,7 @@ describe("LsCommand", () => {
       lsCommand.runPreparations();
 
       stub(logger, "info", (message) => {
-        assert.equal(message, `- package-1\n- package-2\n- package-3\n- package-4\n- package-5 (${chalk.red("private")})`);
+        assert.equal(message, `${formatPublic("package-1")}\n${formatPublic("package-2")}\n${formatPublic("package-3")}\n${formatPublic("package-4")}\n${formatPrivate("package-5")}`);
       });
 
       lsCommand.runCommand(exitWithCode(0, done));
@@ -41,7 +53,7 @@ describe("LsCommand", () => {
         lsCommand.runPreparations();
 
         stub(logger, "info", (message) => {
-          assert.equal(message, "- package-1");
+          assert.equal(message, formatOnlyPublic("package-1"));
         });
 
         lsCommand.runCommand(exitWithCode(0, done));
@@ -61,7 +73,7 @@ describe("LsCommand", () => {
       lsCommand.runPreparations();
 
       stub(logger, "info", (message) => {
-        assert.equal(message, "- package-1\n- package-2\n- package-3");
+        assert.equal(message, `${formatOnlyPublic("package-1")}\n${formatOnlyPublic("package-2")}\n${formatOnlyPublic("package-3")}`);
       });
 
       lsCommand.runCommand(exitWithCode(0, done));
@@ -83,7 +95,7 @@ describe("LsCommand", () => {
       lsCommand.runPreparations();
 
       stub(logger, "info", (message) => {
-        assert.equal(message, "- @test/package-2\n- @test/package-1");
+        assert.equal(message, `${formatOnlyPublic("@test/package-2")}\n${formatOnlyPublic("@test/package-1")}`);
       });
 
       lsCommand.runCommand(exitWithCode(0, done));