From: Ian Weller <ian@ianweller.org>
Date: Sat, 13 Mar 2010 02:32:59 +0000 (-0600)
Subject: Ability to have username in init command
X-Git-Url: https://projects.mako.cc/source/mw/commitdiff_plain/2c712c501ee2e538d09ad94cf25c5749471c7bfd?ds=inline

Ability to have username in init command
---

diff --git a/src/mw/clicommands.py b/src/mw/clicommands.py
index e441e30..3c0b448 100644
--- a/src/mw/clicommands.py
+++ b/src/mw/clicommands.py
@@ -36,11 +36,11 @@ class CommandBase(object):
         self.parser = OptionParser(usage=usage, description=description)
         self.name = name
         self.metadir = mw.metadir.Metadir()
-        global_options = OptionGroup(self.parser, "Global Options")
-        global_options.add_option('-u', '--use-auth', action='store_true',
-                                  dest='use_auth', help='force authentication '
-                                  'even if not required')
-        self.parser.add_option_group(global_options)
+        #global_options = OptionGroup(self.parser, "Global Options")
+        #global_options.add_option('-u', '--use-auth', action='store_true',
+        #                          dest='use_auth', help='force authentication '
+        #                          'even if not required')
+        #self.parser.add_option_group(global_options)
         self.shortcuts = []
 
     def main(self):
@@ -75,13 +75,15 @@ class InitCommand(CommandBase):
     def __init__(self):
         usage = 'API_URL'
         CommandBase.__init__(self, 'init', 'start a mw repo', usage)
+        self.parser.add_option('-u', '--username', dest='username',
+                               help='use wiki with login')
 
     def _do_command(self):
         if len(self.args) < 1:
             self.parser.error('must have URL to remote api.php')
         elif len(self.args) > 1:
             self.parser.error('too many arguments')
-        self.metadir.create(self.args[0])
+        self.metadir.create(self.args[0], self.options.username)
 
 
 class PullCommand(CommandBase):
diff --git a/src/mw/metadir.py b/src/mw/metadir.py
index 18811db..6c6bfeb 100644
--- a/src/mw/metadir.py
+++ b/src/mw/metadir.py
@@ -49,7 +49,7 @@ class Metadir(object):
         else:
             self.config = None
 
-    def create(self, api_url):
+    def create(self, api_url, username=None):
         # create the directory
         if os.path.isdir(self.location):
             print '%s: you are already in a mw repo' % self.me
@@ -64,6 +64,8 @@ class Metadir(object):
         self.config = ConfigParser.RawConfigParser()
         self.config.add_section('remote')
         self.config.set('remote', 'api_url', api_url)
+        if username != None:
+            self.config.set('remote', 'username', username)
         with open(self.config_loc, 'wb') as config_file:
             self.config.write(config_file)
         # create cache/