Finalizing fixes

gsscoder · gsscoder · commit 171124e027d2 · 2015-07-30T07:56:43.000+02:00
diff --git a/src/CommandLine/Text/HelpText.cs b/src/CommandLine/Text/HelpText.cs
@@ -430,11 +430,14 @@ public static string RenderUsageText<T>(ParserResult<T> parserResult)
         {
             if (parserResult == null) throw new ArgumentNullException("parserResult");
 
-            var examples = GetUsageFromType(parserResult.TypeInfo.Current)
-                .Return(x => x, Enumerable.Empty<Example>());
-            if (examples.Empty())
+            var usage = GetUsageFromType(parserResult.TypeInfo.Current);
+            if (usage.MatchNothing())
                 return string.Empty;
 
+            var usageTuple = usage.FromJust();
+            var examples = usageTuple.Item2;
+            var appAlias = usageTuple.Item1.ApplicationAlias ?? ReflectionHelper.GetAssemblyName();
+
             var text = new StringBuilder();
             foreach (var e in examples)
             {
@@ -447,6 +450,8 @@ public static string RenderUsageText<T>(ParserResult<T> parserResult)
                 {
                     var commandLine = new StringBuilder()
                         .Append(2.Spaces())
+                        .Append(appAlias)
+                        .Append(' ')
                         .Append(Parser.Default.FormatCommandLine(e.Sample,
                             config =>
                                 {
@@ -540,7 +545,7 @@ private IEnumerable<Specification> GetSpecificationsFromType(Type type)
                 .Concat(valueSpecs);
         }
 
-        private static Maybe<IEnumerable<Example>> GetUsageFromType(Type type)
+        private static Maybe<Tuple<UsageAttribute, IEnumerable<Example>>> GetUsageFromType(Type type)
         {
             return type.GetUsageData().Map(
                 tuple =>
@@ -550,14 +555,15 @@ private static Maybe<IEnumerable<Example>> GetUsageFromType(Type type)
 
                     var examples = (IEnumerable<Example>)prop
                         .GetValue(null, BindingFlags.Public | BindingFlags.Static | BindingFlags.GetProperty, null, null, null);
-                    var groups = attr.Groups;
-
-                    return examples.Select(example => groups.ContainsKey(example.Group)
-                        ? example.WithGroupDescription(groups[example.Group])
-                        : example)
-                            .OrderBy(x => x.Group)
-                            .ThenBy(x => x.GroupDescription)
-                        .Memorize();
+                    //var groups = attr.Groups;
+
+                    //return examples.Select(example => groups.ContainsKey(example.Group)
+                    //    ? example.WithGroupDescription(groups[example.Group])
+                    //    : example)
+                    //        .OrderBy(x => x.Group)
+                    //        .ThenBy(x => x.GroupDescription)
+                    //    .Memorize();
+                    return Tuple.Create(attr, examples);
                 });
         }
 
diff --git a/src/CommandLine/Text/UsageAttribute.cs b/src/CommandLine/Text/UsageAttribute.cs
@@ -8,8 +8,6 @@ namespace CommandLine.Text
     [AttributeUsage(AttributeTargets.Property, AllowMultiple = false, Inherited = true)]
     public sealed class UsageAttribute : Attribute
     {
-        public UsageAttribute()
-        {
-        }
+        public string ApplicationAlias { get; set; }
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -8,8 +8,6 @@ namespace CommandLine.Text`
`8`	`8`	`[AttributeUsage(AttributeTargets.Property, AllowMultiple = false, Inherited = true)]`
`9`	`9`	`public sealed class UsageAttribute : Attribute`
`10`	`10`	`{`
`11`		`- public UsageAttribute()`
`12`		`- {`
`13`		`- }`
	`11`	`+ public string ApplicationAlias { get; set; }`
`14`	`12`	`}`
`15`	`13`	`}`