enebootools 2.0.5__tar.gz → 2.0.7__tar.gz

{enebootools-2.0.5/enebootools.egg-info → enebootools-2.0.7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: enebootools
-Version: 2.0.5
+Version: 2.0.7
 Summary: ERP tools for Eneboo
 Home-page: https://github.com/aulla/eneboo-tools
 Author: David Martínez Martí, José A. Fernández Fernández

{enebootools-2.0.5 → enebootools-2.0.7}/enebootools/__init__.py

@@ -8,7 +8,7 @@ from pprint import pformat
 import enebootools.parseargs as pa
 
 
-__VERSION__ = "2.0.5"
+__VERSION__ = "2.0.7"
 QS_EXTEND_MODE = "legacy"
 
 

{enebootools-2.0.5 → enebootools-2.0.7}/enebootools/assembler/kobjects.py

@@ -110,10 +110,10 @@ class BaseObject(object):
 
     def _get_full_required_modules(self):
         if self.all_required_modules:
-            # print("***", self, self.all_required_modules)
             return self.all_required_modules
         req = []
         myreq = []
+
         for modname in self.required_modules:
             obj = ModuleObject.find(modname)
             if obj is None:
@@ -122,7 +122,7 @@ class BaseObject(object):
                     % (modname, self.formal_name())
                 )
                 continue
-            # print("*", self, modname)
+
             new_reqs = [
                 modulename
                 for modulename in obj._get_full_required_modules()
@@ -169,14 +169,21 @@ class BaseObject(object):
 
         req += [modulename for modulename in myreq if modulename not in req]
         new_list = []
+
         for module_name in req:
-            if "/" not in module_name:
+            if (
+                "/" not in module_name
+            ):  # esto filtra dependencias que son añadidas por código de módulo, para evitar que introduzca módulos con versiones incorrectas
                 module_obj = ModuleObject.find(module_name)
                 formal_name = module_obj.formal_name()
-                if formal_name in req:
-                    self.iface.debug(
-                        "Omitiendo módulo %s (ya existe %s)" % (module_name, formal_name)
-                    )
+                if formal_name in [
+                    formal_name for req_item in req if str(req_item).endswith(formal_name)
+                ]:
+                    if str(self.fullpath).endswith("fun_euromoda"):
+                        self.iface.debug(
+                            "Omitiendo módulo %s (ya existe %s : %s)"
+                            % (module_name, formal_name, module_obj.fullpath)
+                        )
                     continue
 
             new_list.append(module_name)
@@ -189,6 +196,7 @@ class BaseObject(object):
             return self.all_required_features
         req = []
         myreq = []
+
         for featname in self.required_features:
             obj = FeatureObject.find(featname)
             if obj is None:
@@ -196,16 +204,17 @@ class BaseObject(object):
                     "Funcionalidad con nombre %s no encontrada (requerida por %s )"
                     % (featname, self.formal_name())
                 )
+                if self.formal_name() == "fun_euromoda":
+                    print("No existe", featname)
+
                 continue
-            new_reqs = [
-                featurename
-                for featurename in obj._get_full_required_features()
-                if featurename not in req
-            ]
+
+            new_reqs = []
+            for featurename in obj._get_full_required_features():
+                if featurename not in req and "24_%s" % featurename not in req:
+                    new_reqs.append(featurename)
             if self.type == "prj":
                 for n in new_reqs:
-                    if n in self.required_features:
-                        continue
                     self.iface.debug(
                         "Proyecto %s, se agrega funcionalidad %s solicitada por %s"
                         % (self.formal_name(), n, featname)
@@ -327,14 +336,24 @@ class FeatureObject(BaseObject):
         if self.dstfolder:
             binstr.set("dstfolder", self.dstfolder)
         etree.SubElement(binstr, "Message", text="Copiando módulos . . .")
-        # print("------->", self._get_full_required_modules())
-        for modulename in self._get_full_required_modules():
+
+        self.iface.debug("-- MODULES -----> %s" % self._get_full_required_modules())
+
+        for modulename in (
+            self.required_modules
+            if self.qs_extend_mode == "yeboyebo"
+            else self._get_full_required_modules()
+        ):
             module = ModuleObject.find(modulename)
+            if not module:
+                self.iface.warn("No encontramos el módulo %s" % modulename)
+
             cpfolder = etree.SubElement(binstr, "CopyFolderAction")
             cpfolder.set("src", module.fullpath)
             cpfolder.set("dst", module.obj.relpath)
             cpfolder.set("create_dst", "yes")
 
+        self.iface.debug("-- FEATURES -----> %s" % self._get_full_required_features())
         for featurename in self._get_full_required_features():
             feature = FeatureObject.find(featurename)
             patch_list = feature.get_patch_list()
@@ -365,7 +384,11 @@ class FeatureObject(BaseObject):
         if self.dstfolder:
             binstr.set("dstfolder", self.dstfolder)
 
-        for modulename in self._get_full_required_modules():
+        for modulename in (
+            self.required_modules
+            if self.qs_extend_mode == "yeboyebo"
+            else self._get_full_required_modules()
+        ):
             module = ModuleObject.find(modulename)
             cpfolder = etree.SubElement(binstr, "CopyFolderAction")
             cpfolder.set("src", os.path.join(dep_folder, module.obj.relpath))
@@ -401,7 +424,11 @@ class FeatureObject(BaseObject):
         if self.dstfolder:
             binstr.set("dstfolder", self.dstfolder)
 
-        for modulename in self.all_required_modules:
+        for modulename in (
+            self.required_modules
+            if self.qs_extend_mode == "yeboyebo"
+            else self._get_full_required_modules()
+        ):
             module = ModuleObject.find(modulename)
             cpfolder = etree.SubElement(binstr, "CopyFolderAction")
             cpfolder.set("src", os.path.join(dep_folder, module.obj.relpath))
@@ -645,7 +672,6 @@ class ObjectIndex(object, metaclass=Singleton):
 
     def get_build_actions(self, target, func, dstfolder=None):
         feature = FeatureObject.find(func)
-        # print("*******************", func, feature)
         if not feature:
             self.iface.error("Funcionalidad %s desconocida." % func)
             return None

{enebootools-2.0.5 → enebootools-2.0.7}/enebootools/mergetool/__init__.py

@@ -516,7 +516,11 @@ class MergeToolInterface(EnebooToolsInterface):
                 if nom.startswith("test_"):
                     return flpatchtest.diff_test(self, base, final)
 
-                elif nom.endswith("_api.py"):
+                elif (
+                    nom.endswith(("_api.py", "_schema.py", "_model.py"))
+                    or nom.startswith("test_")
+                    and nom.endswith(".py")
+                ):
                     return flpatchapipy.diff_py(self, base, final)
                 elif "models" in base or "pruebasqs" in base:
                     return flpatchmodel.diff_model(self, base, final)
@@ -545,7 +549,11 @@ class MergeToolInterface(EnebooToolsInterface):
                     return flpatchpy.patch_py(self, base, patch)
                 elif nom.endswith("_def.py"):
                     return flpatchpy.patch_py(self, base, patch)
-                elif nom.endswith(("_api.py", "_schema.py", "_model.py")):
+                elif (
+                    nom.endswith(("_api.py", "_schema.py", "_model.py"))
+                    or nom.startswith("test_")
+                    and nom.endswith(".py")
+                ):
                     return flpatchapipy.patch_py(self, base, patch)
                 elif "models" in base or "pruebasqs" in base:
                     return flpatchmodel.patch_model(self, base, patch)

{enebootools-2.0.5 → enebootools-2.0.7}/enebootools/mergetool/flpatchapipy.py

@@ -184,7 +184,7 @@ def pyclass_reader(iface, file_name, file_lines):
             if heu_dtype is None:
                 heu_cnames = []
                 other_functions = []
-                for l in class_lines:
+                """ for l in class_lines:
                     m = re.search("def\s+(?P<cname>[a-zA-Z0-9]+)_\w+", l)
                     if m:
                         heu_cname = m.group("cname")
@@ -201,7 +201,7 @@ def pyclass_reader(iface, file_name, file_lines):
                         iface.error(">>>" + l)
 
                     if cname in heu_cnames:
-                        heu_cname = cname
+                        heu_cname = cname """
 
                 if heu_cname:
                     heu_dtype = "class_definition"

{enebootools-2.0.5 → enebootools-2.0.7}/enebootools/mergetool/flpatchdir.py

@@ -316,7 +316,11 @@ class FolderApplyPatch(object):
         old_style, self.iface.patch_py_style_name = self.iface.patch_py_style_name, style
         self.iface.set_output_file(dst + ".patched")
         if style in ["legacy"]:
-            if filename.endswith(("_api.py", "_schema.py", "_model.py")):
+            if (
+                filename.endswith(("_api.py", "_schema.py", "_model.py"))
+                or filename.startswith("test_")
+                and filename.endswith(".py")
+            ):
                 ret = flpatchapipy.patch_py(self.iface, dst, src)
             else:
                 ret = flpatchpy.patch_py(self.iface, dst, src)

{enebootools-2.0.5 → enebootools-2.0.7/enebootools.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: enebootools
-Version: 2.0.5
+Version: 2.0.7
 Summary: ERP tools for Eneboo
 Home-page: https://github.com/aulla/eneboo-tools
 Author: David Martínez Martí, José A. Fernández Fernández