Convert ad hoc shell calls to singleton instance; fix upgrade bug.

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

diff --git a/wizard/app/mediawiki.py b/wizard/app/mediawiki.py
index 9a9ea30f9de55a9fc05a3bca30ba9157842c32ae..c6ac8ae3f419448ccebd4744426ba2f65c98380c 100644 (file)
--- a/wizard/app/mediawiki.py
+++ b/wizard/app/mediawiki.py
@@ -1,12 +1,16 @@
 import re
 import distutils.version
 import os
+import lxml.cssselect
+import lxml.etree
+import StringIO
+import logging
 
 from wizard import app, install, resolve, shell, util
 from wizard.app import php
 
 def make_filename_regex(var):
-    return 'LocalSettings.php', re.compile('^(\$' + app.expand_re(var) + r'''\s*=\s*)(.*)(;)''', re.M)
+    return 'LocalSettings.php', php.re_var(var)
 
 seed = util.dictmap(make_filename_regex, {
         'WIZARD_IP': 'IP', # obsolete, remove after we're done
@@ -21,62 +25,56 @@ seed = util.dictmap(make_filename_regex, {
         })
 
 class Application(app.Application):
-    parametrized_files = ['LocalSettings.php', 'php.ini']
+    database = "mysql"
+    parametrized_files = ['LocalSettings.php'] + php.parametrized_files
     deprecated_keys = set(['WIZARD_IP']) | php.deprecated_keys
     extractors = app.make_extractors(seed)
     extractors.update(php.extractors)
     substitutions = app.make_substitutions(seed)
     substitutions.update(php.substitutions)
-    install_schema = install.ArgSchema("mysql", "admin", "email")
-    install_schema.add(install.Arg("title", help="Title of your new MediaWiki install"))
+    install_schema = install.ArgSchema("db", "admin", "email", "title")
     def checkConfig(self, deployment):
-        return os.path.isfile(os.path.join(deployment.location, "LocalSettings.php"))
+        return os.path.isfile("LocalSettings.php")
     def detectVersion(self, deployment):
-        contents = deployment.read("includes/DefaultSettings.php")
-        regex = make_filename_regex("wgVersion")[1]
-        match = regex.search(contents)
-        if not match: return None
-        return distutils.version.LooseVersion(match.group(2)[1:-1])
-    def checkWeb(self, deployment, out=None):
-        page = deployment.fetch("/index.php?title=Main_Page")
-        if type(out) is list:
-            out.append(page)
-        return page.find("<!-- Served") != -1
+        return self.detectVersionFromFile("includes/DefaultSettings.php", php.re_var("wgVersion"))
+    def checkWeb(self, deployment):
+        return self.checkWebPage(deployment, "/index.php?title=Main_Page", "<!-- Served")
     def prepareMerge(self, deployment):
         resolve.fix_newlines("LocalSettings.php")
     def install(self, version, options):
-        try:
-            os.unlink("LocalSettings.php")
-        except OSError:
-            pass
-
+        util.soft_unlink("LocalSettings.php")
         os.chmod("config", 0777) # XXX: vaguely sketchy
 
         postdata = {
             'Sitename': options.title,
             'EmergencyContact': options.email,
             'LanguageCode': 'en',
-            'DBserver': options.mysql_host,
-            'DBname': options.mysql_db,
-            'DBuser': options.mysql_user,
-            'DBpassword': options.mysql_password,
-            'DBpassword2': options.mysql_password,
+            'DBserver': options.dsn.host,
+            'DBname': options.dsn.database,
+            'DBuser': options.dsn.username,
+            'DBpassword': options.dsn.password,
+            'DBpassword2': options.dsn.password,
             'defaultEmail': options.email,
             'SysopName': options.admin_name,
             'SysopPass': options.admin_password,
             'SysopPass2': options.admin_password,
             }
         result = install.fetch(options, '/config/index.php', post=postdata)
-        if options.verbose or options.debug: print result
+        result_etree = lxml.etree.parse(StringIO.StringIO(result), lxml.etree.HTMLParser())
+        selector = lxml.cssselect.CSSSelector(".error")
+        error_messages = [e.text for e in selector(result_etree)]
+        logging.debug("Installation output:\n\n" + result)
         if result.find("Installation successful") == -1:
-            raise install.Failure()
+            if not error_messages:
+                raise app.InstallFailure()
+            else:
+                raise app.RecoverableInstallFailure(error_messages)
         os.rename('config/LocalSettings.php', 'LocalSettings.php')
     def upgrade(self, d, version, options):
-        sh = shell.Shell()
         if not os.path.isfile("AdminSettings.php"):
-            sh.call("git", "checkout", "-q", "mediawiki-" + str(version), "--", "AdminSettings.php")
+            shell.call("git", "checkout", "-q", "mediawiki-" + str(version), "--", "AdminSettings.php")
         try:
-            result = sh.eval("php", "maintenance/update.php", "--quick", log=True)
+            result = shell.eval("php", "maintenance/update.php", "--quick", log=True)
         except shell.CallError as e:
             raise app.UpgradeFailure("Update script returned non-zero exit code\nSTDOUT: %s\nSTDERR: %s" % (e.stdout, e.stderr))
         results = result.rstrip().split()
@@ -86,6 +84,16 @@ class Application(app.Application):
         app.backup_database(backup_dir, deployment)
     def restore(self, deployment, backup_dir, options):
         app.restore_database(backup_dir, deployment)
+    def remove(self, deployment, options):
+        app.remove_database(deployment)
+    def researchFilter(self, filename, added, deleted):
+        if filename == "LocalSettings.php":
+            return added == deleted == 10 or added == deleted == 9
+        elif filename == "AdminSettings.php":
+            return added == 0 and deleted == 20
+        elif filename == "config/index.php" or filename == "config/index.php5":
+            return added == 0
+        return False
 
 Application.resolutions = {
 'LocalSettings.php': [