cleepcli 1.43.0__tar.gz → 1.43.2__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: cleepcli
-Version: 1.43.0
+Version: 1.43.2
 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.0 → cleepcli-1.43.2}/bin/ccli

@@ -733,10 +733,15 @@ def modcheckdoc(module, as_json):
     try:
         res = c.check_module_documentation(module)
 
+        content = res["details"]
         if as_json:
-            logging.info('%s' % json.dumps(res["details"]))
+            if res["invalid"]:
+                content = {"error": res["error"]}
+            logging.info('%s' % json.dumps(content))
         else:
-            logging.info('%s' % res["details"])
+            if res["invalid"]:
+                content = f"Error: {res['error']}"
+            logging.info('%s' % content)
 
         if res["invalid"]:
             sys.exit(1)

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

@@ -733,10 +733,15 @@ def modcheckdoc(module, as_json):
     try:
         res = c.check_module_documentation(module)
 
+        content = res["details"]
         if as_json:
-            logging.info('%s' % json.dumps(res["details"]))
+            if res["invalid"]:
+                content = {"error": res["error"]}
+            logging.info('%s' % json.dumps(content))
         else:
-            logging.info('%s' % res["details"])
+            if res["invalid"]:
+                content = f"Error: {res['error']}"
+            logging.info('%s' % content)
 
         if res["invalid"]:
             sys.exit(1)

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

@@ -853,7 +853,7 @@ overgeneral-exceptions=Exception
 
     def __check_modimgsrc_directive(self, module_name, js_files, all_files):
         """
-        Check if developer uses mod-img-src directive to display its images
+        Check if developer uses mod-img-src or cl-img-src directive to display its images
 
         Args:
             module_name (string): module name
@@ -891,8 +891,8 @@ overgeneral-exceptions=Exception
 
         # check directive usage for found images
         for image_file in image_files:
-            pattern = r"mod-img-src\s*=\s*[\"']\s*%s\s*[\"']" % image_file['path'].replace(module_name+'/', '')
-            self.logger.debug('Mod-img-src pattern: %s' % pattern)
+            pattern = r"(?:cl-img-src|cl-app-img)\s*=\s*[\"']\s*%s\s*[\"']" % image_file['path'].replace(module_name+'/', '')
+            self.logger.debug('cl-img-src|cl-app-img pattern: %s' % pattern)
             found = False
             for cached in cacheds:
                 matches = re.finditer(pattern, cached, re.MULTILINE)
@@ -901,7 +901,7 @@ overgeneral-exceptions=Exception
                     found = True
                     founds.append(image_file['path'])
             if not found:
-                warnings.append('Image "%s" may not be displayed properly because mod-img-src directive wasn\'t used' % image_file['filename'])
+                warnings.append('Image "%s" may not be displayed properly because cl-app-src directive wasn\'t used (or cl-img-src in config component)' % image_file['filename'])
 
         return warnings, founds
 
@@ -1429,7 +1429,8 @@ overgeneral-exceptions=Exception
         """
         output = {
             "invalid": False,
-            "details": {}
+            "error": "",
+            "details": {},
         }
 
         self.logger.debug("Check module docs by command line")
@@ -1441,7 +1442,9 @@ overgeneral-exceptions=Exception
 
         if resp["returncode"] != 0:
             output["invalid"] = True
-        output["details"] = json.loads(resp["stdout"])
+            output["error"] = json.loads(resp["stdout"])
+        else:
+            output["details"] = json.loads(resp["stdout"])
 
         return output
 
@@ -1459,6 +1462,8 @@ overgeneral-exceptions=Exception
         self.logger.debug("Call resp: %s", resp)
         if resp["error"]:
             output["invalid"] = True
-        output["details"] = resp["data"] if resp["data"] is not None else {}
+            output["error"] = resp["message"]
+        else:
+            output["details"] = resp["data"] if resp["data"] is not None else {}
 
         return output

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

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

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

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