fix arguments parsing

GitTools · Nov 11, 2020 · d7bba81 · d7bba81
1 parent 302eb63
commit d7bba81
Show file tree

Hide file tree

Showing 29 changed files with 417 additions and 49 deletions.
diff --git a/dist/azure/gitreleasemanager/addasset/bundle.js b/dist/azure/gitreleasemanager/addasset/bundle.js
diff --git a/dist/azure/gitreleasemanager/close/bundle.js b/dist/azure/gitreleasemanager/close/bundle.js
diff --git a/dist/azure/gitreleasemanager/create/bundle.js b/dist/azure/gitreleasemanager/create/bundle.js
diff --git a/dist/azure/gitreleasemanager/discard/bundle.js b/dist/azure/gitreleasemanager/discard/bundle.js
diff --git a/dist/azure/gitreleasemanager/open/bundle.js b/dist/azure/gitreleasemanager/open/bundle.js
diff --git a/dist/azure/gitreleasemanager/publish/bundle.js b/dist/azure/gitreleasemanager/publish/bundle.js
diff --git a/dist/azure/gitreleasemanager/setup/bundle.js b/dist/azure/gitreleasemanager/setup/bundle.js
diff --git a/dist/azure/gitversion/execute/bundle.js b/dist/azure/gitversion/execute/bundle.js
diff --git a/dist/azure/gitversion/setup/bundle.js b/dist/azure/gitversion/setup/bundle.js
diff --git a/dist/github/gitreleasemanager/addasset/bundle.js b/dist/github/gitreleasemanager/addasset/bundle.js
diff --git a/dist/github/gitreleasemanager/close/bundle.js b/dist/github/gitreleasemanager/close/bundle.js
diff --git a/dist/github/gitreleasemanager/create/bundle.js b/dist/github/gitreleasemanager/create/bundle.js
diff --git a/dist/github/gitreleasemanager/discard/bundle.js b/dist/github/gitreleasemanager/discard/bundle.js
diff --git a/dist/github/gitreleasemanager/open/bundle.js b/dist/github/gitreleasemanager/open/bundle.js
diff --git a/dist/github/gitreleasemanager/publish/bundle.js b/dist/github/gitreleasemanager/publish/bundle.js
diff --git a/dist/github/gitreleasemanager/setup/bundle.js b/dist/github/gitreleasemanager/setup/bundle.js
diff --git a/dist/github/gitversion/execute/bundle.js b/dist/github/gitversion/execute/bundle.js
diff --git a/dist/github/gitversion/setup/bundle.js b/dist/github/gitversion/setup/bundle.js
diff --git a/dist/mock/gitreleasemanager/addasset/bundle.js b/dist/mock/gitreleasemanager/addasset/bundle.js
diff --git a/dist/mock/gitreleasemanager/close/bundle.js b/dist/mock/gitreleasemanager/close/bundle.js
diff --git a/dist/mock/gitreleasemanager/create/bundle.js b/dist/mock/gitreleasemanager/create/bundle.js
diff --git a/dist/mock/gitreleasemanager/discard/bundle.js b/dist/mock/gitreleasemanager/discard/bundle.js
diff --git a/dist/mock/gitreleasemanager/open/bundle.js b/dist/mock/gitreleasemanager/open/bundle.js
diff --git a/dist/mock/gitreleasemanager/publish/bundle.js b/dist/mock/gitreleasemanager/publish/bundle.js
diff --git a/dist/mock/gitreleasemanager/setup/bundle.js b/dist/mock/gitreleasemanager/setup/bundle.js
diff --git a/dist/mock/gitversion/execute/bundle.js b/dist/mock/gitversion/execute/bundle.js
diff --git a/dist/mock/gitversion/setup/bundle.js b/dist/mock/gitversion/setup/bundle.js
diff --git a/src/tools/gitreleasemanager/tool.ts b/src/tools/gitreleasemanager/tool.ts
@@ -26,7 +26,8 @@ export interface IGitReleaseManagerTool extends IDotnetTool {
 }
 
 @injectable()
-export class GitReleaseManagerTool extends DotnetTool
+export class GitReleaseManagerTool
+    extends DotnetTool
     implements IGitReleaseManagerTool {
     constructor(
         @inject(TYPES.IBuildAgent) buildAgent: IBuildAgent,

diff --git a/src/tools/gitversion/tool.ts b/src/tools/gitversion/tool.ts
@@ -60,7 +60,7 @@ export class GitVersionTool extends DotnetTool implements IGitVersionTool {
         workDir: string,
         options: GitVersionSettings
     ): string[] {
-        const args = [workDir, '/output', 'json', '/output', 'buildserver']
+        let args = [workDir, '/output', 'json', '/output', 'buildserver']
 
         const {
             useConfigFile,
@@ -103,8 +103,7 @@ export class GitVersionTool extends DotnetTool implements IGitVersionTool {
         }
 
         if (additionalArguments) {
-            //args.push(additionalArguments)
-            Array.prototype.push.apply(args,additionalArguments.split(' '))
+            args = args.concat(this.argStringToArray(additionalArguments))
         }
         return args
     }
@@ -120,6 +119,68 @@ export class GitVersionTool extends DotnetTool implements IGitVersionTool {
         })
     }
 
+    private argStringToArray(argString: string): string[] {
+        var args: string[] = []
+
+        var inQuotes = false
+        var escaped = false
+        var lastCharWasSpace = true
+        var arg = ''
+
+        var append = function (c: string) {
+            // we only escape double quotes.
+            if (escaped && c !== '"') {
+                arg += '\\'
+            }
+
+            arg += c
+            escaped = false
+        }
+
+        for (var i = 0; i < argString.length; i++) {
+            var c = argString.charAt(i)
+
+            if (c === ' ' && !inQuotes) {
+                if (!lastCharWasSpace) {
+                    args.push(arg)
+                    arg = ''
+                }
+                lastCharWasSpace = true
+                continue
+            } else {
+                lastCharWasSpace = false
+            }
+
+            if (c === '"') {
+                if (!escaped) {
+                    inQuotes = !inQuotes
+                } else {
+                    append(c)
+                }
+                continue
+            }
+
+            if (c === '\\' && escaped) {
+                append(c)
+                continue
+            }
+
+            if (c === '\\' && inQuotes) {
+                escaped = true
+                continue
+            }
+
+            append(c)
+            lastCharWasSpace = false
+        }
+
+        if (!lastCharWasSpace) {
+            args.push(arg.trim())
+        }
+
+        return args
+    }
+
     private toCamelCase(input: string): string {
         return input.replace(/(?:^\w|[A-Z]|\b\w|\s+)/g, function (
             match,