fix for broken host help and leftover timeline activation help

Fixes #868
Fixes #869

Author: starpit

app/content/js/repl.js

@@ -757,7 +757,7 @@ self.exec = (commandUntrimmed, execOptions) => {
             if (usage && usage.strict) { // strict: command wants *us* to enforce conformance
                 // required and optional parameters
                 const { strict:cmd, required=[], oneof=[], optional:_optional=[] } = usage,
-                      optLikeOneOfs = oneof.filter(({name}) => name.charAt(0) === '-'), // some one-ofs might be of the form --foo
+                      optLikeOneOfs = oneof.filter(({command,name=command}) => name.charAt(0) === '-'), // some one-ofs might be of the form --foo
                       positionalConsumers = _optional.filter(({name, alias, consumesPositional}) => consumesPositional && (parsedOptions[unflag(name)] || parsedOptions[unflag(alias)])),
                       optional = builtInOptions.concat(_optional).concat(optLikeOneOfs),
                       positionalOptionals = optional.filter(({positional}) => positional),

app/content/js/usage-error.js

@@ -131,7 +131,8 @@ const format = (message, options={}) => {
         const { command, docs, title, breadcrumb=title||command, header=docs&&`${docs}.`, example, detailedExample, sampleInputs,
                 commandPrefix, commandPrefixNotNeeded,
                 available, parents=[], related, required, optional, oneof } = usage,
-              outerCommandPrefix = commandPrefix
+              outerCommandPrefix = commandPrefix,
+              outerCommand = command
 
         // the return value will be `result`; we will populate it with
         // those fields now; `body` is the flex-wrap portion of the
@@ -339,7 +340,7 @@ const format = (message, options={}) => {
 
                 // fields of the row model
                 // debug('row', rowData)
-                const { commandPrefix=outerCommandPrefix, command=commandPrefix, name=command, label=name,
+                const { commandPrefix=outerCommandPrefix, command=outerCommand, name=command, label=name,
                         alias, numeric, aliases=[alias], hidden=false, advanced=false,
                         available,
                         example=numeric&&'N', dir:isDir=available||false,
@@ -360,7 +361,7 @@ const format = (message, options={}) => {
                       allowedPart = allowed && smaller(span(undefined))
 
                 // for repl.exec,
-                const commandForExec = alias => `${commandPrefix && !commandPrefixNotNeeded ? commandPrefix + ' ' : ''}${alias}`
+                const commandForExec = (alias, cmd='') => `${commandPrefix && !commandPrefixNotNeeded ? commandPrefix + ' ' : ''}${alias} ${cmd}`
 
                 row.className = 'log-line entity'
                 cmdCell.className = 'log-field'
@@ -412,7 +413,10 @@ const format = (message, options={}) => {
                         if (partial) {
                             return repl.partial(commandForExec(alias)(command) + `${partial === true ? '' : ' ' + partial}`)
                         } else {
-                            return repl.pexec(commandForExec(command))
+                            console.error('CP', commandPrefix)
+                            console.error('CCC', command)
+                            console.error('NNN', name)
+                            return repl.pexec(commandForExec(command, name !== command ? name : undefined))
                         }
                     }
                 }

app/plugins/modules/activation-visualizations/usage.js

@@ -18,7 +18,9 @@
 const nRowsInViewport = 4
 
 /** list of related commands */
-const all = ['summary', 'timeline', 'grid']
+const all = ['summary',
+             //'timeline',
+             'grid']
 const allExcept = cmd => all.filter(_ => _ !== cmd)
 
 /** optional arguments */
@@ -40,7 +42,7 @@ const parents = ['visualize']
 
 const header = {
     summary: 'Visualize the statistical distribution of activation latencies',
-    timeline: 'Show activity over time',
+    //timeline: 'Show activity over time',
     grid: 'Show a large number of recent activations in a grid view'
 }
 
@@ -56,7 +58,7 @@ module.exports = {
         commandPrefix: 'visualize',
         commandPrefixNotNeeded: true,
         available: [{ command: 'summary', docs: header.summary },
-                    { command: 'timeline', docs: header.timeline },
+                    //{ command: 'timeline', docs: header.timeline },
                     { command: 'grid', docs: header.grid }],
         related: ['wsk activation', 'composer session']
     },
@@ -75,7 +77,7 @@ module.exports = {
         related: allExcept('summary')
     },
 
-    timeline: {
+    /*timeline: {
         strict: 'timeline',
         command: 'timeline',
         nRowsInViewport,
@@ -85,7 +87,7 @@ module.exports = {
         optional: optional.concat([{ name: '--theme', docs: 'a color theme to use' }]),
         parents,
         related: allExcept('timeline')
-    },
+    },*/
 
     grid: {
         strict: 'grid',

app/plugins/ui/commands/auth.js

@@ -90,10 +90,10 @@ const usage = {
             nRowsInViewport: 5,
             oneof: [
                 { name: 'local', docs: 'Use a local OpenWhisk installation' },
-                { name: 'us-south', docs: 'Use the IBM Cloud Dallas installation' },
-                { name: 'eu-gb', docs: 'Use the IBM Cloud London installation' },
-                { name: 'eu-de', docs: 'Use the IBM Cloud Frankrut installation' },
-                { name: 'hostname', docs: 'Use a given hostname or IP address' }
+                { command: 'us-south', docs: 'Use the IBM Cloud Dallas installation' },
+                { command: 'eu-gb', docs: 'Use the IBM Cloud London installation' },
+                { command: 'eu-de', docs: 'Use the IBM Cloud Frankrut installation' },
+                { command: 'hostname', docs: 'Use a given hostname or IP address' }
             ],
             parents: ['host']
         }