Rewrite .scripts to .wizard.

[wizard.git] / wizard / command / __init__.py

diff --git a/wizard/command/__init__.py b/wizard/command/__init__.py
index 85777767ddb8ae6a8eb02d0972a610b83d3be7e4..4dc52c707ce39196b1b92bae3789b9ccccb2572f 100644 (file)
--- a/wizard/command/__init__.py
+++ b/wizard/command/__init__.py
@@ -14,25 +14,6 @@ from wizard import util
 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()
@@ -151,13 +132,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)