fix for @demos tab completion from inside asar bundle

Fixes #686

Author: starpit

app/content/js/repl.js

@@ -647,7 +647,11 @@ self.exec = (commandUntrimmed, execOptions) => {
                                   err = new modules.errors.usage({ message, usage })
                             err.code = 499
                             debug(message, args, parsedOptions, optional, argv) // args is argv with options stripped
-                            return ui.oops(block, nextBlock)(err)
+                            if (execOptions && execOptions.failWithUsage) {
+                                return err
+                            } else {
+                                return ui.oops(block, nextBlock)(err)
+                            }
 
                         } else if (match.boolean && typeof parsedOptions[optionalArg] !== 'boolean'
                                    || (match.booleanOK && !(typeof parsedOptions[optionalArg] === 'boolean' || typeof parsedOptions[optionalArg] === 'string'))
@@ -670,7 +674,11 @@ self.exec = (commandUntrimmed, execOptions) => {
                                   error = new modules.errors.usage({ message, usage })
                             debug(message, match)
                             error.code = 498
-                            return ui.oops(block, nextBlock)(error)
+                            if (execOptions && execOptions.failWithUsage) {
+                                return error
+                            } else {
+                                return ui.oops(block, nextBlock)(error)
+                            }
                         }
                     }
                 }
@@ -809,7 +817,9 @@ self.exec = (commandUntrimmed, execOptions) => {
                         // indicate that the command was NOT successfuly completed
                         evaluator.error(err)
 
-                        if (!nested) {
+                        if (execOptions && execOptions.failWithUsage) {
+                            return err
+                        } else if (!nested) {
                             ui.oops(block, nextBlock)(err)
                         } else {
                             throw err
@@ -818,7 +828,9 @@ self.exec = (commandUntrimmed, execOptions) => {
                 })
         }
     } catch (e) {
-        if (ui.headless) {
+        if (execOptions && execOptions.failWithUsage) {
+            return e
+        } else if (ui.headless) {
             throw e
         }
 

app/plugins/modules/composer/lib/usage.js

@@ -61,6 +61,7 @@ exports.create = command => ({
  *
  */
 exports.invoke = {
+    command: 'invoke',
     strict: 'invoke',
     title: 'Invoke composition',
     header: 'Invoke a given app and wait for its completion',

app/plugins/ui/commands/openwhisk-usage.js

@@ -125,8 +125,8 @@ module.exports = {
                    // ACTION CREATE
                    { command: 'create', docs: 'create a new action', strict: 'create',
                      example: 'wsk action create <action> <sourceFile>',
-                     required: [{ name: 'name', docs: 'the name of your new action' }],
-                     optional: sourceFile.concat(actionMix),
+                     required: [{ name: 'name', docs: 'the name of your new action' }].concat(sourceFile),
+                     optional: actionMix,
                      parents: context('action')
                    },
                    // ACTION UPDATE

app/plugins/ui/commands/tab-completion.js

@@ -27,6 +27,8 @@ const fs = require('fs'),
 *
 */
 const complete = (match, prompt, { temporaryContainer, partial=temporaryContainer.partial, dirname=temporaryContainer.dirname }) => {
+    debug('completion', match, partial, dirname)
+
     // in case match includes partial as a prefix
     const partialIdx = match.indexOf(partial),
           completion = partialIdx >= 0 ? match.substring(partialIdx + partial.length) : match
@@ -42,9 +44,11 @@ const complete = (match, prompt, { temporaryContainer, partial=temporaryContaine
                 if (!err) {
                     if (stats.isDirectory()) {
                         // add a trailing slash if the dirname/match is a directory
+                        debug('complete as directory')
                         prompt.value = prompt.value + completion + '/'
                     } else {
                         // otherwise, dirname/match is not a directory
+                        debug('complete as file')
                         prompt.value = prompt.value + completion
                     }
                 } else {
@@ -54,8 +58,11 @@ const complete = (match, prompt, { temporaryContainer, partial=temporaryContaine
 
         } else {
             // otherwise, just add the completion to the prompt
+            debug('complete as file (alt)')
             prompt.value = prompt.value + completion
         }
+    } else {
+        debug('no completion string')
     }
 }
 
@@ -265,54 +272,59 @@ const suggestLocalFile = (last, block, prompt, temporaryContainer, lastIdx) => {
     // dirname will "foo" in the above example; it
     // could also be that last is itself the name
     // of a directory
-    const lastIsDir = last.charAt(last.length - 1) === '/'
-    dirname = lastIsDir ? last : path.dirname(last)
+    const lastIsDir = last.charAt(last.length - 1) === '/',
+          dirname = lastIsDir ? last : path.dirname(last)
 
+    debug('suggest local file', dirname, last)
+    
     if (dirname) {
-        fs.access(dirname, err => {
-            if (!err) {
-                // then dirname exists! now scan the directory so we can find matches
-                fs.readdir(dirname, (err, files) => {
-                    if (!err) {
-                        const partial = path.basename(last),
-                              matches = files.filter(f => (lastIsDir || f.indexOf(partial) === 0)
-                                                     && !f.endsWith('~') && !f.startsWith('.'))
-
-                        if (matches.length === 1) {
-                            //
-                            // then there is one unique match, so autofill it now;
-                            // completion will be the bit we have to append to the current prompt.value
-                            //
-                            complete(matches[0], prompt, { temporaryContainer, partial, dirname })
-
-                        } else if (matches.length > 1) {
-                            //
-                            // then there are multiple matches, present the choices
-                            //
-
-                            // make a temporary div to house the completion options,
-                            // and attach it to the block that encloses the current prompt
-                            if (!temporaryContainer) {
-                                temporaryContainer = makeCompletionContainer(block, prompt, partial, dirname, lastIdx)
-                            }
+        // then dirname exists! now scan the directory so we can find matches
+        fs.readdir(dirname, (err, files) => {
+            if (err) {
+                debug('fs.readdir error', err)
+
+            } else {
+                debug('fs.readdir success')
+
+                const partial = path.basename(last),
+                      matches = files.filter(f => (lastIsDir || f.indexOf(partial) === 0)
+                                             && !f.endsWith('~') && !f.startsWith('.'))
+
+                if (matches.length === 1) {
+                    //
+                    // then there is one unique match, so autofill it now;
+                    // completion will be the bit we have to append to the current prompt.value
+                    //
+                    debug('singleton file completion', matches[0])
+                    complete(matches[0], prompt, { temporaryContainer, partial, dirname })
+
+                } else if (matches.length > 1) {
+                    //
+                    // then there are multiple matches, present the choices
+                    //
+                    debug('multi file completion')
+
+                    // make a temporary div to house the completion options,
+                    // and attach it to the block that encloses the current prompt
+                    if (!temporaryContainer) {
+                        temporaryContainer = makeCompletionContainer(block, prompt, partial, dirname, lastIdx)
+                    }
 
-                            // add each match to that temporary div
-                            matches.forEach((match, idx) => {
-                                const { option, optionInner } = addSuggestion(temporaryContainer, partial, dirname, prompt)(match, idx)
+                    // add each match to that temporary div
+                    matches.forEach((match, idx) => {
+                        const { option, optionInner } = addSuggestion(temporaryContainer, partial, dirname, prompt)(match, idx)
 
-                                // see if the match is a directory, so that we add a trailing slash
-                                fs.lstat(expandHomeDir(path.join(dirname, match)), (err, stats) => {
-                                    if (!err && stats.isDirectory()) {
-                                        optionInner.innerText = match + '/'
-                                    } else {
-                                        optionInner.innerText = match
-                                    }
-                                    option.setAttribute('data-value', option.innerText)
-                                })
-                            })
-                        }
-                    }
-                })
+                        // see if the match is a directory, so that we add a trailing slash
+                        fs.lstat(expandHomeDir(path.join(dirname, match)), (err, stats) => {
+                            if (!err && stats.isDirectory()) {
+                                optionInner.innerText = match + '/'
+                            } else {
+                                optionInner.innerText = match
+                            }
+                            option.setAttribute('data-value', option.innerText)
+                        })
+                    })
+                }
             }
         })
     }