oh-my-batch 0.4.9__tar.gz → 0.5.1__tar.gz

{oh_my_batch-0.4.9 → oh_my_batch-0.5.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: oh-my-batch
-Version: 0.4.9
+Version: 0.5.1
 Summary: 
 License: GPL
 Author: weihong.xu

{oh_my_batch-0.4.9 → oh_my_batch-0.5.1}/oh_my_batch/batch.py

@@ -13,13 +13,17 @@ class BatchMaker:
         self._script_bottom = []
         self._command = []
 
-    def add_work_dirs(self, *dir: str):
+    def add_work_dirs(self, *dir: str, abs=False):
         """
         Add working directories
 
         :param dir: Directories to work on, can be glob patterns
+        :param abs: Whether to convert to absolute path
         """
-        self._work_dirs.extend(expand_globs(dir))
+        paths = expand_globs(dir)
+        if abs:
+            paths = [os.path.abspath(p) for p in paths]
+        self._work_dirs.extend(paths)
         return self
 
     def add_header_files(self, *file: str, encoding='utf-8'):

{oh_my_batch-0.4.9 → oh_my_batch-0.5.1}/oh_my_batch/combo.py

@@ -92,7 +92,7 @@ class ComboMaker:
         return self
 
     def add_file_set(self, key: str, *path: str, format=None,
-                         sep=' ', abs=False, raise_invalid=False):
+                     sep=' ', abs=False, raise_invalid=False):
         """
         Add a variable with files by glob pattern as one string
         Unlike add_files, this function joins the files with a delimiter.
@@ -163,7 +163,8 @@ class ComboMaker:
             self._broadcast_keys.append(key)
         return self
 
-    def make_files(self, file: str, template: str, delimiter='@', mode=None, encoding='utf-8'):
+    def make_files(self, file: str, template: str, delimiter='@', mode=None, encoding='utf-8',
+                   extra_vars_from_file=None):
         """
         Make files from template against each combo
         The template file can include variables with delimiter.
@@ -179,6 +180,7 @@ class ComboMaker:
         can be changed to other character, e.g $, $$, ...
         :param mode: File mode, e.g. 755, 644, ...
         :param encoding: File encoding
+        :param extra_vars_from_file: Load extra variables from json file, which can be used in template
         """
         _delimiter = delimiter
 
@@ -190,9 +192,17 @@ class ComboMaker:
             _template = template.format(i=i, **combo)
             with open(_template, 'r') as f:
                 template_text = f.read()
-            text = _Template(template_text).safe_substitute(combo)
+
+            if extra_vars_from_file is not None:
+                _vars_file = extra_vars_from_file.format(i=i, **combo)
+                with open(_vars_file, 'r') as f:
+                    extra_vars = json.load(f)
+            else:
+                extra_vars = {}
+            text = _Template(template_text).safe_substitute(combo, **extra_vars)
             _file = file.format(i=i, **combo)
             ensure_dir(_file)
+
             with open(_file, 'w', encoding=encoding) as f:
                 f.write(text)
             if mode is not None:

{oh_my_batch-0.4.9 → oh_my_batch-0.5.1}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "oh-my-batch"
-version = "0.4.9"
+version = "0.5.1"
 description = ""
 authors = ["weihong.xu <xuweihong.cn@gmail.com>"]
 license = "GPL"