args with hyphen (-) are not being treated #14

Author: goya

lib/util/args.js

@@ -1,6 +1,6 @@
 {
   "name": "pgb-cli",
-  "version": "1.1.0",
+  "version": "1.1.1",
   "description": "nodeJS CLI to PhoneGap Build",
   "keywords": [
     "PhoneGap",

package.json

@@ -23,7 +23,7 @@ module.exports = (opts) => {
       let arg = rawArgs[i]
       let args = arg.split('=')
       let key = args.shift().toLowerCase().replace(/^--/, '')
-      let variable = (key in opts.variables) || args.length
+      let variable = args.length || (arg.startsWith('--') && (key in opts.variables))
 
       if (variable) {
         let value = (args.length) ? args.join('=') : rawArgs[++i]
@@ -33,7 +33,7 @@ module.exports = (opts) => {
           variables[key] = value
         }
       } else if (arg.startsWith('--')) {
-        parseArgs([arg.slice(2)])
+        parseArgs([arg.replace(/-/g, '')])
       } else if (arg.startsWith('-')) {
         parseArgs(arg.slice(1))
       } else {

src/util/args.js

@@ -67,6 +67,14 @@ describe('args', () => {
     })
   })
 
+  test('should parse variables only with --blah or blah=blah', () => {
+    let opts = { flags: {}, aliases: {}, variables: { lock: false, foo: false } }
+    argv('foo lock 12 --lock b yut=9 foo bar')
+    return parseArgs(opts).then((result) => {
+      expect(result).toEqual({ commands: ['foo', 'lock', '12', 'foo', 'bar'], variables: { lock: 'b', yut: '9' } })
+    })
+  })
+
   test('should parse variables', () => {
     let opts = { flags: {}, aliases: {}, variables: {} }
     argv('foo var1=abc var2=def')
@@ -75,6 +83,14 @@ describe('args', () => {
     })
   })
 
+  test('should parse variables with dashes in name', () => {
+    let opts = { flags: { 'exitcode': '' }, aliases: {}, variables: { } }
+    argv('foo --exit-code')
+    return parseArgs(opts).then((result) => {
+      expect(result).toEqual({ commands: [ 'foo' ], exitcode: true, variables: { } })
+    })
+  })
+
   test('should parse variables correctly with equal signs in value', () => {
     let opts = { flags: { }, aliases: {}, variables: { var1: false } }
     argv('foo var1=abc var2=bar=12')