azdev 0.1.67__tar.gz → 0.1.70__tar.gz

{azdev-0.1.67 → azdev-0.1.70}/HISTORY.rst

@@ -2,6 +2,18 @@
 
 Release History
 ===============
+0.1.70
+++++++
+* Fix cmdcov issue(#455): remove tested_command.txt reference.
+
+0.1.69
+++++++
+* `azdev command-change tree-export`: Add command help message.
+
+0.1.68
+++++++
+* `azdev command-change tree-export`: Add new command to support export command tree of CLI modules.
+
 0.1.67
 ++++++
 * `azdev extension cal-next-version`: Justify preview/exp tag operation based on last version's tag and next version's stable/preview tag.

{azdev-0.1.67/azdev.egg-info → azdev-0.1.70}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: azdev
-Version: 0.1.67
+Version: 0.1.70
 Summary: Microsoft Azure CLI Developer Tools
 Home-page: https://github.com/Azure/azure-cli-dev-tools
 Author: Microsoft Corporation
@@ -145,6 +145,18 @@ License
 
 Release History
 ===============
+0.1.70
+++++++
+* Fix cmdcov issue(#455): remove tested_command.txt reference.
+
+0.1.69
+++++++
+* `azdev command-change tree-export`: Add command help message.
+
+0.1.68
+++++++
+* `azdev command-change tree-export`: Add new command to support export command tree of CLI modules.
+
 0.1.67
 ++++++
 * `azdev extension cal-next-version`: Justify preview/exp tag operation based on last version's tag and next version's stable/preview tag.

{azdev-0.1.67 → azdev-0.1.70}/azdev/__init__.py

@@ -4,4 +4,4 @@
 # license information.
 # -----------------------------------------------------------------------------
 
-__VERSION__ = '0.1.67'
+__VERSION__ = '0.1.70'

{azdev-0.1.67 → azdev-0.1.70}/azdev/commands.py

@@ -40,6 +40,7 @@ def load_command_table(self, _):
     with CommandGroup(self, 'command-change', operation_group('command_change')) as g:
         g.command('meta-export', 'export_command_meta')
         g.command('meta-diff', 'cmp_command_meta')
+        g.command('tree-export', 'export_command_tree')
 
     with CommandGroup(self, 'cli', operation_group('pypi')) as g:
         g.command('check-versions', 'verify_versions')

{azdev-0.1.67 → azdev-0.1.70}/azdev/help.py

@@ -197,6 +197,13 @@ helps['command-change meta-diff'] = """
           text: azdev statistics meta-diff --base-meta-file fileA --diff-meta-file fileB --only-break
 """
 
+helps['command-change tree-export'] = """
+    short-summary: Export Command Tree for CLI modules or extensions.
+    examples:
+        - name: Export command tree for CLI modules
+          text: azdev command-change tree-export CLI --output-file command_tree.json
+"""
+
 helps['perf'] = """
     short-summary: Commands to test CLI performance.
 """

{azdev-0.1.67 → azdev-0.1.70}/azdev/operations/cmdcov/cmdcov.py

@@ -58,7 +58,6 @@ class CmdcovManager:
         self.enable_cli_own = enable_cli_own
         self.all_commands = {m: [] for m in self.selected_mod_names}
         self.all_tested_commands = {m: [] for m in self.selected_mod_names}
-        self.all_live_commands = []
         self.all_untested_commands = {}
         self.command_test_coverage = {'Total': [0, 0, 0]}
         self.date = time.strftime("%Y-%m-%d %H:%M:%S", time.localtime())
@@ -73,8 +72,6 @@ class CmdcovManager:
         self._get_all_tested_commands_from_regex()
         self._get_all_tested_commands_from_record()
         self._run_command_test_coverage()
-        self._get_all_tested_commands_from_live()
-        self._run_command_test_coverage_enhance()
         html_file = self._render_html()
         if self.enable_cli_own:
             command_test_coverage = {k: v for k, v in self.command_test_coverage.items() if k in CLI_OWN_MODULES}
@@ -191,10 +188,6 @@ class CmdcovManager:
                             cmd = command + ' ' + argument
                             self.all_tested_commands[self.selected_mod_names[idx]].append(cmd)
 
-    def _get_all_tested_commands_from_live(self):
-        with open(os.path.join(self.cmdcov_path, 'tested_command.txt'), 'r') as f:
-            self.all_live_commands = f.readlines()
-
     def _run_command_test_coverage(self):
         """
         all_commands: All commands that need to be test
@@ -247,56 +240,6 @@ class CmdcovManager:
         logger.warning(self.command_test_coverage)
         return self.command_test_coverage
 
-    def _run_command_test_coverage_enhance(self):
-        """
-        all_untest_commands: {[module]:[],}
-        all_tested_commands_from_file: []
-        command_test_coverage: {[module: [test, untested, pct]
-        module: vm
-        percentage: xx.xxx%
-        """
-        import ast
-        total_tested = 0
-        total_untested = 0
-        # pylint: disable=too-many-nested-blocks
-        for module, untested_commands in self.all_untested_commands.items():
-            for cmd_idx, command in enumerate(untested_commands):
-                exist_flag = False
-                prefix = command.rsplit('[', maxsplit=1)[0]
-                opt_list = ast.literal_eval('[' + command.rsplit('[', maxsplit=1)[1]) if self.level == 'argument' \
-                    else []
-                for cmd in self.all_live_commands:
-                    if prefix in cmd:
-                        if self.level == 'argument':
-                            for opt in opt_list:
-                                if opt in cmd:
-                                    self.command_test_coverage[module][0] += 1
-                                    untested_commands.pop(cmd_idx)
-                                    exist_flag = True
-                                    if exist_flag:
-                                        break
-                        else:
-                            self.command_test_coverage[module][0] += 1
-                            untested_commands.pop(cmd_idx)
-                            exist_flag = True
-                            if exist_flag:
-                                break
-                    if exist_flag:
-                        break
-            try:
-                self.command_test_coverage[module][1] = len(untested_commands)
-                self.command_test_coverage[module][2] = f'''{self.command_test_coverage[module][0] /
-                                                        (self.command_test_coverage[module][0] +
-                                                         self.command_test_coverage[module][1]):.3%}'''
-            except ZeroDivisionError:
-                self.command_test_coverage[module] = [0, 0, 'N/A']
-            total_tested += self.command_test_coverage[module][0] if self.command_test_coverage[module] else 0
-            total_untested += self.command_test_coverage[module][1] if self.command_test_coverage[module] else 0
-        self.command_test_coverage['Total'][0] = total_tested
-        self.command_test_coverage['Total'][1] = total_untested
-        self.command_test_coverage['Total'][2] = f'{total_tested / (total_tested + total_untested):.3%}'
-        logger.warning(self.command_test_coverage)
-
     def _render_html(self):
         """
         :return: Return a HTML string

{azdev-0.1.67 → azdev-0.1.70}/azdev/operations/command_change/__init__.py

@@ -12,7 +12,7 @@ from knack.log import get_logger
 import azure_cli_diff_tool
 from azdev.utilities import display, require_azure_cli, heading, get_path_table, filter_by_git_diff
 from .custom import DiffExportFormat, get_commands_meta, STORED_DEPRECATION_KEY
-from .util import export_commands_meta
+from .util import export_commands_meta, dump_command_tree, add_to_command_tree
 from ..statistics import _create_invoker_and_load_cmds, _get_command_source, \
     _command_codegen_info  # pylint: disable=protected-access
 from ..statistics.util import filter_modules
@@ -129,3 +129,60 @@ def export_command_meta(modules=None, git_source=None, git_target=None, git_repo
 
 def cmp_command_meta(base_meta_file, diff_meta_file, only_break=False, output_type="text", output_file=None):
     return azure_cli_diff_tool.meta_diff(base_meta_file, diff_meta_file, only_break, output_type, output_file)
+
+
+def export_command_tree(modules, output_file=None):
+    require_azure_cli()
+
+    # allow user to run only on CLI or extensions
+    cli_only = modules == ['CLI']
+    ext_only = modules == ['EXT']
+    if cli_only or ext_only:
+        modules = None
+
+    selected_modules = get_path_table(include_only=modules)
+
+    if cli_only:
+        selected_modules['ext'] = {}
+    if ext_only:
+        selected_modules['core'] = {}
+        selected_modules['mod'] = {}
+
+    if not any(selected_modules.values()):
+        logger.warning('No commands selected to check.')
+
+    selected_mod_names = list(selected_modules['mod'].keys())
+    selected_mod_names += list(selected_modules['ext'].keys())
+    selected_mod_names += list(selected_modules['core'].keys())
+
+    if selected_mod_names:
+        display('Modules selected: {}\n'.format(', '.join(selected_mod_names)))
+
+    heading('Export Command Tree')
+    start = time.time()
+    display('Initializing with loading command table...')
+    from azure.cli.core import get_default_cli  # pylint: disable=import-error
+    az_cli = get_default_cli()
+
+    # load commands, args, and help
+    _create_invoker_and_load_cmds(az_cli)
+
+    stop = time.time()
+    logger.info('Commands loaded in %i sec', stop - start)
+    display('Commands loaded in {} sec'.format(stop - start))
+    command_loader = az_cli.invocation.commands_loader
+
+    # trim command table to selected_modules
+    command_loader = filter_modules(command_loader, modules=selected_mod_names)
+
+    if not command_loader.command_table:
+        logger.warning('No commands selected to check.')
+
+    command_tree = {}
+
+    for command_name, command in command_loader.command_table.items():
+        module_source = _get_command_source(command_name, command)['module']
+        # The command tree is a tree structure like our azExtCmdTree: https://aka.ms/azExtCmdTree
+        add_to_command_tree(command_tree, command_name, module_source)
+
+    dump_command_tree(command_tree, output_file)

{azdev-0.1.67 → azdev-0.1.70}/azdev/operations/command_change/util.py

@@ -73,3 +73,18 @@ def export_commands_meta(commands_meta, meta_output_path=None):
             os.makedirs(file_folder)
         with open(file_name, "w") as f_out:
             f_out.write(jsbeautifier.beautify(json.dumps(module_info), options))
+
+
+def add_to_command_tree(tree, key, value):
+    parts = key.split()
+    subtree = tree
+    for part in parts[:-1]:
+        if not subtree.get(part):
+            subtree[part] = {}
+        subtree = subtree[part]
+    subtree[parts[-1]] = value
+
+
+def dump_command_tree(command_tree, output_file):
+    with open(output_file, 'w', encoding='utf-8') as f:
+        json.dump(command_tree, f, indent=4)

{azdev-0.1.67 → azdev-0.1.70}/azdev/params.py

@@ -129,6 +129,10 @@ def load_arguments(self, _):
                    help='format to print diff and suggest message')
         c.argument('output_file', help='command meta diff json file path to store')
 
+    with ArgumentsContext(self, 'command-change tree-export') as c:
+        c.positional('modules', modules_type)
+        c.argument('output_file', help='command tree json file path to store')
+
     # region cmdcov
     with ArgumentsContext(self, 'cmdcov') as c:
         c.positional('modules', modules_type)

{azdev-0.1.67 → azdev-0.1.70/azdev.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: azdev
-Version: 0.1.67
+Version: 0.1.70
 Summary: Microsoft Azure CLI Developer Tools
 Home-page: https://github.com/Azure/azure-cli-dev-tools
 Author: Microsoft Corporation
@@ -145,6 +145,18 @@ License
 
 Release History
 ===============
+0.1.70
+++++++
+* Fix cmdcov issue(#455): remove tested_command.txt reference.
+
+0.1.69
+++++++
+* `azdev command-change tree-export`: Add command help message.
+
+0.1.68
+++++++
+* `azdev command-change tree-export`: Add new command to support export command tree of CLI modules.
+
 0.1.67
 ++++++
 * `azdev extension cal-next-version`: Justify preview/exp tag operation based on last version's tag and next version's stable/preview tag.