Formated output in long command description

diff --git a/kamaki/cli/__init__.py b/kamaki/cli/__init__.py
index 377b615..62b28e1 100644 (file)
--- a/kamaki/cli/__init__.py
+++ b/kamaki/cli/__init__.py
@@ -302,7 +302,7 @@ def update_parser_help(parser, cmd):
         parser.syntax += ' <...>'
     if cmd.has_description:
         parser.parser.description = cmd.help\
-        + ((' . . . %s' % description) if description else '')
+        + (('\n%s' % description) if description else '')
     else:
         parser.parser.description = description
 

diff --git a/kamaki/cli/argument.py b/kamaki/cli/argument.py
index cfa7f7d..fa31a28 100644 (file)
--- a/kamaki/cli/argument.py
+++ b/kamaki/cli/argument.py
@@ -38,6 +38,7 @@ from logging import getLogger
 
 
 from argparse import ArgumentParser, ArgumentError
+from argparse import RawDescriptionHelpFormatter
 
 try:
     from progress.bar import ShadyBar as KamakiProgressBar
@@ -373,7 +374,8 @@ class ArgumentParseManager(object):
         :param arguments: (dict) if given, overrides the global _argument as
             the parsers arguments specification
         """
-        self.parser = ArgumentParser(add_help=False)
+        self.parser = ArgumentParser(add_help=False,
+            formatter_class=RawDescriptionHelpFormatter)
         self.syntax = '%s <cmd_group> [<cmd_subbroup> ...] <cmd>' % exe
         if arguments:
             self.arguments = arguments

diff --git a/kamaki/cli/commands/pithos_cli.py b/kamaki/cli/commands/pithos_cli.py
index d563be4..d6ca1a4 100644 (file)
--- a/kamaki/cli/commands/pithos_cli.py
+++ b/kamaki/cli/commands/pithos_cli.py
@@ -280,9 +280,11 @@ class _store_container_command(_store_account_command):
 @command(pithos_cmds)
 class store_list(_store_container_command):
     """List containers, object trees or objects in a directory
-    without parameters for a list of containers,
-    with one parameter (container) for the contents of a container,
-    with <container>:<prefix> for all contents starting with prefix
+    Use with:
+    1 no parameters : containers in set account
+    2. one parameter (container) or --container : contents of container
+    3. <container>:<prefix> or --container=<container> <prefix>: objects in
+        container starting with prefix
     """
 
     def __init__(self, arguments={}):