Make docopt more readable

gmon

@@ -2,12 +2,12 @@
 
 """Generic mon echoer
 
-usage: gmon [--format=<format>] [-p|--plain] [-x|--xgp] <command> [<args>...]
+usage: gmon [options] COMMAND [ARGS...]
 
 Options:
-    -c, --chars     specify limit in characters
-    --format <format>   specify format: plain is a plain text, xgp
-                        is specific for xfce4-genmon-plugin
+    -c, --chars CHARS specify limit in characters
+    --format FMT    specify format: plain is a plain text, xgp
+                    is specific for xfce4-genmon-plugin
     -p, --plain     same as --format=plain
     -x, --xgp       same as --format=xgp
     -h, --help      show this screen

include/gmon.py

@@ -60,8 +60,8 @@ class PluginData(object):
             self.fmt = "plain"
         elif cmdargs['--xgp']:
             self.fmt = "xgp"
-        self.name = cmdargs['<command>']
-        self.args = cmdargs['<args>']
+        self.name = cmdargs['COMMAND']
+        self.args = cmdargs['ARGS']
         if cmdargs['--chars']:
             self.maxlen = int(cmdargs['--chars'])
 
@@ -70,7 +70,7 @@ class Subcommand(object):
 
     def __init__(self, cmdargs, pluginpath):
         self.plugindata = PluginData(cmdargs)
-        self.name = cmdargs['<command>']
+        self.name = cmdargs['COMMAND']
         self._load_plugin(pluginpath)
 
     def _load_plugin(self, pluginpath):