gOdoo-cli 0.12.5__tar.gz → 0.12.7__tar.gz

{godoo_cli-0.12.5 → godoo_cli-0.12.7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: gOdoo-cli
-Version: 0.12.5
+Version: 0.12.7
 Summary: Wrapper around Odoo-Bin with some convinience RPC functions.
 Home-page: https://github.com/OpenJKSoftware/gOdoo
 License: LGPL-3

{godoo_cli-0.12.5 → godoo_cli-0.12.7}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "gOdoo-cli"
-version = "0.12.5"
+version = "0.12.7"
 description = "Wrapper around Odoo-Bin with some convinience RPC functions."
 authors = ["Joshua Kreuder <Joshua_Kreuder@outlook.com>"]
 license = "LGPL-3"

{godoo_cli-0.12.5 → godoo_cli-0.12.7}/src/godoo_cli/helpers/modules.py

@@ -8,6 +8,10 @@ from typing import Any, Dict, Generator, List, Optional, Union
 LOGGER = getLogger(__name__)
 
 
+class NotAValidModuleError(ValueError):
+    """Raised when a path is not a valid odoo module folder"""
+
+
 class godooModule:
     """Encapsulates a odoo module folder"""
 
@@ -17,9 +21,9 @@ class godooModule:
         self.validate_is_module()
 
     def validate_is_module(self):
-        """Throws ValueError if path is not a valid odoo module folder"""
+        """Throws NotAModuleError if path is not a valid odoo module folder"""
         if not self.path.is_dir() or not self.manifest_file.exists():
-            raise ValueError(f"{self.path} is not a valid odoo module")
+            raise NotAValidModuleError(f"{self.path} is not a valid odoo module")
 
     def __repr__(self) -> str:
         return f"godooModule({str(self.path.absolute())})"
@@ -81,16 +85,18 @@ class godooModules:
     def _get_modules(self) -> Generator[godooModule, None, None]:
         """Generator that Iterates Addon Paths and yields all godooModules found in them."""
         for path in self.addon_paths:
-            for module in path.iterdir():
+            for addon_folder_child in path.iterdir():
                 try:
-                    mod = self.godoo_modules.get(module.stem)
+                    mod = self.godoo_modules.get(addon_folder_child.name)
                     if not mod:
-                        mod = godooModule(module)
+                        mod = godooModule(addon_folder_child)
                         self.godoo_modules[mod.name] = mod
-                    if mod.path != module:
-                        raise IndexError(f"Module {mod.name} is found in multiple paths")
+                    if mod.path != addon_folder_child:
+                        raise IndexError(
+                            f"Module {mod.name} is found in multiple paths:\n{mod.path}\n{addon_folder_child}"
+                        )
                     yield mod
-                except ValueError:
+                except NotAValidModuleError:
                     # Silently skip dir, as it's not a Odoo Module
                     continue
 

godoo_cli-0.12.7/src/godoo_cli/version.py

@@ -0,0 +1 @@
+__version__ = "0.12.7"

godoo_cli-0.12.5/src/godoo_cli/version.py

@@ -1 +0,0 @@
-__version__ = "0.12.5"