azdev 0.1.68__tar.gz → 0.1.71__tar.gz

{azdev-0.1.68 → azdev-0.1.71}/HISTORY.rst

@@ -2,6 +2,19 @@
 
 Release History
 ===============
+0.1.71
+++++++
+* `azdev extension show`: Show detailed extension info that installed in your development environment.
+* `azdev extension cal-next-version`: Fix last stable version parser from index.json.
+
+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.

{azdev-0.1.68/azdev.egg-info → azdev-0.1.71}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: azdev
-Version: 0.1.68
+Version: 0.1.71
 Summary: Microsoft Azure CLI Developer Tools
 Home-page: https://github.com/Azure/azure-cli-dev-tools
 Author: Microsoft Corporation
@@ -145,6 +145,19 @@ License
 
 Release History
 ===============
+0.1.71
+++++++
+* `azdev extension show`: Show detailed extension info that installed in your development environment.
+* `azdev extension cal-next-version`: Fix last stable version parser from index.json.
+
+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.

{azdev-0.1.68 → azdev-0.1.71}/azdev/__init__.py

@@ -4,4 +4,4 @@
 # license information.
 # -----------------------------------------------------------------------------
 
-__VERSION__ = '0.1.68'
+__VERSION__ = '0.1.71'

{azdev-0.1.68 → azdev-0.1.71}/azdev/commands.py

@@ -67,6 +67,7 @@ def load_command_table(self, _):
         g.command('publish', 'publish_extensions')
         g.command('update-index', 'update_extension_index')
         g.command('cal-next-version', 'cal_next_version')
+        g.command('show', 'show_extension')
 
     with CommandGroup(self, 'extension repo', operation_group('extensions')) as g:
         g.command('add', 'add_extension_repo')

{azdev-0.1.68 → azdev-0.1.71}/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.
 """
@@ -251,6 +258,9 @@ helps['extension list'] = """
     short-summary: List what extensions are currently visible to your development environment.
 """
 
+helps['extension show'] = """
+    short-summary: Show detailed extension info that installed in your development environment.
+"""
 
 helps['extension publish'] = """
     short-summary: Build and publish an extension to a storage account.

{azdev-0.1.68 → azdev-0.1.71}/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.68 → azdev-0.1.71}/azdev/operations/extensions/__init__.py

@@ -138,6 +138,36 @@ def list_extensions():
     return results
 
 
+def show_extension(mod_name):
+    ext_paths = get_ext_repo_paths()
+    ext_mod_paths = [os.path.join(ext, "src", mod_name) for ext in ext_paths]
+    mod_install_path = find_files(ext_mod_paths, '*.*-info')
+
+    if not mod_install_path:
+        raise CLIError('extension not installed using azdev: {}'.format(mod_name))
+
+    if len(mod_install_path) > 1:
+        raise CLIError('extension {} duplicated, please specify extension name'.format(mod_name))
+
+    mod_install_dir = os.path.dirname(mod_install_path[0])
+    long_name = os.path.basename(mod_install_dir)
+    assert long_name == mod_name
+    mod_info = {
+        "name": mod_name,
+        "path": mod_install_dir
+    }
+    # extract pkg name from egg-info or dist-info folders
+    logger.debug("Extracting pkg info from %s...", mod_install_path[0])
+    meta_files = ["PKG-INFO", "METADATA"]
+    pkg_info_path = [os.path.join(mod_install_path[0], meta) for meta in meta_files
+                     if os.path.isfile(os.path.join(mod_install_path[0], meta))]
+    from .util import get_pkg_info_from_pkg_metafile
+    for pkg_info_file in pkg_info_path:
+        pkg_info = get_pkg_info_from_pkg_metafile(pkg_info_file)
+        mod_info.update(pkg_info)
+    return mod_info
+
+
 def _get_sha256sum(a_file):
     import hashlib
     sha256 = hashlib.sha256()

{azdev-0.1.68 → azdev-0.1.71}/azdev/operations/extensions/util.py

@@ -81,3 +81,16 @@ def get_whl_from_url(url, filename, tmp_dir, whl_cache=None):
                 f.write(chunk)
     whl_cache[url] = ext_file
     return ext_file
+
+
+def get_pkg_info_from_pkg_metafile(pkg_info_file):
+    mod_info = {}
+    with open(pkg_info_file, "r", encoding="utf-8") as f:
+        for line in f:
+            if line.startswith("Name:"):
+                pkg_name = line.split(":")[-1].strip()
+                mod_info["pkg_name"] = pkg_name
+            if line.startswith("Version:"):
+                pkg_version = line.split(":")[-1].strip()
+                mod_info["pkg_version"] = pkg_version
+    return mod_info

{azdev-0.1.68 → azdev-0.1.71}/azdev/operations/extensions/version_upgrade.py

@@ -9,6 +9,7 @@
 # https://github.com/Azure/azure-cli/blob/release/doc/extensions/versioning_guidelines.md
 
 from packaging.version import parse
+from knack.util import CLIError
 from azure_cli_diff_tool.utils import DiffLevel
 from azdev.operations.constant import (PREVIEW_INIT_SUFFIX, VERSION_MAJOR_TAG, VERSION_MINOR_TAG,
                                        VERSION_PATCH_TAG, VERSION_STABLE_TAG, VERSION_PREVIEW_TAG, VERSION_PRE_TAG,
@@ -70,6 +71,8 @@ class VersionUpgradeMod:
         self.init_version_pre_tag()
         self.next_version = ModuleVersion(self.version)
         self.last_stable_major = float('inf')
+        self.pkg_name = self.module_name
+        self.parse_pkg_name()
         self.parse_last_stable_major()
 
     def norm_versions(self):
@@ -179,15 +182,22 @@ class VersionUpgradeMod:
                 has_stable = True
         return has_stable, max_stable_major
 
+    def parse_pkg_name(self):
+        from azdev.operations.extensions import show_extension
+        try:
+            self.pkg_name = show_extension(self.module_name)["pkg_name"]
+        except CLIError:
+            pass
+
     def parse_last_stable_major(self):
         import requests
         try:
             response = requests.get(CLI_EXTENSION_INDEX_URL)
             extension_data = response.json()
-            if self.module_name not in extension_data["extensions"]:
+            if self.pkg_name not in extension_data["extensions"]:
                 return
             has_stable, max_stable_major = self.find_max_version(
-                extension_data["extensions"][self.module_name])
+                extension_data["extensions"][self.pkg_name])
             if has_stable:
                 self.last_stable_major = max_stable_major
             else:

{azdev-0.1.68 → azdev-0.1.71}/azdev/params.py

@@ -178,6 +178,9 @@ def load_arguments(self, _):
         c.argument('next_version_pre_tag', help='next version is stable or preview, if not provided, use current stable/preview tag')
         c.argument('next_version_segment_tag', help='used to modify actual major/minor/patch/pre, if provided, increment version as provided')
 
+    with ArgumentsContext(self, 'extension show') as c:
+        c.argument('mod_name', required=True, help='installed extension module name')
+
     with ArgumentsContext(self, 'cli create') as c:
         c.positional('mod_name', help='Name of the module to create.')
 

{azdev-0.1.68 → azdev-0.1.71/azdev.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: azdev
-Version: 0.1.68
+Version: 0.1.71
 Summary: Microsoft Azure CLI Developer Tools
 Home-page: https://github.com/Azure/azure-cli-dev-tools
 Author: Microsoft Corporation
@@ -145,6 +145,19 @@ License
 
 Release History
 ===============
+0.1.71
+++++++
+* `azdev extension show`: Show detailed extension info that installed in your development environment.
+* `azdev extension cal-next-version`: Fix last stable version parser from index.json.
+
+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.