Merge pull request #334 from billboga/allow-spaces-when-tokenizing-option-value

Allow spaces when tokenizing option-value

Author: nemec

src/CommandLine/Core/Tokenizer.cs

@@ -6,6 +6,7 @@
 usingCommandLine.Infrastructure;
 usingCSharpx;
 usingRailwaySharp.ErrorHandling;
+usingSystem.Text.RegularExpressions;
 
 namespaceCommandLine.Core
 {
@@ -188,9 +189,19 @@ private static IEnumerable<Token> TokenizeLongName(
 onError(newBadFormatTokenError(value));
 yieldbreak;
 }
-varparts=text.Split('=');
-yieldreturnToken.Name(parts[0]);
-yieldreturnToken.Value(parts[1],true);
+
+vartokenMatch=Regex.Match(text,"^([^=]+)=([^ ].*)$");
+
+if(tokenMatch.Success)
+{
+yieldreturnToken.Name(tokenMatch.Groups[1].Value);
+yieldreturnToken.Value(tokenMatch.Groups[2].Value,true);
+}
+else
+{
+onError(newBadFormatTokenError(value));
+yieldbreak;
+}
 }
 }
 }

tests/CommandLine.Tests/Unit/Core/TokenizerTests.cs

@@ -92,6 +92,41 @@ public void Normalize_should_remove_all_value_with_explicit_assignment_of_existi
 
 // Teardown
 }
+
+[Fact]
+publicvoidShould_properly_parse_option_with_equals_in_value()
+{
+/**
+ * This is how the arg. would look in `static void Main(string[] args)`
+ * if passed from the command-line and the option-value wrapped in quotes.
+ * Ex.) ./app --connectionString="Server=localhost;Data Source..."
+ */
+varargs=new[]{"--connectionString=Server=localhost;Data Source=(LocalDB)\v12.0;Initial Catalog=temp;"};
+
+varresult=Tokenizer.Tokenize(args, name =>NameLookupResult.OtherOptionFound, token =>token);
+
+vartokens=result.SucceededWith();
+
+Assert.NotNull(tokens);
+Assert.Equal(2,tokens.Count());
+Assert.Equal("connectionString",tokens.First().Text);
+Assert.Equal("Server=localhost;Data Source=(LocalDB)\v12.0;Initial Catalog=temp;",tokens.Last().Text);
+}
+
+[Fact]
+publicvoidShould_return_error_if_option_format_with_equals_is_not_correct()
+{
+varargs=new[]{"--option1 = fail","--option2= fail"};
+
+varresult=Tokenizer.Tokenize(args, name =>NameLookupResult.OtherOptionFound, token =>token);
+
+vartokens=result.SuccessfulMessages();
+
+Assert.NotNull(tokens);
+Assert.Equal(2,tokens.Count());
+Assert.Equal(ErrorType.BadFormatTokenError,tokens.First().Tag);
+Assert.Equal(ErrorType.BadFormatTokenError,tokens.Last().Tag);
+}
 }
 
 }