import logging
import shutil
import sqlalchemy
+import random
+import string
+import urlparse
+import tempfile
import wizard
from wizard import resolve, scripts, shell, util
parametrized_files = []
#: Keys that are used in older versions of the application, but
#: not for the most recent version.
- deprecated_keys = []
+ deprecated_keys = set()
+ #: Keys that we can simply generate random strings for if they're missing
+ random_keys = set()
#: Dictionary of variable names to extractor functions. These functions
#: take a :class:`wizard.deploy.Deployment` as an argument and return the value of
#: the variable, or ``None`` if it could not be found.
result = {}
for k,extractor in self.extractors.items():
result[k] = extractor(deployment)
+ # XXX: ugh... we have to do quoting
+ for k in self.random_keys:
+ if result[k] is None:
+ result[k] = "'%s'" % ''.join(random.choice(string.letters + string.digits) for i in xrange(30))
return result
def dsn(self, deployment):
"""
# XXX: You'd have to put support for an explicit different database
# type here
return sqlalchemy.engine.url.URL(self.database, username=user, password=password, host=host, database=database)
+ def url(self, deployment):
+ """
+ Returns the deployment specific web URL. Uses the override file
+ in :file:`.scripts` if it exists, and otherwise attempt to extract
+ the variables from the source files.
+
+ This function might return ``None``, which indicates we couldn't figure
+ it out.
+ """
+ url = self.urlFromOverride(deployment)
+ if url:
+ return url
+ return self.urlFromExtract(deployment)
+ def urlFromOverride(self, deployment):
+ """
+ Extracts URL from explicit url override file.
+ """
+ try:
+ return urlparse.urlparse(open(deployment.url_file).read().strip())
+ except IOError:
+ return None
+ def urlFromExtract(self, deployment):
+ """
+ Extracts URL from a deployment, and returns ``None`` if we can't
+ figure it out. Default implementation is to fail; we might
+ do something clever with extractable variables in the future.
+ """
+ return None
def parametrize(self, deployment, ref_deployment):
"""
Takes a generic source checkout and parametrizes it according to the
default implementation uses :attr:`resolutions`.
"""
resolved = True
- sh = shell.Shell()
- for status in sh.eval("git", "ls-files", "--unmerged").splitlines():
- file = status.split()[-1]
+ files = set()
+ for status in shell.eval("git", "ls-files", "--unmerged").splitlines():
+ files.add(status.split()[-1])
+ for file in files:
+ # check for newline mismatch
+ # HACK: using git diff to tell if files are binary or not
+ if not len(shell.eval("git", "diff", file).splitlines()) == 1 and util.mixed_newlines(file):
+ # this code only works on Unix
+ def get_newline(filename):
+ f = open(filename, "U")
+ # for some reason I need two
+ s = f.readline()
+ if s != "" and f.newlines is None:
+ f.readline()
+ if not isinstance(f.newlines, str):
+ raise Exception("Assert: expected newlines to be string, instead was %s in %s" % (repr(f.newlines), file))
+ return f.newlines
+ def create_reference(id):
+ f = tempfile.NamedTemporaryFile(prefix="wizardResolve", delete=False)
+ shell.call("git", "cat-file", "blob", ":%d:%s" % (id, file), stdout=f)
+ f.close()
+ return get_newline(f.name), f.name
+ def convert(filename, dest_nl):
+ contents = open(filename, "U").read().replace("\n", dest_nl)
+ open(filename, "wb").write(contents)
+ logging.info("Mixed newlines detected in %s", file)
+ common_nl, common_file = create_reference(1)
+ our_nl, our_file = create_reference(2)
+ their_nl, their_file = create_reference(3)
+ remerge = False
+ if common_nl != their_nl:
+ # upstream can't keep their newlines straight
+ logging.info("Converting common file (1) from %s to %s newlines", repr(common_nl), repr(their_nl))
+ convert(common_file, their_nl)
+ remerge = True
+ if our_nl != their_nl:
+ # common case
+ logging.info("Converting our file (2) from %s to %s newlines", repr(our_nl), repr(their_nl))
+ convert(our_file, their_nl)
+ remerge = True
+ if remerge:
+ logging.info("Remerging %s", file)
+ with open(file, "wb") as f:
+ try:
+ shell.call("git", "merge-file", "--stdout", our_file, common_file, their_file, stdout=f)
+ logging.info("New merge was clean")
+ shell.call("git", "add", file)
+ continue
+ except shell.CallError:
+ pass
+ logging.info("Merge was still unclean")
+ else:
+ logging.warning("Mixed newlines detected in %s, but no remerge possible", file)
+ # manual resolutions
if file in self.resolutions:
contents = open(file, "r").read()
for spec, result in self.resolutions[file]:
logging.info("Did resolution with spec:\n" + spec)
open(file, "w").write(contents)
if not resolve.is_conflict(contents):
- sh.call("git", "add", file)
+ shell.call("git", "add", file)
else:
resolved = False
else:
# bogus config files in the -scripts versions of installs. Maybe
# we should check a hash or something?
raise NotImplementedError
+ def researchFilter(self, filename, added, deleted):
+ """
+ Allows an application to selectively ignore certain diffstat signatures
+ during research; for example, configuration files will have a very
+ specific set of changes, so ignore them; certain installation files
+ may be removed, etc. Return ``True`` if a diffstat signature should be
+ ignored,
+ """
+ return False
+ def researchVerbose(self, filename):
+ """
+ Allows an application to exclude certain dirty files from the output
+ report; usually this will just be parametrized files, since those are
+ guaranteed to have changes. Return ``True`` if a file should only
+ be displayed in verbose mode.
+ """
+ return filename in self.parametrized_files
@staticmethod
def make(name):
"""Makes an application, but uses the correct subtype if available."""
try:
__import__("wizard.app." + name)
return getattr(wizard.app, name).Application(name)
- except ImportError:
- return Application(name)
+ except ImportError as error:
+ # XXX ugly hack to check if the import error is from the top level
+ # module we care about or a submodule. should be an archetectural change.
+ if error.args[0].split()[-1]==name:
+ return Application(name)
+ else:
+ raise
class ApplicationVersion(object):
"""Represents an abstract notion of a version for an application, where
raise NotImplementedError
def backup_mysql_database(outdir, deployment):
- sh = shell.Shell()
+ """
+ Database backups for MySQL using the :command:`mysqldump` utility.
+ """
outfile = os.path.join(outdir, "db.sql")
try:
- sh.call("mysqldump", "--compress", "-r", outfile, *get_mysql_args(deployment.dsn))
- sh.call("gzip", "--best", outfile)
+ shell.call("mysqldump", "--compress", "-r", outfile, *get_mysql_args(deployment.dsn))
+ shell.call("gzip", "--best", outfile)
except shell.CallError as e:
- shutil.rmtree(outdir)
raise BackupFailure(e.stderr)
def restore_database(backup_dir, deployment):
raise NotImplementedError
def restore_mysql_database(backup_dir, deployment):
- sh = shell.Shell()
+ """
+ Database restoration for MySQL by piping SQL commands into :command:`mysql`.
+ """
if not os.path.exists(backup_dir):
raise RestoreFailure("Backup %s doesn't exist", backup_dir.rpartition("/")[2])
sql = open(os.path.join(backup_dir, "db.sql"), 'w+')
- sh.call("gunzip", "-c", os.path.join(backup_dir, "db.sql.gz"), stdout=sql)
+ shell.call("gunzip", "-c", os.path.join(backup_dir, "db.sql.gz"), stdout=sql)
sql.seek(0)
- sh.call("mysql", *get_mysql_args(deployment.dsn), stdin=sql)
+ shell.call("mysql", *get_mysql_args(deployment.dsn), stdin=sql)
sql.close()
def remove_database(deployment):
"""
- Generic database removal function.
+ Generic database removal function. Actually, not so generic because we
+ go and check if we're on scripts and if we are run a different command.
"""
+ if deployment.dsn.host == "sql.mit.edu":
+ try:
+ shell.call("/mit/scripts/sql/bin/drop-database", deployment.dsn.database)
+ return
+ except shell.CallError:
+ pass
engine = sqlalchemy.create_engine(deployment.dsn)
engine.execute("DROP DATABASE `%s`" % deployment.dsn.database)
scripts.mit.edu / wizard.git / blobdiff