Merge pull request #108 from oleksabor/develop

fixing #106

Author: siywilliams

FluentCommandLineParser.Tests/FluentCommandLineParser.Tests.csproj

@@ -83,6 +83,7 @@
   <ItemGroup>
     <Compile Include="Integration\Int64InlineDataAttribute.cs" />
     <Compile Include="Integration\Lists\Int64ListInlineDataAttribute.cs" />
+    <Compile Include="Internals\UsefulExtensionTests.cs" />
     <Compile Include="UriTests.cs" />
     <Compile Include="CommandLineOptionFormatterTests.cs" />
     <Compile Include="Commands\AddArgs.cs" />

FluentCommandLineParser.Tests/Internals/UsefulExtensionTests.cs

@@ -0,0 +1,43 @@
+using Fclp.Internals.Extensions;
+using NUnit.Framework;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Fclp.Tests.Internals
+{
+	/// <summary>
+	/// option value that has double quote at the end
+	/// </summary>
+	[TestFixture]
+	public class when_there_is_qoute_in_the_end
+	{
+		[Test]
+		public void parser() // not sure that it should be here
+		{
+			var args = new[] { "--param", "something \"4\"" };
+
+			var sut = new Fclp.FluentCommandLineParser<Config>();
+			sut.Setup(_ => _.Param).As('p', "param");
+			var res = sut.Parse(args);
+
+			Assert.AreEqual("something \"4\"", sut.Object.Param);
+		}
+
+		[Test]
+		public void RemoveAnyWrappingDoubleQuotes()
+		{
+			var str = "something \"4\"";
+			str = str.WrapInDoubleQuotes();
+			str = str.RemoveAnyWrappingDoubleQuotes();
+			Assert.AreEqual("something \"4\"", str);
+		}
+	}
+
+	public class Config
+	{
+		public string Param { get; set; }
+	}
+}

FluentCommandLineParser/Internals/Extensions/UsefulExtension.cs

@@ -92,9 +92,11 @@ public static string WrapInDoubleQuotes(this string str)
 		/// </summary>
 		public static string RemoveAnyWrappingDoubleQuotes(this string str)
 		{
-			return str.IsNullOrWhiteSpace()
-				       ? str
-				       : str.TrimStart('"').TrimEnd('"');
+
+			if (!str.IsNullOrWhiteSpace())
+				if (str.StartsWith("\"") && str.EndsWith("\""))
+					return str.Substring(1, str.Length - 2);
+			return str;
 		}
 
 		/// <summary>

FluentCommandLineParser/Internals/Parsing/OptionParsers/StringCommandLineOptionParser.cs

@@ -39,7 +39,11 @@ public class StringCommandLineOptionParser : ICommandLineOptionParser<string>
 		/// <returns></returns>
 		public string Parse(ParsedOption parsedOption)
 		{
-			return parsedOption.Value == null ? null : parsedOption.Value.RemoveAnyWrappingDoubleQuotes();
+			if (parsedOption.Value == null)
+				return null;
+			return parsedOption.Value.ContainsWhitespace()
+				? parsedOption.Value.RemoveAnyWrappingDoubleQuotes()
+				: parsedOption.Value;
 		}
 
 		/// <summary>