provide -h by default; handle multiline help; multiple verbose levels

slapos/cli/command.py

+# -*- coding: utf-8 -*-
+
+import argparse
+
+import cliff
+
+
+class Command(cliff.command.Command):
+    def get_parser(self, prog_name):
+        parser = argparse.ArgumentParser(
+            description=self.get_description(),
+            prog=prog_name,
+            formatter_class=argparse.RawTextHelpFormatter
+        )
+
+        return parser

slapos/cli/config.py

@@ -3,7 +3,7 @@
 import ConfigParser
 import os
 
-from cliff.command import Command
+from slapos.cli.command import Command
 
 
 class ConfigError(Exception):

slapos/cli/entry.py

@@ -22,6 +22,14 @@ class SlapOSCommandManager(cliff.commandmanager.CommandManager):
 
 class SlapOSApp(cliff.app.App):
 
+    #
+    # self.options.verbose_level:
+    #    -q  -> 0
+    #    -v  -> 2
+    #    -vv -> 3
+    #    etc.
+    #
+
     log = logging.getLogger(__name__)
 
     def __init__(self):
@@ -32,19 +40,25 @@ class SlapOSApp(cliff.app.App):
         )
 
     def initialize_app(self, argv):
-        self.log.debug('initialize_app')
+        if self.options.verbose_level > 2:
+            self.log.debug('initialize_app')
 
     def prepare_to_run_command(self, cmd):
-        self.log.debug('prepare_to_run_command %s', cmd.__class__.__name__)
+        if self.options.verbose_level > 2:
+            self.log.debug('prepare_to_run_command %s', cmd.__class__.__name__)
 
     def clean_up(self, cmd, result, err):
-        self.log.debug('clean_up %s', cmd.__class__.__name__)
+        if self.options.verbose_level > 2:
+            self.log.debug('clean_up %s', cmd.__class__.__name__)
+
         if err:
             self.log.debug('got an error: %s', err)
 
 
 def main(argv=sys.argv[1:]):
     app = SlapOSApp()
+    if not argv:
+        argv = ['-h']
     return app.run(argv)
 
 

slapos/cli/register.py

@@ -3,7 +3,7 @@
 import logging
 import sys
 
-from cliff.command import Command
+from slapos.cli.command import Command
 from slapos.register.register import do_register, RegisterConfig