Added service list to commandline tool.

Author: lehmannro

README.rst

@@ -150,7 +150,7 @@ service as its first argument followed by the service's parameters.
 The results of the service call are printed in separate lines with the fields
 separated by commas (use ``--delimiter`` to modify that behaviour, it
 understands patterns such as ``\t`` for TAB).  Use ``--schema`` to obtain the
-service's result columns.
+service's result columns, or, if no service is supplied, a list of services.
 
 You can supply your credentials via ``--user`` and ``--password`` for
 authenticated access.
@@ -162,6 +162,9 @@ program will terminate with exit code 1.  If the remote server reported failure
 Changelog
 ---------
 
+1.3.1
+  * Added service listing to ``wortschatz`` script.
+
 1.3
   * Added commandline script ``wortschatz`` for ad-hoc access.
   * Jumped to setuptools.

gendocs

@@ -22,8 +22,10 @@ TEMPLATE = """
 """
 
 for name, service in services.iteritems():
-    label = "%s(%s)" % (name, ", ".join(service._args))
-    print TEMPLATE % dict(label=label, underline="^" * len(label), name=name,
-                          returns=", ".join(service._returns),
+    label = service._label
+    print TEMPLATE % dict(label=label,
+                          underline="^" * len(label),
+                          name=name,
+                          returns=func._retlabel,
                           doc=dedent(service._doc))
 EOF

libleipzig/main.py

@@ -2,7 +2,10 @@
 from libleipzig import WebFault
 import optparse
 
-parser = optparse.OptionParser()
+parser = optparse.OptionParser(
+    epilog = "Services: %s" % ("; ".join(service._label for service
+                                          in services.itervalues()))
+        )
 parser.add_option("-s", "--schema", action='store_true',
     help="show service's output schema and exit")
 parser.add_option("-d", "--delimiter", metavar="DELIM", default=",",

libleipzig/transport.py

@@ -75,8 +75,9 @@ def func(*vectors, **options):
         func._doc = func.__doc__ or ''
         func._args = args
         func._returns = results
-        func.__doc__ = "%s(%s) -> %s\n" % (name, ", ".join(args),
-            ", ".join(results)) + func._doc
+        func._label = label = "%s(%s)" % (name, ", ".join(args))
+        func._retlabel = retlabel = ", ".join(results)
+        func.__doc__ = "%s -> %s\n" % (label, retlabel) + func._doc
         func.prefetch = lambda: get_client(func, name)
         func.set_credentials = lambda username, password: (
                 get_client(func, name).set_options(