Updated handling of arguments (#68)

* Updated handling of arguments

Updated handling of arguments to avoid issues with spaces.

* updated from code review

updated from code review suggestions

* added space to combined args

args tokenizes on spaces, so if two args are combined there should be a space between them.

* Update Args.cs

Author: dresdor

src/SpecFlow.NetCore/Args.cs

@@ -1,4 +1,5 @@
-using System;
+using System;
+using System.Collections.Generic;
 using System.IO;
 using System.Linq;
 using static System.Console;
@@ -21,59 +22,74 @@ public Args(string[] args)
 		{
 			WorkingDirectory = new DirectoryInfo(Directory.GetCurrentDirectory());
 
+			// Command line arguments are required.  If absent, exit.
 			if (args == null || !args.Any())
+			{
 				return;
+			}
 
-			// Very basic arg parsing:
-			//   - Assume odd elements are arg names.
-			//   - Assume even elements are arg values.
-			//   - Paths with spaces will probably blow up.
-			//   - Duplicates, last one wins.
-
-			for (var i = 0; i < args.Length; i++)
+			// establish a dictionary of all good command line variables
+			var argDictionary = new Dictionary<string, string>()
 			{
-				if (IsOdd(i))
-					continue;
+ 				{SpecFlowPathArgName , null},
+ 				{WorkingDirectoryArgName, null },
+ 				{TestFrameworkArgName, null },
+ 				{ToolsVersionArgName, null }
+ 			};
 
-				if (i + 1 >= args.Length)
-					throw new Exception("Uneven arguments");
 
-				var name = args[i];
-				var value = args[i + 1];
+			string lastKey = null;
+			// loop through all arguments, attempting to detect and fix bad values
+			foreach(string arg in args)
+			{
+				if (argDictionary.ContainsKey(arg))
+				{
+					lastKey = arg;
+				}
+				else if (arg.StartsWith("--") || string.IsNullOrEmpty(lastKey))
+				{
+					// We are making the assumption that anything starting with -- is intentionally an argument key.
+					// If that argument key is not in the dictionary, we know it is a bad argument.
+					// Additionally, if the first argument key is not in our dictionary, the arguments are bad.
+					throw new Exception("Unknown argument: " + arg);
+				}
+				else
+				{
+					argDictionary[lastKey] = string.IsNullOrEmpty(argDictionary[lastKey]) ? arg : argDictionary[lastKey] + " " + arg;
+				}
+			}
 
-				switch (name)
+			foreach (var key in argDictionary.Keys)
+			{
+				switch (key)
 				{
 					case SpecFlowPathArgName:
-						SpecFlowPath = value;
+						SpecFlowPath = argDictionary[key];
 						break;
 
 					case WorkingDirectoryArgName:
-						if (!Directory.Exists(value))
-							throw new Exception("Working directory doesn't exist: " + value);
-						WorkingDirectory = new DirectoryInfo(value);
+						var path = string.IsNullOrEmpty(argDictionary[key]) ? Directory.GetCurrentDirectory() : argDictionary[key];
+						if (!Directory.Exists(path))
+						{
+							throw new Exception("Working directory doesn't exist: " + path);
+						}
+						WorkingDirectory = new DirectoryInfo(path);
 						break;
 
 					case TestFrameworkArgName:
-						TestFramework = value;
+						TestFramework = argDictionary[key];
 						break;
 
 					case ToolsVersionArgName:
-						ToolsVersion = value;
+						ToolsVersion = argDictionary[key];
 						break;
-
-					default:
-						throw new Exception("Unknown argument: " + name);
 				}
 			}
 
 			WriteLine("SpecFlowPath: " + SpecFlowPath);
 			WriteLine("WorkingDirectory: " + WorkingDirectory.FullName);
 			WriteLine("TestFramework: " + TestFramework);
-		}
-
-		private bool IsOdd(int i)
-		{
-			return i % 2 != 0;
+			WriteLine("ToolsVersion: " + ToolsVersion);
 		}
 	}
-}
+}