Merge pull request #133 from Microsoft/users/wismythe/command-inventory

Update command inventory command to generate JSON

Author: tedchamb

scripts/generate_command_inventory.py

@@ -11,26 +11,10 @@
 import sys
 import os
 
-
 from knack import CLI
 from vsts.cli.vsts_cli_help import VstsCLIHelp
 from vsts.cli.vsts_commands_loader import VstsCommandsLoader
 
-class Exporter(json.JSONEncoder):
-
-    def default(self, o):#pylint: disable=method-hidden
-        try:
-            return super(Exporter, self).default(o)
-        except TypeError:
-            return str(o)
-
-parser = argparse.ArgumentParser(description='Command Table Parser')
-parser.add_argument('--commands', metavar='N', nargs='+', help='Filter by first level command (OR)')
-parser.add_argument('--params', metavar='N', nargs='+', help='Filter by parameters (OR)')
-args = parser.parse_args()
-cmd_set_names = args.commands
-param_names = args.params
-
 # ignore the params passed in now so they aren't used by the cli
 sys.argv = sys.argv[:1]
 
@@ -43,30 +27,26 @@ def default(self, o):#pylint: disable=method-hidden
 
 loader = vstscli.commands_loader_cls()
 loader.__init__(vstscli)
-loader.load_command_table([])
+cmd_table = loader.load_command_table([])
 for command in loader.command_table:
     loader.load_arguments(command)
 
-cmd_table = loader.load_command_table([])
-cmd_list = [cmd_name for cmd_name in cmd_table.keys() if cmd_set_names is None or cmd_name.split()[0] in cmd_set_names]
-results = []
+vstsclihelp = vstscli.help_cls(cli_ctx=vstscli)
+
+global_parser = vstscli.parser_cls.create_global_parser(cli_ctx=vstscli)
+parser = vstscli.parser_cls(cli_ctx=vstscli, prog=vstscli.name, parents=[global_parser])
+parser.load_command_table(cmd_table)
+
+cmd_list = cmd_table.keys()
+
+results = {}
+
+for cmd_name in cmd_list:
+    cmd_args = cmd_table[cmd_name].arguments
+    args = []
+    for arg in cmd_args:
+        args.append(arg)
+    results[cmd_name] = args
 
-if param_names:
-    for name in cmd_list:
-        cmd_name = [x for x in cmd_table.keys() if name == x][0]
-        cmd_args = cmd_table[cmd_name]['arguments']
-        match = False
-        for arg in cmd_args:
-            if match:
-                break
-            arg_name = re.sub('--','', arg['name']).split(' ')[0]
-            if arg_name in param_names:
-                results.append(name)
-                match = True
-else:
-    results = cmd_list
+print(json.dumps(results, indent=1))
 
-heading = '=== COMMANDS IN {} PACKAGE(S) WITH {} PARAMETERS ==='.format(
-    cmd_set_names or 'ANY', param_names or 'ANY')
-print('\n{}\n'.format(heading))
-print('\n'.join(results))