Improve abbrevs for install and help

The existence of 'install-test' and 'install-clean' make 'npm inst' no longer
de-reference to 'npm install'.  Similarly, the existence of 'help-search'
prevents 'hel' from being a shorthand for 'help'.

This adds some artisanally hand-crafted abbreviations for these cases.

Fix: #1617

PR-URL: https://github.com/npm/cli/pull/1622
Credit: @isaacs
Close: #1622
Reviewed-by: @ruyadorno

3 files changed, 32 insertions, 18 deletions

diff --git a/tap-snapshots/test-lib-config-cmd-list.js-TAP.test.js b/tap-snapshots/test-lib-config-cmd-list.js-TAP.test.js
index 3a0c47d3c..d7db532f4 100644
--- a/tap-snapshots/test-lib-config-cmd-list.js-TAP.test.js
+++ b/tap-snapshots/test-lib-config-cmd-list.js-TAP.test.js
@@ -10,16 +10,23 @@ Object {
   "affordances": Object {
     "add": "install",
     "add-user": "adduser",
-    "apihelp": "help",
     "author": "owner",
     "dist-tags": "dist-tag",
     "find": "search",
+    "hlep": "help",
     "home": "docs",
     "ic": "ci",
+    "in": "install",
     "info": "view",
     "innit": "init",
+    "ins": "install",
+    "inst": "install",
+    "insta": "install",
+    "instal": "install",
     "install-clean": "ci",
-    "isntall": "install",
+    "isnt": "install",
+    "isnta": "install",
+    "isntal": "install",
     "isntall-clean": "ci",
     "issues": "bugs",
     "la": "ll",
@@ -40,7 +47,6 @@ Object {
   "aliases": Object {
     "add": "install",
     "add-user": "adduser",
-    "apihelp": "help",
     "author": "owner",
     "c": "config",
     "cit": "install-ci-test",
@@ -50,13 +56,21 @@ Object {
     "ddp": "dedupe",
     "dist-tags": "dist-tag",
     "find": "search",
+    "hlep": "help",
     "home": "docs",
     "i": "install",
     "ic": "ci",
+    "in": "install",
     "info": "view",
     "innit": "init",
+    "ins": "install",
+    "inst": "install",
+    "insta": "install",
+    "instal": "install",
     "install-clean": "ci",
-    "isntall": "install",
+    "isnt": "install",
+    "isnta": "install",
+    "isntal": "install",
     "isntall-clean": "ci",
     "issues": "bugs",
     "it": "install-test",
@@ -125,7 +139,6 @@ Object {
     "fund",
     "org",
     "help",
-    "help-search",
     "ls",
     "ll",
     "search",
@@ -154,6 +167,7 @@ Object {
   ],
   "plumbing": Array [
     "birthday",
+    "help-search",
   ],
   "shorthands": Object {
     "c": "config",
diff --git a/tap-snapshots/test-lib-utils-update-notifier.js-TAP.test.js b/tap-snapshots/test-lib-utils-update-notifier.js-TAP.test.js
index 0e2841a3f..cab4cdf18 100644
--- a/tap-snapshots/test-lib-utils-update-notifier.js-TAP.test.js
+++ b/tap-snapshots/test-lib-utils-update-notifier.js-TAP.test.js
@@ -6,73 +6,73 @@
  */
 'use strict'
 exports[`test/lib/utils/update-notifier.js TAP notification situations color and unicode major > must match snapshot 1`] = `
-New major version of npm available! <<major>>-beta.0 → 7.0.0
+New major version of npm available! <<major>>-beta.1 → 7.0.0
 Changelog: https://github.com/npm/cli/releases/tag/v7.0.0
 Run npm install -g npm to update!
 `
 
 exports[`test/lib/utils/update-notifier.js TAP notification situations color and unicode minor > must match snapshot 1`] = `
-New minor version of npm available! <<minor>>-beta.0 → 7.0.0
+New minor version of npm available! <<minor>>-beta.1 → 7.0.0
 Changelog: https://github.com/npm/cli/releases/tag/v7.0.0
 Run npm install -g npm to update!
 `
 
 exports[`test/lib/utils/update-notifier.js TAP notification situations color and unicode minor > must match snapshot 2`] = `
-New patch version of npm available! <<patch>>-beta.0 → 7.0.0
+New patch version of npm available! <<patch>>-beta.1 → 7.0.0
 Changelog: https://github.com/npm/cli/releases/tag/v7.0.0
 Run npm install -g npm to update!
 `
 
 exports[`test/lib/utils/update-notifier.js TAP notification situations color, no unicode major > must match snapshot 1`] = `
-New major version of npm available! <<major>>-beta.0 -> 7.0.0
+New major version of npm available! <<major>>-beta.1 -> 7.0.0
 Changelog: https://github.com/npm/cli/releases/tag/v7.0.0
 Run npm install -g npm to update!
 `
 
 exports[`test/lib/utils/update-notifier.js TAP notification situations color, no unicode minor > must match snapshot 1`] = `
-New minor version of npm available! <<minor>>-beta.0 -> 7.0.0
+New minor version of npm available! <<minor>>-beta.1 -> 7.0.0
 Changelog: https://github.com/npm/cli/releases/tag/v7.0.0
 Run npm install -g npm to update!
 `
 
 exports[`test/lib/utils/update-notifier.js TAP notification situations color, no unicode minor > must match snapshot 2`] = `
-New patch version of npm available! <<patch>>-beta.0 -> 7.0.0
+New patch version of npm available! <<patch>>-beta.1 -> 7.0.0
 Changelog: https://github.com/npm/cli/releases/tag/v7.0.0
 Run npm install -g npm to update!
 `
 
 exports[`test/lib/utils/update-notifier.js TAP notification situations no color, no unicode major > must match snapshot 1`] = `
-New major version of npm available! <<major>>-beta.0 -> 7.0.0
+New major version of npm available! <<major>>-beta.1 -> 7.0.0
 Changelog: https://github.com/npm/cli/releases/tag/v7.0.0
 Run npm i -g npm to update!
 `
 
 exports[`test/lib/utils/update-notifier.js TAP notification situations no color, no unicode minor > must match snapshot 1`] = `
-New minor version of npm available! <<minor>>-beta.0 -> 7.0.0
+New minor version of npm available! <<minor>>-beta.1 -> 7.0.0
 Changelog: https://github.com/npm/cli/releases/tag/v7.0.0
 Run npm i -g npm to update!
 `
 
 exports[`test/lib/utils/update-notifier.js TAP notification situations no color, no unicode minor > must match snapshot 2`] = `
-New patch version of npm available! <<patch>>-beta.0 -> 7.0.0
+New patch version of npm available! <<patch>>-beta.1 -> 7.0.0
 Changelog: https://github.com/npm/cli/releases/tag/v7.0.0
 Run npm i -g npm to update!
 `
 
 exports[`test/lib/utils/update-notifier.js TAP notification situations unicode, no color major > must match snapshot 1`] = `
-New major version of npm available! <<major>>-beta.0 → 7.0.0
+New major version of npm available! <<major>>-beta.1 → 7.0.0
 Changelog: https://github.com/npm/cli/releases/tag/v7.0.0
 Run npm i -g npm to update!
 `
 
 exports[`test/lib/utils/update-notifier.js TAP notification situations unicode, no color minor > must match snapshot 1`] = `
-New minor version of npm available! <<minor>>-beta.0 → 7.0.0
+New minor version of npm available! <<minor>>-beta.1 → 7.0.0
 Changelog: https://github.com/npm/cli/releases/tag/v7.0.0
 Run npm i -g npm to update!
 `
 
 exports[`test/lib/utils/update-notifier.js TAP notification situations unicode, no color minor > must match snapshot 2`] = `
-New patch version of npm available! <<patch>>-beta.0 → 7.0.0
+New patch version of npm available! <<patch>>-beta.1 → 7.0.0
 Changelog: https://github.com/npm/cli/releases/tag/v7.0.0
 Run npm i -g npm to update!
 `
diff --git a/tap-snapshots/test-lib-view.js-TAP.test.js b/tap-snapshots/test-lib-view.js-TAP.test.js
index 473ad227d..6bccea684 100644
--- a/tap-snapshots/test-lib-view.js-TAP.test.js
+++ b/tap-snapshots/test-lib-view.js-TAP.test.js
@@ -282,7 +282,7 @@ dist
 dist-tags:
 
 
-published 12 months ago
+published a year ago
 `
 
 exports[`test/lib/view.js TAP should log package info package with no versions > must match snapshot 1`] = `