Merge pull request #21 from gemini-testing/INFRADUTY-20011

fix(locator): fix argv parsing

Author: OldSkyTree

lib/locator.js

@@ -1,22 +1,28 @@
 const _ = require('lodash');
 
-module.exports = function({options, env, argv, envPrefix = '', cliPrefix = '--'}) {
-    argv = argv.reduce(function(argv, arg) {
-        if (!_.includes(arg, '=')) {
+function parseArgv(argv, cliPrefix) {
+    return argv.reduce(function(argv, arg) {
+        if (!arg.startsWith(cliPrefix) || !_.includes(arg, '=')) {
             return argv.concat(arg);
         }
+
         const parts = arg.split('=');
         const option = parts[0];
         const value = parts.slice(1).join('=');
+
         return argv.concat(option, value);
     }, []);
+}
+
+module.exports = function({options, env, argv, envPrefix = '', cliPrefix = '--'}) {
+    const parsedArgv = parseArgv(argv, cliPrefix);
 
     function getNested(option, {namePrefix, envPrefix, cliPrefix}) {
         return (subKey) => {
             const envName = envPrefix + _.snakeCase(subKey);
             const cliFlag = cliPrefix + _.kebabCase(subKey);
 
-            const argIndex = argv.lastIndexOf(cliFlag);
+            const argIndex = parsedArgv.lastIndexOf(cliFlag);
             const subOption = _.get(option, subKey);
             const newName = namePrefix ? `${namePrefix}.${subKey}` : subKey;
 
@@ -26,7 +32,7 @@ module.exports = function({options, env, argv, envPrefix = '', cliPrefix = '--'}
                     parent: namePrefix,
                     option: subOption,
                     envVar: env[envName],
-                    cliOption: argIndex > -1 ? argv[argIndex + 1] : undefined
+                    cliOption: argIndex > -1 ? parsedArgv[argIndex + 1] : undefined
                 },
                 {
                     namePrefix: newName,
@@ -64,4 +70,3 @@ module.exports = function({options, env, argv, envPrefix = '', cliPrefix = '--'}
         }
     );
 };
-

test/locator.js

@@ -99,7 +99,7 @@ describe('locator', () => {
         assert.propertyVal(childPointer, 'cliOption', 'cli value');
     });
 
-    it('should return cli option set with --option=value syntax', () => {
+    it('should return cli option set with --option="cli value"', () => {
         const pointer = locatorWithArgv([
             '--option=cli value'
         ]);
@@ -108,7 +108,7 @@ describe('locator', () => {
         assert.propertyVal(childPointer, 'cliOption', 'cli value');
     });
 
-    it('should allow to have = sign inside option set with --option=value syntax', () => {
+    it('should allow to have = sign inside option set with --option="cli=value"', () => {
         const pointer = locatorWithArgv([
             '--option=cli=value'
         ]);
@@ -117,6 +117,16 @@ describe('locator', () => {
         assert.propertyVal(childPointer, 'cliOption', 'cli=value');
     });
 
+    it('should allow to have = sign inside option set with --option "cli=value"', () => {
+        const pointer = locatorWithArgv([
+            '--option',
+            'cli=value'
+        ]);
+        const childPointer = pointer.nested('option');
+
+        assert.propertyVal(childPointer, 'cliOption', 'cli=value');
+    });
+
     it('should use last value of an option', () => {
         const pointer = locatorWithArgv([
             '--option=first',