I thought I committed this last night. Ho hum.

- This implements most of the rest of the new tracker config layout:
  - dbinit.py split between schema.py and initial_data.py
  - interfaces.py gone
  - tracker and detectors __init__.py gone
- Added some missing functionality to backends: db_exists test and db_nuke.
- Implemented configuration file options in postgresql backend.
- Cleaned up tracker initialisation a lot.

Author: Richard Jones

cgi-bin/roundup.cgi

@@ -16,7 +16,7 @@
 # BASIS, AND THERE IS NO OBLIGATION WHATSOEVER TO PROVIDE MAINTENANCE,
 # SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
 # 
-# $Id: roundup.cgi,v 1.39 2004-06-29 08:59:08 richard Exp $
+# $Id: roundup.cgi,v 1.40 2004-07-27 00:57:17 richard Exp $
 
 # python version check
 from roundup import version_check
@@ -158,16 +158,19 @@ def main(out, err):
         else:
             tracker_home = TRACKER_HOMES[tracker]
             tracker = roundup.instance.open(tracker_home)
-            from roundup.cgi.client import Unauthorised, NotFound
-            client = tracker.Client(tracker, request, os.environ)
+            from roundup.cgi import client
+            if hasattr(tracker, 'Client'):
+                client = tracker.Client(tracker, request, os.environ)
+            else:
+                client = client.Client(tracker, request, os.environ)
             try:
                 client.main()
-            except Unauthorised:
+            except client.Unauthorised:
                 request.send_response(403)
                 request.send_header('Content-Type', 'text/html')
                 request.end_headers()
                 out.write('Unauthorised')
-            except NotFound:
+            except client.NotFound:
                 request.send_response(404)
                 request.send_header('Content-Type', 'text/html')
                 request.end_headers()

demo.py

@@ -2,7 +2,7 @@
 #
 # Copyright (c) 2003 Richard Jones ([email protected])
 # 
-# $Id: demo.py,v 1.11 2004-05-28 01:09:10 richard Exp $
+# $Id: demo.py,v 1.12 2004-07-27 00:57:17 richard Exp $
 
 import sys, os, string, re, urlparse
 import shutil, socket, errno, BaseHTTPServer
@@ -27,7 +27,7 @@ class config:
             module.db_nuke(config)
     elif backend == 'postgresql':
         class config:
-            POSTGRESQL_DATABASE = {'database': 'rounduptest'}
+            POSTGRESQL_DATABASE = 'rounduptest'
             DATABASE = 'home'
         if module.db_exists(config):
             module.db_nuke(config)

frontends/ZRoundup/ZRoundup.py

@@ -14,7 +14,7 @@
 # BASIS, AND THERE IS NO OBLIGATION WHATSOEVER TO PROVIDE MAINTENANCE,
 # SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
 # 
-# $Id: ZRoundup.py,v 1.18 2004-07-21 04:50:40 richard Exp $
+# $Id: ZRoundup.py,v 1.19 2004-07-27 00:57:17 richard Exp $
 #
 ''' ZRoundup module - exposes the roundup web interface to Zope
 
@@ -40,7 +40,7 @@
 modulesecurity = ModuleSecurityInfo()
 
 import roundup.instance
-from roundup.cgi.client import NotFound
+from roundup.cgi import client
 
 modulesecurity.declareProtected('View management screens',
     'manage_addZRoundupForm')
@@ -139,7 +139,7 @@ def __init__(self, id, instance_home):
     def roundup_opendb(self):
         '''Open the roundup instance database for a transaction.
         '''
-        instance = roundup.instance.open(self.instance_home)
+        tracker = roundup.instance.open(self.instance_home)
         request = RequestWrapper(self.REQUEST['RESPONSE'])
         env = self.REQUEST.environ
 
@@ -159,7 +159,9 @@ def roundup_opendb(self):
             env['TRACKER_NAME'] = path_components[-1]
 
         form = FormWrapper(self.REQUEST.form)
-        return instance.Client(instance, request, env, form)
+        if hasattr(tracker, 'Client'):
+            return tracker.Client(tracker, request, env, form)
+        return client.Client(tracker, request, env, form)
 
     security.declareProtected('View', 'index_html')
     def index_html(self):
@@ -208,7 +210,7 @@ def index_html(self, REQUEST=None):
             # and call roundup to do something 
             client.main()
             return ''
-        except NotFound:
+        except client.NotFound:
             raise 'NotFound', REQUEST.URL
             pass
         except:

roundup/admin.py

@@ -16,7 +16,7 @@
 # BASIS, AND THERE IS NO OBLIGATION WHATSOEVER TO PROVIDE MAINTENANCE,
 # SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
 #
-# $Id: admin.py,v 1.76 2004-07-13 10:21:32 a1s Exp $
+# $Id: admin.py,v 1.77 2004-07-27 00:57:17 richard Exp $
 
 '''Administration commands for maintaining Roundup trackers.
 '''
@@ -445,29 +445,19 @@ def do_initialise(self, tracker_home, args):
             raise UsageError, _('Instance has not been installed')%locals()
 
         # is there already a database?
-        try:
-            db_exists = tracker.select_db.Database.exists(tracker.config)
-        except AttributeError:
-            # TODO: move this code to exists() static method in every backend
-            db_exists = os.path.exists(os.path.join(tracker_home, 'db'))
-        if db_exists:
+        if tracker.exists():
             ok = raw_input(_(
 """WARNING: The database is already initialised!
 If you re-initialise it, you will lose all the data!
 Erase it? Y/N: """))
             if ok.strip().lower() != 'y':
                 return 0
 
-            # Get a database backend in use by tracker
-            try:
-                # nuke it
-                tracker.select_db.Database.nuke(tracker.config)
-            except AttributeError:
-                # TODO: move this code to nuke() static method in every backend
-                shutil.rmtree(os.path.join(tracker_home, 'db'))
+            # nuke it
+            tracker.nuke()
 
         # GO
-        init.initialise(tracker_home, adminpw)
+        tracker.init(password.Password(adminpw))
 
         return 0
 

roundup/backends/back_anydbm.py

@@ -15,7 +15,7 @@
 # BASIS, AND THERE IS NO OBLIGATION WHATSOEVER TO PROVIDE MAINTENANCE,
 # SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
 # 
-#$Id: back_anydbm.py,v 1.166 2004-07-22 04:47:35 richard Exp $
+#$Id: back_anydbm.py,v 1.167 2004-07-27 00:57:18 richard Exp $
 '''This module defines a backend that saves the hyperdatabase in a
 database chosen by anydbm. It is guaranteed to always be available in python
 versions >2.1.1 (the dumbdbm fallback in 2.1.1 and earlier has several
@@ -43,6 +43,16 @@
     Multilink, DatabaseError, Boolean, Number, Node
 from roundup.date import Range
 
+def db_exists(config):
+    # check for the user db
+    for db in 'user user.db'.split():
+        if os.path.exists(os.path.join(config.TRACKER_HOME, 'db', db)):
+            return 1
+    return 0
+
+def db_nuke(config):
+    shutil.rmtree(os.path.join(config.TRACKER_HOME, 'db'))
+
 #
 # Now the database
 #

roundup/backends/back_bsddb.py

@@ -15,17 +15,23 @@
 # BASIS, AND THERE IS NO OBLIGATION WHATSOEVER TO PROVIDE MAINTENANCE,
 # SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
 # 
-#$Id: back_bsddb.py,v 1.30 2004-07-02 05:22:09 richard Exp $
+#$Id: back_bsddb.py,v 1.31 2004-07-27 00:57:18 richard Exp $
 '''This module defines a backend that saves the hyperdatabase in BSDDB.
 '''
 __docformat__ = 'restructuredtext'
 
-import bsddb, os, marshal
+import bsddb, os, marshal, shutil
 from roundup import hyperdb, date
 
 # these classes are so similar, we just use the anydbm methods
 from back_anydbm import Database, Class, FileClass, IssueClass
 
+def db_exists(config):
+    return os.path.exists(os.path.join(config.TRACKER_HOME, 'db', 'user'))
+
+def db_nuke(config):
+    shutil.rmtree(os.path.join(config.TRACKER_HOME, 'db'))
+
 #
 # Now the database
 #

roundup/backends/back_bsddb3.py

@@ -15,17 +15,23 @@
 # BASIS, AND THERE IS NO OBLIGATION WHATSOEVER TO PROVIDE MAINTENANCE,
 # SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
 # 
-#$Id: back_bsddb3.py,v 1.24 2004-07-02 05:22:09 richard Exp $
+#$Id: back_bsddb3.py,v 1.25 2004-07-27 00:57:18 richard Exp $
 '''This module defines a backend that saves the hyperdatabase in BSDDB3.
 '''
 __docformat__ = 'restructuredtext'
 
-import bsddb3, os, marshal, errno
+import bsddb3, os, marshal, errno, shutil
 from roundup import hyperdb, date
 
 # these classes are so similar, we just use the anydbm methods
 from back_anydbm import Database, Class, FileClass, IssueClass
 
+def db_exists(config):
+    return os.path.exists(os.path.join(config.TRACKER_HOME, 'db', 'user'))
+
+def db_nuke(config):
+    shutil.rmtree(os.path.join(config.TRACKER_HOME, 'db'))
+
 #
 # Now the database
 #

roundup/backends/back_metakit.py

@@ -1,4 +1,4 @@
-# $Id: back_metakit.py,v 1.81 2004-07-20 23:24:26 richard Exp $
+# $Id: back_metakit.py,v 1.82 2004-07-27 00:57:18 richard Exp $
 '''Metakit backend for Roundup, originally by Gordon McMillan.
 
 Known Current Bugs:
@@ -56,6 +56,13 @@
 READ = 0
 READWRITE = 1
 
+def db_exists(config):
+    return os.path.exists(os.path.join(config.TRACKER_HOME, 'db',
+        'tracker.mk4'))
+
+def db_nuke(config):
+    shutil.rmtree(os.path.join(config.TRACKER_HOME, 'db'))
+
 # general metakit error
 class MKBackendError(Exception):
     pass

roundup/backends/back_postgresql.py

@@ -14,15 +14,37 @@
 from roundup import hyperdb, date
 from roundup.backends import rdbms_common
 
+from roundup import configuration
+
+configuration.SETTINGS += (
+    ("postgresql", (
+        (configuration.Option, 'database', 'roundup'),
+        (configuration.NullableOption, 'host', 'localhost'),
+        (configuration.NullableOption, 'port', '5432'),
+        (configuration.NullableOption, 'user', 'roundup'),
+        (configuration.NullableOption, 'password', 'roundup'),
+    )),
+)
+
+def connection_dict(config):
+    d = {
+        'database': config.POSTGRESQL_DATABASE,
+    }
+    for name in 'host', 'port', 'password', 'user':
+        cvar = 'POSTGRESQL_'+name.upper()
+        if config[cvar] is not None:
+            d[name] = config[cvar]
+    return d
+
 def db_create(config):
     """Clear all database contents and drop database itself"""
-    command = 'CREATE DATABASE %s'%config.POSTGRESQL_DATABASE['database']
+    command = 'CREATE DATABASE %s'%config.POSTGRESQL_DATABASE
     config.logging.getLogger('hyperdb').info(command)
     db_command(config, command)
 
 def db_nuke(config, fail_ok=0):
     """Clear all database contents and drop database itself"""
-    command = 'DROP DATABASE %s'% config.POSTGRESQL_DATABASE['database']
+    command = 'DROP DATABASE %s'% config.POSTGRESQL_DATABASE
     config.logging.getLogger('hyperdb').info(command)
     db_command(config, command)
 
@@ -33,7 +55,7 @@ def db_command(config, command):
     '''Perform some sort of database-level command. Retry 10 times if we
     fail by conflicting with another user.
     '''
-    template1 = config.POSTGRESQL_DATABASE.copy()
+    template1 = connection_dict(config)
     template1['database'] = 'template1'
 
     try:
@@ -70,7 +92,7 @@ def pg_command(cursor, command):
 
 def db_exists(config):
     """Check if database already exists"""
-    db = getattr(config, 'POSTGRESQL_DATABASE')
+    db = connection_dict(config)
     try:
         conn = psycopg.connect(**db)
         conn.close()
@@ -82,7 +104,7 @@ class Database(rdbms_common.Database):
     arg = '%s'
 
     def sql_open_connection(self):
-        db = getattr(self.config, 'POSTGRESQL_DATABASE')
+        db = connection_dict(config)
         self.config.logging.getLogger('hyperdb').info('open database %r'%db)
         try:
             conn = psycopg.connect(**db)

roundup/backends/back_sqlite.py

@@ -1,4 +1,4 @@
-# $Id: back_sqlite.py,v 1.30 2004-07-02 05:22:09 richard Exp $
+# $Id: back_sqlite.py,v 1.31 2004-07-27 00:57:18 richard Exp $
 '''Implements a backend for SQLite.
 
 See https://pysqlite.sourceforge.net/ for pysqlite info
@@ -9,13 +9,19 @@
 '''
 __docformat__ = 'restructuredtext'
 
-import os, base64, marshal
+import os, base64, marshal, shutil
 
 from roundup import hyperdb, date, password
 from roundup.backends import locking
 from roundup.backends import rdbms_common
 import sqlite
 
+def db_exists(config):
+    return os.path.exists(os.path.join(config.TRACKER_HOME, 'db', 'db'))
+
+def db_nuke(config):
+    shutil.rmtree(os.path.join(config.TRACKER_HOME, 'db'))
+
 class Database(rdbms_common.Database):
     # char to use for positional arguments
     arg = '%s'