buildz 0.6.9__tar.gz → 0.6.10__tar.gz

{buildz-0.6.9/buildz.egg-info → buildz-0.6.10}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: buildz
-Version: 0.6.9
+Version: 0.6.10
 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.9 → buildz-0.6.10}/buildz/ioc/ioc/confs.py

@@ -85,6 +85,7 @@ class Confs(Base):
         return None
     def get_env_maps(self, id, maps):
         ids = self.env_ids(id)
+        #print(f"[TZBZ] get_env_maps({id})[{ids}] in {maps}")
         envs = maps
         for id in ids:
             if type(envs)!=dict:
@@ -97,10 +98,23 @@ class Confs(Base):
         return envs
     def get_env_conf(self, id, sid=None):
         return self.get_env_maps(id, self.envs)
+    def enable_args(self, enable = True):
+        key = "args"
+        if enable:
+            if key in self.env_orders:
+                return
+            self.env_orders = [key]+self.env_orders
+        else:
+            if key not in self.env_orders:
+                return
+            self.env_orders.remove(key)
+    def set_args_type(self, args_type):
+        self.args_type = args_type
     def get_env(self, id, sid=None):
         for key in self.env_orders:
             fc = self.env_fcs[key]
             obj = fc(id, sid)
+            #print(f"[TZBZ] get_env.{key}.{fc}({id}, {sid}): {obj}")
             if obj is not None:
                 return obj
         return None
@@ -122,6 +136,9 @@ class Confs(Base):
                 break 
             envs = envs[id]
         return envs
+    def set_envs(self, maps):
+        self.flush_env(maps)
+        self.update_env(maps)
     def set_env(self, id, val):
         obj = {id:val}
         self.flush_env(obj)

buildz-0.6.10/buildz/ioc/ioc_deal/branch.py

@@ -0,0 +1,47 @@
+#
+from ..ioc.base import Base, EncapeData,IOCError
+from .base import FormatData,FormatDeal
+from buildz import xf, pyz
+import os
+dp = os.path.dirname(__file__)
+join = os.path.join
+class BranchDeal(FormatDeal):
+    """
+        分支branch:
+            {
+                id: id
+                type: branch
+                judge: item_conf
+                vals: {
+                    judge_val: item_conf
+                    ...
+                }
+                default(optional): item_conf
+            }
+        简写：
+            [[id, branch], judge, {vals}, default]
+            [branch, judge, {vals}, default]
+            [branch, judge, {vals}]
+        例:
+            [branch, [env, env.test], {true:..., false: ...}]
+    """
+    def init(self, fp_lists=None, fp_defaults=None):
+        super().init("BranchDeal", fp_lists, fp_defaults, join(dp, "conf", "branch_lists.js"), None)
+    def deal(self, edata:EncapeData):
+        data = edata.data
+        data = self.fill(data)
+        judge = xf.get_first(data, 'judge', 'key', 'var')
+        judge = self.get_obj(judge, edata.conf, edata.src, edata.info)
+        vals = xf.get_first(data, 'vals', 'data', 'datas')
+        val = None
+        if judge in vals:
+            val = vals[judge]
+            val = self.get_obj(val, edata.conf, edata.src, edata.info)
+            return val
+        if 'default' not in data:
+            raise IOCError(f"<branch> not any vals match '{judeg}'")
+        default = data['default']
+        val = self.get_obj(default, edata.conf, edata.src, edata.info)
+        return val
+
+pass

buildz-0.6.10/buildz/ioc/ioc_deal/conf/branch_lists.js

@@ -0,0 +1,26 @@
+// [[id, type], key]
+[
+    {
+        nullable: 0,
+        out: 1,
+        conf: {
+            //sort:-1,
+            data:[
+                {key: type, default: null }
+                {key: id, default: null},
+            ]
+        }
+    },
+    {
+        nullable: 0,
+        key: judge
+    },
+    {
+        nullable: 0,
+        key: vals
+    },
+    {
+        nullable: 1,
+        key: default
+    }
+]

{buildz-0.6.9 → buildz-0.6.10}/buildz/ioc/ioc_deal/conf/deals.js

@@ -82,6 +82,11 @@
             type: iocf,
             note: 加配置文件,
             build: buildz.ioc.ioc_deal.iocf.IOCFObjectDeal
+        },
+        {
+            type: branch,
+            note: 条件配置,
+            build: buildz.ioc.ioc_deal.branch.BranchDeal
         }
     ]
 }

{buildz-0.6.9 → buildz-0.6.10/buildz.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: buildz
-Version: 0.6.9
+Version: 0.6.10
 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.9 → buildz-0.6.10}/buildz.egg-info/SOURCES.txt

@@ -56,6 +56,7 @@ buildz/ioc/ioc/conf.py
 buildz/ioc/ioc/confs.py
 buildz/ioc/ioc/single.py
 buildz/ioc/ioc_deal/base.py
+buildz/ioc/ioc_deal/branch.py
 buildz/ioc/ioc_deal/call.py
 buildz/ioc/ioc_deal/calls.py
 buildz/ioc/ioc_deal/deal.py
@@ -73,6 +74,7 @@ buildz/ioc/ioc_deal/ref.py
 buildz/ioc/ioc_deal/val.py
 buildz/ioc/ioc_deal/var.py
 buildz/ioc/ioc_deal/xfile.py
+buildz/ioc/ioc_deal/conf/branch_lists.js
 buildz/ioc/ioc_deal/conf/call_defaults.js
 buildz/ioc/ioc_deal/conf/call_lists.js
 buildz/ioc/ioc_deal/conf/calls_defaults.js

{buildz-0.6.9 → buildz-0.6.10}/setup.py

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