Move demo.py to roundup.demo where it appears when installed.

This removes part of distutils building magic and brings
Roundup sources closer to the state how it works when
installed.

Previously I've introduced a bug where I've made "demo"
tracker home configurable and by default created in the dir
the demo.py script, which became directory of roundup.demo
module after installation. This will be fixed in the next
commit. Simplicity matters.

Author: techtonik

2to3-done.txt

@@ -42,7 +42,6 @@ TODO
 ./roundup/dist/command/bdist_rpm.py
 ./roundup/dist/command/build.py
 ./roundup/dist/command/build_doc.py
-./roundup/dist/command/build_py.py
 ./roundup/dist/command/build_scripts.py
 ./roundup/exceptions.py
 ./roundup/hyperdb.py

demo.py

@@ -1,202 +1,6 @@
-#!/usr/bin/env python
-#
-# Copyright (c) 2003 Richard Jones ([email protected])
-#
-
-import errno
-import os
-import shutil
-import socket
-import sys
-import urlparse
-import getopt
-
-from roundup import configuration
-from roundup.scripts import roundup_server
-
-# Path where demo instance files will be stored
-TRACKER_HOME = os.path.join(os.path.dirname(__file__), 'demo')
-
-def install_demo(home, backend, template):
-    """Install a demo tracker
-
-    Parameters:
-        home:
-            tracker home directory path
-        backend:
-            database backend name
-        template:
-            tracker template
-
-    """
-
-    from roundup import init, instance, password, backends
-
-    # set up the config for this tracker
-    config = configuration.CoreConfig()
-    config['TRACKER_HOME'] = home
-    config['MAIL_DOMAIN'] = 'localhost'
-    config['DATABASE'] = 'db'
-    config['WEB_DEBUG'] = True
-    if backend in ('mysql', 'postgresql'):
-        config['RDBMS_HOST'] = 'localhost'
-        config['RDBMS_USER'] = 'rounduptest'
-        config['RDBMS_PASSWORD'] = 'rounduptest'
-        config['RDBMS_NAME'] = 'rounduptest'
-
-    # see if we need to clean up existing directory
-    if os.path.exists(home):
-        if os.path.exists(home + '/config.ini'):
-            # clear everything out to avoid conflicts with former
-            # extensions and detectors
-            print "Nuking directory left from the previous demo instance."
-            shutil.rmtree(home)
-        else:
-            print "Error: Refusing to nuke non-tracker directory:"
-            print "    %s" % home
-            sys.exit(1)
-
-    template_dir = os.path.join('share', 'roundup', 'templates', template)
-    init.install(home, template_dir)
-    # don't have email flying around
-    nosyreaction = os.path.join(home, 'detectors', 'nosyreaction.py')
-    if os.path.exists(nosyreaction):
-        os.remove(nosyreaction)
-    nosyreaction += 'c'
-    if os.path.exists(nosyreaction):
-        os.remove(nosyreaction)
-    init.write_select_db(home, backend)
-
-    # figure basic params for server
-    hostname = 'localhost'
-    # pick a fairly odd, random port
-    port = 8917
-    while 1:
-        print 'Trying to set up web server on port %d ...'%port,
-        s = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
-        s.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1)
-        try:
-            s.connect((hostname, port))
-        except socket.error, e:
-            if not hasattr(e, 'args') or e.args[0] != errno.ECONNREFUSED:
-                raise
-            print 'should be ok.'
-            break
-        else:
-            s.close()
-            print 'already in use.'
-            port += 100
-    config['TRACKER_WEB'] = 'http://%s:%s/demo/'%(hostname, port)
-
-    # write the config
-    config['INSTANT_REGISTRATION'] = 1
-    # FIXME: Move template-specific demo initialization into the templates.
-    if template == 'responsive':
-        config['STATIC_FILES'] = "static"
-    if template == 'jinja2':
-        config['TEMPLATE_ENGINE'] = 'jinja2'
-        config['STATIC_FILES'] = "static"
-    config.save(os.path.join(home, config.INI_FILE))
-
-    # open the tracker and initialise
-    tracker = instance.open(home)
-    tracker.init(password.Password('admin'))
-
-    # add the "demo" user
-    db = tracker.open('admin')
-    # FIXME: Move tracker-specific demo initialization into the tracker templates.
-    if template == 'minimal':
-        db.user.create(username='demo', password=password.Password('demo'),
-                       roles='User')
-    else:
-        db.user.create(username='demo', password=password.Password('demo'),
-                       realname='Demo User', roles='User')
-    db.commit()
-    db.close()
-
-def run_demo(home):
-    """Run the demo tracker instance from its ``home`` directory"""
-    cfg = configuration.CoreConfig(home)
-    url = cfg["TRACKER_WEB"]
-    hostname, port = urlparse.urlparse(url)[1].split(':')
-    port = int(port)
-    success_message = '''Server running - connect to:
-    %(url)s
-1. Log in as "demo"/"demo" or "admin"/"admin".
-2. Hit Control-C to stop the server.
-3. Re-start the server by running "%(script)s" again.
-4. Re-initialise the server by running "%(script)s nuke".
-
-Demo tracker is set up to be accessed by localhost browser.  If you
-run demo on a server host, please stop the demo, open file
-"%(datadir)s/config.ini" with your editor, change the host name in the "web"
-option in section "[tracker]", save the file, then re-run the demo
-program. If you want to change backend types, you must use "nuke".
-
-''' % dict(url=url, script=sys.argv[0], datadir=TRACKER_HOME)
-
-    # disable command line processing in roundup_server
-    sys.argv = sys.argv[:1] + ['-p', str(port), '-n', hostname, 'demo=' + home]
-    roundup_server.run(success_message=success_message)
-
-
-def usage(msg = ''):
-
-    if msg: print msg
-    print 'Usage: %s [options] [nuke]'%sys.argv[0]
-    print """
- Run a demo server. Config and database files are created
- in %(datadir)s/ subdirectory of %(script)s dir.
-    
-Options:
- -h                -- print this help message
- -t template       -- specify the tracker template to use
- -b backend        -- specify the database backend to use
-""" % dict(script=sys.argv[0], datadir=TRACKER_HOME)
-
-
-def main():
-    """Run a demo server for users to play with for instant gratification.
-
-    Sets up the web service on localhost. Disables nosy lists.
-    """
-
-    try:
-        opts, args = getopt.getopt(sys.argv[1:], 't:b:h')
-    except getopt.GetoptError, e:
-        usage(str(e))
-        return 1
-    for opt, arg in opts:
-        if opt == '-h':
-            usage()
-            return 0
-
-    home = os.path.abspath(TRACKER_HOME)
-    nuke = args and args[0] == 'nuke'
-    if not os.path.exists(home) or nuke:
-        backend = 'anydbm'
-        template = 'classic'
-        for opt, arg in opts:
-            if opt == '-t':
-                template = arg
-            elif opt == '-b':
-                backend = arg
-        if (len(args) > 1 or
-            (len(args) == 1 and args[0] != 'nuke')):
-            usage()
-            return 1
-
-        print "Initializing demo instance in:\n    %s" % home
-        install_demo(home, backend, template)
-    elif opts:
-        print "Error: Arguments are not allowed when running an existing demo."
-        print "       Use the 'nuke' command to start over."
-        sys.exit(1)
-
-    run_demo(home)
-
-
-if __name__ == '__main__':
-    sys.exit(main())
-
-# vim: set filetype=python sts=4 sw=4 et si :
+import sys
+import roundup
+
+from roundup.demo import main
+
+sys.exit(main())