Remove table output

DEPENDENCIES.md

@@ -288,8 +288,6 @@ graph LR;
  cidr-regex-->ip-regex;
  cli-columns-->string-width;
  cli-columns-->strip-ansi;
- cli-table3-->colors-colors["@colors/colors"];
- cli-table3-->string-width;
  color-convert-->color-name;
  columnify-->strip-ansi;
  columnify-->wcwidth;

docs/lib/content/commands/npm-doctor.md

@@ -34,20 +34,21 @@ there are any recommended changes, it will display them. By default npm
 runs all of these checks. You can limit what checks are ran by
 specifying them as extra arguments.
 
-#### `npm ping`
+#### `Connecting to the registry`
 
 By default, npm installs from the primary npm registry,
-`registry.npmjs.org`. `npm doctor` hits a special ping endpoint within the
-registry. This can also be checked with `npm ping`. If this check fails,
-you may be using a proxy that needs to be configured, or may need to talk
-to your IT staff to get access over HTTPS to `registry.npmjs.org`.
+`registry.npmjs.org`. `npm doctor` hits a special connection testing
+endpoint within the registry. This can also be checked with `npm ping`.
+If this check fails, you may be using a proxy that needs to be
+configured, or may need to talk to your IT staff to get access over
+HTTPS to `registry.npmjs.org`.
 
 This check is done against whichever registry you've configured (you can
 see what that is by running `npm config get registry`), and if you're using
 a private registry that doesn't support the `/whoami` endpoint supported by
 the primary registry, this check may fail.
 
-#### `npm -v`
+#### `Checking npm version`
 
 While Node.js may come bundled with a particular version of npm, it's the
 policy of the CLI team that we recommend all users run `npm@latest` if they
@@ -57,7 +58,7 @@ support releases typically only receive critical security and regression
 fixes. The team believes that the latest tested version of npm is almost
 always likely to be the most functional and defect-free version of npm.
 
-#### `node -v`
+#### `Checking node version`
 
 For most users, in most circumstances, the best version of Node will be the
 latest long-term support (LTS) release. Those of you who want access to new
@@ -66,7 +67,7 @@ be running a newer version, and some may be required to run an older
 version of Node because of enterprise change control policies. That's OK!
 But in general, the npm team recommends that most users run Node.js LTS.
 
-#### `npm config get registry`
+#### `Checking configured npm registry`
 
 You may be installing from private package registries for your project or
 company. That's great! Others may be following tutorials or StackOverflow
@@ -75,7 +76,7 @@ Sometimes, this may entail changing the registry you're pointing at. This
 part of `npm doctor` just lets you, and maybe whoever's helping you with
 support, know that you're not using the default registry.
 
-#### `which git`
+#### `Checking for git executable in PATH`
 
 While it's documented in the README, it may not be obvious that npm needs
 Git installed to do many of the things that it does. Also, in some cases

docs/lib/content/commands/npm-profile.md

@@ -17,28 +17,17 @@ support this interface.
 * `npm profile get [<property>]`: Display all of the properties of your
  profile, or one or more specific properties. It looks like:
 
-```bash
-+-----------------+---------------------------+
-| name | example |
-+-----------------+---------------------------+
-| email | [email protected] (verified) |
-+-----------------+---------------------------+
-| two factor auth | auth-and-writes |
-+-----------------+---------------------------+
-| fullname | Example User |
-+-----------------+---------------------------+
-| homepage | |
-+-----------------+---------------------------+
-| freenode | |
-+-----------------+---------------------------+
-| twitter | |
-+-----------------+---------------------------+
-| github | |
-+-----------------+---------------------------+
-| created | 2015-02-26T01:38:35.892Z |
-+-----------------+---------------------------+
-| updated | 2017-10-02T21:29:45.922Z |
-+-----------------+---------------------------+
+```
+name: example
+email: [email protected] (verified)
+two-factor auth: auth-and-writes
+fullname: Example User
+homepage:
+freenode:
+twitter:
+github:
+created: 2015-02-26T01:38:35.892Z
+updated: 2017-10-02T21:29:45.922Z
 ```
 
 * `npm profile set <property> <value>`: Set the value of a profile

docs/lib/content/commands/npm-token.md

@@ -16,24 +16,14 @@ This lets you list, create and revoke authentication tokens.
  Shows a table of all active authentication tokens. You can request
  this as JSON with `--json` or tab-separated values with `--parseable`.
 
-```bash
-+--------+---------+------------+----------+----------------+
-| id | token | created | read-only | CIDR whitelist |
-+--------+---------+------------+----------+----------------+
-| 7f3134 | 1fa9ba… | 2017-10-02 | yes | |
-+--------+---------+------------+----------+----------------+
-| c03241 | af7aef… | 2017-10-02 | no | 192.168.0.1/24 |
-+--------+---------+------------+----------+----------------+
-| e0cf92 | 3a436a… | 2017-10-02 | no | |
-+--------+---------+------------+----------+----------------+
-| 63eb9d | 74ef35… | 2017-09-28 | no | |
-+--------+---------+------------+----------+----------------+
-| 2daaa8 | cbad5f… | 2017-09-26 | no | |
-+--------+---------+------------+----------+----------------+
-| 68c2fe | 127e51… | 2017-09-23 | no | |
-+--------+---------+------------+----------+----------------+
-| 6334e1 | 1dadd1… | 2017-09-23 | no | |
-+--------+---------+------------+----------+----------------+
+```
+Read only token npm_1f… with id 7f3134 created 2017-10-21
+
+Publish token npm_af… with id c03241 created 2017-10-02
+with IP Whitelist: 192.168.0.1/24
+
+Publish token npm_… with id e0cf92 created 2017-10-02
+
 ```
 
 * `npm token create [--read-only] [--cidr=<cidr-ranges>]`:
@@ -49,16 +39,8 @@ This lets you list, create and revoke authentication tokens.
  website](https://docs.npmjs.com/creating-and-viewing-access-tokens)
  for more information on generating automation tokens.
 
-```bash
-+----------------+--------------------------------------+
-| token | a73c9572-f1b9-8983-983d-ba3ac3cc913d |
-+----------------+--------------------------------------+
-| cidr_whitelist | |
-+----------------+--------------------------------------+
-| readonly | false |
-+----------------+--------------------------------------+
-| created | 2017-10-02T07:52:24.838Z |
-+----------------+--------------------------------------+
+```
+Created publish token a73c9572-f1b9-8983-983d-ba3ac3cc913d
 ```
 
 * `npm token revoke <token|id>`:

lib/commands/doctor.js

@@ -1,7 +1,6 @@
 const cacache = require('cacache')
 const fs = require('fs')
 const fetch = require('make-fetch-happen')
-const Table = require('cli-table3')
 const which = require('which')
 const pacote = require('pacote')
 const { resolve } = require('path')
@@ -34,57 +33,59 @@ const maskLabel = mask => {
 
 const subcommands = [
  {
- groups: ['ping', 'registry'],
- title: 'npm ping',
+ // Ping is left in as a legacy command but is listed as "connection" to
+ // make more sense to more people
+ groups: ['connection', 'ping', 'registry'],
+ title: 'Connecting to the registry',
  cmd: 'checkPing',
  }, {
  groups: ['versions'],
- title: 'npm -v',
+ title: 'Checking npm version',
  cmd: 'getLatestNpmVersion',
  }, {
  groups: ['versions'],
- title: 'node -v',
+ title: 'Checking node version',
  cmd: 'getLatestNodejsVersion',
  }, {
  groups: ['registry'],
- title: 'npm config get registry',
+ title: 'Checking configured npm registry',
  cmd: 'checkNpmRegistry',
  }, {
  groups: ['environment'],
- title: 'git executable in PATH',
+ title: 'Checking for git executable in PATH',
  cmd: 'getGitPath',
  }, {
  groups: ['environment'],
- title: 'global bin folder in PATH',
+ title: 'Checking for global bin folder in PATH',
  cmd: 'getBinPath',
  }, {
  groups: ['permissions', 'cache'],
- title: 'Perms check on cached files',
+ title: 'Checking permissions on cached files (this may take awhile)',
  cmd: 'checkCachePermission',
  windows: false,
  }, {
  groups: ['permissions'],
- title: 'Perms check on local node_modules',
+ title: 'Checking permissions on local node_modules (this may take awhile)',
  cmd: 'checkLocalModulesPermission',
  windows: false,
  }, {
  groups: ['permissions'],
- title: 'Perms check on global node_modules',
+ title: 'Checking permissions on global node_modules (this may take awhile)',
  cmd: 'checkGlobalModulesPermission',
  windows: false,
  }, {
  groups: ['permissions'],
- title: 'Perms check on local bin folder',
+ title: 'Checking permissions on local bin folder',
  cmd: 'checkLocalBinPermission',
  windows: false,
  }, {
  groups: ['permissions'],
- title: 'Perms check on global bin folder',
+ title: 'Checking permissions on global bin folder',
  cmd: 'checkGlobalBinPermission',
  windows: false,
  }, {
  groups: ['cache'],
- title: 'Verify cache contents',
+ title: 'Verifying cache contents (this may take awhile)',
  cmd: 'verifyCachedFiles',
  windows: false,
  },
@@ -104,43 +105,28 @@ class Doctor extends BaseCommand {
  static params = ['registry']
  static ignoreImplicitWorkspace = false
  static usage = [`[${subcommands.flatMap(s => s.groups)
- .filter((value, index, self) => self.indexOf(value) === index)
+ .filter((value, index, self) => self.indexOf(value) === index && value !== 'ping')
  .join('] [')}]`]
 
  static subcommands = subcommands
 
- // minimum width of check column, enough for the word `Check`
- #checkWidth = 5
-
  async exec (args) {
  log.info('doctor', 'Running checkup')
  let allOk = true
 
  const actions = this.actions(args)
- this.#checkWidth = actions.reduce((length, item) =>
- Math.max(item.title.length, length), this.#checkWidth)
 
- if (!this.npm.silent) {
- this.output(['Check', 'Value', 'Recommendation/Notes'].map(h => this.npm.chalk.underline(h)))
- }
- // Do the actual work
+ const chalk = this.npm.chalk
  for (const { title, cmd } of actions) {
- const item = [title]
+ this.output(title)
+ // TODO when we have an in progress indicator that could go here
+ let result
  try {
- item.push(true, await this[cmd]())
+ result = await this[cmd]()
+ this.output(`${chalk.green('Ok')}${result ? `\n${result}` : ''}\n`)
  } catch (err) {
- item.push(false, err)
- }
- if (!item[1]) {
  allOk = false
- item[0] = this.npm.chalk.red(item[0])
- item[1] = this.npm.chalk.red('not ok')
- item[2] = this.npm.chalk.cyan(String(item[2]))
- } else {
- item[1] = this.npm.chalk.green('ok')
- }
- if (!this.npm.silent) {
- this.output(item)
+ this.output(`${chalk.red('Not ok')}\n${chalk.cyan(err)}\n`)
  }
  }
 
@@ -343,38 +329,11 @@ class Doctor extends BaseCommand {
  }
  }
 
- output (row) {
- const t = new Table({
- chars: {
- top: '',
- 'top-mid': '',
- 'top-left': '',
- 'top-right': '',
- bottom: '',
- 'bottom-mid': '',
- 'bottom-left': '',
- 'bottom-right': '',
- left: '',
- 'left-mid': '',
- mid: '',
- 'mid-mid': '',
- right: '',
- 'right-mid': '',
- middle: ' ',
- },
- style: {
- 'padding-left': 0,
- 'padding-right': 0,
- // setting border here is not necessary visually since we've already
- // zeroed out all the chars above, but without it cli-table3 will wrap
- // some of the separator spaces with ansi codes which show up in
- // snapshots.
- border: 0,
- },
- colWidths: [this.#checkWidth, 6],
- })
- t.push(row)
- output.standard(t.toString())
+ output (...args) {
+ // TODO display layer should do this
+ if (!this.npm.silent) {
+ output.standard(...args)
+ }
  }
 
  actions (params) {