Fix navigate bug with aliased subcommands

* Fixes #108
* Add an `identifier` field to data for aliased subcommands
  containing only the non-aliased name of the subcommand.
* Modify `parser_navigate` to use this `identifier` when it is
  present.

Author: hstock

sphinxarg/parser.py

@@ -20,7 +20,9 @@ def parser_navigate(parser_result, path, current_path=None):
             ' '.join(current_path))
     next_hop = path.pop(0)
     for child in parser_result['children']:
-        if child['name'] == next_hop:
+        # identifer is only used for aliased subcommands
+        identifier = child['identifier'] if 'identifier' in child else child['name']
+        if identifier == next_hop:
             current_path.append(next_hop)
             return parser_navigate(child, path, current_path)
     raise NavigationException(
@@ -88,6 +90,8 @@ def parse_parser(parser, data=None, **kwargs):
                 'usage': subaction.format_usage().strip(),
                 'bare_usage': _format_usage_without_prefix(subaction),
             }
+            if subalias:
+                subdata['identifier'] = name
             parse_parser(subaction, subdata, **kwargs)
             data.setdefault('children', []).append(subdata)
 

test/test_parser.py

@@ -214,6 +214,7 @@ def test_parse_nested_with_alias():
     assert data['children'] == [
         {
             'name': 'install (i)',
+            'identifier': 'install',
             'help': 'install help',
             'usage': 'usage: py.test install [-h] [--upgrade] ref',
             'bare_usage': 'py.test install [-h] [--upgrade] ref',
@@ -258,7 +259,8 @@ def test_aliased_traversal():
         'bare_usage': 'py.test level1 [-h]',
         'help': '',
         'usage': 'usage: py.test level1 [-h]',
-        'name': 'level1'})
+        'name': 'level1 (l1)',
+        'identifier': 'level1'})
 
 def test_parse_nested_traversal():
     parser = argparse.ArgumentParser()