Webware for Python

Author: ianb
Date: 2005-04-11 16:24:25 -0600 (Mon, 11 Apr 2005)
New Revision: 2328

Modified:
   WSGIKit/trunk/setup.py
Log:
Make sure people know setup.py is broken

Modified: WSGIKit/trunk/setup.py
===================================================================
--- WSGIKit/trunk/setup.py	2005-04-11 06:24:01 UTC (rev 2327)
+++ WSGIKit/trunk/setup.py	2005-04-11 22:24:25 UTC (rev 2328)
@@ -1,3 +1,12 @@
+import sys
+print "This setup.py is broken right now, it won't install a useable"
+print "WSGIKit right now.  Instead, just add this directory to your"
+print "$PYTHONPATH variable.  We apologize for any inconvenience."
+print "(Also note that you may want to run build-pkg to fetch some"
+print "modules this depends on, or at least that the tutorial depends"
+print "on)"
+sys.exit()
+
 from distutils.core import setup
 import warnings
 warnings.filterwarnings("ignore", "Unknown distribution option")

Author: ianb
Date: 2005-04-11 00:24:01 -0600 (Mon, 11 Apr 2005)
New Revision: 2327

Added:
   WSGIKit/trunk/docs/BlogTutorial.txt
Modified:
   WSGIKit/trunk/wsgikit/tests/doctest_webapp.py
Log:
More doctest work to allow for different kinds of doctest statements; Very beginning of blog tutorial which will make use of new features

Added: WSGIKit/trunk/docs/BlogTutorial.txt
===================================================================
--- WSGIKit/trunk/docs/BlogTutorial.txt	2005-04-11 06:23:21 UTC (rev 2326)
+++ WSGIKit/trunk/docs/BlogTutorial.txt	2005-04-11 06:24:01 UTC (rev 2327)
@@ -0,0 +1,105 @@
++++++++++++++
+Blog Tutorial
++++++++++++++
+
+:author: Ian Bicking <ianb@...>
+:revision: $Rev: 2321 $
+:date: $LastChangedDate: 2005-04-09 17:55:39 -0500 (Sat, 09 Apr 2005) $
+
+.. contents::
+
+Introduction
+============
+
+This tutorial will go through the process of creating a blog using
+WSGIKit_, SQLObject_, and `Zope Page Templates`_.  This blog will rely
+heavily on static publishing -- that is, when at all possible flat
+HTML pages will be written to disk.  For some parts (e.g., posting a
+new item) this will of course be infeasible, but for most of the site
+this should work fine.
+
+.. _WSGIKit: http://wsgikit.org
+.. _SQLObject: http://sqlobject.org
+.. _Zope Page Templates: http://www.zope.org/DevHome/Wikis/DevSite/Projects/ZPT/FrontPage
+
+As much as possible, this code will be accompanied by unit tests, and
+test-driven methodologies.  Doing test-driven documenting of the
+incremental process of creating test-driven software may get a little
+hairy, but wish me luck!
+
+This tutorial presupposes you are somewhat comfortable with the basic
+stack -- the `To-Do Tutorial`_ is a better place to start for a
+beginner.
+
+.. _To-Do Tutorial: TodoTutorial.html
+
+Setting Up The App
+==================
+
+.. note::
+
+    We're doing all this in the Python, even though you'd normally do
+    some of this in the shell.  This way the authors of this tutorial
+    can use something called doctest_, which allows this tutorial to
+    be tested Python in an automated way.
+
+    .. _doctest: http://python.org/doc/current/lib/module-doctest.html
+
+.. run:
+
+    from wsgikit.tests.doctest_webapp import *
+    BASE = '/var/www/wkblog'
+    import sys
+    clear_dir(BASE)
+    run("app-setup create -o %s webkit_zpt" % BASE)
+    os.chdir(BASE)
+
+::
+
+    $ export PYTHONPATH=/path/to/WSGIKit:$PYTHONPATH
+    $ BASE=/var/www/wkblog
+    $ app-setup create -o $BASE webkit_zpt
+    $ cd $BASE
+
+The Model
+=========
+
+Since we're using SQLObject, we'll be doing the complete model in
+that.  The predecessor of this blog used flat files, custom-written
+indexes, and simple rfc822_ based files for structure.  It did not
+scale well at all.
+
+.. _rfc822: http://python.org/doc/current/lib/module-rfc822.html
+
+Here's the model:
+
+.. run:
+
+    create_file('db.py', 'v1', r"""
+    from sqlobject import *
+    
+    class Article(SQLObject):
+        url = StringCol(notNull=True)
+        title = StringCol()
+        content = StringCol(notNull=True)
+        content_mime_type = StringCol(notNull=True)
+        type = ForeignKey('ArticleType')
+        author = ForeignKey('User')
+        parent = ForeignKey('Article', default=None)
+    
+    class ArticleType(SQLObject):
+        name = StringCol(alternateID=True)
+    
+    class User(SQLObject):
+        class sqlmeta:
+            table = 'user_info'
+        username = StringCol(alternateID=True)
+        email = StringCol()
+        name = StringCol()
+        password_encoded = StringCol()
+        role = StringCol(notNull=True, default='user')
+    """)
+
+.. raw:: html
+   :file: resources/BlogTutorial/db.py.v1.gen.html
+

Modified: WSGIKit/trunk/wsgikit/tests/doctest_webapp.py
===================================================================
--- WSGIKit/trunk/wsgikit/tests/doctest_webapp.py	2005-04-11 06:23:21 UTC (rev 2326)
+++ WSGIKit/trunk/wsgikit/tests/doctest_webapp.py	2005-04-11 06:24:01 UTC (rev 2327)
@@ -229,15 +229,175 @@
     f.write(''.join(lines))
     f.close()
 
+class LongFormDocTestParser(doctest.DocTestParser):
+
+    """
+    This parser recognizes some reST comments as commands, without
+    prompts or expected output, like:
+
+    .. run:
+
+        do_this(...
+        ...)
+    """
+
+    _EXAMPLE_RE = re.compile(r"""
+        # Source consists of a PS1 line followed by zero or more PS2 lines.
+        (?: (?P<source>
+                (?:^(?P<indent> [ ]*) >>>    .*)    # PS1 line
+                (?:\n           [ ]*  \.\.\. .*)*)  # PS2 lines
+            \n?
+            # Want consists of any non-blank lines that do not start with PS1.
+            (?P<want> (?:(?![ ]*$)    # Not a blank line
+                         (?![ ]*>>>)  # Not a line starting with PS1
+                         .*$\n?       # But any other line
+                      )*))
+        | 
+        (?: # This is for longer commands that are prefixed with a reST
+            # comment like '.. run:' (two colons makes that a directive).
+            # These commands cannot have any output.
+
+            (?:^\.\.[ ]*(?P<run>run):[ ]*\n) # Leading command/command
+            (?:[ ]*\n)?         # Blank line following
+            (?P<runsource>
+                (?:(?P<runindent> [ ]+)[^ ].*$)
+                (?:\n [ ]+ .*)*)
+            )
+        |
+        (?: # This is for shell commands
+
+            (?P<shellsource>
+                (?:^(P<shellindent> [ ]*) [$] .*)   # Shell line
+                (?:\n               [ ]*  [>] .*)*) # Continuation
+            \n?
+            # Want consists of any non-blank lines that do not start with $
+            (?P<shellwant> (?:(?![ ]*$)
+                              (?![ ]*[$]$)
+                              .*$\n?
+                           )*))
+        """, re.MULTILINE | re.VERBOSE)
+
+    def _parse_example(self, m, name, lineno):
+        r"""
+        Given a regular expression match from `_EXAMPLE_RE` (`m`),
+        return a pair `(source, want)`, where `source` is the matched
+        example's source code (with prompts and indentation stripped);
+        and `want` is the example's expected output (with indentation
+        stripped).
+
+        `name` is the string's name, and `lineno` is the line number
+        where the example starts; both are used for error messages.
+
+        >>> def parseit(s):
+        ...     p = LongFormDocTestParser()
+        ...     return p._parse_example(p._EXAMPLE_RE.search(s), '<string>', 1)
+        >>> parseit('>>> 1\n1')
+        ('1', {}, '1', None)
+        >>> parseit('>>> (1\n... +1)\n2')
+        ('(1\n+1)', {}, '2', None)
+        >>> parseit('.. run:\n\n    test1\n    test2\n')
+        ('test1\ntest2', {}, '', None)
+        """
+        # Get the example's indentation level.
+        runner = m.group('run') or ''
+        indent = len(m.group('%sindent' % runner))
+        
+        # Divide source into lines; check that they're properly
+        # indented; and then strip their indentation & prompts.
+        source_lines = m.group('%ssource' % runner).split('\n')
+        if runner:
+            self._check_prefix(source_lines[1:], ' '*indent, name, lineno)
+        else:
+            self._check_prompt_blank(source_lines, indent, name, lineno)
+            self._check_prefix(source_lines[2:], ' '*indent + '.', name, lineno)
+        if runner:
+            source = '\n'.join([sl[indent:] for sl in source_lines])
+        else:
+            source = '\n'.join([sl[indent+4:] for sl in source_lines])
+
+        if runner:
+            want = ''
+            exc_msg = None
+        else:
+            # Divide want into lines; check that it's properly indented; and
+            # then strip the indentation.  Spaces before the last newline should
+            # be preserved, so plain rstrip() isn't good enough.
+            want = m.group('want')
+            want_lines = want.split('\n')
+            if len(want_lines) > 1 and re.match(r' *$', want_lines[-1]):
+                del want_lines[-1]  # forget final newline & spaces after it
+            self._check_prefix(want_lines, ' '*indent, name,
+                               lineno + len(source_lines))
+            want = '\n'.join([wl[indent:] for wl in want_lines])
+
+            # If `want` contains a traceback message, then extract it.
+            m = self._EXCEPTION_RE.match(want)
+            if m:
+                exc_msg = m.group('msg')
+            else:
+                exc_msg = None
+
+        # Extract options from the source.
+        options = self._find_options(source, name, lineno)
+
+        return source, options, want, exc_msg
+
+
+    def parse(self, string, name='<string>'):
+        """
+        Divide the given string into examples and intervening text,
+        and return them as a list of alternating Examples and strings.
+        Line numbers for the Examples are 0-based.  The optional
+        argument `name` is a name identifying this string, and is only
+        used for error messages.
+        """
+        string = string.expandtabs()
+        # If all lines begin with the same indentation, then strip it.
+        min_indent = self._min_indent(string)
+        if min_indent > 0:
+            string = '\n'.join([l[min_indent:] for l in string.split('\n')])
+
+        output = []
+        charno, lineno = 0, 0
+        # Find all doctest examples in the string:
+        for m in self._EXAMPLE_RE.finditer(string):
+            # Add the pre-example text to `output`.
+            output.append(string[charno:m.start()])
+            # Update lineno (lines before this example)
+            lineno += string.count('\n', charno, m.start())
+            # Extract info from the regexp match.
+            (source, options, want, exc_msg) = \
+                     self._parse_example(m, name, lineno)
+            # Create an Example, and add it to the list.
+            if not self._IS_BLANK_OR_COMMENT(source):
+                # @@: Erg, this is the only line I need to change...
+                output.append( doctest.Example(source, want, exc_msg,
+                                    lineno=lineno,
+                                    indent=min_indent+len(m.group('indent') or m.group('runindent')),
+                                    options=options) )
+            # Update lineno (lines inside this example)
+            lineno += string.count('\n', m.start(), m.end())
+            # Update charno.
+            charno = m.end()
+        # Add any remaining post-example text to `output`.
+        output.append(string[charno:])
+        return output
+
+
+
 if __name__ == '__main__':
     import sys
+    if sys.argv[1:] and sys.argv[1] == 'doctest':
+        doctest.testmod()
+        sys.exit()
     if not wsgikit_parent in sys.path:
         sys.path.append(wsgikit_parent)
     for fn in sys.argv[1:]:
         fn = os.path.abspath(fn)
         # @@: OK, ick; but this module gets loaded twice
         sys.testing_document_filename = fn
-        doctest.testfile(fn, module_relative=False)
+        doctest.testfile(fn, module_relative=False,
+                         parser=LongFormDocTestParser())
         new = os.path.splitext(fn)[0] + '.html'
         assert new != fn
         os.system('rest2html %s > %s' % (fn, new))

Author: ianb
Date: 2005-04-11 00:23:21 -0600 (Mon, 11 Apr 2005)
New Revision: 2326

Modified:
   WSGIKit/trunk/docs/TodoTutorial.txt
Log:
typos

Modified: WSGIKit/trunk/docs/TodoTutorial.txt
===================================================================
--- WSGIKit/trunk/docs/TodoTutorial.txt	2005-04-11 05:16:53 UTC (rev 2325)
+++ WSGIKit/trunk/docs/TodoTutorial.txt	2005-04-11 06:23:21 UTC (rev 2326)
@@ -35,7 +35,7 @@
     >>> from wsgikit.tests.doctest_webapp import *
 
 Lets start out quickly.  We'll be installing the application in
-``/var/www/todo_sql``::
+``/var/www/todo_sql``:
 
 .. comment (setup)
 
@@ -43,9 +43,6 @@
     >>> import sys
     >>> sys.path.append('/path/to/WSGIKit')
     >>> clear_dir(BASE)
-
-.. comment (interactive)
-
     >>> run("app-setup create -o %s webkit_zpt" % BASE)
     >>> os.chdir(BASE)
     >>> ls(recurse=True)
@@ -63,6 +60,7 @@
         stylesheet.css
 
 ::
+
     $ export PYTHONPATH=/path/to/WSGIKit:$PYTHONPATH
     $ BASE=/var/www/todo_sql
     $ app-setup create -o $BASE webkit_zpt
@@ -543,7 +541,6 @@
     ...  <input type="text" name="description">
     ...  <input type="submit" value="Create!!!!">
     ... </form>
-    ... <tal:block replace="servlet/request/environ" />
     ... </metal:body>
     ... </html>
     ... """)

Author: ianb
Date: 2005-04-10 23:16:53 -0600 (Sun, 10 Apr 2005)
New Revision: 2325

Added:
   WSGIKit/trunk/wsgikit/app_templates/__init__.py
   WSGIKit/trunk/wsgikit/app_templates/webkit_zpt/__init__.py
   WSGIKit/trunk/wsgikit/app_templates/webkit_zpt/command.py
Removed:
   WSGIKit/trunk/wsgikit/app_template.py
Modified:
   WSGIKit/trunk/scripts/app-setup
   WSGIKit/trunk/wsgikit/app_setup.py
Log:
Delegate most of the command processing to the template's command module


Modified: WSGIKit/trunk/scripts/app-setup
===================================================================
--- WSGIKit/trunk/scripts/app-setup	2005-04-11 02:14:36 UTC (rev 2324)
+++ WSGIKit/trunk/scripts/app-setup	2005-04-11 05:16:53 UTC (rev 2325)
@@ -15,4 +15,4 @@
     sys.path.insert(0, os.path.dirname(relative_wsgikit))
 
 from wsgikit import app_setup
-sys.exit(app_setup.the_runner.run(sys.argv))
+sys.exit(app_setup.run(sys.argv))

Modified: WSGIKit/trunk/wsgikit/app_setup.py
===================================================================
--- WSGIKit/trunk/wsgikit/app_setup.py	2005-04-11 02:14:36 UTC (rev 2324)
+++ WSGIKit/trunk/wsgikit/app_setup.py	2005-04-11 05:16:53 UTC (rev 2325)
@@ -4,16 +4,106 @@
 import fnmatch
 import os
 import sys
+from cStringIO import StringIO
+import re
+from wsgikit.util.thirdparty import load_new_module
+string = load_new_module('string', (2, 4))
 
 from wsgikit import app_template
+from wsgikit import pyconfig
+from wsgikit import urlparser
 
+class InvalidCommand(Exception):
+    pass
+
+def find_template_info(args):
+    """
+    Given command-line arguments, this finds the app template
+    (wsgikit.app_templates.<template_name>.command).  It looks for a
+    -t or --template option (but ignores all other options), and if
+    none then looks in server.conf for a template_name option.
+
+    Returns template_name, template_dir, module
+    """
+    template_name = None
+    template_name, rest = find_template_option(args)
+    if template_name:
+        next_template_name, rest = find_template_option(rest)
+        if next_template_name:
+            raise InvalidCommand(
+                'You cannot give two templates on the commandline '
+                '(first I found %r, then %r)'
+                % (template_name, next_template_name))
+    else:
+        template_name = find_template_config(args)
+    if not template_name:
+        raise InvalidCommand(
+            'Not template given (provide --template=name or run this command '
+            'from a directory containing server.conf)')
+    if not re.search(r'^[a-zA-Z_][a-zA-Z0-9_]*$', template_name):
+        raise InvalidCommand(
+            'The template name %r is invalid; template names can contain only '
+            'letters, numbers, and _.' % template_name)
+    try:
+        template_mod = load_template(template_name)
+    except ImportError, e:
+        raise InvalidCommand(
+            'No template exists by the name %r (%s)' % (template_name, e))
+    return (template_name, os.path.dirname(template_mod.__file__), template_mod)
+
+def find_template_option(args):
+    copy = args[:]
+    while copy:
+        if copy[0] == '--':
+            return None, copy
+        if copy[0] == '-t' or copy[0] == '--template':
+            if not copy[1:]:
+                raise InvalidCommand(
+                    '%s needs to be followed with a template name' % copy[0])
+            return copy[1], copy[2:]
+        if copy[0].startswith('-t'):
+            return copy[0][2:], copy[1:]
+        if copy[0].startswith('--template='):
+            return copy[0][len('--template='):], copy[1:]
+        copy.pop(0)
+    return None, []
+
+def find_template_config(args):
+    conf_fn = os.path.join(os.getcwd(), 'server.conf')
+    if not os.path.exists(conf_fn):
+        return None
+    conf = pyconfig.Config()
+    conf.load(conf_fn)
+    return conf.get('template_name')
+
+def load_template(template_name):
+    base = os.path.join(os.path.dirname(__file__), 'app_templates')
+    full_name = 'wsgikit.app_templates.%s.command' % template_name
+    errors = StringIO()
+    mod = urlparser.load_module_from_name(
+        None, os.path.join(base, template_name, 'command'),
+        full_name, errors)
+    if mod is None:
+        raise InvalidCommand(
+            'Cannot load module: %s' % errors.getvalue())
+    return mod
+
+def run(args):
+    try:
+        name, dir, mod = find_template_info(args)
+    except InvalidCommand, e:
+        print str(e)
+        return 2
+    return mod.run(args, name, dir, mod)
+
 class CommandRunner(object):
 
     def __init__(self):
         self.commands = {}
         self.command_aliases = {}
+        self.register_standard_commands()
 
-    def run(self, argv):
+    def run(self, argv, template_name, template_dir, template_module):
         invoked_as = argv[0]
         args = argv[1:]
         for i in range(len(args)):
@@ -30,7 +120,8 @@
         if real_command not in self.commands.keys():
             self.invalid('COMMAND %s unknown' % command)
         runner = self.commands[real_command](
-            invoked_as, command, args, self)
+            invoked_as, command, args, self,
+            template_name, template_dir, template_module)
         runner.run()
 
     def register(self, command):
@@ -43,16 +134,23 @@
         print msg
         sys.exit(code)
 
-the_runner = CommandRunner()
-register = the_runner.register
+    def register_standard_commands(self):
+        # @@: these commands shouldn't require a template
+        self.register(CommandHelp)
+        self.register(CommandList)
 
-def standard_parser(simulate=True, interactive=False):
+############################################################
+## Command framework
+############################################################
+
+def standard_parser(verbose=True, simulate=True, interactive=False):
     parser = optparse.OptionParser()
-    parser.add_option('-v', '--verbose',
-                      help='Be verbose (multiple times for more verbosity)',
-                      action='count',
-                      dest='verbose',
-                      default=0)
+    if verbose:
+        parser.add_option('-v', '--verbose',
+                          help='Be verbose (multiple times for more verbosity)',
+                          action='count',
+                          dest='verbose',
+                          default=0)
     if simulate:
         parser.add_option('-n', '--simulate',
                           help="Don't actually do anything (implies -v)",
@@ -64,6 +162,10 @@
                           action="count",
                           dest="interactive",
                           default=0)
+    parser.add_option('-t', '--template',
+                      help='Use this template',
+                      metavar='NAME',
+                      dest='template_name')
     return parser
 
 class Command(object):
@@ -76,11 +178,15 @@
     required_args = []
     description = None
     
-    def __init__(self, invoked_as, command_name, args, runner):
+    def __init__(self, invoked_as, command_name, args, runner,
+                 template_name, template_dir, template_module):
         self.invoked_as = invoked_as
         self.command_name = command_name
         self.raw_args = args
         self.runner = runner
+        self.template_name = template_name
+        self.template_dir = template_dir
+        self.template_module = template_module
 
     def run(self):
         self.parser.usage = "%%prog [options]\n%s" % self.summary
@@ -88,7 +194,7 @@
             os.path.basename(self.invoked_as),
             self.command_name)
         if self.description:
-            self.parser.description = description
+            self.parser.description = self.description
         self.options, self.args = self.parser.parse_args(self.raw_args)
         if (getattr(self.options, 'simulate', False)
             and not self.options.verbose):
@@ -122,20 +228,13 @@
                 return response[0].lower() == 'y'
             print 'Y or N please'
 
-    def template_dir(self):
-        return os.path.join(os.path.dirname(__file__), 'app_templates')
-
-    def template(self, name):
-        dir = os.path.join(self.template_dir(), name)
-        if not os.path.exists(dir):
-            raise OSError(
-                "Template directory %s does not exist (for template %r)"
-                % (dir, name))
-        return app_template.Template(dir)
-
     def _get_prog_name(self):
         return os.path.basename(self.invoked_as)
     prog_name = property(_get_prog_name)
+
+############################################################
+## Standard commands
+############################################################
     
 class CommandList(Command):
 
@@ -148,67 +247,48 @@
 
     def command(self):
         any = False
-        for dir in os.listdir(self.template_dir()):
-            dir = os.path.join(self.template_dir(), dir)
+        app_template_dir = os.path.join(os.path.dirname(__file__), 'app_templates')
+        for name in os.listdir(app_template_dir):
+            dir = os.path.join(app_template_dir, name)
             if not os.path.exists(os.path.join(dir, 'description.txt')):
                 if self.options.verbose >= 2:
                     print 'Skipping %s (no description.txt)' % dir
                 continue
-            template = app_template.Template(dir)
-            if self.args and not fnmatch.fnmatch(template.name, self.args[0]):
+            if self.args and not fnmatch.fnmatch(name, self.args[0]):
                 continue
-            print template.describe(verbosity=self.options.verbose)
+            if not self.options.verbose:
+                print '%s: %s\n' % (name, self.template_description().splitlines()[0])
+            else:
+                return '%s: %s\n' % (self.name, self.template_description())
+            # @@: for verbosity >= 2 we should give lots of metadata
             any = True
         if not any:
             print 'No application templates found'
 
-register(CommandList)
+    def template_description(self):
+        f = open(os.path.join(self.template_dir, 'description.txt'))
+        content = f.read().strip()
+        f.close()
+        return content
 
-class CommandCreate(Command):
-
-    name = 'create'
-    summary = 'Create application from template'
-
-    max_args = None
-    min_args = 1
-
-    parser = standard_parser()
-    parser.add_option('-o', '--output',
-                      help="Directory to write to (default current directory)",
-                      metavar="DIR",
-                      dest="output_dir",
-                      default=os.getcwd())
-
-    def command(self):
-        template = self.template(self.args[0])
-        template.create(self.options, self.args[1:])
-        if self.options.verbose:
-            print 'Now do:'
-            print '  cd %s' % self.options.output_dir
-            print '  wsgi-server'
-            
-
-register(CommandCreate)
-
-
 class CommandHelp(Command):
 
     name = 'help'
     summary = 'Show help'
 
-    parser = optparse.OptionParser()
+    parser = standard_parser(verbose=False)
 
     max_args = 1
 
     def command(self):
-        if self.args:
-            the_runner.run([self.invoked_as, self.args[0], '-h'])
+        if args:
+            self.runner.run([self.invoked_as, self.args[0], '-h'])
         else:
             print 'Available commands:'
             print '  (use "%s help COMMAND" or "%s COMMAND -h" ' % (
                 self.prog_name, self.prog_name)
             print '  for more information)'
-            items = the_runner.commands.items()
+            items = self.runner.commands.items()
             items.sort()
             max_len = max([len(cn) for cn, c in items])
             for command_name, command in items:
@@ -219,7 +299,107 @@
                     print '%s (Aliases: %s)' % (
                         ' '*max_len, ', '.join(command.aliases))
 
-register(CommandHelp)
+############################################################
+## Optional helper commands
+############################################################
 
+class CommandCreate(Command):
+
+    name = 'create'
+    summary = 'Create application from template'
+
+    max_args = 1
+    min_args = 1
+
+    parser = standard_parser()
+
+    default_options = {
+        'server': 'wsgiutils',
+        'verbose': True,
+        'reload': True,
+        'debug': True,
+        }
+
+    def command(self):
+        self.output_dir = self.args[0]
+        self.create(self.output_dir)
+        if self.options.verbose:
+            print 'Now do:'
+            print '  cd %s' % self.options.output_dir
+            print '  wsgi-server'
+
+    def create(self, output_dir):
+        file_dir = os.path.join(self.template_dir, 'template')
+        if not os.path.exists(file_dir):
+            raise OSError(
+                'No %s directory, I don\'t know what to do next' % file_dir)
+        template_options = self.default_options.copy()
+        template_options.update(self.options.__dict__)
+        template_options['app_name'] = os.path.basename(output_dir)
+        template_options['base_dir'] = output_dir
+        template_options['absolute_base_dir'] = os.path.abspath(output_dir)
+        template_options['absolute_parent'] = os.path.dirname(
+            os.path.abspath(output_dir))
+        template_options['template_name'] = self.template_name
+        self.copy_dir(file_dir, output_dir, template_options, self.options.verbose,
+                      self.options.simulate)
+
+    def copy_dir(self, *args, **kw):
+        copy_dir(*args, **kw)
+
+def copy_dir(source, dest, vars, verbosity, simulate):
+    names = os.listdir(source)
+    names.sort()
+    if not os.path.exists(dest):
+        if verbosity >= 1:
+            print 'Creating %s/' % dest
+        if not simulate:
+            os.makedirs(dest)
+    elif verbosity >= 2:
+        print 'Directory %s exists' % dest
+    for name in names:
+        full = os.path.join(source, name)
+        if name.startswith('.'):
+            if verbosity >= 2:
+                print 'Skipping hidden file %s' % full
+            continue
+        dest_full = os.path.join(dest, _substitute_filename(name, vars))
+        if os.path.isdir(full):
+            if verbosity:
+                print 'Recursing into %s' % full
+            copy_dir(full, dest_full, vars, verbosity, simulate)
+            continue
+        f = open(full, 'rb')
+        content = f.read()
+        f.close()
+        content = _substitute_content(content, vars)
+        if verbosity:
+            print 'Copying %s to %s' % (full, dest_full)
+        f = open(dest_full, 'wb')
+        f.write(content)
+        f.close()
+
+def _substitute_filename(fn, vars):
+    for var, value in vars.items():
+        fn = fn.replace('+%s+' % var, str(value))
+    return fn
+
+def _substitute_content(content, vars):
+    tmpl = string.Template(content)
+    return tmpl.substitute(TypeMapper(vars))
+
+class TypeMapper(dict):
+
+    def __getitem__(self, item):
+        if item.startswith('str_'):
+            return repr(str(self[item[4:]]))
+        elif item.startswith('bool_'):
+            if self[item[5:]]:
+                return 'True'
+            else:
+                return 'False'
+        else:
+            return dict.__getitem__(self, item)
+
 if __name__ == '__main__':
-    the_runner.run(sys.argv)
+    run(sys.argv)

Deleted: WSGIKit/trunk/wsgikit/app_template.py
===================================================================
--- WSGIKit/trunk/wsgikit/app_template.py	2005-04-11 02:14:36 UTC (rev 2324)
+++ WSGIKit/trunk/wsgikit/app_template.py	2005-04-11 05:16:53 UTC (rev 2325)
@@ -1,126 +0,0 @@
-import os
-from wsgikit.util.thirdparty import load_new_module
-string = load_new_module('string', (2, 4))
-
-default_options = {
-    'server': 'wsgiutils',
-    'verbose': True,
-    'reload': True,
-    'debug': True,
-    }
-
-class Template(object):
-
-    def __init__(self, dir):
-        self.dir = dir
-        self.name = os.path.basename(dir)
-
-    def describe(self, verbosity):
-        if not verbosity:
-            return '%s: %s\n' % (self.name, self.description.splitlines()[0])
-        else:
-            return '%s: %s\n' % (self.name, self.description)
-        # @@: for verbosity >= 2 we should give lots of metadata
-            
-    def _get_description(self):
-        f = open(os.path.join(self.dir, 'description.txt'))
-        content = f.read().strip()
-        f.close()
-        return content
-    description = property(_get_description)
-
-    def collect_options(self, args):
-        result = {}
-        while args:
-            if args[0].startswith('-') and not args[0].startswith('--'):
-                assert 0, (
-                    'All template options must be long form (--option=...): %r' % args[0])
-            if not args[0].startswith('--'):
-                assert 0, (
-                    'You can only give options to a template, not unnamed arguments: %r' % args[0])
-            name = args[0][2:]
-            if '=' in name:
-                name, value = name.split('=', 1)
-                args = args[1:]
-            else:
-                if not args[1:]:
-                    assert 0, (
-                        'You did not give a value for the option %r' % args[0])
-                value = args[1]
-                args = args[2:]
-            name = name.replace('-', '_')
-            result[name] = value
-        return result
-
-    def copy_dir(self, source, dest, options, verbosity, simulate):
-        names = os.listdir(source)
-        names.sort()
-        if not os.path.exists(dest):
-            if verbosity >= 1:
-                print 'Creating %s/' % dest
-            if not simulate:
-                os.makedirs(dest)
-        elif verbosity >= 2:
-            print 'Directory %s exists' % dest
-        for name in names:
-            full = os.path.join(source, name)
-            if name.startswith('.'):
-                if verbosity >= 2:
-                    print 'Skipping hidden file %s' % full
-                continue
-            dest_full = os.path.join(dest, self.substitute_filename(name, options))
-            if os.path.isdir(full):
-                if verbosity:
-                    print 'Recursing into %s' % full
-                self.copy_dir(full, dest_full, options, verbosity, simulate)
-                continue
-            f = open(full, 'rb')
-            content = f.read()
-            f.close()
-            content = self.substitute_content(content, options)
-            if verbosity:
-                print 'Copying %s to %s' % (full, dest_full)
-            f = open(dest_full, 'wb')
-            f.write(content)
-            f.close()
-
-    def substitute_filename(self, fn, options):
-        for var, value in options.items():
-            fn = fn.replace('+%s+' % var, str(value))
-        return fn
-
-    def substitute_content(self, content, options):
-        tmpl = string.Template(content)
-        return tmpl.substitute(TypeMapper(options))
-            
-    def create(self, options, args):
-        outdir = options.output_dir
-        template_dir = os.path.join(self.dir, 'template')
-        if not os.path.exists(template_dir):
-            raise OSError(
-                'No %s directory, I don\'t know what to do next' % template_dir)
-        template_options = default_options.copy()
-        template_options.update(self.collect_options(args))
-        template_options['app_name'] = os.path.basename(outdir)
-        template_options['base_dir'] = outdir
-        template_options['absolute_base_dir'] = os.path.abspath(outdir)
-        template_options['absolute_parent'] = os.path.dirname(
-            os.path.abspath(outdir))
-        template_options['template_name'] = self.name
-        self.copy_dir(template_dir, outdir, template_options, options.verbose,
-                      options.simulate)
-        
-    
-class TypeMapper(dict):
-
-    def __getitem__(self, item):
-        if item.startswith('str_'):
-            return repr(str(self[item[4:]]))
-        elif item.startswith('bool_'):
-            if self[item[5:]]:
-                return 'True'
-            else:
-                return 'False'
-        else:
-            return dict.__getitem__(self, item)
-        

Added: WSGIKit/trunk/wsgikit/app_templates/__init__.py
===================================================================
--- WSGIKit/trunk/wsgikit/app_templates/__init__.py	2005-04-11 02:14:36 UTC (rev 2324)
+++ WSGIKit/trunk/wsgikit/app_templates/__init__.py	2005-04-11 05:16:53 UTC (rev 2325)
@@ -0,0 +1 @@
+#

Added: WSGIKit/trunk/wsgikit/app_templates/webkit_zpt/__init__.py
===================================================================
--- WSGIKit/trunk/wsgikit/app_templates/webkit_zpt/__init__.py	2005-04-11 02:14:36 UTC (rev 2324)
+++ WSGIKit/trunk/wsgikit/app_templates/webkit_zpt/__init__.py	2005-04-11 05:16:53 UTC (rev 2325)
@@ -0,0 +1 @@
+#

Added: WSGIKit/trunk/wsgikit/app_templates/webkit_zpt/command.py
===================================================================
--- WSGIKit/trunk/wsgikit/app_templates/webkit_zpt/command.py	2005-04-11 02:14:36 UTC (rev 2324)
+++ WSGIKit/trunk/wsgikit/app_templates/webkit_zpt/command.py	2005-04-11 05:16:53 UTC (rev 2325)
@@ -0,0 +1,6 @@
+from wsgikit.app_setup import CommandRunner, standard_parser, CommandCreate
+
+the_runner = CommandRunner()
+the_runner.register(CommandCreate)
+
+run = the_runner.run

Author: ianb
Date: 2005-04-10 20:14:36 -0600 (Sun, 10 Apr 2005)
New Revision: 2324

Modified:
   WSGIKit/trunk/wsgikit/app_templates/webkit_zpt/template/server.conf
Log:
Use repr()'d strings, which will work on Windows

Modified: WSGIKit/trunk/wsgikit/app_templates/webkit_zpt/template/server.conf
===================================================================
--- WSGIKit/trunk/wsgikit/app_templates/webkit_zpt/template/server.conf	2005-04-11 02:09:19 UTC (rev 2323)
+++ WSGIKit/trunk/wsgikit/app_templates/webkit_zpt/template/server.conf	2005-04-11 02:14:36 UTC (rev 2324)
@@ -2,8 +2,8 @@
 
 app_template = $str_template_name
 app_name = $str_app_name
-webkit_dir = '$absolute_base_dir/web'
-sys_path = ['$absolute_parent']
+webkit_dir = $str_absolute_base_dir + '/web'
+sys_path = [$str_absolute_parent]
 
 ## Server options:

Author: ianb
Date: 2005-04-10 20:09:19 -0600 (Sun, 10 Apr 2005)
New Revision: 2323

Modified:
   WSGIKit/trunk/docs/WSGIKit.txt
Log:
Clarified WSGIUtils requirement

Modified: WSGIKit/trunk/docs/WSGIKit.txt
===================================================================
--- WSGIKit/trunk/docs/WSGIKit.txt	2005-04-11 02:05:59 UTC (rev 2322)
+++ WSGIKit/trunk/docs/WSGIKit.txt	2005-04-11 02:09:19 UTC (rev 2323)
@@ -1,4 +1,4 @@
-WSGI WebKit
+WSGIKit
 ===========
 
 This is a WSGI_ version of WebKit.  In addition to supporting WSGI, it
@@ -17,23 +17,23 @@
 Quick Start
 -----------
 
-The commands::
+First, grab WSGIUtils, at http://www.owlfish.com/software/wsgiutils/,
+or download it directly from
+http://www.owlfish.com/software/wsgiutils/downloads/WSGI%20Utils-0.5.tar.gz
 
-    cd ~
-    svn co http://svn.w4py.org/WSGIKit/trunk WSGIKit
-    http://www.owlfish.com/software/wsgiutils/downloads/WSGI%20Utils-0.4.tar.gz
-    mkdir src
-    cd src
-    tar zfx ../WSGI\ Utils-0.4.tar.gz
-    cd WSGI\ Utils
-    python setup.py install --home=~
-    cd ../../
-    export PYTHONPATH=~/lib/python:~/WSGIKit:$PYTHONPATH
-    cd WSGIKit/wsgikit
-    ./server.py --webkit-dir=../examples/todo --server=wsgiutils --reload -v -D
+You can use other servers with WSGIKit, but WSGIUtils is pretty easy
+and built on SimpleHTTPServer.  Run ``python setup.py install`` to
+install it.
 
-Then open up http://localhost:8080/
+Right now it's best NOT to install WSGIKit with ``setup.py``, but just
+to run it out of the checkout.  An easy way to do that::
 
+    ./scripts/app-setup create webkit_zpt /path/to/put/files
+    cd /path/to/put/files
+    /path/to/wsgikit/scripts/server -v
+
+And it will be running a server on http://localhost:8080/
+
 Compatibility
 -------------

Author: ianb
Date: 2005-04-10 20:05:59 -0600 (Sun, 10 Apr 2005)
New Revision: 2322

Modified:
   WSGIKit/trunk/wsgikit/server.py
Log:
Use spawnve instead of spawnvpe, which isn't available on Windows

Modified: WSGIKit/trunk/wsgikit/server.py
===================================================================
--- WSGIKit/trunk/wsgikit/server.py	2005-04-09 22:55:39 UTC (rev 2321)
+++ WSGIKit/trunk/wsgikit/server.py	2005-04-11 02:05:59 UTC (rev 2322)
@@ -251,8 +251,8 @@
         args = [sys.executable] + sys.argv
         new_environ = os.environ.copy()
         new_environ[reloader_environ_key] = 'true'
-        exit_code = os.spawnvpe(os.P_WAIT, sys.executable,
-                                args, new_environ)
+        exit_code = os.spawnve(os.P_WAIT, sys.executable,
+                               args, new_environ)
         if exit_code != 3:
             return None, exit_code
         print "Exit code 3; restarting server"