Add Trac references to email addr heuristic TODO

[wizard.git] / plugins / scripts / wizard_scripts.py

diff --git a/plugins/scripts/wizard_scripts.py b/plugins/scripts/wizard_scripts.py
index 1dde2bd55b7eb73ee705c8153cfec749e9e023bb..4c6540aad46958daaa175e56e24b6cef497d1487 100644 (file)
--- a/plugins/scripts/wizard_scripts.py
+++ b/plugins/scripts/wizard_scripts.py
@@ -14,6 +14,14 @@ import sqlalchemy
 import wizard
 from wizard import deploy, shell, install, util, user
 
+def dummy_apps():
+    return [
+        "joomla", "e107", "gallery2", "advancedbook", "phpical",
+        "trac", "turbogears", "django", "rails",
+        # these are technically deprecated
+        "advancedpoll", "gallery",
+    ]
+
 def deploy_web(dir):
     # try the directory
     homedir, _, web_path = dir.partition("/web_scripts")
@@ -113,10 +121,23 @@ def sql_auth(url):
             return url
         except shell.CallError:
             pass
+        except OSError:
+            pass
+    return None
+
+def sql_drop(url):
+    if url.host == "sql.mit.edu":
+        try:
+            shell.call("/mit/scripts/sql/bin/drop-database", url.database)
+            return True
+        except shell.CallError:
+            pass
     return None
 
 def user_email(name):
-    # XXX: simplistic install which doesn't work most of the time
+    # XXX: simplistic heuristic which doesn't work most of the time
+    # See Scripts #224 (this issue) and Scripts #193 (tracking a contact
+    # address)
     return "%s@scripts.mit.edu" % name
 
 def user_operator():
@@ -163,10 +184,13 @@ class MysqlStrategy(install.Strategy):
     provides = frozenset(["dsn"])
     def prepare(self):
         """Uses the SQL programs in the scripts locker"""
+        logging.info("Attempting wizard_scripts MySQL strategy")
         if self.application.database != "mysql":
             raise install.StrategyFailed
         try:
             self._triplet = shell.eval("/mit/scripts/sql/bin/get-password").split()
+        except OSError:
+            raise install.StrategyFailed
         except shell.CallError:
             raise install.StrategyFailed
         if len(self._triplet) != 3:
@@ -180,6 +204,8 @@ class MysqlStrategy(install.Strategy):
         # race condition
         name = shell.eval("/mit/scripts/sql/bin/get-next-database", os.path.basename(self.dir))
         database = shell.eval("/mit/scripts/sql/bin/create-database", name)
+        if not database:
+            raise CreateDatabaseError
         options.dsn = sqlalchemy.engine.url.URL("mysql", username=username, password=password, host=host, database=database)
 
 class EmailStrategy(install.Strategy):
@@ -194,3 +220,13 @@ class EmailStrategy(install.Strategy):
     def execute(self, options):
         """No-op."""
         options.email = self._user + "@mit.edu"
+
+class CreateDatabaseError(wizard.Error):
+    """Could not create a database with the create-database script."""
+    def __str__(self):
+        return """
+
+ERROR: We were unable to create a database for you: this may indicate
+that you have exceeded your quota of databases or indicate a problem
+with the sql.mit.edu service.  Please mail scripts@mit.edu with this
+error message."""