pass configuration to commandline interface

cmdinterface/cli.py

@@ -3,13 +3,16 @@
 import cmd, sys, os
 
 class CommandLineInterface(cmd.Cmd):
-    def __init__(self):
+    def __init__(self, config = None):
         cmd.Cmd.__init__(self)
         self.prompt = "inf> "
         sys.path.append("../")
 
         import common
-        self.configuration = common.config.Configuration()
+        if config != None:
+            self.configuration = config
+        else:
+            self.configuration = common.config.Configuration()
 
         self.env = dict()
 
@@ -67,6 +70,10 @@ def do_PI(self, string):
         inst.cmdloop()
 
     def do_configuration(self, string):
+        if string == "":
+            self.print_configuration()
+            return
+
         import common
 
         try:

common/config.py

@@ -55,7 +55,7 @@ def checkConfig(self):
             self.messageDelimiter = self.config['messageDelimiter']
 
         if 'fieldDelimiter' in self.config:
-            self.fieldDelimiter = config.config['fieldDelimiter']
+            self.fieldDelimiter = self.config['fieldDelimiter']
 
         if 'entropyGnuplotFile' in self.config:
             self.gnuplotFile = self.config['entropyGnuplotFile']

main.py

@@ -37,12 +37,12 @@ def main():
     if not configFile:
         # if we are started without a config file, we just drop into 
         # interactive mode ...
-        command_line_interface()
+        command_line_interface(None)
 
     conf = common.config.Configuration(configFile)
 
     if conf.interactive:
-        command_line_interface()
+        command_line_interface(conf)
 
 
     if conf.inputFile != None:
@@ -84,7 +84,7 @@ def usage():
     print "       -c\tconfig file in yaml format (optional)"
     sys.exit(-1)
 
-def command_line_interface():
+def command_line_interface(config):
     print "Welcome to Protocol-Informatics. What do you want to do today?"
     import cmdinterface
     cmdline = cmdinterface.cli.CommandLineInterface()