Fix deprecation action. (#86)

Author: tjprescott

knack/arguments.py

@@ -235,7 +235,9 @@ def argument(self, argument_dest, arg_type=None, **kwargs):
         :param kwargs: Possible values: `options_list`, `validator`, `completer`, `nargs`, `action`, `const`, `default`,
                        `type`, `choices`, `required`, `help`, `metavar`. See /docs/arguments.md.
         """
-        kwargs['action'] = self._handle_deprecations(argument_dest, **kwargs)
+        deprecate_action = self._handle_deprecations(argument_dest, **kwargs)
+        if deprecate_action:
+            kwargs['action'] = deprecate_action
         self.command_loader.argument_registry.register_cli_argument(self.command_scope,
                                                                     argument_dest,
                                                                     arg_type,
@@ -259,7 +261,9 @@ def extra(self, argument_dest, **kwargs):
         :param kwargs: Possible values: `options_list`, `validator`, `completer`, `nargs`, `action`, `const`, `default`,
                        `type`, `choices`, `required`, `help`, `metavar`. See /docs/arguments.md.
         """
-        kwargs['action'] = self._handle_deprecations(argument_dest, **kwargs)
+        deprecate_action = self._handle_deprecations(argument_dest, **kwargs)
+        if deprecate_action:
+            kwargs['action'] = deprecate_action
         self.command_loader.extra_argument_registry[self.command_scope][argument_dest] = CLICommandArgument(
             argument_dest, **kwargs)
 

knack/commands.py

@@ -144,6 +144,17 @@ def __init__(self, cli_ctx=None, command_cls=CLICommand, excluded_command_handle
         self.argument_registry = ArgumentRegistry()
         self.extra_argument_registry = defaultdict(lambda: {})
 
+    def _populate_command_group_table_with_subgroups(self, name):
+        if not name:
+            return
+
+        # ensure all subgroups have some entry in the command group table
+        name_components = name.split()
+        for i, _ in enumerate(name_components):
+            subgroup_name = ' '.join(name_components[:i + 1])
+            if subgroup_name not in self.command_group_table:
+                self.command_group_table[subgroup_name] = {}
+
     def load_command_table(self, args):  # pylint: disable=unused-argument
         """ Load commands into the command table
 
@@ -246,6 +257,7 @@ def __init__(self, command_loader, group_name, operations_tmpl, **kwargs):
         Deprecated.ensure_new_style_deprecation(self.command_loader.cli_ctx, self.group_kwargs, 'command group')
         if kwargs['deprecate_info']:
             kwargs['deprecate_info'].target = group_name
+        command_loader._populate_command_group_table_with_subgroups(group_name)  # pylint: disable=protected-access
         self.command_loader.command_group_table[group_name] = self
 
     def __enter__(self):
@@ -273,6 +285,7 @@ def command(self, name, handler_name, **kwargs):
         # don't inherit deprecation info from command group
         command_kwargs['deprecate_info'] = kwargs.get('deprecate_info', None)
 
+        self.command_loader._populate_command_group_table_with_subgroups(' '.join(command_name.split()[:-1]))  # pylint: disable=protected-access
         self.command_loader.command_table[command_name] = self.command_loader.create_command(
             command_name,
             self.operations_tmpl.format(handler_name),

setup.py

@@ -9,7 +9,7 @@
 from codecs import open
 from setuptools import setup, find_packages
 
-VERSION = '0.4.0'
+VERSION = '0.4.1'
 
 DEPENDENCIES = [
     'argcomplete',