Merge lp:~cboylan/boots/boots_source into lp:boots

[Clark Boylan]

[Clark Boylan (cboylan)]

Implemented the source metacommand. Tested with the employees DB. Tested sourcing a single file and a list of files.

=== modified file 'boots/lib/console.py'
--- boots/lib/console.py	2010-02-28 22:37:03 +0000
+++ boots/lib/console.py	2010-03-03 00:54:14 +0000
@@ -65,7 +65,9 @@
             '\quit':       self.quit,
             '\help':       self.show_help,
             '\h':          self.show_help,
-            'help':        self.show_help})
+            'help':        self.show_help,
+            'source':      self.meta_source,
+            '\.':          self.meta_source,})
         self.metacommandmanager.add(self.metacommands)
         
         self.servers = []
@@ -76,12 +78,13 @@
 
         self.ui = PlainUI(self)
         self.presenter = self.ui
+        self.driver_stack = []
         if self.config["script"]:
-            self.driver = ScriptDriver(self, self.config["script"], self.config["lingo"])
+            self.driver_stack.insert(0, ScriptDriver(self, self.config["script"], self.config["lingo"]))
         elif self.config["command"]:
-            self.driver = StringDriver(self, self.config["command"], self.config["lingo"])
+            self.driver_stack.insert(0, StringDriver(self, self.config["command"], self.config["lingo"]))
         else:
-            self.driver = self.ui
+            self.driver_stack.insert(0, self.ui)
             
         if hasattr(self.ui, "metacommands"):
             self.metacommandmanager.add(self.ui.metacommands)
@@ -159,7 +162,7 @@
         self.connect(self.config["host"], self.config["port"], self.config["database"])
     
     def _welcome_message(self):
-        if self.welcome_msg and self.driver.is_interactive:
+        if self.welcome_msg and self.driver_stack[0].is_interactive:
             server_lines = []
             for server in self.servers:
                 line_format = "{0.hostname}:{0.port} (server v{0.server_version})"
@@ -174,14 +177,20 @@
         self._load_servers()
         self._welcome_message()
             
-        for command, lingo in self.driver.get_input():
-            if not self.metacommands.execute(command):
-                result = self.run(command, lingo)
-                    
+        while self.driver_stack:
+            driver = self.driver_stack[0]
+            try:
+                command, lingo = driver.get_input().next()
+                if not self.metacommands.execute(command):
+                    result = self.run(command, lingo)
+            except StopIteration:
+                last_driver = self.driver_stack.pop(0)
+
+        self.driver_stack.insert(0, last_driver)            
         self.quit()
         
     def quit(self, exitcode = 0):
-        if self.driver.is_interactive:
+        if self.driver_stack[0].is_interactive:
             self.presenter.presenter_graph.put("Boots quit.")
             
         self.hooks["unload"].call()
@@ -225,3 +234,7 @@
             port = int(port)
 
         self.disconnect(host, port)
+
+    def meta_source(self, *file_list):
+        for x in range(0, len(file_list)):
+            self.driver_stack.insert(x, ScriptDriver(self, file_list[x], self.config["lingo"]))