Refactor more boilerplate out.

[wizard.git] / wizard / app / wordpress.py

diff --git a/wizard/app/wordpress.py b/wizard/app/wordpress.py
index 9bc112fd60798d90a2bbf959f62933c5014fcc19..742881b93a857d5846b690963a08eced1ca1ddd4 100644 (file)
--- a/wizard/app/wordpress.py
+++ b/wizard/app/wordpress.py
@@ -1,23 +1,27 @@
 import os
 import re
 import logging
+import distutils
+import urlparse
 
 from wizard import app, install, resolve, sql, util
 from wizard.app import php
 
-# XXX: We probably want to separate out the re.compile() line
 def make_filename_regex_define(var):
-    return 'wp-config.php', re.compile('^(define\(\'' + app.expand_re(var) + r''''\s*,\s*)(.*)(\);)''', re.M)
+    return 'wp-config.php', php.re_define(var)
 
 seed = util.dictmap(make_filename_regex_define, {
+    # these funny names are due to convention set by MediaWiki
     'WIZARD_DBSERVER': 'DB_HOST',
     'WIZARD_DBNAME': 'DB_NAME',
     'WIZARD_DBUSER': 'DB_USER',
     'WIZARD_DBPASSWORD': 'DB_PASSWORD',
+    'WIZARD_SECRETKEY': 'SECRET_KEY',
+    'WIZARD_AUTH_KEY': 'AUTH_KEY',
+    'WIZARD_SECURE_AUTH_KEY': 'SECURE_AUTH_KEY',
+    'WIZARD_LOGGED_IN_KEY': 'LOGGED_IN_KEY',
+    'WIZARD_NONCE_KEY': 'NONCE_KEY',
     })
-# XXX: I have omitted an implementation for table prefix, on grounds that we
-# do not permit it to be configured. If we do end up growing support for
-# arbitrary table prefixes this should be added.
 
 class Application(app.Application):
     parametrized_files = ['wp-config.php'] + php.parametrized_files
@@ -26,24 +30,23 @@ class Application(app.Application):
     substitutions = app.make_substitutions(seed)
     substitutions.update(php.substitutions)
     install_schema = install.ArgSchema("mysql", "email", "title")
+    deprecated_keys = set(['WIZARD_SECRETKEY'])
     def download(self, version):
         return "http://wordpress.org/wordpress-%s.tar.gz" % version
     def checkConfig(self, deployment):
         return os.path.isfile("wp-config.php")
+    def checkWeb(self, deployment):
+        # XXX: this sucks pretty hard
+        return self.checkWebPage(deployment, "", "<html")
     def detectVersion(self, deployment):
-        # XXX: Very duplicate code with MediaWiki; refactor
-        contents = deployment.read("wp-includes/version.php")
-        match = php.re_var("wp_version").search(contents)
-        if not match: return None
-        return distutils.version.LooseVersion(match.group(2)[1:-1])
+        return self.detectVersionFromFile("wp-includes/version.php", php.re_var("wp_version"))
     def prepareMerge(self, deployment):
-        resolve.fix_newlines("wp-config.php")
+        # This file shouldn't really be edited by users, but be careful: it's
+        # stored as DOS and not as UNIX, so you'll get conflicts if you add this line:
+        # resolve.fix_newlines("wp-config.php")
+        pass
     def install(self, version, options):
-        # XXX: Hmm... we should figure out something about this
-        try:
-            os.unlink("wp-config.php")
-        except OSError:
-            pass
+        util.soft_unlink("wp-config.php")
 
         post_setup_config = {
                 'dbhost': options.mysql_host,
@@ -67,11 +70,20 @@ class Application(app.Application):
         result = install.fetch(options, "wp-admin/install.php?step=2", post_install)
         logging.debug("install.php output\n\n" + result)
         os.chmod(".", old_mode)
-        if "Finished" not in result:
-            raise install.Failure()
+        if "Finished" not in result and "Success" not in result:
+            raise app.InstallFailure()
 
         # not sure what to do about this
         meta = sql.mysql_connect(options)
         wp_options = meta.tables["wp_options"]
         wp_options.update().where(wp_options.c.option_name == 'siteurl').values(option_value=options.web_path).execute()
         wp_options.update().where(wp_options.c.option_name == 'home').values(option_value="http://%s%s" % (options.web_host, options.web_path)).execute() # XXX: what if missing leading slash; this should be put in a function
+        # should also set the username and admin password
+    def upgrade(self, d, version, options):
+        result = d.fetch("wp-admin/upgrade.php?step=1")
+        if "Upgrade Complete" not in result and "No Upgrade Required" not in result:
+            raise app.UpgradeFailure(result)
+    def backup(self, deployment, backup_dir, options):
+        app.backup_database(backup_dir, deployment)
+    def restore(self, deployment, backup_dir, options):
+        app.restore_database(backup_dir, deployment)