Add a logout command

[mw] / src / mw / clicommands.py

diff --git a/src/mw/clicommands.py b/src/mw/clicommands.py
index e44f0d8b639501a794885cccdf0e2209b63f9131..33c4177d0ceac2ec134fbc46dc669879e6abf636 100644 (file)
--- a/src/mw/clicommands.py
+++ b/src/mw/clicommands.py
@@ -31,14 +31,16 @@ class CommandBase(object):
         self.description = description
         if usage is None:
             usage = '%prog ' + name
+        else:
+            usage = '%%prog %s %s' % (name, usage)
         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):
@@ -55,8 +57,11 @@ class CommandBase(object):
         result = self.api.call({'action': 'login',
                                 'lgname': user,
                                 'lgpassword': passwd})
-        if result['login']['result'] != 'Success':
-            raise Exception('Login error: %s' % result['login']['result'])
+        if result['login']['result'] == 'Success':
+            # cookies are saved to a file
+            print 'Login successful! (yay)'
+        else:
+            print 'Login failed: %s' % result['login']['result']
 
     def _die_if_no_init(self):
         if self.metadir.config is None:
@@ -65,13 +70,13 @@ class CommandBase(object):
 
     def _api_setup(self):
         self.api_url = self.metadir.config.get('remote', 'api_url')
-        self.api = mw.api.API(self.api_url)
+        self.api = mw.api.API(self.api_url, self.metadir)
 
 
 class InitCommand(CommandBase):
 
     def __init__(self):
-        usage = '%prog init API_URL'
+        usage = 'API_URL'
         CommandBase.__init__(self, 'init', 'start a mw repo', usage)
 
     def _do_command(self):
@@ -82,10 +87,34 @@ class InitCommand(CommandBase):
         self.metadir.create(self.args[0])
 
 
+class LoginCommand(CommandBase):
+
+    def __init__(self):
+        CommandBase.__init__(self, 'login', 'authenticate with wiki')
+
+    def _do_command(self):
+        self._die_if_no_init()
+        self._api_setup()
+        self._login()
+
+
+class LogoutCommand(CommandBase):
+
+    def __init__(self):
+        CommandBase.__init__(self, 'logout', 'forget authentication')
+
+    def _do_command(self):
+        self._die_if_no_init()
+        try:
+            os.unlink(os.path.join(self.metadir.location, 'cookies'))
+        except OSError:
+            pass
+
+
 class PullCommand(CommandBase):
 
     def __init__(self):
-        usage = '%prog fetch [options] PAGENAME ...'
+        usage = '[options] PAGENAME ...'
         CommandBase.__init__(self, 'pull', 'add remote pages to repo', usage)
 
     def _do_command(self):
@@ -144,3 +173,14 @@ class DiffCommand(CommandBase):
                 print self.metadir.diff_rv_to_working(
                     mw.api.filename_to_pagename(file[:-5])
                 ),
+
+
+class CommitCommand(CommandBase):
+
+    def __init__(self):
+        CommandBase.__init__(self, 'commit', 'commit changes to wiki')
+        self.shortcuts.append('ci')
+
+    def _do_command(self):
+        self._die_if_no_init()
+        self._api_setup()