oh-my-batch 0.2.5__py3-none-any.whl → 0.3.1__py3-none-any.whl

oh_my_batch/assets/functions.sh

@@ -21,7 +21,7 @@ checkpoint() {
     fi
 }
 
-echo -e "${GREEN}Functiion: checkpoint${NC}"
+echo -e "${GREEN}Function: checkpoint${NC}"
 cat <<EOF
 Usage:
     checkpoint <flag_file> <command> [arg1] [arg2] ...

oh_my_batch/combo.py

@@ -161,7 +161,7 @@ class ComboMaker:
                 raise ValueError(f"Variable {key} not found")
         return self
 
-    def make_files(self, template: str, dest: str, delimiter='@', mode=None, encoding='utf-8'):
+    def make_files(self, file: str, template: str, delimiter='@', mode=None, encoding='utf-8'):
         """
         Make files from template against each combo
         The template file can include variables with delimiter.
@@ -171,8 +171,8 @@ class ComboMaker:
         For example, if dest is 'output/{i}-{TEMP}.txt', 
         then files are saved as output/0-300K.txt, output/1-400K.txt, ...
 
+        :param file: Path pattern to destination file
         :param template: Path to template file
-        :param dest: Path pattern to destination file
         :param delimiter: Delimiter for variables in template, default is '@', as '$' is popular in shell scripts
         can be changed to other character, e.g $, $$, ...
         :param mode: File mode, e.g. 755, 644, ...
@@ -188,12 +188,12 @@ class ComboMaker:
             with open(template, 'r') as f:
                 template_text = f.read()
             text = _Template(template_text).safe_substitute(combo)
-            _dest = dest.format(i=i, **combo)
-            ensure_dir(_dest)
-            with open(_dest, 'w', encoding=encoding) as f:
+            _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:
-                os.chmod(_dest, mode_translate(str(mode)))
+                os.chmod(_file, mode_translate(str(mode)))
         return self
     
     def print(self, *line: str, file: str = '', mode=None, encoding='utf-8'):

oh_my_batch/util.py

@@ -60,7 +60,7 @@ def ensure_dir(path: str):
     """
     d = os.path.dirname(path)
     if d:
-        os.makedirs(os.path.dirname(d), exist_ok=True)
+        os.makedirs(d, exist_ok=True)
 
 
 def mode_translate(mode: str):

{oh_my_batch-0.2.5.dist-info → oh_my_batch-0.3.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: oh-my-batch
-Version: 0.2.5
+Version: 0.3.1
 Summary: 
 License: GPL
 Author: weihong.xu
@@ -47,10 +47,12 @@ To make the best use of `oh-my-batch`, you need to know some shell tips.
 You can load useful functions from `oh-my-batch` this way:
 
 ```bash
-omb misc export-shell-func > omb-func.sh && source omb-func.sh && rm omb-func.sh
+eval "$(omb misc export-shell-func)"
+# or
+omb misc export-shell-func > omb-func.sh && source omb-func.sh
 ```
 
-This will load some functions to your shell script, for example, `checkpoint`.
+This will load extra functions to your shell script, for example, `checkpoint`.
 
 ### Generate files from different combinations of parameters
 
@@ -83,8 +85,8 @@ omb combo \
     add_files DATA_FILE tmp/*.data - \
     add_var TEMP 300 400 500 - \
     add_randint RANDOM -n 3 -a 1 -b 1000 --broadcast - \
-    make_files tmp/in.lmp.tmp tmp/tasks/{i}-T-{TEMP}/in.lmp - \
-    make_files tmp/run.sh.tmp tmp/tasks/{i}-T-{TEMP}/run.sh --mode 755 - \
+    make_files tmp/tasks/{i}-T-{TEMP}/in.lmp --template tmp/in.lmp.tmp - \
+    make_files tmp/tasks/{i}-T-{TEMP}/run.sh --template tmp/run.sh.tmp --mode 755 - \
     done
 ```
 

{oh_my_batch-0.2.5.dist-info → oh_my_batch-0.3.1.dist-info}/RECORD

@@ -1,15 +1,15 @@
 oh_my_batch/__init__.py,sha256=BsRNxZbqDWfaIZJGxzIDqCubRWztMGFDceW08TECuFs,98
 oh_my_batch/__main__.py,sha256=sWyFZMwWNvhkanwZSJRGfBBDoIevhC028dTSB67i6yI,61
 oh_my_batch/assets/__init__.py,sha256=Exub46UbQaz2V2eXpQeiVfnThQpXaNeuyjlGY6gBSZc,130
-oh_my_batch/assets/functions.sh,sha256=dvPGpOKz4CyUSlE5IAewQc8HUrQJuaZ0j-WZIuxB3Tg,1002
+oh_my_batch/assets/functions.sh,sha256=LaiavZBu84D7C1r-dWhf91vPTuHXCMV1DQZUIPVQnjE,1001
 oh_my_batch/batch.py,sha256=6qnaXEVyA493heGzzbCrdZXCcnYk8zgl7WP0rmo7KlU,3690
 oh_my_batch/cli.py,sha256=Jyz8q2pUYke3mfJS6F_G9S9hApddgXxQw1BsN6Kfkjc,553
-oh_my_batch/combo.py,sha256=-qgqT7XSvEeyefMPD3-HuX-aozefjSKhbZbPm1pm_18,9324
+oh_my_batch/combo.py,sha256=U3vdHcqe2TEqMVMH7kVW-AlIYFzle839E9BzMNVtj6Y,9324
 oh_my_batch/job.py,sha256=Uk0E-WxnexBu9wuUV3uc1aAwVF_5rWdNdLEOB8Y9B-U,6252
 oh_my_batch/misc.py,sha256=G_iOovRCrShBJJCc82QLN0CvMqW4adOefEoY1GedEiw,452
-oh_my_batch/util.py,sha256=K-XAndE5dgpxBrohAlUhVpeJGT7Q9vUG9ghHc9L0HaU,2426
-oh_my_batch-0.2.5.dist-info/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-oh_my_batch-0.2.5.dist-info/METADATA,sha256=KxRayqgrzOIz_ng2VHElCtjowYOPlfvaOKzEBoeID5w,5445
-oh_my_batch-0.2.5.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-oh_my_batch-0.2.5.dist-info/entry_points.txt,sha256=ZY2GutSoNjjSyJ4qO2pTeseKUFgoTYdvmgkuZZkwi68,77
-oh_my_batch-0.2.5.dist-info/RECORD,,
+oh_my_batch/util.py,sha256=5ve2QcviuF0UHFLrsXmjMTj0ogXJ4g05q1y-yWCFuOk,2409
+oh_my_batch-0.3.1.dist-info/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+oh_my_batch-0.3.1.dist-info/METADATA,sha256=vCTUrC_RUrC7162mntphFlwIt3JAYvdxjC3EFQZFqi8,5492
+oh_my_batch-0.3.1.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+oh_my_batch-0.3.1.dist-info/entry_points.txt,sha256=ZY2GutSoNjjSyJ4qO2pTeseKUFgoTYdvmgkuZZkwi68,77
+oh_my_batch-0.3.1.dist-info/RECORD,,