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

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

commit:     4cef51017af1d97fa4c75625fcabc351486804cb
Author:     André Erdmann <dywi <AT> mailerd <DOT> de>
AuthorDate: Tue Aug 13 08:42:54 2013 +0000
Commit:     André Erdmann <dywi <AT> mailerd <DOT> de>
CommitDate: Tue Aug 13 08:42:54 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/R_overlay.git;a=commit;h=4cef5101

roverlay/runtime: make runtime object modular

split RuntimeEnvironment into a common (RuntimeEnvironmentBase) and a "main
script"-specific part (RuntimeEnvironment, as before).

The runtime object does no longer set up itself in __init__(), setup() has to be
called manually now.

---
 roverlay/defaultscript.py |   1 +
 roverlay/runtime.py       | 144 +++++++++++++++++++++++++++-------------------
 2 files changed, 85 insertions(+), 60 deletions(-)

diff --git a/roverlay/defaultscript.py b/roverlay/defaultscript.py
index dfbe29d..8c629f8 100644
--- a/roverlay/defaultscript.py
+++ b/roverlay/defaultscript.py
@@ -35,6 +35,7 @@ def main_installed ( *args, **kw ):
 
 def main ( installed, *args, **kw ):
    main_env = roverlay.runtime.RuntimeEnvironment ( installed, *args, **kw )
+   main_env.setup()
 
    if main_env.want_command ( 'setupdirs' ):
       sys.exit ( run_setupdirs ( main_env ) )

diff --git a/roverlay/runtime.py b/roverlay/runtime.py
index 81a7726..a65555d 100644
--- a/roverlay/runtime.py
+++ b/roverlay/runtime.py
@@ -18,113 +18,137 @@ import roverlay.stats.collector
 
 from roverlay.core import DIE, die
 
+class RuntimeEnvironmentBase ( object ):
+
+   ARG_PARSER_CLS  = None
+   KEEP_ARG_PARSER = False
 
-class RuntimeEnvironment ( object ):
    def __init__ ( self,
       installed,
       hide_exceptions=False,
       config_file_name=roverlay.core.DEFAULT_CONFIG_FILE_NAME
    ):
-      super ( RuntimeEnvironment, self ).__init__()
-
+      super ( RuntimeEnvironmentBase, self ).__init__()
       self.logger            = logging.getLogger()
+      self.installed         = bool ( installed )
+      self.hide_exceptions   = bool ( hide_exceptions )
+      self.config_file_name  = str ( config_file_name )
       self.HLINE             = 79 * '-'
+
       self.stats             = roverlay.stats.collector.static
       self.config            = None
       self.additional_config = None
       self.options           = None
-      self.actions_done      = set()
       self.command           = None
+   # --- end of __init__ (...) ---
 
-      self._repo_list        = None
-      self._overlay_creator  = None
-      self.stats_db_file     = None
-
-      self.want_db_commit    = False
-
-      self.hide_exceptions = hide_exceptions
-      if hide_exceptions:
+   def setup ( self ):
+      roverlay.core.setup_initial_logger()
+      self.stats.time.begin ( "setup" )
+      if self.hide_exceptions:
          try:
-            self.setup ( installed, config_file_name )
+            self.do_setup()
          except:
             die ( "failed to initialize runtime environment." )
       else:
-         self.setup ( installed, config_file_name )
-   # --- end of __init__ (...) ---
-
-   def get_repo_list ( self ):
-      if self._repo_list is None:
-         self._repo_list = roverlay.remote.repolist.RepoList (
-            sync_enabled   = not self.config.get_or_fail ( 'nosync' ),
-            force_distroot = self.options.get ( 'force_distroot' )
-         )
-      return self._repo_list
-   # --- end of get_repo_list (...) ---
-
-   def get_overlay_creator ( self ):
-      if self._overlay_creator is None:
-         self._overlay_creator = roverlay.overlay.creator.OverlayCreator (
-            skip_manifest           = not self.options ['manifest'],
-            incremental             = self.options ['incremental'],
-            allow_write             = self.options ['write_overlay'],
-            immediate_ebuild_writes = self.options ['immediate_ebuild_writes'],
-         )
-      return self._overlay_creator
-   # --- end of get_overlay_creator (...) ---
-
-   def setup ( self, installed, config_file_name ):
-      roverlay.core.setup_initial_logger()
-      self.stats.time.begin ( "setup" )
+         self.do_setup()
+      self.stats.time.end ( "setup" )
+   # --- end of setup (...) ---
 
-      parser = roverlay.argparser.RoverlayMainArgumentParser (
+   def do_setup_parser ( self ):
+      parser = self.ARG_PARSER_CLS (
          defaults={
             'config_file': roverlay.core.locate_config_file (
-               installed, config_file_name
+               self.installed, self.config_file_name
             )
          }
       )
       parser.setup()
       parser.parse()
-      parser.do_extraconf ( installed, 'installed' )
-
-      command           = parser.command
-      options           = parser.parsed
-      additional_config = parser.extra_conf
+      parser.do_extraconf ( self.installed, 'installed' )
 
-      del parser
+      self.command           = getattr ( parser, 'command', None )
+      self.options           = parser.parsed
+      self.additional_config = parser.extra_conf
 
+      if self.KEEP_ARG_PARSER:
+         self.parser = parser
+   # --- end of do_setup_parser (...) ---
 
+   def do_setup_config ( self ):
       try:
          self.config = roverlay.core.load_config_file (
-            options ['config_file'],
-            extraconf      = additional_config,
-            setup_logger   = options ['want_logging'],
-            load_main_only = options ['load_main_only'],
+            self.options ['config_file'],
+            extraconf      = self.additional_config,
+            setup_logger   = self.options.get ( 'want_logging', False ),
+            load_main_only = self.options.get ( 'load_main_only', True ),
          )
       except:
          if self.hide_exceptions:
             die (
                "Cannot load config file {!r}".format (
-                  options ['config_file']
+                  self.options ['config_file']
                ),
                DIE.CONFIG
             )
          else:
             raise
+   # --- end of do_setup_config (...) ---
+
+   def do_setup ( self ):
+      self.do_setup_parser()
+      self.do_setup_config()
+   # --- end of do_setup (...) ---
+
+# --- end of RuntimeEnvironmentBase (...) ---
+
+class RuntimeEnvironment ( RuntimeEnvironmentBase ):
 
+   ARG_PARSER_CLS = roverlay.argparser.RoverlayMainArgumentParser
 
-      self.stats_db_file     = self.config.get ( 'RRD_DB.file', None )
-      self.command           = command
-      self.options           = options
-      self.additional_config = additional_config
+   def __init__ ( self, installed, *args, **kw ):
+      super ( RuntimeEnvironment, self ).__init__ ( installed, *args, **kw )
+
+      self.actions_done     = set()
+      self.command          = None
+
+      self.stats_db_file    = None
+      self.want_db_commit   = False
+
+      self._repo_list       = None
+      self._overlay_creator = None
+   # --- end of __init__ (...) ---
 
+   def get_repo_list ( self ):
+      if self._repo_list is None:
+         self._repo_list = roverlay.remote.repolist.RepoList (
+            sync_enabled   = not self.config.get_or_fail ( 'nosync' ),
+            force_distroot = self.options.get ( 'force_distroot' )
+         )
+      return self._repo_list
+   # --- end of get_repo_list (...) ---
+
+   def get_overlay_creator ( self ):
+      if self._overlay_creator is None:
+         self._overlay_creator = roverlay.overlay.creator.OverlayCreator (
+            skip_manifest           = not self.options ['manifest'],
+            incremental             = self.options ['incremental'],
+            allow_write             = self.options ['write_overlay'],
+            immediate_ebuild_writes = self.options ['immediate_ebuild_writes'],
+         )
+      return self._overlay_creator
+   # --- end of get_overlay_creator (...) ---
+
+   def do_setup ( self ):
+      self.do_setup_parser()
+      self.do_setup_config()
+
+      self.stats_db_file = self.config.get ( 'RRD_DB.file', None )
 
       # want_logging <=> <have a command that uses hooks>
-      if options ['want_logging']:
+      if self.options ['want_logging']:
          roverlay.hook.setup()
-
-      self.stats.time.end ( "setup" )
-   # --- end of setup (...) ---
+   # --- end of do_setup (...) ---
 
    def setup_database ( self ):
       if self.stats_db_file: