diff --git a/pupy/pupygen.py b/pupy/pupygen.py index cdb74015..21283f36 100755 --- a/pupy/pupygen.py +++ b/pupy/pupygen.py @@ -199,8 +199,13 @@ class ListOptions(argparse.Action): print "" print colorize("## available transports :","green") for name, dic in transports.iteritems(): - print "\t- {:<20} : {}".format(name, dic["info"]) - print "" + print "\t- {}".format(name,) + print "\t {:<15} : {}".format("description", dic["info"]) + arguments=','.join([x for x in dic["client_kwargs"].iterkeys()])+','.join([x for x in dic["client_transport_kwargs"].iterkeys()]) + if not arguments: + arguments = "none" + print "\t {:<15} : {}".format("arguments" ,arguments) + print colorize("## available scriptlets :", "green") scriptlets_dic=load_scriptlets() for name, sc in scriptlets_dic.iteritems(): diff --git a/pupy/scriptlets/scriptlets.py b/pupy/scriptlets/scriptlets.py index c7299d89..53b62636 100644 --- a/pupy/scriptlets/scriptlets.py +++ b/pupy/scriptlets/scriptlets.py @@ -24,13 +24,14 @@ class Scriptlet(object): @classmethod def get_help(cls): - res=("\tdescription: %s\n"%cls.__doc__) + res=("\tdescription : %s\n"%cls.__doc__) if cls.arguments: - res+=("\targuments: \n") + res+=("\targuments : \n") for arg, desc in cls.arguments.iteritems(): - res+="\t\t- {:<10} : {}\n".format(arg, desc) + res+="\t\t\t{:<10} : {}\n".format(arg, desc) else: - res+=("\targuments: this scriptlet does not take any argument\n") + res+=("\targuments : \n") + res+="\t\t\t{:<10}\n".format("no arguments") return res ROOT=os.path.abspath(os.path.join(os.path.dirname(__file__),"..","packages"))