Refactoring on OptionInfo, OptionMap. Added SwitchExtensions.

Author: gsscoder

CommandLine.sln

@@ -7,6 +7,25 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CommandLine.Tests", "src\te
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CommandLine.Demo", "src\demo\CommandLine.Demo.csproj", "{9E573FFF-4ECB-4C59-A914-C0B74D44D2E8}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Files", "Files", "{4F498B61-A7BC-4B32-9ACB-901D4F50659B}"
+	ProjectSection(SolutionItems) = preProject
+		CommandLine.FxCop = CommandLine.FxCop
+		Rakefile.rb = Rakefile.rb
+	EndProjectSection
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "NuGet", "NuGet", "{CC062800-4709-4A04-8A0D-DD972C1BFFC5}"
+	ProjectSection(SolutionItems) = preProject
+		nuget\CommandLine.nuspec = nuget\CommandLine.nuspec
+		nuget\readme.txt = nuget\readme.txt
+	EndProjectSection
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Docs", "Docs", "{18282A82-E36C-4938-8397-C0A1166983BA}"
+	ProjectSection(SolutionItems) = preProject
+		doc\ChangeLog = doc\ChangeLog
+		doc\LICENSE = doc\LICENSE
+		README.md = README.md
+	EndProjectSection
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -50,6 +69,10 @@ Global
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
+	GlobalSection(NestedProjects) = preSolution
+		{CC062800-4709-4A04-8A0D-DD972C1BFFC5} = {4F498B61-A7BC-4B32-9ACB-901D4F50659B}
+		{18282A82-E36C-4938-8397-C0A1166983BA} = {4F498B61-A7BC-4B32-9ACB-901D4F50659B}
+	EndGlobalSection
 	GlobalSection(MonoDevelopProperties) = preSolution
 		StartupItem = src\demo\CommandLine.Demo.csproj
 		Policies = $0

README.md

@@ -1,4 +1,4 @@
-Command Line Parser Library 1.9.4.123 Beta for CLR.
+Command Line Parser Library 1.9.4.125 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,8 @@ Compatibility:
 
 News: 
 ---
+  - Added ``strings`` task to Rakefile used to regenerate ``SR.strings.cs``.
+  - Internal refactoring on ``OptionMap`` and ``OptionInfo``.
   - Refactoring in respect of FxCop rules (see ChangeLog). ``HandleParsingErrorsDelegate`` renamed to ``ParsingErrorsHandler``, ``MultiLineTextAttribute`` renamed to ``MultilineTextAttribute``.
   - Removed synchronization from ``OptionInfo`` and ``TargetWrapper`` (parsing should occur in one thread;
       if not, synchronization must be provided by developer not by the library).
@@ -21,12 +23,6 @@ News:
   - ``CommandLineParserSettings``, ``CommandLineParser`` are now correctly disposable.
   - Merged pull request #44 from @dbaileychess (Derek Bailey) that adds ``BaseOptionAttribute::MetaKey`` similar to python [argparse](http://docs.python.org/2/library/argparse.html#module-argparse).
   - Implemented [strict parsing](https://github.com/gsscoder/commandline/blob/master/src/tests/Parser/StrictFixture.cs) (see issue #32 by @nemec).
-  - Removed recently added ``#define`` directives.
-  - Removed dependency from ``CommandLineOptionsBase``; use ``ParserStateAttributed`` and ``IParserState``.
-  - Short name of ordinary options is now defined as character.
-  - Introduced support for verb commands (e.g. ``app verb1 --ordinary-option``).
-  - Internal refactoring and code reorganization for better maintainability.
-  - No member with public visibility was left without XML comments.
 
 To build:
 ---

Rakefile.rb

@@ -1,6 +1,6 @@
 PRODUCT = "Command Line Parser Library"
 DESCRIPTION = "Command Line Parser Library allows CLR applications to define a syntax for parsing command line arguments."
-VERSION = "1.9.4.119"
+VERSION = "1.9.4.125"
 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"
@@ -36,6 +36,8 @@ def invoke_runtime(cmd)
 BUILD_DIR = File.expand_path("build")
 OUTPUT_DIR = "#{BUILD_DIR}/out"
 BIN_DIR = "#{BUILD_DIR}/bin"
+SOURCE_DIR = File.expand_path("src")
+LIB_DIR = "#{SOURCE_DIR}/libcmdline"
 
 msbuild :build_msbuild do |b|
   b.properties :configuration => CONFIGURATION, "OutputPath" => OUTPUT_DIR
@@ -59,6 +61,11 @@ def invoke_runtime(cmd)
   sh "#{nunit} -labels #{OUTPUT_DIR}/CommandLine.Tests.dll"
 end
 
+task :strings do
+  invstrtool = invoke_runtime("tools/invariantstr.exe")
+  sh "#{invstrtool} -i #{LIB_DIR}/Internal/SR.strings -n CommandLine.Internal"
+end
+
 task :clean do
   FileUtils.rm_rf BUILD_DIR
   FileUtils.rm_rf "src/libcmdline/bin"

doc/ChangeLog

@@ -1,3 +1,12 @@
+2013-01-22	Giacomo Stelluti Scala	<gsscoder@gmail.com>
+
+  * Added solution folder "Files" to CommandLine.sln.
+  * OptionMap constructor is now private. Instance is now created by two factory methods '::Create()'
+      derived by 'OptionInfo::CreateMap()'.
+  * OptionInfo.verbs.cs merged with OptionInfo.cs
+  * Added rake task 'strings' to regenerate SR.string.cs from SR.string.
+  * Version incremented to 1.9.4.125 Beta.
+
 2013-01-22	Giacomo Stelluti Scala	<gsscoder@gmail.com>
 
   * CommandLine.snk regenerated, the current prevented the build process.

doc/README

@@ -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.123 Beta (*1)
-Latest Update: 20-01-2013
+Version 1.9.4.125 Beta (*1)
+Latest Update: 22-01-2013
 
 Git home:
 https://github.com/gsscoder/commandline

src/demo/CommandLine.Demo.csproj

@@ -55,6 +55,9 @@
     <Compile Include="..\libcmdline\Utils\StringExtensions.cs">
       <Link>Library\Utils\StringExtensions.cs</Link>
     </Compile>
+    <Compile Include="..\libcmdline\Utils\SwitchExtensions.cs">
+      <Link>Library\Utils\SwitchExtensions.cs</Link>
+    </Compile>
     <Compile Include="Program.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="Properties\ThisAssembly.cs" />
@@ -76,10 +79,6 @@
     <Compile Include="..\libcmdline\Internal\OptionInfo.cs">
       <Link>Library\Internal\OptionInfo.cs</Link>
     </Compile>
-    <Compile Include="..\libcmdline\Internal\OptionInfo.Verbs.cs">
-      <Link>Library\Internal\OptionInfo.Verbs.cs</Link>
-      <DependentUpon>OptionInfo.cs</DependentUpon>
-    </Compile>
     <Compile Include="..\libcmdline\Internal\OptionMap.cs">
       <Link>Library\Internal\OptionMap.cs</Link>
     </Compile>

src/libcmdline/CommandLine.csproj

@@ -83,16 +83,14 @@
     <Compile Include="Internal\SR.strings.cs">
       <DependentUpon>SR.strings</DependentUpon>
     </Compile>
+    <Compile Include="Utils\SwitchExtensions.cs" />
     <Compile Include="Utils\StringExtensions.cs" />
     <Compile Include="Internal\ReflectionUtil.cs" />
     <Compile Include="Utils\Pair.cs" />
     <Compile Include="Internal\TargetWrapper.cs" />
     <Compile Include="Internal\LongOptionParser.cs" />
     <Compile Include="Internal\OptionGroupParser.cs" />
     <Compile Include="Internal\OptionInfo.cs" />
-    <Compile Include="Internal\OptionInfo.Verbs.cs">
-      <DependentUpon>OptionInfo.cs</DependentUpon>
-    </Compile>
     <Compile Include="Internal\OptionMap.cs" />
     <Compile Include="Internal\OneCharStringEnumerator.cs" />
     <Compile Include="Internal\StringArrayEnumerator.cs" />

src/libcmdline/CommandLineParser.Verbs.cs

@@ -94,7 +94,7 @@ private bool DoParseArgumentsUsingVerbs(string[] args, object options)
                 }
                 return false;
             }
-            var optionMap = OptionInfo.CreateMap(options, verbs, _settings);
+            var optionMap = OptionMap.Create(options, verbs, _settings);
             // Read the verb from command line arguments
             if (TryParseHelpVerb(args, options, helpInfo, optionMap))
             {

src/libcmdline/CommandLineParser.cs

@@ -142,7 +142,7 @@ private bool DoParseArguments(string[] args, object options)
         private bool DoParseArgumentsCore(string[] args, object options)
         {
             bool hadError = false;
-            var optionMap = OptionInfo.CreateMap(options, _settings);
+            var optionMap = OptionMap.Create(options, _settings);
             optionMap.SetDefaults();
             var target = new TargetWrapper(options);
 
@@ -152,7 +152,7 @@ private bool DoParseArgumentsCore(string[] args, object options)
                 string argument = arguments.Current;
                 if (!string.IsNullOrEmpty(argument))
                 {
-                    ArgumentParser parser = ArgumentParser.Create(argument, _settings.IgnoreUnknownArguments);
+                    var parser = ArgumentParser.Create(argument, _settings.IgnoreUnknownArguments);
                     if (parser != null)
                     {
                         Internal.ParserState result = parser.Parse(arguments, optionMap, options);
@@ -164,7 +164,9 @@ private bool DoParseArgumentsCore(string[] args, object options)
                         }
 
                         if ((result & Internal.ParserState.MoveOnNextElement) == Internal.ParserState.MoveOnNextElement)
+                        {
                             arguments.MoveNext();
+                        }
                     }
                     else if (target.IsValueListDefined)
                     {

src/libcmdline/Internal/ArgumentParser.cs

@@ -59,12 +59,12 @@ protected void DefineOptionThatViolatesFormat(OptionInfo option)
         public static ArgumentParser Create(string argument, bool ignoreUnknownArguments = false)
         {
             if (argument.IsNumeric()) { return null; }
-            if (string.CompareOrdinal(argument, "-") == 0) { return null; }
-            if (argument[0] == '-' && argument[1] == '-')
+            if (argument.IsDash()) { return null; }
+            if (argument.IsLongOption())
             {
                 return new LongOptionParser(ignoreUnknownArguments);
             }
-            if (argument[0] == '-')
+            if (argument.IsShortOption())
             {
                 return new OptionGroupParser(ignoreUnknownArguments);
             }
@@ -76,7 +76,7 @@ public static bool IsInputValue(string argument)
             if (argument.IsNumeric()) { return true; }
             if (argument.Length > 0)
             {
-                return string.CompareOrdinal(argument, "-") == 0 || argument[0] != '-';
+                return argument.IsDash() || !argument.IsShortOption();
             }
             return true;
         }
@@ -100,17 +100,13 @@ protected static IList<string> GetNextInputValues(IArgumentEnumerator ae)
 
         public static bool CompareShort(string argument, char? option, bool caseSensitive)
         {
-            var completeShortName = string.Concat("-", new string(option.Value, 1));
-
-            return string.Compare(argument, completeShortName,
+            return string.Compare(argument, option.ToOption(),
                 caseSensitive ? StringComparison.Ordinal : StringComparison.OrdinalIgnoreCase) == 0;
         }
 
         public static bool CompareLong(string argument, string option, bool caseSensitive)
         {
-            var completeLongName = string.Concat("--", option);
-
-            return string.Compare(argument, completeLongName,
+            return string.Compare(argument, option.ToOption(),
                 caseSensitive ? StringComparison.Ordinal : StringComparison.OrdinalIgnoreCase) == 0;
         }