[gentoo-commits] proj/R_overlay:master commit in: roverlay/

["André Erdmann" <dywi@mailerd.de>]

commit:     f2caad3d9b949a0a0ca52219d467fbdc8c75499d
Author:     André Erdmann <dywi <AT> mailerd <DOT> de>
AuthorDate: Tue Sep 17 15:26:08 2013 +0000
Commit:     André Erdmann <dywi <AT> mailerd <DOT> de>
CommitDate: Tue Sep 17 15:26:08 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/R_overlay.git;a=commit;h=f2caad3d

argparser,argutil: support subparsers

---
 roverlay/argparser.py | 54 +++++++++++++++++++++++++++++++++++-----------
 roverlay/argutil.py   | 60 +++++++++++++++++++++++++++++++++++++++++++++++++--
 2 files changed, 100 insertions(+), 14 deletions(-)

diff --git a/roverlay/argparser.py b/roverlay/argparser.py
index 5b28d0f..d52a1e2 100644
--- a/roverlay/argparser.py
+++ b/roverlay/argparser.py
@@ -6,6 +6,7 @@
 
 import argparse
 import collections
+import sys
 
 import roverlay.core
 import roverlay.argutil
@@ -566,6 +567,7 @@ class RoverlayArgumentParserBase ( roverlay.argutil.ArgumentParserProxy ):
 class RoverlayArgumentParser ( RoverlayArgumentParserBase ):
 
    MULTIPLE_COMMANDS   = False
+   COMMAND_SUBPARSERS  = None
    COMMAND_DESCRIPTION = None
    DEFAULT_COMMAND     = None
 
@@ -582,6 +584,18 @@ class RoverlayArgumentParser ( RoverlayArgumentParserBase ):
          assert self.default_command in self.COMMAND_DESCRIPTION
    # --- end of __init__ (...) ---
 
+   def get_args_to_parse ( self ):
+      if self.__class__.COMMAND_SUBPARSERS is None:
+         return sys.argv[1:]
+      else:
+         args = sys.argv[1:]
+
+         if any ( command in args for command in self.COMMAND_DESCRIPTION ):
+            return args
+         else:
+            return args + [ self.default_command ]
+   # --- end of get_args_to_parse (...) ---
+
    def get_commands ( self ):
       if self.MULTIPLE_COMMANDS:
          return self.command
@@ -590,23 +604,39 @@ class RoverlayArgumentParser ( RoverlayArgumentParserBase ):
    # --- end of get_commands (...) ---
 
    def setup_actions ( self ):
-      arg = self.add_argument_group (
-         "actions", title="actions",
-         description=self.format_command_map ( self.COMMAND_DESCRIPTION ),
-      )
+      if self.__class__.COMMAND_SUBPARSERS is None:
+         arg = self.add_argument_group (
+            "actions", title="actions",
+            description=self.format_command_map ( self.COMMAND_DESCRIPTION ),
+         )
 
-      arg (
-         'command', default=self.default_command, metavar='<action>',
-         nargs=( "*" if self.MULTIPLE_COMMANDS else "?" ),
-         choices=self.COMMAND_DESCRIPTION.keys(),
-         flags=self.ARG_HELP_DEFAULT,
-         help="action to perform"
-      )
+         arg (
+            'command', default=self.default_command, metavar='<action>',
+            nargs=( "*" if self.MULTIPLE_COMMANDS else "?" ),
+            choices=self.COMMAND_DESCRIPTION.keys(),
+            flags=self.ARG_HELP_DEFAULT,
+            help="action to perform"
+         )
 
-      return arg
+         return arg
+      else:
+         self.add_subparsers (
+            title="commands",
+            description=self.format_command_map ( self.COMMAND_DESCRIPTION ),
+            dest="command",
+            help="action to perform [%(default)s]",
+         )
+         # set_defaults() not necessary due to get_args_to_parse()
+         self.parser.set_defaults ( command=self.default_command )
+
+         for command in self.COMMAND_DESCRIPTION:
+            subparser = self.add_subparser ( command )
+
+         return None
    # --- end of setup_actions (...) ---
 
    def parse_actions ( self ):
+      print ( self.parsed )
       self.command = self.parsed ['command']
    # --- end of parse_actions (...) ---
 

diff --git a/roverlay/argutil.py b/roverlay/argutil.py
index c3981e5..7c36980 100644
--- a/roverlay/argutil.py
+++ b/roverlay/argutil.py
@@ -8,6 +8,7 @@ import os
 import argparse
 import pwd
 import grp
+import sys
 
 
 from roverlay.config.entryutil import deref_entry_safe
@@ -158,6 +159,9 @@ class ArgumentParserError ( Exception ):
 class ArgumentGroupExists ( ArgumentParserError ):
    pass
 
+class SubparserExists ( ArgumentParserError ):
+   pass
+
 class ArgumentFlagException ( ArgumentParserError ):
    pass
 
@@ -207,10 +211,54 @@ class ArgumentParserProxy ( object ):
          self.defaults = dict ( defaults )
 
       self._argument_groups = dict()
+      self._subparsers      = dict()
+      self._subparser_ctrl  = None
 
       self.parsed = None
    # --- end of __init__ (...) ---
 
+   def add_subparsers ( self, ignore_exist=False, **kwargs ):
+      if self._subparser_ctrl is None:
+         self._subparser_ctrl = self.parser.add_subparsers ( **kwargs )
+      elif not ignore_exist:
+         raise AssertionError ( "add_subparsers() already called!" )
+
+      return self._subparser_ctrl
+   # --- end of add_subparsers (...) ---
+
+   def add_subparser ( self,
+      command, defaults=True, proxy_cls=None, **parser_kwargs
+   ):
+      if command in self._subparsers:
+         raise SubparserExists ( command )
+      else:
+         if proxy_cls is None:
+            get_proxy = ArgumentParserProxy.wrap
+         elif proxy_cls is True:
+            get_proxy = self.__class__.wrap
+         elif hasattr ( proxy_cls, 'wrap' ):
+            get_proxy = proxy_cls.wrap
+         else:
+            get_proxy = proxy_cls
+
+         parser = (
+            self.add_subparsers ( ignore_exist=True ).add_parser (
+               command, **parser_kwargs
+            )
+         )
+
+         proxy = get_proxy (
+            parser,
+            defaults = ( self.defaults if defaults is True else defaults )
+         )
+         self._subparsers [command] = proxy
+         return proxy
+   # --- end of add_subparser (...) ---
+
+   def get_subparser ( self, name ):
+      return self._subparsers [name]
+   # --- end of get_subparser (...) ---
+
    def get_options ( self ):
       return self.parsed
    # --- end of get_options (...) ---
@@ -331,12 +379,20 @@ class ArgumentParserProxy ( object ):
       )
    # --- end of group_arg (...) ---
 
-   def parse_args ( self, *args, **kwargs ):
-      self.parsed = self.parser.parse_args ( *args, **kwargs )
+   def get_args_to_parse ( self ):
+      return sys.argv[1:]
+   # --- end of get_args_to_parse (...) ---
+
+   def parse_args ( self, args=None, namespace=None ):
+      self.parsed = self.parser.parse_args (
+         args      = ( self.get_args_to_parse() if args is None else args ),
+         namespace = namespace,
+      )
       return self.parsed
    # --- end of parse_args (...) ---
 
    def parse ( self, *args, **kwargs ):
+      print ( "ArgumentParserProxy.parse() is deprecated. Use parse_args()." )
       return self.parse_args ( *args, **kwargs )
    # --- end of parse (...) ---