Merge lp:~ken-brotherton/boots/input into lp:boots

[KenBrotherton]

[KenBrotherton (ken-brotherton)]

Fully sure this won't be correct but here it is, a attempt at the input selection.

[David Rosenbaum (davidjrosenbaum)]

This hasn't been merged yet. Please leave the status set to "Needs Review" until then.

[lp:~ken-brotherton/boots/input]

37. By broken <broken@multivac> on 2010-02-01

added file reading and input type selection, I think.

38. By broken <broken@multivac> on 2010-02-02

Modified script.py to only open and pass file to generic.py
Modified generic.py to accept streams (I think amybe at least)

-------------- This line and the following will be ignored -------------Modif
-

modified:
  src/boots/lib/ui/generic.py
  src/boots/lib/ui/script.py

39. By broken <broken@multivac> on 2010-02-02

Modified script.py: trimmed error checking and file close on init. Modified generic.py to accept streams.

[Max Goodhart (chromakode)]

Merged. A couple code comments:

* Please remember to use 4 spaces for indentation instead of tabs.
* Unlike C++, to access class instance members, you have to explicitly use self.membername, rather than just referring to membername.

Finally, in the future, I'd appreciate if you tested more before proposing a merge. It took a couple tweaks before the code was working properly. While I realize you couldn't test the code directly, as some work needed to be done in the Console class, it never hurts to write up a simple testing script to make sure the class you implemented is working properly.

review: Approve

=== modified file 'src/boots/lib/console.py'
--- src/boots/lib/console.py	2010-02-01 20:46:55 +0000
+++ src/boots/lib/console.py	2010-02-02 00:16:15 +0000
@@ -50,9 +50,22 @@
         self.config = config
         # FIXME: Once metacommands are supported it should be possible to change the lingo at runtime using a metacommand.
         self.lingo = self.config['lingo']
+<<<<<<< TREE
         self.servers = [api.Server(self.config["host"], self.config["port"],
                                  {"database": self.config["database"]})]
         self.ui = PlainUI(self.config["prompt"])
+=======
+        self.server = api.Server(self.config["host"], self.config["port"],
+                                 {"database": self.config["database"]})
+
+        if self.config["script"] == None
+            self.driver = PlainUI(self.config["prompt"])
+            self.presenter = PlainUI(?)
+        self.driver = ScriptDriver(self.config["script"])
+        self.presenter = PlainUI(?)
+
+
+>>>>>>> MERGE-SOURCE
         #Instead of an empty set, the set of console metacommands should be
         #listed here. Also, the metacommand dictionary to be passed into
         #self.metacommands needs to be set up somewhere.

=== modified file 'src/boots/lib/ui/generic.py'
--- src/boots/lib/ui/generic.py	2010-01-31 00:00:49 +0000
+++ src/boots/lib/ui/generic.py	2010-02-02 00:16:15 +0000
@@ -30,7 +30,10 @@
 
 import readline
 
-class StdinDriver(object):
+class StreamDriver(object):
+    def __init__(self, stream):
+        self.stream = stream
+	 
     """Gets user input from stdin via a prompt."""
     def get_input(self, prompt = "> ", input_complete = lambda command: True):
         while True:
@@ -38,7 +41,7 @@
                 # Continue to read input until it is complete.
                 lines = ''
                 while True:
-                    lines += '\n' + raw_input(prompt)
+                    lines += '\n' + stream.readline()
 
                     if input_complete(lines):
                         break
@@ -47,7 +50,11 @@
             except EOFError:
                 return
 
-class StdoutPresenter(object):	
+class StreamPresenter(object):
+	def __init__(self, stream):
+        self.stream = stream
+	
     """Prints row information in a "raw" format"""
     def present(self, row):
-        print(row)
+        stream.write(str)
+        stream.write("\n")

=== added file 'src/boots/lib/ui/script.py'
--- src/boots/lib/ui/script.py	1970-01-01 00:00:00 +0000
+++ src/boots/lib/ui/script.py	2010-02-02 00:16:15 +0000
@@ -0,0 +1,43 @@
+# Boots Client
+# www.launchpad.net/boots
+# www.launchpad.net/drizzle
+# lib/ui/script.py
+#
+# ##### BEGIN LICENSE BLOCK #####
+# Version: MPL 1.1
+#
+# The contents of this file are subject to the Mozilla Public License
+# Version 1.1 (the "License"); you may not use this file except in
+# compliance with the License. You may obtain a copy of the License at
+# http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS"
+# basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
+# License for the specific language governing rights and limitations
+# under the License.
+#
+# The Original Code is Boots Client code.
+#
+# The Initial Developer of the Original Code is Clark Boylan, Ken
+# Brotherton, Max Goodman, Victoria Lewis, David Rosenbaum, and Andreas
+# Turriff. Portions created by Clark Boylan, Ken Brotherton, Max Goodman,
+# Victoria Lewis, David Rosenbaum, and Andreas Turriff are Copyright (C)
+# 2009. All Rights Reserved.
+#
+# Contributor(s):
+#
+# ##### END LICENSE BLOCK #####
+
+
+from boots.lib.metacommands import metacommands
+
+class ScriptDriver(object):
+    def __init__(self, path = None):
+        self.metacommands = metacommands.MetaCommands({}, self)
+        self.path = path
+        f = open(path)
+        super(self).__init__(f)
+
+
+        
+