cleepcli 1.43.2__tar.gz → 1.43.4__tar.gz

{cleepcli-1.43.2/cleepcli.egg-info → cleepcli-1.43.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: cleepcli
-Version: 1.43.2
+Version: 1.43.4
 Summary: Cleep-cli helps developers to build great Cleep applications from command line.
 Home-page: https://github.com/CleepDevice/cleep-cli
 Author: Tanguy Bonneau

{cleepcli-1.43.2 → cleepcli-1.43.4}/bin/ccli

@@ -733,17 +733,21 @@ def modcheckdoc(module, as_json):
     try:
         res = c.check_module_documentation(module)
 
-        content = res["details"]
         if as_json:
-            if res["invalid"]:
-                content = {"error": res["error"]}
-            logging.info('%s' % json.dumps(content))
+            logging.info("%s", json.dumps(res))
         else:
-            if res["invalid"]:
-                content = f"Error: {res['error']}"
-            logging.info('%s' % content)
-
-        if res["invalid"]:
+            message = f'Error: {res.get("message")}' if res.get("error") else "Documentation is valid"
+            logging.info("%s", message)
+            for fn_name, fn_data in res.get("data", {}).items():
+                logging.info("- %s [%s]", fn_name, "OK" if fn_data.get("valid", False) else "KO")
+                logging.info("  Errors:")
+                for error in fn_data.get("errors", []):
+                    logging.info("   - %s", error)
+                logging.info("  Warnings:")
+                for warn in fn_data.get("warnings", []):
+                    logging.info("   - %s", warn)
+
+        if res.get("error", True):
             sys.exit(1)
     except Exception as e:
         if logging.getLogger().getEffectiveLevel() == logging.DEBUG:

{cleepcli-1.43.2 → cleepcli-1.43.4}/bin/cleep-cli

@@ -733,17 +733,21 @@ def modcheckdoc(module, as_json):
     try:
         res = c.check_module_documentation(module)
 
-        content = res["details"]
         if as_json:
-            if res["invalid"]:
-                content = {"error": res["error"]}
-            logging.info('%s' % json.dumps(content))
+            logging.info("%s", json.dumps(res))
         else:
-            if res["invalid"]:
-                content = f"Error: {res['error']}"
-            logging.info('%s' % content)
-
-        if res["invalid"]:
+            message = f'Error: {res.get("message")}' if res.get("error") else "Documentation is valid"
+            logging.info("%s", message)
+            for fn_name, fn_data in res.get("data", {}).items():
+                logging.info("- %s [%s]", fn_name, "OK" if fn_data.get("valid", False) else "KO")
+                logging.info("  Errors:")
+                for error in fn_data.get("errors", []):
+                    logging.info("   - %s", error)
+                logging.info("  Warnings:")
+                for warn in fn_data.get("warnings", []):
+                    logging.info("   - %s", warn)
+
+        if res.get("error", True):
             sys.exit(1)
     except Exception as e:
         if logging.getLogger().getEffectiveLevel() == logging.DEBUG:

{cleepcli-1.43.2 → cleepcli-1.43.4}/cleepcli/check.py

@@ -1428,9 +1428,9 @@ overgeneral-exceptions=Exception
         Check app documentation by command line
         """
         output = {
-            "invalid": False,
-            "error": "",
-            "details": {},
+            "error": False,
+            "message": None,
+            "data": None,
         }
 
         self.logger.debug("Check module docs by command line")
@@ -1440,11 +1440,9 @@ overgeneral-exceptions=Exception
         resp = console.command(cmd)
         self.logger.debug("Cmd resp: %s", resp)
 
-        if resp["returncode"] != 0:
-            output["invalid"] = True
-            output["error"] = json.loads(resp["stdout"])
-        else:
-            output["details"] = json.loads(resp["stdout"])
+        output["error"] = resp.get("returncode", 1) != 0
+        output["message"] = None if resp.get("returncode", 1) == 0 else "Invalid application documentation"
+        output["data"] = json.loads(''.join(resp.get("stdout", [])))
 
         return output
 
@@ -1452,18 +1450,22 @@ overgeneral-exceptions=Exception
         """
         Check app documentation by api call
         """
+        self.logger.debug("Check module docs by api call")
         output = {
-            "invalid": False,
-            "details": {}
+            "error": False,
+            "message": None,
+            "data": None,
         }
+        try:
+            resp = self.cleepapi.check_documentation(module_name)
+            self.logger.debug("Call resp: %s", resp)
 
-        self.logger.debug("Check module docs by api call")
-        resp = self.cleepapi.check_documentation(module_name)
-        self.logger.debug("Call resp: %s", resp)
-        if resp["error"]:
-            output["invalid"] = True
-            output["error"] = resp["message"]
-        else:
-            output["details"] = resp["data"] if resp["data"] is not None else {}
+            output["error"] = resp.get("error", True)
+            output["message"] = resp.get("message")
+            output["data"] = resp.get("data")
+
+        except Exception:
+            output["error"] = True
+            output["message"] = "Cleep api call failed. Unable to get application documentation"
 
         return output

{cleepcli-1.43.2 → cleepcli-1.43.4}/cleepcli/ci.py

@@ -143,6 +143,7 @@ class Ci():
             resp = requests.post(self.CLEEP_COMMAND_URL, json={
                 'command': 'check_modules_updates',
                 'to': 'update',
+                'timeout': 60.0,
             })
             resp.raise_for_status()
             resp_json = resp.json()
@@ -156,7 +157,8 @@ class Ci():
                 'to': 'update',
                 'params': {
                     'module_name': 'update',
-                }
+                },
+                'timeout': 60.0,
             })
             resp.raise_for_status()
             resp_json = resp.json()
@@ -179,7 +181,8 @@ class Ci():
                     'module_name': module_name,
                     'package': package_path,
                     'no_compatibility_check': no_compatibility_check,
-                }
+                },
+                'timeout': 60.0,
             })
             resp.raise_for_status()
             resp_json = resp.json()
@@ -224,7 +227,8 @@ class Ci():
             time.sleep(1.0)
             resp = requests.post(self.CLEEP_COMMAND_URL, json={
                 'command': 'get_modules_updates',
-                'to': 'update'
+                'to': 'update',
+                'timeout': 60.0,
             })
             resp.raise_for_status()
             resp_json = resp.json()

{cleepcli-1.43.2 → cleepcli-1.43.4}/cleepcli/package.py

@@ -418,7 +418,7 @@ sha256sum $DEB > $SHA256
         if data_code_quality['score'] < 7.0:
             raise Exception('Code quality for app "%s" is too low to be packaged (%s). Please improve it to be greater than 7.0' % (module_name, data_code_quality['score']))
         data_documentation = check.check_module_documentation(module_name)
-        if data_documentation['invalid']:
+        if data_documentation['error']:
             raise Exception('Documentation is invalid. Please fix it before publishing')
         data_breaking_changes = docs.check_module_breaking_changes(module_name)
         if len(data_breaking_changes['errors']) > 0:

{cleepcli-1.43.2 → cleepcli-1.43.4}/cleepcli/version.py

@@ -1,5 +1,5 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
 
-VERSION = '1.43.2'
+VERSION = '1.43.4'
 

{cleepcli-1.43.2 → cleepcli-1.43.4/cleepcli.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: cleepcli
-Version: 1.43.2
+Version: 1.43.4
 Summary: Cleep-cli helps developers to build great Cleep applications from command line.
 Home-page: https://github.com/CleepDevice/cleep-cli
 Author: Tanguy Bonneau