X-Git-Url: https://scripts.mit.edu/gitweb/wizard.git/blobdiff_plain/4ac56819593aec239c5c02711b0284ba0789e910..319f82896fb658d9bbaf8d01d6c2c7410eb967c7:/wizard/command/__init__.py diff --git a/wizard/command/__init__.py b/wizard/command/__init__.py index fb8b45b..8d5e14c 100644 --- a/wizard/command/__init__.py +++ b/wizard/command/__init__.py @@ -9,30 +9,17 @@ import shutil import cStringIO import wizard -from wizard import util +from wizard import util, shell + +def chdir_to_production(): + if os.path.exists(".git/WIZARD_UPGRADE_VERSION"): # XXX do something more robust + util.chdir(shell.eval("git", "config", "remote.origin.url")) + return True + return False logging_setup = False debug = True # This will get overwritten with the real value early on -def boolish(val): - """ - Parse the contents of an environment variable as a boolean. - This recognizes more values as ``False`` than :func:`bool` would. - - >>> boolish("0") - False - >>> boolish("no") - False - >>> boolish("1") - True - """ - try: - return bool(int(val)) - except (ValueError, TypeError): - if val == "No" or val == "no" or val == "false" or val == "False": - return False - return bool(val) - def setup_logger(options, numeric_args): global logging_setup if logging_setup: return logging.getLogger() @@ -89,6 +76,8 @@ def security_check_homedir(location): This protects against malicious mountpoints, and is roughly equivalent to the suexec checks. """ + # XXX: this is a smidge unfriendly to systems who haven't setup + # nswitch. try: uid = util.get_dir_uid(location) real = os.path.realpath(location) @@ -128,79 +117,6 @@ def create_logdir(log_dir): # # XXX: update last symlink os.chmod(log_dir, 0o777) -class Report(object): - #: Set of indices that should be skipped - skip = None - #: Dict of append names to counts. You should manually increment these as necessary - fails = None - #: Number of successes - successes = 0 - #: Names of the files objects - names = None - def __init__(self, names, fobjs, skip, fails): - self.skip = skip - self.names = names - self.fails = fails - for name, fobj in zip(names, fobjs): - setattr(self, name, fobj) - def flush(self): - for n in self.names: - getattr(self, n).flush() - -def report_files(log_dir, names): - return [os.path.join(os.path.join(log_dir, "%s.txt" % x)) for x in names] - -def read_reports(log_dir, names): - """ - Reads a number of reports files. The return value is a :class:`Report` - object with attributes that are open file objects that correspond to ``names``. - """ - return Report(names, [(os.path.exists(f) and open(f, "r") or cStringIO.StringIO()) for f in report_files(log_dir, names)], set(), {}) - -def open_reports(log_dir, names=('warnings', 'errors'), redo=False, append_names=()): - """ - Returns a :class:`Report` object configured appropriately for the - parameters passed. This object has attributes names + append_names which - contain file objects opened as "w". ``names`` report files are cleared unconditionally - when they are opened (i.e. are not preserved from run to run.) ``append_names`` - report files are not cleared unless ``redo`` is True, and persist over - runs: assuming the convention that [0001] is the index of the deployment, - the ``skip`` attribute on the returned report object contains indexes that - should be skipped. - """ - skip = set() - fails = {} - if not redo: - rr = read_reports(log_dir, append_names) - def build_set(skip, fails, name, fobj): - lines = fobj.read().strip().splitlines() - skip |= set(int(l[1:5]) for l in lines) - fails[name] = len(lines) - fobj.close() - for name in append_names: - build_set(skip, fails, name, getattr(rr, name)) - else: - names += append_names - for name in append_names: - fails[name] = 0 - append_names = () - files = report_files(log_dir, names) - append_files = report_files(log_dir, append_names) - # backup old reports - old_reports = os.path.join(log_dir, "old-reports") - rundir = os.path.join(old_reports, "run") - if not os.path.exists(old_reports): - os.mkdir(old_reports) - else: - util.safe_unlink(rundir) - for f in files: - if os.path.exists(f): - os.rename(f, rundir) - for f in append_files: - if os.path.exists(f): - shutil.copy(f, rundir) - return Report(names + append_names, [open(f, "w") for f in files] + [open(f, "a") for f in append_files], skip, fails) - class NullLogHandler(logging.Handler): """Log handler that doesn't do anything""" def emit(self, record): @@ -222,13 +138,15 @@ class WizardOptionParser(optparse.OptionParser): self.add_option("-h", "--help", action="help", help=optparse.SUPPRESS_HELP) group = optparse.OptionGroup(self, "Common Options") group.add_option("-v", "--verbose", dest="verbose", action="store_true", - default=boolish(os.getenv("WIZARD_VERBOSE")), help="Turns on verbose output. Envvar is WIZARD_VERBOSE") + default=util.boolish(os.getenv("WIZARD_VERBOSE")), help="Turns on verbose output. Envvar is WIZARD_VERBOSE") group.add_option("--debug", dest="debug", action="store_true", - default=boolish(os.getenv("WIZARD_DEBUG")), help="Turns on debugging output. Envvar is WIZARD_DEBUG") + default=util.boolish(os.getenv("WIZARD_DEBUG")), help="Turns on debugging output. Envvar is WIZARD_DEBUG") group.add_option("-q", "--quiet", dest="quiet", action="store_true", - default=boolish(os.getenv("WIZARD_QUIET")), help="Turns off output to stdout. Envvar is WIZARD_QUIET") + default=util.boolish(os.getenv("WIZARD_QUIET")), help="Turns off output to stdout. Envvar is WIZARD_QUIET") group.add_option("--log-file", dest="log_file", metavar="FILE", - default=None, help="Logs verbose output to file") + default=os.getenv("WIZARD_LOGFILE"), help="Logs verbose output to file") + group.add_option("--directory", dest="directory", metavar="PATH", + default=os.getenv("WIZARD_DIRECTORY", ".wizard"), help="Initialize this folder to store metadata.") self.add_option_group(group) options, numeric_args = self.parse_args(*args, **kwargs) setup_logger(options, numeric_args)