X-Git-Url: https://projects.mako.cc/source/mw/blobdiff_plain/768bad65409c069fdc2b7bf94d07a2ad34e0a00d..refs/heads/master:/src/mw/cli.py

diff --git a/src/mw/cli.py b/src/mw/cli.py
index e1d96c0..6e73c02 100644
--- a/src/mw/cli.py
+++ b/src/mw/cli.py
@@ -1,6 +1,6 @@
 ###
 # mw - VCS-like nonsense for MediaWiki websites
-# Copyright (C) 2009  Ian Weller <ian@ianweller.org>
+# Copyright (C) 2011  Ian Weller <ian@ianweller.org> and others
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -13,16 +13,16 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License along
-# with this program; if not, write to the Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+# with this program.  If not, see <http://www.gnu.org/licenses/>.
 ###
 
-import inspect
 import mw.clicommands
 import os
 import sys
 
+
 class CLI(object):
+
     def __init__(self):
         self.me = os.path.basename(sys.argv[0])
         self.commands = {}
@@ -36,7 +36,8 @@ class CLI(object):
                 cmd = clazz()
                 self.commands[cmd.name] = cmd
                 self.shortcuts[cmd.name] = cmd.shortcuts
-        self.all_commands = self.commands
+        self.all_commands = {}
+        self.all_commands.update(self.commands)
         for command in self.shortcuts:
             for shortcut in self.shortcuts[command]:
                 self.all_commands[shortcut] = self.commands[command]
@@ -44,7 +45,9 @@ class CLI(object):
     def usage(self):
         print 'usage: %s [subcommand]' % self.me
         print
-        for name in self.commands:
+        commands = self.commands.keys()
+        commands.sort()
+        for name in commands:
             cmd = self.commands[name]
             if len(cmd.shortcuts) > 0:
                 full = name + ' (' + ' '.join(cmd.shortcuts) + ')'
@@ -58,8 +61,8 @@ class CLI(object):
         # determine what the subcommand is
         if len(sys.argv) > 1:
             if sys.argv[1] in self.all_commands:
-                the_command = sys.argv[1] # SWEET ACTION
-            elif sys.argv[1] in ['--help', '-h']:
+                the_command = sys.argv[1]  # SWEET ACTION
+            elif sys.argv[1] in ['--help', '-h', 'help']:
                 self.usage()
             else:
                 print '%s: invalid subcommand: %s' % (self.me, sys.argv[1])
@@ -67,4 +70,4 @@ class CLI(object):
         if len(sys.argv) == 1:
             self.usage()
         # woo let's go
-        self.commands[the_command].main()
+        self.all_commands[the_command].main()