buildz 0.6.40__tar.gz → 0.6.41__tar.gz

{buildz-0.6.40/buildz.egg-info → buildz-0.6.41}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: buildz
-Version: 0.6.40
+Version: 0.6.41
 Summary: 配置读写（基于json格式进行简化）、ioc、以及其他工具代码。a json-base file format's read and write code by python, and codes to read and product object from configure file in such format(ioc), and other tool codes
 Home-page: https://github.com/buildCodeZ/buildz
 Author: Zzz

{buildz-0.6.40 → buildz-0.6.41}/buildz/ioc/ioc/conf.py

@@ -191,8 +191,12 @@ class Conf(Base):
         if self._default_type is None:
             return self.confs.default_type
         return self._default_type
-    def get_var(self, key, i = -1):
-        return self.confs.get_var(key, i)
+    def get_var(self, key, i = -1, search_confs = True):
+        var, exist = self.confs.get_var(key, i)
+        if not exist and search_confs:
+            gid = self.confs.gid(self.namespace, key)
+            var, exist = self.confs.get_var(gid, i)
+        return var, exist
     def set_var(self, key, val):
         return self.confs.set_var(key, val)
     def unset_var(self, key):

{buildz-0.6.40 → buildz-0.6.41}/buildz/ioc/ioc/confs.py

@@ -540,6 +540,21 @@ class PushVar(IOCDObj):
         id = confs.gid(self.decorator.namespace, self.key)
         confs.push_var(id, val)
 
+pass
+class PushVars(IOCDObj):
+    def init(self, maps):
+        super().init()
+        self.maps
+    def bind(self, wrap):
+        super().bind(wrap)
+        self.decorator.add_bind(self)
+    def call(self):
+        conf = self.decorator.obj
+        confs = conf.confs
+        for key, val in self.maps.items():
+            id = confs.gid(self.decorator.namespace, key)
+            confs.push_var(id, val)
+
 pass
 # class PushVar(IOCDObj):
 #     def init(self, id):

buildz-0.6.41/buildz/ioc/ioc/loads.py

@@ -0,0 +1,35 @@
+#
+from buildz import Base, xf
+from ..ioc.decorator import decorator,IOCDObj
+class Loads(IOCDObj):
+    def init(self, conf, vtype = "envs"):
+        if type(conf)==str:
+            conf = xf.loads(conf)
+        self._type = vtype
+        self.conf = conf
+    def bind(self, wrap):
+        super().bind(wrap)
+        self.decorator.add_bind(self)
+    def call(self):
+        conf = self.decorator.obj
+        confs = conf.confs
+        maps = {}
+        for key, val in self.conf.items():
+            key = confs.gid(self.decorator.namespace, key)
+            maps[key] = val
+        if self._type == 'env':
+            confs.flush_env(maps)
+            xf.deep_fill(maps, conf.envs, 1)
+        else:
+            confs.push_vars(maps)
+
+pass
+
+class Loadf(Loads):
+    def init(self, fp, vtype="env"):
+        conf = xf.loadf(fp)
+        super().init(conf, vtype)
+
+pass
+decorator.regist("load_conf", Loads)
+decorator.regist("loadf_conf", Loadf)

buildz-0.6.41/buildz/ioc/ioc_deal/init.py

@@ -0,0 +1,5 @@
+
+from . import obj
+from . import base
+from . import var
+from ..ioc import loads

{buildz-0.6.40 → buildz-0.6.41}/buildz/ioc/ioc_deal/var.py

@@ -48,7 +48,7 @@ class IOCVar(IOCDObj):
         conf['id'] = self.id
         conf['type'] = 'var'
         conf['var'] = src
-        decorator.add_datas(conf)
+        self.decorator.add_datas(conf)
         return cls
 
 pass

{buildz-0.6.40 → buildz-0.6.41}/buildz/ioc/wrap.py

@@ -17,7 +17,7 @@ def pkg(fp):
     __import__(fp)
 
 pass
-def imports(dp, pts=".*\.py$", pfx=""):
+def imports(dp=".", pts=".*\.py$", pfx=""):
     """
     find filepath by dirpath(dp) and pattern(pts), 
     import:

{buildz-0.6.40 → buildz-0.6.41/buildz.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: buildz
-Version: 0.6.40
+Version: 0.6.41
 Summary: 配置读写（基于json格式进行简化）、ioc、以及其他工具代码。a json-base file format's read and write code by python, and codes to read and product object from configure file in such format(ioc), and other tool codes
 Home-page: https://github.com/buildCodeZ/buildz
 Author: Zzz

{buildz-0.6.40 → buildz-0.6.41}/buildz.egg-info/SOURCES.txt

@@ -97,6 +97,7 @@ buildz/ioc/ioc/base.py
 buildz/ioc/ioc/conf.py
 buildz/ioc/ioc/confs.py
 buildz/ioc/ioc/decorator.py
+buildz/ioc/ioc/loads.py
 buildz/ioc/ioc/single.py
 buildz/ioc/ioc_deal/base.py
 buildz/ioc/ioc_deal/branch.py

{buildz-0.6.40 → buildz-0.6.41}/setup.py

@@ -7,7 +7,7 @@ from setuptools import setup, find_packages
 
 setup(
     name = 'buildz',
-    version = '0.6.40',
+    version = '0.6.41',
     keywords='buildz',
     long_description=open('README.md', 'r', encoding="utf-8").read(),
     long_description_content_type='text/markdown',

buildz-0.6.40/buildz/ioc/ioc_deal/init.py

@@ -1,4 +0,0 @@
-
-from . import obj
-from . import base
-from . import var