Merge branch 'develop' of github.com:commandlineparser/commandline into develop

Author: ericnewton76

README.md

@@ -55,10 +55,14 @@ class Options
   public IEnumerable<string> InputFiles { get; set; }
 
   // Omitting long name, defaults to name of property, ie "--verbose"
-  [Option(Default = false, HelpText = "Prints all messages to standard output.")]
+  [Option(
+	Default = false,
+	HelpText = "Prints all messages to standard output.")]
   public bool Verbose { get; set; }
-
-  [Option("stdin", Default = false, HelpText = "Read from stdin")]
+  
+  [Option("stdin",
+	Default = false
+	HelpText = "Read from stdin")]
   public bool stdin { get; set; }
 
   [Value(0, MetaName = "offset", HelpText = "File offset.")]
@@ -79,7 +83,7 @@ F# Examples:
 type options = {
   [<Option('r', "read", Required = true, HelpText = "Input files.")>] files : seq<string>;
   [<Option(HelpText = "Prints all messages to standard output.")>] verbose : bool;
-  [<Option(DefaultValue = "русский", HelpText = "Content language.")>] language : string;
+  [<Option(Default = "русский", HelpText = "Content language.")>] language : string;
   [<Value(0, MetaName="offset", HelpText = "File offset.")>] offset : int64 option;
 }
 
@@ -94,18 +98,22 @@ VB.Net:
 
 ```VB.NET
 Class Options
-    <CommandLine.Option("r", "read", Required:=True, HelpText:="Input files to be processed.")>
-    Public Property InputFiles As IEnumerable(Of String)
-
-    ' Omitting long name, defaults to name of property, ie "--verbose"
-    <CommandLine.Option(HelpText:="Prints all messages to standard output.")>
-    Public Property Verbose As Boolean
-
-    <CommandLine.Option([Default]:="中文", HelpText:="Content language.")>
-    Public Property Language As String
-
-    <CommandLine.Value(0, MetaName:="offset", HelpText:="File offset.")>
-    Public Property Offset As Long?
+	<CommandLine.Option('r', "read", Required := true,
+	HelpText:="Input files to be processed.")>
+	Public Property InputFiles As IEnumerable(Of String)
+
+	' Omitting long name, defaults to name of property, ie "--verbose"
+	<CommandLine.Option(
+	HelpText:="Prints all messages to standard output.")>
+	Public Property Verbose As Boolean
+
+	<CommandLine.Option(Default:="中文",
+	HelpText:="Content language.")>
+	Public Property Language As String
+
+	<CommandLine.Value(0, MetaName:="offset",
+	HelpText:="File offset.")>
+	Public Property Offset As Long?
 End Class
 
 Sub Main(ByVal args As String())

src/CommandLine/Core/TypeConverter.cs

@@ -49,6 +49,19 @@ private static Maybe<object> ChangeTypeScalar(string value, Type conversionType,
             return result.ToMaybe();
         }
 
+        private static object ConvertString(string value, Type type, CultureInfo conversionCulture)
+        {
+            try
+            {
+                return Convert.ChangeType(value, type, conversionCulture);
+            }
+            catch (InvalidCastException)
+            {
+                // Required for converting from string to TimeSpan because Convert.ChangeType can't
+                return System.ComponentModel.TypeDescriptor.GetConverter(type).ConvertFrom(null, conversionCulture, value);
+            }
+        }
+
         private static Result<object, Exception> ChangeTypeScalarImpl(string value, Type conversionType, CultureInfo conversionCulture, bool ignoreValueCase)
         {
             Func<object> changeType = () =>
@@ -71,10 +84,9 @@ private static Result<object, Exception> ChangeTypeScalarImpl(string value, Type
                         () =>
 #if !SKIP_FSHARP
                             isFsOption
-                                ? FSharpOptionHelper.Some(type, Convert.ChangeType(value, type, conversionCulture)) :
+                                ? FSharpOptionHelper.Some(type, ConvertString(value, type, conversionCulture)) :
 #endif
-                                Convert.ChangeType(value, type, conversionCulture);
-
+                                ConvertString(value, type, conversionCulture);
 #if !SKIP_FSHARP
                     Func<object> empty = () => isFsOption ? FSharpOptionHelper.None(type) : null;
 #else

tests/CommandLine.Tests/CommandLine.Tests.csproj

@@ -95,6 +95,7 @@
     <Compile Include="Fakes\Options_With_Two_Options_Having_Required_Set_To_True.cs" />
     <Compile Include="Fakes\Options_With_Required_Set_To_True.cs" />
     <Compile Include="Fakes\Options_With_Required_Set_To_True_Within_Same_Set.cs" />
+    <Compile Include="Fakes\Options_With_TimeSpan.cs" />
     <Compile Include="Fakes\Help_Fakes.cs" />
     <Compile Include="Fakes\IInterface_With_Two_Scalar_Options.cs" />
     <Compile Include="Fakes\Immutable_Verb_Fakes.cs" />

tests/CommandLine.Tests/Fakes/Options_With_TimeSpan.cs

@@ -0,0 +1,12 @@
+// Copyright 2005-2015 Giacomo Stelluti Scala & Contributors. All rights reserved. See License.md in the project root for license information.
+
+using System;
+
+namespace CommandLine.Tests.Fakes
+{
+    public class Options_With_TimeSpan
+    {
+        [Option('d', "duration")]
+        public TimeSpan Duration { get; set; }
+    }
+}

tests/CommandLine.Tests/Unit/Core/InstanceBuilderTests.cs

@@ -1023,6 +1023,22 @@ public void Parse_Guid(string[] arguments, Options_With_Guid expected)
             // Teardown
         }
 
+        [Fact]
+        public void Parse_TimeSpan()
+        {
+            // Fixture setup
+            var expectedResult = new Options_With_TimeSpan { Duration = TimeSpan.FromMinutes(42) };
+
+            // Exercize system 
+            var result = InvokeBuild<Options_With_TimeSpan>(
+                new[] { "--duration=00:42:00" });
+
+            // Verify outcome
+            expectedResult.ShouldBeEquivalentTo(((Parsed<Options_With_TimeSpan>)result).Value);
+
+            // Teardown
+        }
+
         public static IEnumerable<object> RequiredValueStringData
         {
             get