Introduced ValueOptionAttribute (see issue #23).

Author: gsscoder

CommandLine.sln.DotSettings.user

@@ -1,4 +1,4 @@
-Command Line Parser Library 1.9.4.139 beta for CLR.
+Command Line Parser Library 1.9.4.201 beta for CLR.
 ===
 The Command Line Parser Library offers to CLR applications a clean and concise API for manipulating command line arguments and related tasks defining switches, options and verb commands. It allows you to display an help screen with an high degree of customization and a simple way to report syntax errors to the end user. Everything that is boring and repetitive to be programmed stands up on library shoulders, letting developers concentrate on core logic.
 __The search for the command line parser for your application is over, with this library you got a solid parsing API constantly updated since 2005.__
@@ -11,6 +11,7 @@ Compatibility:
 
 News: 
 ---
+  - Introduced ``ValueOptionAttribute`` enhancement of issue #23.
   - ``CommandLineParser`` refactored (also using new ``ParserContext`` type).
   - ``ReflectionUtil`` now caches data using ``ReflectionCache``.
   - Added ``strings`` task to Rakefile used to regenerate ``SR.strings.cs``.
@@ -48,14 +49,7 @@ To start:
 
 Public API:
 ---
-  - Version 1.9.4.91: Breaking, short name of an option must be defined as character (``System.Char``). Non breaking, added support for verbs.
-  - Version 1.9.4.99: Breaking, removed dependency from ``CommandLineOptionsBase``, introduced [ParseStateAttribute](https://github.com/gsscoder/commandline/blob/master/src/sample/Program.cs).
-  - Version 1.9.4.107: Non breaking, implemented [strict parsing](https://github.com/gsscoder/commandline/blob/master/src/tests/Parser/StrictFixture.cs) (see issue #32).
-  - Version 1.9.4.109: Non breaking, pull request #44.
-  - Version 1.9.4.111: Non breaking, ``CommandLineParserSettings``, ``CommandLineParser`` implements ``IDisposable``.
-  - Version 1.9.4.113: Non breaking, added ``CommandLineParser::WasVerbOptionInvoked`` helper method.
-  - Version 1.9.4.123: Breaking, ``HandleParsingErrorsDelegate`` renamed to ``ParsingErrorsHandler``, ``MultiLineTextAttribute`` renamed to ``MultilineTextAttribute``. Non breaking, refactoring (see ChangeLog).
-  - Version 1.9.4.127: 'Partially' non breaking, ``OptionAttribute`` is now sealed. ``OptionArrayAttribute`` and ``OptionListAttribute`` derives from ``BaseOptionAttribute`` (update your custom types too).
+Latest changes are recorded from Version 1.9.4.91, please refer to [this document](https://github.com/gsscoder/commandline/blob/master/doc/PublicAPI.md).
 
 Verb Commands:
 ---

README.md

@@ -1,7 +1,7 @@
 PRODUCT = "Command Line Parser Library"
 DESCRIPTION = "Command Line Parser Library allows CLR applications to define a syntax for parsing command line arguments."
 INF_VERSION = "1.9"
-VERSION = INF_VERSION + ".4.139"
+VERSION = INF_VERSION + ".4.201"
 COPYRIGHT = "Copyright (c) 2005 - 2013 Giacomo Stelluti Scala"
 LICENSE_URL = "https://raw.github.com/gsscoder/commandline/master/doc/LICENSE"
 PROJECT_URL = "https://github.com/gsscoder/commandline"

Rakefile.rb

@@ -1,3 +1,12 @@
+2013-01-25	Giacomo Stelluti Scala	<[email protected]>
+
+  * Implemented issue #23 (https://github.com/gsscoder/commandline/issues/33) that
+      introduces ValueOptionAttribute.
+  * Internal Target type renamed to ValueMapper.
+  * OptionInfo property writing primitives refactored in PropertyWriter type.
+  * Added ValueOptionAttributeParsingFixture and new mock types.
+  * Version incremented to 1.9.4.201 beta.  
+
 2013-01-24	Giacomo Stelluti Scala	<[email protected]>
 
   * Sources in Utils dir moved to CommandLine.Utils namespace.

doc/ChangeLog

@@ -0,0 +1,11 @@
+Public API Changes:
+---
+  - Version 1.9.4.91: Breaking, short name of an option must be defined as character (``System.Char``). Non breaking, added support for verbs.
+  - Version 1.9.4.99: Breaking, removed dependency from ``CommandLineOptionsBase``, introduced [ParseStateAttribute](https://github.com/gsscoder/commandline/blob/master/src/sample/Program.cs).
+  - Version 1.9.4.107: Non breaking, implemented [strict parsing](https://github.com/gsscoder/commandline/blob/master/src/tests/Parser/StrictFixture.cs) (see issue #32).
+  - Version 1.9.4.109: Non breaking, pull request #44.
+  - Version 1.9.4.111: Non breaking, ``CommandLineParserSettings``, ``CommandLineParser`` implements ``IDisposable``.
+  - Version 1.9.4.113: Non breaking, added ``CommandLineParser::WasVerbOptionInvoked`` helper method.
+  - Version 1.9.4.123: Breaking, ``HandleParsingErrorsDelegate`` renamed to ``ParsingErrorsHandler``, ``MultiLineTextAttribute`` renamed to ``MultilineTextAttribute``. Non breaking, refactoring (see ChangeLog).
+  - Version 1.9.4.127: 'Partially' non breaking, ``OptionAttribute`` is now sealed. ``OptionArrayAttribute`` and ``OptionListAttribute`` derives from ``BaseOptionAttribute`` (update your custom types too).
+  - Version 1.9.4.201: Non breaking, introduced ``ValueOptionAttribute`` enhancement of issue #23.

doc/PublicAPI.md

@@ -3,8 +3,8 @@ Command Line Parser Library
 Project Author/Coordinator: Giacomo Stelluti Scala
 Main Contributor(s): Steven Evans, Kevin Moore, Dan Nemec (nemec), Alexander Fast (mizipzor)
 --------------------------------------------------------------------------------------------
-Version 1.9.4.139 beta (*1)
-Latest Update: 24-01-2013
+Version 1.9.4.201 beta (*1)
+Latest Update: 25-01-2013
 
 Git home:
 https://github.com/gsscoder/commandline

doc/README

@@ -4,8 +4,8 @@
 using System.Runtime.InteropServices;
 [assembly: AssemblyProduct("Command Line Parser Library")]
 [assembly: AssemblyCopyright("Copyright (c) 2005 - 2013 Giacomo Stelluti Scala")]
-[assembly: AssemblyVersion("1.9.4.139")]
-[assembly: AssemblyFileVersion("1.9.4.139")]
+[assembly: AssemblyVersion("1.9.4.201")]
+[assembly: AssemblyFileVersion("1.9.4.201")]
 
 [assembly: AssemblyInformationalVersion("1.9")]
 [assembly: NeutralResourcesLanguage("en-US")]

doc/config/NAnt.exe.config.part

@@ -34,11 +34,17 @@
     <Reference Include="System" />
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="..\libcmdline\Attributes\ValueOptionAttribute.cs">
+      <Link>Library\Attributes\ValueOptionAttribute.cs</Link>
+    </Compile>
     <Compile Include="..\libcmdline\Internal\PresentParserState.cs">
       <Link>Library\Internal\PresentParserState.cs</Link>
     </Compile>
-    <Compile Include="..\libcmdline\Internal\Target.cs">
-      <Link>Library\Internal\Target.cs</Link>
+    <Compile Include="..\libcmdline\Internal\PropertyWriter.cs">
+      <Link>Library\Internal\PropertyWriter.cs</Link>
+    </Compile>
+    <Compile Include="..\libcmdline\Internal\ValueMapper.cs">
+      <Link>Library\Internal\ValueMapper.cs</Link>
     </Compile>
     <Compile Include="..\libcmdline\ParserContext.cs">
       <Link>Library\ParserContext.cs</Link>

src/CommonAssemblyInfo.cs

@@ -42,6 +42,7 @@ namespace CommandLine
     /// Must be applied to a field compatible with an <see cref="System.Collections.Generic.IList&lt;T&gt;"/> interface
     /// of <see cref="System.String"/> instances.
     /// </summary>
+    /// <remarks>To map individual values use instead <see cref="CommandLine.ValueOptionAttribute"/>.</remarks>
     [AttributeUsage(AttributeTargets.Property, AllowMultiple = false, Inherited = true)]
     public sealed class ValueListAttribute : Attribute
     {

src/demo/CommandLine.Demo.csproj

@@ -1,6 +1,6 @@
 #region License
 //
-// Command Line Library: TargetWrapper.cs
+// Command Line Library: ValueOptionAttribute.cs
 //
 // Author:
 //   Giacomo Stelluti Scala ([email protected])
@@ -27,39 +27,21 @@
 //
 #endregion
 #region Using Directives
+using System;
 using System.Collections.Generic;
+using System.Text;
 #endregion
 
-namespace CommandLine.Internal
+namespace CommandLine
 {
-    sealed class Target
+    /// <summary>
+    /// Maps a single unnamed option to the target property. Values will be mapped in order of declaration.
+    /// This attribute takes precedence over <see cref="CommandLine.ValueListAttribute"/> with which
+    /// can coexist.
+    /// </summary>
+    /// <remarks>It can handle only scalar values. Do not apply to arrays or lists.</remarks>
+    [AttributeUsage(AttributeTargets.Property, AllowMultiple = false, Inherited = true)]
+    public sealed class ValueOptionAttribute : Attribute
     {
-        private Target() {}
-
-        public Target(object target)
-        {
-            _target = target;
-            _valueListAttribute = ValueListAttribute.GetAttribute(_target);
-            if (IsValueListDefined)
-            {
-                _valueList = ValueListAttribute.GetReference(_target);
-            }
-        }
-
-        public bool IsValueListDefined { get { return _valueListAttribute != null; } }
-
-        public bool AddValueItemIfAllowed(string item)
-        {
-            if (_valueListAttribute.MaximumElements == 0 || _valueList.Count == _valueListAttribute.MaximumElements)
-            {
-                return false;
-            }
-            _valueList.Add(item);
-            return true;
-        }
-
-        private readonly object _target;
-        private readonly IList<string> _valueList;
-        private readonly ValueListAttribute _valueListAttribute;
     }
 }

src/libcmdline/Attributes/ValueListAttribute.cs

@@ -79,6 +79,8 @@
     <Compile Include="Attributes\OptionListAttribute.cs" />
     <Compile Include="Attributes\ParserStateAttribute.cs" />
     <Compile Include="Attributes\ValueListAttribute.cs" />
+    <Compile Include="Attributes\ValueOptionAttribute.cs" />
+    <Compile Include="Internal\PropertyWriter.cs" />
     <Compile Include="ParserContext.cs" />
     <Compile Include="Utils\Assumes.cs" />
     <Compile Include="Internal\SR.strings.cs">
@@ -89,7 +91,7 @@
     <Compile Include="Utils\StringExtensions.cs" />
     <Compile Include="Utils\ReflectionUtil.cs" />
     <Compile Include="Utils\Pair.cs" />
-    <Compile Include="Internal\Target.cs" />
+    <Compile Include="Internal\ValueMapper.cs" />
     <Compile Include="Internal\LongOptionParser.cs" />
     <Compile Include="Internal\OptionGroupParser.cs" />
     <Compile Include="Internal\OptionInfo.cs" />

src/libcmdline/Internal/Target.cs renamed to src/libcmdline/Attributes/ValueOptionAttribute.cs

@@ -154,12 +154,12 @@ private bool DoParseArgumentsDispatcher(ParserContext context)
 
         private bool DoParseArgumentsCore(ParserContext context)
         {
-            bool hadError = false;
+            var hadError = false;
             var optionMap = OptionMap.Create(context.Target, _settings);
             optionMap.SetDefaults();
-            var target = new Target(context.Target);
+            var valueMapper = context.Target.CreateValueMapper();
 
-            IArgumentEnumerator arguments = new StringArrayEnumerator(context.Arguments);
+            var arguments = new StringArrayEnumerator(context.Arguments);
             while (arguments.MoveNext())
             {
                 var argument = arguments.Current;
@@ -183,9 +183,9 @@ private bool DoParseArgumentsCore(ParserContext context)
                         arguments.MoveNext();
                     }
                 }
-                else if (target.IsValueListDefined)
+                else if (valueMapper.CanReceiveValues)
                 {
-                    if (!target.AddValueItemIfAllowed(argument))
+                    if (!valueMapper.MapValueItem(argument))
                     {
                         hadError = true;
                     }