Added changes for clu helps

Author: arroyc

src/CLU/Microsoft.CLU/CommandLineParser/UnixCommandLineParser.cs

@@ -56,7 +56,7 @@ public bool Parse(ICommandBinder commandBinder, string[] arguments)
                     {
                         if (commandBinder.SupportsAutomaticHelp && arg.Equals("--help", System.StringComparison.OrdinalIgnoreCase))
                         {
-                            PresentCommandHelp(commandBinder, arguments.Take(position).ToArray(), false);
+                            PresentCommandHelp(arguments.Take(position).ToArray());
                             return false;
                         }
 
@@ -125,7 +125,7 @@ public bool Parse(ICommandBinder commandBinder, string[] arguments)
                         commandBinder.SupportsAutomaticHelp && 
                         arg.Equals("help", System.StringComparison.OrdinalIgnoreCase))
                     {
-                        PresentCommandHelp(commandBinder, arguments.Skip(position + 1).ToArray(), true);
+                        PresentCommandCompletion(arguments.Skip(position + 1).ToArray());
                         return false;
                     }
 
@@ -183,17 +183,42 @@ public string FormatParameterName(string name, string type, bool isMandatory, bo
             return builder.ToString();
         }
 
-        private void PresentCommandHelp(ICommandBinder commandBinder, string[] arguments, bool prefix)
+        private void PresentCommandCompletion(string[] arguments)
+        {
+            foreach (var cmd in Help.CommandDispatchHelper.CompleteCommands(CLUEnvironment.GetPackagesRootPath(), arguments).OrderBy((cmd) => cmd.Commandline))
+            {
+                Console.WriteLine(cmd.Commandline);
+            }
+        }
+
+        private void PresentCommandHelp(string[] arguments)
         {
             // BUGBUG - NYI!
             if (arguments.Length == 0)
             {
-                var concatenatedArgs = string.Join(" ", arguments);
-                Console.WriteLine($"Look up help corresponding to the arguments '{concatenatedArgs}'");
+                Console.WriteLine("TODO: Present help for Azure itself...");
             }
             else
-            {
-                Console.WriteLine("Present help for Azure itself...");
+            { 
+                var helpFile = Help.CommandDispatchHelper.FindBestHelp(CLUEnvironment.GetPackagesRootPath(), arguments);
+                if (helpFile != null)
+                {
+                    // Found appropriate help...
+                    var cmdLine = string.Join(" ", arguments);
+                    Console.WriteLine($"Help for command {cmdLine}");
+                    Console.WriteLine();
+
+                    foreach (var line in helpFile.GetHelpContent())
+                    {
+                        Console.WriteLine(line);
+                    }
+                    return;
+                }
+                else
+                {
+                    var joinedArgs = string.Join(" ", arguments);
+                    Console.WriteLine($"Unable to find help for command {joinedArgs}, type az help to see available commands");
+                }
             }
         }
 

src/CLU/Microsoft.CLU/Help/CommandDispatchHelper.cs

@@ -27,7 +27,7 @@ public static IEnumerable<CommandInfo> FindCommands(string pkgRoot, string[] arg
                 return CommandDispatchHelper.MatchScore(cmd, semiColonSeparatedArgs) >= cmd.Length;
             };
 
-            return FindMatches(pkgRoot, args, matcher);
+            return FindCommandMatches(pkgRoot, args, matcher);
         }
 
         /// <summary>
@@ -51,10 +51,34 @@ public static IEnumerable<CommandInfo> CompleteCommands(string pkgRoot, string[]
                 return CommandDispatchHelper.MatchScore(cmd, semiColonSeparatedArgs) >= semiColonSeparatedArgs.Length;
             };
 
-            return FindMatches(pkgRoot, args, matcher);
+            return FindCommandMatches(pkgRoot, args, matcher);
         }
 
-        public static IEnumerable<CommandInfo> FindMatches(string pkgRoot, string[] args, Func<string, bool> matchFunc)
+        public static HelpInfo FindBestHelp(string pkgRoot, string[] args)
+        {
+            var semiColonSeparatedArgs = String.Join(";", args) + ";";
+
+            Func<string, bool> matcher = (hlp) =>
+            {
+                return hlp.Length <= semiColonSeparatedArgs.Length && CommandDispatchHelper.MatchScore(hlp, semiColonSeparatedArgs) == hlp.Length;
+            };
+
+            return FindHelpMatches(pkgRoot, args, matcher).OrderByDescending((hi) => CommandDispatchHelper.MatchScore(hi.Discriminators, semiColonSeparatedArgs)).ThenBy((hi) => hi.Discriminators).FirstOrDefault();
+        }
+
+        public static IEnumerable<HelpInfo> FindHelpMatches(string pkgRoot, string[] args, Func<string, bool> matchFunc)
+        {
+            foreach (var helpInfo in GetPackages(pkgRoot).SelectMany((p) => p.GetHelp()))
+            {
+                var semiColonSeparatedCommand = helpInfo.Discriminators + ";";
+                if (matchFunc(semiColonSeparatedCommand))
+                {
+                    yield return helpInfo;
+                }
+            }
+        }
+
+        public static IEnumerable<CommandInfo> FindCommandMatches(string pkgRoot, string[] args, Func<string, bool> matchFunc)
         {
             foreach (var commandIndex in GetCommandIndexes(pkgRoot).SelectMany((s) => { return s; }))
             {
@@ -130,6 +154,13 @@ public string IndexPath
                 }
             }
 
+            public string HelpPath
+            {
+                get
+                {
+                    return System.IO.Path.Combine(Path, Version, "content", "help");
+                }
+            }
             public virtual IEnumerable<CommandInfo> GetCommands()
             {
                 if (System.IO.File.Exists(IndexPath))
@@ -145,12 +176,61 @@ public virtual IEnumerable<CommandInfo> GetCommands()
                     return new CommandInfo[] { };
                 }
             }
+
+            public virtual IEnumerable<HelpInfo> GetHelp()
+            {
+                if (System.IO.Directory.Exists(HelpPath))
+                {
+                    return System.IO.Directory.EnumerateFiles(HelpPath, "*.hlp", System.IO.SearchOption.TopDirectoryOnly).Select((f) =>
+                    {
+                        return new HelpInfo(f);
+                    });
+                }
+                else
+                {
+                    return new HelpInfo[] { };
+                }
+            }
+        }
+
+        public class HelpInfo
+        {
+            private string _path;
+
+            public HelpInfo(string path)
+            {
+                _path = path;
+
+                Discriminators = System.IO.Path.GetFileNameWithoutExtension(path).Replace('.', ';');
+            }
+
+            public IEnumerable<string> GetHelpContent()
+            {
+                if (System.IO.File.Exists(_path))
+                {
+                    return System.IO.File.ReadAllLines(_path);
+                }
+                else
+                {
+                    return new string[] { };
+                }
+            }
+
+            public string Discriminators { get; private set; }
         }
 
         public class CommandInfo
         {
             public PkgInfo Package { get; set; }
             public string Discriminators { get; set; }
+
+            public string Commandline
+            {
+                get
+                {
+                    return Discriminators.Replace(';', ' ');
+                }
+            }
         }
     }
 }