Merge pull request #55 from montgomerybc/argument-values-start-with-non-word-character

Support Arguments values starting with non-word chars

Author: jpdillingham

src/Utility.CommandLine.Arguments/Arguments.cs

@@ -176,7 +176,7 @@ public class Arguments
         /// <summary>
         ///     The regular expression with which to parse the command line string.
         /// </summary>
-        private const string ArgumentRegEx = "(?:[-]{1,2}|\\/)([^=: ]+)[=: ]?(\\/?\\w\\S*|\\\"[^\"]*\\\"|\\\'[^']*\\\')?|([^ ([^'\\\"]+|\"[^\\\"]+\"|\\\'[^']+\\\')";
+        private const string ArgumentRegEx = "(?:[-]{1,2}|\\/)([^=: ]+)[=: ]?(\\/?[^-'\"]\\S*|\\\"[^\"]*\\\"|\\\'[^']*\\\')?|([^ ([^'\\\"]+|\"[^\\\"]+\"|\\\'[^']+\\\')";
 
         /// <summary>
         ///     The regular expression with which to parse argument-value groups.

tests/Utility.CommandLine.Arguments.Tests/ArgumentsTests.cs

@@ -383,6 +383,25 @@ public void ParseValueWithQuotedPeriod()
             Assert.Equal("test2.test2", test["test2"]);
         }
 
+        [Theory]
+        [InlineData(".")]
+        [InlineData("..")]
+        [InlineData("..\\")]
+        [InlineData(".\\foo")]
+        [InlineData("..\\foo")]
+        [InlineData("..\\..")]
+        [InlineData("\\")]
+        [InlineData("\\foo")]
+        [InlineData("\\foo\\bar")]
+        [InlineData("\\\\foo")]
+        [InlineData("\\\\foo\\bar")]
+        public void ParseValueStartingWithNonWord(string value)
+        {
+            Dictionary<string, object> test = Arguments.Parse($"-f {value}").ArgumentDictionary;
+
+            Assert.Equal(value, test["f"]);
+        }
+
         [Fact]
         public void Populate()
         {