bug fix for quote parsing of command line

Fixes #728

Author: starpit

app/content/js/repl.js

@@ -472,8 +472,15 @@ const split = (str, removeOuterQuotes=true) => {
             continue
         }
 
+        const last = stack.length > 0 && stack[stack.length - 1]
+
+        if (char === '{') {
+            stack.push(char)
+        } else if (char === '}' && last === '{') {
+            stack.pop()
+        }
+
         if (char === '\'' || char === '"') {
-            const last = stack.length > 0 && stack[stack.length - 1]
 
             if (char === last) {
                 // found matching close quote

app/plugins/package.json

@@ -11,6 +11,7 @@
   "license": "ISC",
   "dependencies": {
     "archiver": "^1.3.0",
+    "debug": "^3.1.0",
     "htmlparser2": "^3.9.2",
     "inquirer": "^3.3.0",
     "js-beautify": "1.6.14",

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

@@ -258,7 +258,7 @@ const handleKeyValuePairAsArray = key => (M, idx, argv, type) => {
         while (!argv[idx].endsWith(startQuote)) {
             paramValue = `${paramValue} ${argv[++idx]}`
         }
-        paramValue = paramValue.replace(new RegExp(startQuote, 'g'), '')
+        //paramValue = paramValue.replace(new RegExp(startQuote, 'g'), '')
     }
 
     if (paramValue.charAt(0) === '@') {

tests/lib/ui.js

@@ -39,6 +39,7 @@ selectors.SIDECAR_PACKAGE_NAME_TITLE = `${selectors.SIDECAR} .sidecar-header-nam
 selectors.SIDECAR_CONTENT = `${selectors.SIDECAR} .sidecar-content`,
 selectors.SIDECAR_WEB_ACTION_URL = `${selectors.SIDECAR} .sidecar-header .entity-web-export-url.has-url`
 selectors.SIDECAR_ACTION_SOURCE = `${selectors.SIDECAR_CONTENT} .action-content .action-source`,
+selectors.SIDECAR_PACKAGE_PARAMETERS = `${selectors.SIDECAR_CONTENT} .package-content .package-source`,
 selectors.SIDECAR_ACTIVATION_RESULT = `${selectors.SIDECAR_CONTENT} .activation-result`,
 selectors.SIDECAR_ACTIVATION_ID = `${selectors.SIDECAR} .sidecar-header .activation-id`,
 selectors.SIDECAR_RULE_CANVAS = `${selectors.SIDECAR} .rule-components`

tests/tests/passes/03/quote-parsing.js

@@ -0,0 +1,64 @@
+/*
+ * Copyright 2018 IBM Corporation
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+const common = require('../../../lib/common'),
+      openwhisk = require('../../../lib/openwhisk'),
+      ui = require('../../../lib/ui'),
+      assert = require('assert'),
+      keys = ui.keys,
+      cli = ui.cli,
+      sidecar = ui.sidecar,
+      actionName = 'foo'
+
+describe('parameter parsing with quotes', function() {
+    before(common.before(this))
+    after(common.after(this))
+
+    it('should have an active repl', () => cli.waitForRepl(this.app))
+
+    const createWith = params => {
+        return it(`should create package with -p creds ${params}`, () => cli.do(`package update ppp -p creds ${params}`, this.app)
+       .then(cli.expectOK)
+       .then(sidecar.expectOpen)
+       .then(sidecar.expectShowing('ppp'))
+       .catch(common.oops(this)))
+    }
+
+    const expectParams = params => {
+        return it('should show parameters', () => cli.do('params', this.app)
+                  .then(cli.expectOK)
+                  .then(sidecar.expectOpen)
+                  .then(sidecar.expectShowing('ppp'))
+                  .then(app => app.client.getText(`${ui.selectors.SIDECAR_PACKAGE_PARAMETERS}`))
+                  .then(ui.expectStruct(params))
+                  .catch(common.oops(this)))
+    }
+
+    createWith(`'"foo" "bar"'`)
+    expectParams({creds:'"foo" "bar"'})
+
+    createWith(`{"foo":"bar"}`)
+    expectParams({creds:{foo:"bar"}})
+
+    createWith(`{"'foo'":"bar"}`)
+    expectParams({creds:{"'foo'":"bar"}})
+
+    createWith(`'{"foo": "bar"}'`)
+    expectParams({creds:{foo:"bar"}})
+
+    createWith(`{"foo":{"bar":"baz"}}`)
+    expectParams({creds:{foo:{bar:"baz"}}})
+})