move emulator link to emulator module and make source variable (exec_path)

Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>

lib/cdist/config.py

@@ -24,9 +24,11 @@ import datetime
 import logging
 import os
 import stat
+import sys
 
 log = logging.getLogger(__name__)
 
+import cdist.emulator
 import cdist.path
 
 CODE_HEADER                     = "#!/bin/sh -e\n"
@@ -35,12 +37,18 @@ class Config:
     """Cdist main class to hold arbitrary data"""
 
     def __init__(self, target_host, 
-                    initial_manifest=False, remote_user="root",
-                    home=None, debug=False):
+                    initial_manifest=False,
+                    remote_user="root",
+                    home=None,
+                    exec_path=sys.argv[0],
+                    debug=False):
 
         self.target_host    = target_host
         self.debug          = debug
         self.remote_user    = remote_user
+        self.exec_path      = exec_path
+
+        # FIXME: broken - construct elsewhere!
         self.remote_prefix = ["ssh", self.remote_user + "@" + self.target_host]
 
         self.path = cdist.path.Path(self.target_host, 
@@ -106,6 +114,9 @@ class Config:
         self.path.remove_remote_dir(cdist.path.REMOTE_BASE_DIR)
         self.path.remote_mkdir(cdist.path.REMOTE_BASE_DIR)
 
+        cdist.emulator.link(self.exec_path,
+            self.path.bin_dir, self.path.list_types())
+
     def run_initial_manifest(self):
         """Run the initial manifest"""
         env = {  "__manifest" : self.path.manifest_dir }
@@ -299,95 +310,3 @@ def config(args):
     time_end = datetime.datetime.now()
     log.info("Total processing time for %s host(s): %s", len(args.host),
                 (time_end - time_start).total_seconds())
-
-def install(args):
-    """Install remote system"""
-    process = {}
-
-def commandline():
-    """Parse command line"""
-    # Construct parser others can reuse
-    parser = {}
-    # Options _all_ parsers have in common
-    parser['most'] = argparse.ArgumentParser(add_help=False)
-    parser['most'].add_argument('-d', '--debug',
-        help='Set log level to debug', action='store_true')
-
-    # Main subcommand parser
-    parser['main'] = argparse.ArgumentParser(description='cdist ' + cdist.VERSION)
-    parser['main'].add_argument('-V', '--version',
-        help='Show version', action='version',
-        version='%(prog)s ' + cdist.VERSION)
-    parser['sub'] = parser['main'].add_subparsers(title="Commands")
-
-    # Banner
-    parser['banner'] = parser['sub'].add_parser('banner', 
-        add_help=False)
-    parser['banner'].set_defaults(func=cdist.banner.banner)
-
-    # Config and install (common stuff)
-    parser['configinstall'] = argparse.ArgumentParser(add_help=False)
-    parser['configinstall'].add_argument('host', nargs='+',
-        help='one or more hosts to operate on')
-    parser['configinstall'].add_argument('-c', '--cdist-home',
-         help='Change cdist home (default: .. from bin directory)',
-         action='store')
-    parser['configinstall'].add_argument('-i', '--initial-manifest', 
-         help='Path to a cdist manifest',
-         dest='manifest', required=False)
-    parser['configinstall'].add_argument('-p', '--parallel',
-         help='Operate on multiple hosts in parallel',
-         action='store_true', dest='parallel')
-    parser['configinstall'].add_argument('-s', '--sequential',
-         help='Operate on multiple hosts sequentially (default)',
-         action='store_false', dest='parallel')
-
-    # Config
-    parser['config'] = parser['sub'].add_parser('config',
-        parents=[parser['most'], parser['configinstall']])
-    parser['config'].set_defaults(func=config)
-
-    # Install
-    parser['install'] = parser['sub'].add_parser('install',
-        parents=[parser['most'], parser['configinstall']])
-    parser['install'].set_defaults(func=install)
-
-    for p in parser:
-        parser[p].epilog = "Get cdist at http://www.nico.schottelius.org/software/cdist/"
-
-    args = parser['main'].parse_args(sys.argv[1:])
-
-    # Most subcommands have --debug, so handle it here
-    if 'debug' in args:
-        if args.debug:
-            logging.root.setLevel(logging.DEBUG)
-    log.debug(args)
-
-    args.func(args)
-
-
-if __name__ == "__main__":
-    try:
-        logging.basicConfig(level=logging.INFO, format='%(levelname)s: %(message)s')
-
-        if re.match(TYPE_PREFIX, os.path.basename(sys.argv[0])):
-            cdist_lib = os.environ["__cdist_python_lib"]
-            sys.path.insert(0, cdist_lib)
-            import cdist.emulator
-            cdist.emulator.emulator(sys.argv)
-        else:
-            cdist_lib = os.path.abspath(os.path.join(os.path.dirname(__file__),
-                '../lib'))
-            sys.path.insert(0, cdist_lib)
-
-            import cdist
-            import cdist.banner
-            import cdist.exec
-            import cdist.path
-
-            commandline()
-    except KeyboardInterrupt:
-        sys.exit(0)
-    except cdist.Error as e:
-        log.error(e)
-        sys.exit(1)

lib/cdist/emulator.py

@@ -133,3 +133,12 @@ def emulator(argv):
 
     # sys.exit(1)
     print("Finished " + type + "/" + object_id + repr(params))
+
+
+def link(exec_path, bin_dir, type_list):
+    """Link type names to cdist-type-emulator"""
+    source = os.path.abspath(exec_path)
+    for type in type_list:
+        destination = os.path.join(bin_dir, type)
+        log.debug("Linking %s to %s", source, destination)
+        os.symlink(source, destination)

lib/cdist/path.py

@@ -94,7 +94,6 @@ class Path:
         # Setup binary directory + contents
         self.bin_dir = os.path.join(self.out_dir, "bin")
         os.mkdir(self.bin_dir)
-        self.link_type_to_emulator()
 
         # List of type explorers transferred
         self.type_explorers_transferred = {}
@@ -275,12 +274,3 @@ class Path:
             # Ensure that the path exists
             self.remote_mkdir(remote_base)
             self.transfer_dir(src, dst)
-
-
-    def link_type_to_emulator(self):
-        """Link type names to cdist-type-emulator"""
-        source = os.path.abspath(sys.argv[0])
-        for type in self.list_types():
-            destination = os.path.join(self.bin_dir, type)
-            log.debug("Linking %s to %s", source, destination)
-            os.symlink(source, destination)