added a couple more tests around the expected results of the parse operation when the double dash is used throughout arg string, also updated the parser to strip out the -- from the results

Author: siywilliams

FluentCommandLineParser.Tests/Internals/CommandLineParserEngineMark2Tests.cs

@@ -108,7 +108,7 @@ class when_args_contains_negative_arguments_seperated_with_double_dash : ParseTe
 					result.ParsedOptions.First().Value.ShouldEqual("-4321");
 			}
 
-			class when_args_contains_single_switch : ParseTestContext
+			class when_args_contains_a_single_switch : ParseTestContext
 			{
 				Establish context = () => SetupArgs("-b");
 
@@ -129,8 +129,8 @@ class when_args_contains_only_the_double_dash_option_prefix : ParseTestContext
 				It should_return_no_parsed_options = () =>
 					result.ParsedOptions.ShouldBeEmpty();
 
-				It should_return_it_as_an_additional = () =>
-					result.AdditionalValues.ShouldContainOnly("--");
+				It should_return_no_additional = () =>
+					result.AdditionalValues.ShouldBeEmpty();
 			}
 
 			class when_args_contains_only_the_single_dash_option_prefix : ParseTestContext
@@ -154,6 +154,28 @@ class when_args_contains_only_the_slash_option_prefix : ParseTestContext
 				It should_return_it_as_an_additional = () =>
 					result.AdditionalValues.ShouldContainOnly("/");
 			}
+
+			class when_args_contains_only_arguments_and_no_options : ParseTestContext
+			{
+				Establish context = () => SetupArgs("arg1 arg2 arg3");
+
+				It should_return_no_parsed_options = () =>
+					result.ParsedOptions.ShouldBeEmpty();
+
+				It should_return_it_as_an_additional = () =>
+					result.AdditionalValues.ShouldContainOnly("arg1", "arg2", "arg3");				
+			}
+
+			class when_args_starts_with_a_double_dash : ParseTestContext
+			{
+				Establish context = () => SetupArgs("-- --int 1 2 3 -a -b ");
+
+				It should_return_no_parsed_options = () =>
+					result.ParsedOptions.ShouldBeEmpty();
+
+				It should_return_all_but_the_double_dash_as_an_additional = () =>
+					result.AdditionalValues.ShouldContainOnly("--int", "1", "2", "3", "-a", "-b");			
+			}
 		} 
 	}
 

FluentCommandLineParser/Internals/Parsing/CommandLineParserEngineMark2.cs

@@ -22,8 +22,10 @@
 // POSSIBILITY OF SUCH DAMAGE.
 #endregion
 
+using System;
 using System.Collections.Generic;
 using System.Linq;
+using Fclp.Internals.Extensions;
 
 namespace Fclp.Internals.Parsing
 {
@@ -32,8 +34,9 @@ namespace Fclp.Internals.Parsing
 	/// </summary>
 	public class CommandLineParserEngineMark2 : ICommandLineParserEngine
 	{
-		private readonly List<string> _additionalOptionsFound = new List<string>();
+		private readonly List<string> _additionalArgumentsFound = new List<string>();
 		private readonly List<ParsedOption> _parsedOptions = new List<ParsedOption>();
+		private readonly OptionArgumentParser _optionArgumentParser = new OptionArgumentParser();
 
 		/// <summary>
 		/// Parses the specified <see><cref>T:System.String[]</cref></see> into appropriate <see cref="ParsedOption"/> objects..
@@ -52,7 +55,7 @@ public ParserEngineResult Parse(string[] args)
 				ParseGroupIntoOption(rawKey, optionGroup.Skip(1));
 			}
 
-			return new ParserEngineResult(_parsedOptions, _additionalOptionsFound);
+			return new ParserEngineResult(_parsedOptions, _additionalArgumentsFound);
 		}
 
 		private void ParseGroupIntoOption(string rawKey, IEnumerable<string> optionGroup)
@@ -63,14 +66,14 @@ private void ParseGroupIntoOption(string rawKey, IEnumerable<string> optionGroup
 
 				TrimSuffix(parsedOption);
 
-				new OptionArgumentParser().ParseArguments(optionGroup, parsedOption);
+				_optionArgumentParser.ParseArguments(optionGroup, parsedOption);
 
 				AddParsedOptionToList(parsedOption);
 			}
 			else
 			{
-				_additionalOptionsFound.Add(rawKey);
-				_additionalOptionsFound.AddRange(optionGroup);
+				AddAdditionArgument(rawKey);
+				optionGroup.ForEach(AddAdditionArgument);
 			}
 		}
 
@@ -86,6 +89,14 @@ private void AddParsedOptionToList(ParsedOption parsedOption)
 			}
 		}
 
+		private void AddAdditionArgument(string argument)
+		{
+			if (IsEndOfOptionsKey(argument) == false)
+			{
+				_additionalArgumentsFound.Add(argument);
+			}
+		}
+
 		private static bool ShortOptionNeedsToBeSplit(ParsedOption parsedOption)
 		{
 			return PrefixIsShortOption(parsedOption.Prefix) && parsedOption.Key.Length > 1;
@@ -122,12 +133,20 @@ private static void TrimSuffix(ParsedOption parsedOption)
 		/// <param name="arg">The <see cref="System.String"/> to examine.</param>
 		/// <returns><c>true</c> if <paramref name="arg"/> is a Option key; otherwise <c>false</c>.</returns>
 		static bool IsAKey(string arg)
-		{
+		{ // TODO: push related special char operations into there own object
 			return arg != null 
 				&& SpecialCharacters.OptionPrefix.Any(arg.StartsWith)
 				&& SpecialCharacters.OptionPrefix.Any(arg.Equals) == false;
 		}
 
+		/// <summary>
+		/// Determines whether the specified string indicates the end of parsed options.
+		/// </summary>
+		static bool IsEndOfOptionsKey(string arg)
+		{
+			return string.Equals(arg, SpecialCharacters.EndOfOptionsKey, StringComparison.InvariantCultureIgnoreCase);
+		}
+
 		/// <summary>
 		/// Parses the specified <see><cref>T:System.String[]</cref></see> into key value pairs.
 		/// </summary>