Modify type of Group to string instead of `Mayb<string>'

moh-hassan · moh-hassan · commit ff61b69a19a8 · 2019-12-17T21:29:43.000+02:00
diff --git a/src/CommandLine/Core/OptionSpecification.cs b/src/CommandLine/Core/OptionSpecification.cs
@@ -13,12 +13,13 @@ sealed class OptionSpecification : Specification
         private readonly string longName;
         private readonly char separator;
         private readonly string setName;
-        private readonly Maybe<string> group;
+        private readonly string group;
 
         public OptionSpecification(string shortName, string longName, bool required, string setName, Maybe<int> min, Maybe<int> max,
             char separator, Maybe<object> defaultValue, string helpText, string metaValue, IEnumerable<string> enumValues,
-            Type conversionType, TargetType targetType, Maybe<string> group, bool hidden = false)
-            : base(SpecificationType.Option, required, min, max, defaultValue, helpText, metaValue, enumValues, conversionType, targetType, hidden)
+            Type conversionType, TargetType targetType, string group, bool hidden = false)
+            : base(SpecificationType.Option,
+                 required, min, max, defaultValue, helpText, metaValue, enumValues, conversionType, targetType, hidden)
         {
             this.shortName = shortName;
             this.longName = longName;
@@ -43,14 +44,14 @@ public static OptionSpecification FromAttribute(OptionAttribute attribute, Type
                 enumValues,
                 conversionType,
                 conversionType.ToTargetType(),
-                string.IsNullOrWhiteSpace(attribute.Group) ? Maybe.Nothing<string>() : Maybe.Just(attribute.Group),
+                attribute.Group,
                 attribute.Hidden);
         }
 
         public static OptionSpecification NewSwitch(string shortName, string longName, bool required, string helpText, string metaValue, bool hidden = false)
         {
             return new OptionSpecification(shortName, longName, required, string.Empty, Maybe.Nothing<int>(), Maybe.Nothing<int>(),
-                '\0', Maybe.Nothing<object>(), helpText, metaValue, Enumerable.Empty<string>(), typeof(bool), TargetType.Switch, Maybe.Nothing<string>(), hidden);
+                '\0', Maybe.Nothing<object>(), helpText, metaValue, Enumerable.Empty<string>(), typeof(bool), TargetType.Switch, string.Empty, hidden);
         }
 
         public string ShortName
@@ -73,7 +74,7 @@ public string SetName
             get { return setName; }
         }
 
-        public Maybe<string> Group
+        public string Group
         {
             get { return group; }
         }
diff --git a/src/CommandLine/Core/SpecificationPropertyRules.cs b/src/CommandLine/Core/SpecificationPropertyRules.cs
@@ -32,15 +32,15 @@ private static Func<IEnumerable<SpecificationProperty>, IEnumerable<Error>> Enfo
                     from sp in specProps
                     where sp.Specification.IsOption()
                     let o = (OptionSpecification)sp.Specification
-                    where o.Group.IsJust()
+                    where o.Group.Length > 0
                     select new
                     {
                         Option = o,
                         Value = sp.Value
                     };
 
                 var groups = from o in optionsValues
-                             group o by o.Option.Group.GetValueOrDefault(null) into g
+                             group o by o.Option.Group into g
                              select g;
 
                 var errorGroups = groups.Where(gr => gr.All(g => g.Value.IsNothing()));
@@ -101,7 +101,7 @@ where sp.Specification.Required
                                            where sp.Value.IsNothing()
                                            let o = (OptionSpecification)sp.Specification
                                            where o.SetName.Length > 0
-                                           where o.Group.IsNothing()
+                                           where o.Group.Length == 0
                                            where setWithRequiredValue.ContainsIfNotEmpty(o.SetName)
                                            select sp.Specification;
                 var missing =
@@ -114,7 +114,7 @@ where sp.Specification.Required
                             where sp.Value.IsNothing()
                             let o = (OptionSpecification)sp.Specification
                             where o.SetName.Length == 0
-                            where o.Group.IsNothing()
+                            where o.Group.Length == 0
                             select sp.Specification)
                         .Concat(
                             from sp in specProps
diff --git a/src/CommandLine/OptionAttribute.cs b/src/CommandLine/OptionAttribute.cs
@@ -16,7 +16,7 @@ public sealed class OptionAttribute : BaseAttribute
         private readonly string shortName;
         private string setName;
         private char separator;
-        private string group;
+        private string group=string.Empty;
 
         private OptionAttribute(string shortName, string longName) : base()
         {
diff --git a/src/CommandLine/Text/HelpText.cs b/src/CommandLine/Text/HelpText.cs
@@ -875,7 +875,12 @@ private HelpText AddOption(string requiredWord, string optionGroupWord, int maxL
         {
             OptionSpecification GetOptionGroupSpecification()
             {
-                if (specification.Tag == SpecificationType.Option && specification is OptionSpecification optionSpecification && optionSpecification.Group.IsJust())
+                if (specification.Tag == SpecificationType.Option &&
+                    specification is OptionSpecification optionSpecification &&
+                    optionSpecification.Group.Length > 0
+                    )
+
+
                 {
                     return optionSpecification;
                 }
@@ -912,7 +917,7 @@ OptionSpecification GetOptionGroupSpecification()
 
             if (optionGroupSpecification != null)
             {
-                optionHelpText = "({0}: {1}) ".FormatInvariant(optionGroupWord, optionGroupSpecification.Group.GetValueOrDefault(null)) + optionHelpText;
+                optionHelpText = "({0}: {1}) ".FormatInvariant(optionGroupWord, optionGroupSpecification.Group)  + optionHelpText;
             }
 
             //note that we need to indent trim the start of the string because it's going to be 
diff --git a/tests/CommandLine.Tests/Unit/Core/NameLookupTests.cs b/tests/CommandLine.Tests/Unit/Core/NameLookupTests.cs
@@ -21,7 +21,7 @@ public void Lookup_name_of_sequence_option_with_separator()
             // Fixture setup
             var expected = Maybe.Just(".");
             var specs = new[] { new OptionSpecification(string.Empty, "string-seq",
-                false, string.Empty, Maybe.Nothing<int>(), Maybe.Nothing<int>(), '.', null, string.Empty, string.Empty, new List<string>(), typeof(IEnumerable<string>), TargetType.Sequence, Maybe.Nothing<string>())};
+                false, string.Empty, Maybe.Nothing<int>(), Maybe.Nothing<int>(), '.', null, string.Empty, string.Empty, new List<string>(), typeof(IEnumerable<string>), TargetType.Sequence, string.Empty)};
 
             // Exercize system
             var result = NameLookup.HavingSeparator("string-seq", specs, StringComparer.Ordinal);
@@ -39,7 +39,7 @@ public void Get_name_from_option_specification()
 
             // Fixture setup
             var expected = new NameInfo(ShortName, LongName);
-            var spec = new OptionSpecification(ShortName, LongName, false, string.Empty, Maybe.Nothing<int>(), Maybe.Nothing<int>(), '.', null, string.Empty, string.Empty, new List<string>(), typeof(IEnumerable<string>), TargetType.Sequence, Maybe.Nothing<string>());
+            var spec = new OptionSpecification(ShortName, LongName, false, string.Empty, Maybe.Nothing<int>(), Maybe.Nothing<int>(), '.', null, string.Empty, string.Empty, new List<string>(), typeof(IEnumerable<string>), TargetType.Sequence, string.Empty);
 
             // Exercize system
             var result = spec.FromOptionSpecification();
diff --git a/tests/CommandLine.Tests/Unit/Core/OptionMapperTests.cs b/tests/CommandLine.Tests/Unit/Core/OptionMapperTests.cs
@@ -32,7 +32,7 @@ public void Map_boolean_switch_creates_boolean_value()
             var specProps = new[]
                 {
                     SpecificationProperty.Create(
-                        new OptionSpecification("x", string.Empty, false, string.Empty, Maybe.Nothing<int>(), Maybe.Nothing<int>(), '\0', Maybe.Nothing<object>(), string.Empty, string.Empty, new List<string>(), typeof(bool), TargetType.Switch, Maybe.Nothing<string>()),
+                        new OptionSpecification("x", string.Empty, false, string.Empty, Maybe.Nothing<int>(), Maybe.Nothing<int>(), '\0', Maybe.Nothing<object>(), string.Empty, string.Empty, new List<string>(), typeof(bool), TargetType.Switch, string.Empty),
                         typeof(Simple_Options).GetProperties().Single(p => p.Name.Equals("BoolValue", StringComparison.Ordinal)),
                         Maybe.Nothing<object>())
                 };
diff --git a/tests/CommandLine.Tests/Unit/Core/TokenPartitionerTests.cs b/tests/CommandLine.Tests/Unit/Core/TokenPartitionerTests.cs
@@ -24,8 +24,8 @@ public void Partition_sequence_returns_sequence()
                 };
             var specs = new[]
                 {
-                    new OptionSpecification(string.Empty, "stringvalue", false, string.Empty, Maybe.Nothing<int>(), Maybe.Nothing<int>(), '\0', null, string.Empty, string.Empty, new List<string>(), typeof(string), TargetType.Scalar, Maybe.Nothing<string>()),
-                    new OptionSpecification("i", string.Empty, false, string.Empty, Maybe.Just(3), Maybe.Just(4), '\0', null, string.Empty, string.Empty, new List<string>(), typeof(IEnumerable<int>), TargetType.Sequence, Maybe.Nothing<string>())
+                    new OptionSpecification(string.Empty, "stringvalue", false, string.Empty, Maybe.Nothing<int>(), Maybe.Nothing<int>(), '\0', null, string.Empty, string.Empty, new List<string>(), typeof(string), TargetType.Scalar, string.Empty),
+                    new OptionSpecification("i", string.Empty, false, string.Empty, Maybe.Just(3), Maybe.Just(4), '\0', null, string.Empty, string.Empty, new List<string>(), typeof(IEnumerable<int>), TargetType.Sequence, string.Empty)
                 };
 
             // Exercize system 
@@ -51,8 +51,8 @@ public void Partition_sequence_returns_sequence_with_duplicates()
                 };
             var specs = new[]
                 {
-                    new OptionSpecification(string.Empty, "stringvalue", false, string.Empty, Maybe.Nothing<int>(), Maybe.Nothing<int>(), '\0', null, string.Empty, string.Empty, new List<string>(), typeof(string), TargetType.Scalar, Maybe.Nothing<string>()),
-                    new OptionSpecification("i", string.Empty, false, string.Empty, Maybe.Just(3), Maybe.Just(4), '\0', null, string.Empty, string.Empty, new List<string>(), typeof(IEnumerable<int>), TargetType.Sequence, Maybe.Nothing<string>())
+                    new OptionSpecification(string.Empty, "stringvalue", false, string.Empty, Maybe.Nothing<int>(), Maybe.Nothing<int>(), '\0', null, string.Empty, string.Empty, new List<string>(), typeof(string), TargetType.Scalar, string.Empty),
+                    new OptionSpecification("i", string.Empty, false, string.Empty, Maybe.Just(3), Maybe.Just(4), '\0', null, string.Empty, string.Empty, new List<string>(), typeof(IEnumerable<int>), TargetType.Sequence, string.Empty)
                 };
 
             // Exercize system 
diff --git a/tests/CommandLine.Tests/Unit/Core/TokenizerTests.cs b/tests/CommandLine.Tests/Unit/Core/TokenizerTests.cs
@@ -26,7 +26,7 @@ public void Explode_scalar_with_separator_in_odd_args_input_returns_sequence()
             var expectedTokens = new[] { Token.Name("i"), Token.Value("10"), Token.Name("string-seq"),
                 Token.Value("aaa"), Token.Value("bb"),  Token.Value("cccc"), Token.Name("switch") };
             var specs = new[] { new OptionSpecification(string.Empty, "string-seq",
-                false, string.Empty, Maybe.Nothing<int>(), Maybe.Nothing<int>(), ',', null, string.Empty, string.Empty, new List<string>(), typeof(IEnumerable<string>), TargetType.Sequence, Maybe.Nothing<string>())};
+                false, string.Empty, Maybe.Nothing<int>(), Maybe.Nothing<int>(), ',', null, string.Empty, string.Empty, new List<string>(), typeof(IEnumerable<string>), TargetType.Sequence, string.Empty)};
 
             // Exercize system
             var result =
@@ -49,7 +49,7 @@ public void Explode_scalar_with_separator_in_even_args_input_returns_sequence()
             var expectedTokens = new[] { Token.Name("x"), Token.Name("string-seq"),
                 Token.Value("aaa"), Token.Value("bb"),  Token.Value("cccc"), Token.Name("switch") };
             var specs = new[] { new OptionSpecification(string.Empty, "string-seq",
-                false, string.Empty, Maybe.Nothing<int>(), Maybe.Nothing<int>(), ',', null, string.Empty, string.Empty, new List<string>(), typeof(IEnumerable<string>), TargetType.Sequence, Maybe.Nothing<string>())};
+                false, string.Empty, Maybe.Nothing<int>(), Maybe.Nothing<int>(), ',', null, string.Empty, string.Empty, new List<string>(), typeof(IEnumerable<string>), TargetType.Sequence, string.Empty)};
 
             // Exercize system
             var result =

Original file line number	Diff line number	Diff line change
`@@ -13,12 +13,13 @@ sealed class OptionSpecification : Specification`
`13`	`13`	`private readonly string longName;`
`14`	`14`	`private readonly char separator;`
`15`	`15`	`private readonly string setName;`
`16`		`- private readonly Maybe<string> group;`
	`16`	`+ private readonly string group;`
`17`	`17`
`18`	`18`	`public OptionSpecification(string shortName, string longName, bool required, string setName, Maybe<int> min, Maybe<int> max,`
`19`	`19`	`char separator, Maybe<object> defaultValue, string helpText, string metaValue, IEnumerable<string> enumValues,`
`20`		`- Type conversionType, TargetType targetType, Maybe<string> group, bool hidden = false)`
`21`		`- : base(SpecificationType.Option, required, min, max, defaultValue, helpText, metaValue, enumValues, conversionType, targetType, hidden)`
	`20`	`+ Type conversionType, TargetType targetType, string group, bool hidden = false)`
	`21`	`+ : base(SpecificationType.Option,`
	`22`	`+ required, min, max, defaultValue, helpText, metaValue, enumValues, conversionType, targetType, hidden)`
`22`	`23`	`{`
`23`	`24`	`this.shortName = shortName;`
`24`	`25`	`this.longName = longName;`
`@@ -43,14 +44,14 @@ public static OptionSpecification FromAttribute(OptionAttribute attribute, Type`
`43`	`44`	`enumValues,`
`44`	`45`	`conversionType,`
`45`	`46`	`conversionType.ToTargetType(),`
`46`		`- string.IsNullOrWhiteSpace(attribute.Group) ? Maybe.Nothing<string>() : Maybe.Just(attribute.Group),`
	`47`	`+ attribute.Group,`
`47`	`48`	`attribute.Hidden);`
`48`	`49`	`}`
`49`	`50`
`50`	`51`	`public static OptionSpecification NewSwitch(string shortName, string longName, bool required, string helpText, string metaValue, bool hidden = false)`
`51`	`52`	`{`
`52`	`53`	`return new OptionSpecification(shortName, longName, required, string.Empty, Maybe.Nothing<int>(), Maybe.Nothing<int>(),`
`53`		`- '\0', Maybe.Nothing<object>(), helpText, metaValue, Enumerable.Empty<string>(), typeof(bool), TargetType.Switch, Maybe.Nothing<string>(), hidden);`
	`54`	`+ '\0', Maybe.Nothing<object>(), helpText, metaValue, Enumerable.Empty<string>(), typeof(bool), TargetType.Switch, string.Empty, hidden);`
`54`	`55`	`}`
`55`	`56`
`56`	`57`	`public string ShortName`
`@@ -73,7 +74,7 @@ public string SetName`
`73`	`74`	`get { return setName; }`
`74`	`75`	`}`
`75`	`76`
`76`		`- public Maybe<string> Group`
	`77`	`+ public string Group`
`77`	`78`	`{`
`78`	`79`	`get { return group; }`
`79`	`80`	`}`
Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@ public sealed class OptionAttribute : BaseAttribute`
`16`	`16`	`private readonly string shortName;`
`17`	`17`	`private string setName;`
`18`	`18`	`private char separator;`
`19`		`- private string group;`
	`19`	`+ private string group=string.Empty;`
`20`	`20`
`21`	`21`	`private OptionAttribute(string shortName, string longName) : base()`
`22`	`22`	`{`
Original file line number	Diff line number	Diff line change
`@@ -875,7 +875,12 @@ private HelpText AddOption(string requiredWord, string optionGroupWord, int maxL`
`875`	`875`	`{`
`876`	`876`	`OptionSpecification GetOptionGroupSpecification()`
`877`	`877`	`{`
`878`		`- if (specification.Tag == SpecificationType.Option && specification is OptionSpecification optionSpecification && optionSpecification.Group.IsJust())`
	`878`	`+ if (specification.Tag == SpecificationType.Option &&`
	`879`	`+ specification is OptionSpecification optionSpecification &&`
	`880`	`+ optionSpecification.Group.Length > 0`
	`881`	`+ )`
	`882`	`+`
	`883`	`+`
`879`	`884`	`{`
`880`	`885`	`return optionSpecification;`
`881`	`886`	`}`
`@@ -912,7 +917,7 @@ OptionSpecification GetOptionGroupSpecification()`
`912`	`917`
`913`	`918`	`if (optionGroupSpecification != null)`
`914`	`919`	`{`
`915`		`- optionHelpText = "({0}: {1}) ".FormatInvariant(optionGroupWord, optionGroupSpecification.Group.GetValueOrDefault(null)) + optionHelpText;`
	`920`	`+ optionHelpText = "({0}: {1}) ".FormatInvariant(optionGroupWord, optionGroupSpecification.Group) + optionHelpText;`
`916`	`921`	`}`
`917`	`922`
`918`	`923`	`//note that we need to indent trim the start of the string because it's going to be`
Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@ public void Map_boolean_switch_creates_boolean_value()`
`32`	`32`	`var specProps = new[]`
`33`	`33`	`{`
`34`	`34`	`SpecificationProperty.Create(`
`35`		`- new OptionSpecification("x", string.Empty, false, string.Empty, Maybe.Nothing<int>(), Maybe.Nothing<int>(), '\0', Maybe.Nothing<object>(), string.Empty, string.Empty, new List<string>(), typeof(bool), TargetType.Switch, Maybe.Nothing<string>()),`
	`35`	`+ new OptionSpecification("x", string.Empty, false, string.Empty, Maybe.Nothing<int>(), Maybe.Nothing<int>(), '\0', Maybe.Nothing<object>(), string.Empty, string.Empty, new List<string>(), typeof(bool), TargetType.Switch, string.Empty),`
`36`	`36`	`typeof(Simple_Options).GetProperties().Single(p => p.Name.Equals("BoolValue", StringComparison.Ordinal)),`
`37`	`37`	`Maybe.Nothing<object>())`
`38`	`38`	`};`