Fix plugin loading code, make wizard load scripts plugin.

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

diff --git a/wizard/app/mediawiki.py b/wizard/app/mediawiki.py
index 9d0468411636be48589753b713dcb99999f9e523..1505fa17d63647f7890ba01832c4c7c5628d0ffc 100644 (file)
--- a/wizard/app/mediawiki.py
+++ b/wizard/app/mediawiki.py
@@ -10,6 +10,7 @@ from wizard import app, install, resolve, shell, util
 from wizard.app import php
 
 def make_filename_regex(var):
+    """See :ref:`versioning config <seed>` for more information."""
     return 'LocalSettings.php', php.re_var(var)
 
 seed = util.dictmap(make_filename_regex, {
@@ -33,14 +34,15 @@ class Application(app.Application):
     substitutions = app.make_substitutions(seed)
     substitutions.update(php.substitutions)
     install_schema = install.ArgSchema("db", "admin", "email", "title")
+    def download(self, version):
+        series = ".".join(str(version).split(".")[:2])
+        return "http://download.wikimedia.org/mediawiki/%s/mediawiki-%s.tar.gz" % (series, version)
     def checkConfig(self, deployment):
         return os.path.isfile("LocalSettings.php")
     def detectVersion(self, deployment):
         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")
+        return self.checkWebPage(deployment, "/index.php?title=Main_Page", outputs=["<!-- Served"])
     def install(self, version, options):
         util.soft_unlink("LocalSettings.php")
         os.chmod("config", 0777) # XXX: vaguely sketchy
@@ -70,12 +72,13 @@ class Application(app.Application):
             else:
                 raise app.RecoverableInstallFailure(error_messages)
         os.rename('config/LocalSettings.php', 'LocalSettings.php')
+        php.ini_replace_vars()
+
     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()