Merge pull request #109 from padovan/minor_improvements

Minor improvements (debug and cmd exit fixes)

Author: aliceinwire

kcidev/libs/common.py

@@ -1,6 +1,7 @@
 #!/usr/bin/env python3
 # -*- coding: utf-8 -*-
 
+import logging
 import os
 import sys
 
@@ -65,6 +66,10 @@ def config_path(settings):
         return global_path
 
 
+def kci_info(content):
+    logging.info(content)
+
+
 def kci_msg(content):
     click.echo(content)
 

kcidev/libs/maestro_common.py

@@ -1,6 +1,7 @@
 #!/usr/bin/env python3
 # -*- coding: utf-8 -*-
 
+import errno
 import json
 import time
 
@@ -11,9 +12,9 @@
 
 
 def maestro_print_api_call(host, data=None):
-    click.secho("maestro api endpoint: " + host, fg="green")
+    kci_info("maestro api endpoint: " + host)
     if data:
-        kci_log(json.dumps(data, indent=4))
+        kci_info(json.dumps(data, indent=4))
 
 
 def maestro_api_error(response):
@@ -53,10 +54,10 @@ def maestro_get_node(url, nodeid):
         response.raise_for_status()
     except requests.exceptions.HTTPError as ex:
         kci_err(ex.response.json().get("detail"))
-        click.Abort()
+        sys.exit(errno.ENOENT)
     except Exception as ex:
         kci_err(ex)
-        click.Abort()
+        sys.exit(errno.ENOENT)
 
     return response.json()
 
@@ -78,10 +79,10 @@ def maestro_get_nodes(url, limit, offset, filter):
         response.raise_for_status()
     except requests.exceptions.HTTPError as ex:
         kci_err(ex.response.json().get("detail"))
-        click.Abort()
+        sys.exit(errno.ENOENT)
     except Exception as ex:
         kci_err(ex)
-        click.Abort()
+        sys.exit(errno.ENOENT)
 
     return response.json()
 

kcidev/main.py

@@ -1,6 +1,8 @@
 #!/usr/bin/env python3
 # -*- coding: utf-8 -*-
 
+import logging
+
 import click
 
 from kcidev.libs.common import *
@@ -28,8 +30,14 @@
     required=False,
 )
 @click.option("--instance", help="API instance to use", required=False)
+@click.option("--debug", is_flag=True, help="Enable debug info")
 @click.pass_context
-def cli(ctx, settings, instance):
+def cli(ctx, settings, instance, debug):
+    if debug:
+        # DEBUG level is too verbose about included packages
+        # us INFO instead
+        logging.basicConfig(level=logging.INFO)
+
     subcommand = ctx.invoked_subcommand
     ctx.obj = {"CFG": load_toml(settings, subcommand)}
     ctx.obj["SETTINGS"] = settings

kcidev/subcommands/checkout.py

@@ -59,7 +59,7 @@ def retrieve_tot_commit(repourl, branch):
     return sha
 
 
-@click.command(help="Create custom tree checkout on KernelCI and trigger a tests")
+@click.command(help="Trigger a test for a specific tree/branch/commit")
 @click.option(
     "--giturl",
     help="Git URL to checkout",