dekshell 0.2.4__py3-none-any.whl → 0.2.5__py3-none-any.whl

dekshell/core/__init__.py

@@ -87,7 +87,7 @@ def shell_command_batch_core(
     def shell_exec(filepath, c=None):
         return shell_command_file(
             filepath,
-            context=(context or {}) | (c or {}),
+            context=c or {},
             marker=marker,
             ms_names=ms_names,
             marker_set_cls=marker_set_cls,

dekshell/core/contexts/methods.py

@@ -3,6 +3,8 @@ import shutil
 import sys
 import tempfile
 import getpass
+from functools import reduce
+from itertools import chain
 from pathlib import Path
 from dektools.file import sure_dir, write_file, read_text, remove_path, sure_parent_dir, normal_path, \
     format_path_desc, read_file, split_ext, path_ext, clear_dir, copy_recurse_ignore, \
@@ -138,6 +140,8 @@ path_common_methods = {
 }
 
 default_methods = {
+    'reduce': reduce,
+    'chain': chain,
     'xeval': _xeval,
     'echo': lambda *x, **y: print(*x, **dict(flush=True) | y),
     'echos': lambda *x, **y: print(*x, **dict(end='', flush=True) | y),

dekshell/core/markers/__init__.py

@@ -12,10 +12,10 @@ from .function import *
 from .exec import *
 from .echo import *
 from .pip_ import *
-from .shell import *
+from .commands import *
 from .redirect import *
 from .input import *
-from .timout import *
+from .shell import *
 from .empty import *
 
 
@@ -39,12 +39,12 @@ def generate_markers(*args, **kwargs):
         EndMarker, BreakMarker, ContinueMarker,
         CommentMultiLineMarker, CommentMarker, CommentShebangMarker, CommentConfigMarker,
         PipMarker,
-        ShellMarker,
+        CommandsMarker,
         RedirectMarker, ShiftMarker,
-        TimeoutMarker,
+        TimeoutMarker, RetryMarker,
         IgnoreMarker,
         PrefixShellMarker,
-        AssignCallMarker, AssignInvokerMarker, AssignGotoMarker, AssignTimeoutMarker,
+        AssignCallMarker, AssignInvokerMarker, AssignGotoMarker, AssignTimeoutMarker, AssignRetryMarker,
         AssignExecMarker, AssignEvalMarker, AssignCmdcallMarker,
         AssignMultiLineRawStrMarker, AssignMultiLineStrMarker, AssignRawStrMarker, AssignStrMarker,
         EmptyMarker,  # must be at the tail

dekshell/core/markers/commands.py

@@ -0,0 +1,30 @@
+from .base import MarkerWithEnd
+from .empty import EmptyMarker
+
+
+class CommandsMarker(MarkerWithEnd):
+    tag_head = "@@"
+    target_marker_cls = EmptyMarker
+
+    def execute(self, context, command, marker_node, marker_set):
+        argv = self.split_raw(command, 1)
+        config = self.get_item(argv, 1, '').strip()
+        if config:
+            config = eval(f'dict({config})', {'environ': context.environ_full()})
+        else:
+            config = None
+        marker = marker_set.find_marker_by_cls(self.target_marker_cls)
+        result = []
+        for child in marker_node.children:
+            if child.is_type(self.target_marker_cls):
+                node = marker_set.node_cls(
+                    marker,
+                    child.command,
+                    child.index,
+                    marker_node,
+                    payload=config
+                )
+                result.append(node)
+            else:
+                result.append(child)
+        return result

dekshell/core/markers/invoke.py

@@ -1,6 +1,6 @@
 import os
 from dektools.file import normal_path
-from ...utils.cmd import pack_context
+from ...utils.cmd import pack_context_full
 from .base import MarkerBase
 from .base.core import get_inner_vars
 
@@ -18,7 +18,7 @@ class MarkerInvokerBase(MarkerBase):
     def execute_file(cls, marker_set, filepath, args, kwargs):
         if marker_set is None:
             marker_set = get_inner_vars('__inner_marker_set__')
-        return cls._run_file(marker_set, normal_path(filepath), pack_context(args, kwargs))
+        return cls._run_file(marker_set, normal_path(filepath), pack_context_full(args, kwargs))
 
     @classmethod
     def _run_file(cls, marker_set, filepath, attrs):

dekshell/core/markers/redirect.py

@@ -28,7 +28,7 @@ class RedirectMarker(MarkerRedirect):
         shell_properties = make_shell_properties(path_shell)
         if shell_properties['shell'] != current_shell:
             fp = self.eval(context, "fp")
-            fpp = os.path.dirname(fp).relace('/', os.sep)
+            fpp = os.path.dirname(fp).replace('/', os.sep)
             shell = shell_properties['sh']['rfc' if os.getcwd() == fpp else 'rf']
             args, kwargs = self.eval(context, f'({key_args}, {key_kwargs})')
             argv = ak2cmd(args, kwargs)

dekshell/core/markers/shell.py

@@ -1,30 +1,56 @@
-from .base import MarkerWithEnd
-from .empty import EmptyMarker
+import subprocess
+from dektools.shell import shell_timeout, shell_wrapper, shell_retry
+from .empty import MarkerShell, ShellCommand
 
 
-class ShellMarker(MarkerWithEnd):
-    tag_head = "@@"
-    target_marker_cls = EmptyMarker
+class TimeoutShellCommand(ShellCommand):
+    def shell(self, command, timeout=None, env=None, **kwargs):
+        try:
+            if timeout > 0:
+                return shell_timeout(command, timeout, env=env)
+            else:
+                return shell_wrapper(command, env=env)
+        except subprocess.SubprocessError as e:
+            return e
+
+
+class TimeoutMarker(MarkerShell):
+    tag_head = "timeout"
+
+    shell_cls = TimeoutShellCommand
 
     def execute(self, context, command, marker_node, marker_set):
-        argv = self.split_raw(command, 1)
-        config = self.get_item(argv, 1, '').strip()
-        if config:
-            config = eval(f'dict({config})', {'environ': context.environ_full()})
-        else:
-            config = None
-        marker = marker_set.find_marker_by_cls(self.target_marker_cls)
-        result = []
-        for child in marker_node.children:
-            if child.is_type(self.target_marker_cls):
-                node = marker_set.node_cls(
-                    marker,
-                    child.command,
-                    child.index,
-                    marker_node,
-                    payload=config
-                )
-                result.append(node)
-            else:
-                result.append(child)
-        return result
+        _, timeout, command = self.split_raw(command, 2)
+        if command:
+            self.execute_core_timeout(context, command, marker_node, marker_set, timeout)
+
+    @classmethod
+    def execute_core_timeout(cls, context, command, marker_node, marker_set, timeout):
+        return cls.execute_core(context, command, marker_node, marker_set, dict(timeout=int(float(timeout))))
+
+
+class RetryShellCommand(ShellCommand):
+    def shell(self, command, times=None, env=None, **kwargs):
+        try:
+            return shell_retry(command=command, times=times, env=env)
+        except subprocess.SubprocessError as e:
+            return e
+
+
+class RetryMarker(MarkerShell):
+    tag_head = "retry"
+
+    shell_cls = RetryShellCommand
+
+    def execute(self, context, command, marker_node, marker_set):
+        _, times, command = self.split_raw(command, 2)
+        if command:
+            self.execute_core_retry(context, command, marker_node, marker_set, times)
+
+    @classmethod
+    def execute_core_retry(cls, context, command, marker_node, marker_set, times):
+        try:
+            times = int(float(times))
+        except ValueError:
+            times = None
+        return cls.execute_core(context, command, marker_node, marker_set, dict(times=times))

dekshell/core/markers/var.py

@@ -1,7 +1,7 @@
 import re
 from .base import MarkerBase, MarkerWithEnd, MarkerNoTranslator, cmd_call_prefix_simple
 from .function import CallMarker
-from .timout import TimeoutMarker
+from .shell import TimeoutMarker, RetryMarker
 from .invoke import MarkerInvokerBase, InvokeMarker, GotoMarker
 
 
@@ -114,6 +114,15 @@ class AssignTimeoutMarker(MarkerAssignValueBase, TimeoutMarker):
         return self.execute_core_timeout(context, expression, marker_node, marker_set, timeout)
 
 
+class AssignRetryMarker(MarkerAssignValueBase, RetryMarker):
+    tag_head = None
+    tag_head_re_args = r'retry[ \t\f\r\n]+'
+
+    def get_value(self, context, marker_node, marker_set, expression):
+        times, expression = self.split_raw(expression, 1)
+        return self.execute_core_retry(context, expression, marker_node, marker_set, times)
+
+
 class DelVarMarker(MarkerBase):
     tag_head = "del"
 

dekshell/utils/cmd.py

@@ -34,7 +34,7 @@ def ak2cmd(args, kwargs=None):
 
 
 def pack_context(args, kwargs):
-    return {f'{key_arg}{i}': arg for i, arg in enumerate(args)} | {key_args: args, key_kwargs: kwargs} | kwargs
+    return {f'{key_arg}{i}': arg for i, arg in enumerate(args)} | {key_args: tuple(args), key_kwargs: kwargs} | kwargs
 
 
 def pack_context_argv():

{dekshell-0.2.4.dist-info → dekshell-0.2.5.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: dekshell
-Version: 0.2.4
+Version: 0.2.5
 Author-Email: sanzenwin <sanzenwin@gmail.com>
 License: MIT
 Requires-Python: >=3.8

{dekshell-0.2.4.dist-info → dekshell-0.2.5.dist-info}/RECORD

@@ -1,16 +1,17 @@
-dekshell-0.2.4.dist-info/METADATA,sha256=b6XJcYT6ikv517oQfef3pSK7ekkKR2-MQQ7QPepKApo,572
-dekshell-0.2.4.dist-info/WHEEL,sha256=thaaA2w1JzcGC48WYufAs8nrYZjJm8LqNfnXFOFyCC4,90
-dekshell-0.2.4.dist-info/entry_points.txt,sha256=d-kbfULiUTZWIBBsrQF3J_-wESncF-4K2rwHT08grlI,75
+dekshell-0.2.5.dist-info/METADATA,sha256=ouSjx0hcMkNMPo1d6jwyzqeNc0pa6f7jeLAK7k0MuB0,572
+dekshell-0.2.5.dist-info/WHEEL,sha256=thaaA2w1JzcGC48WYufAs8nrYZjJm8LqNfnXFOFyCC4,90
+dekshell-0.2.5.dist-info/entry_points.txt,sha256=d-kbfULiUTZWIBBsrQF3J_-wESncF-4K2rwHT08grlI,75
 dekshell/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 dekshell/click/__entry__.py,sha256=CMuxUzXoEe4TcHFZwv-MNFwHnu1HSZCDpXFpqQ814uM,42
 dekshell/click/__init__.py,sha256=rFzB_exzPQaIcbbms5PdHAU3NGdl2MBaYbq9v7g7BOI,1870
-dekshell/core/__init__.py,sha256=zcOxolYNjd2A5LasK3REuAN0EokUQDd_VpwjrguNTuE,5357
+dekshell/core/__init__.py,sha256=ZAJtMPFCVClHCPkoP5rmTq1vVLLMQRa8MP-QJXLBgNM,5337
 dekshell/core/contexts/__init__.py,sha256=ynsfv37azOKfI2UKd0iPl2M6iBW-k5cb1BqSLOWuJpI,482
-dekshell/core/contexts/methods.py,sha256=c52IsT6Jq8N3FPydDRwKyp71XunGutVbDMQygt_IvIM,6979
+dekshell/core/contexts/methods.py,sha256=2wIXEnqNUram0T_gMtrmuWZd1HqfJnMO7G73wTZ33kQ,7078
 dekshell/core/contexts/properties.py,sha256=6rEQjExvAmZ69OfhPLLIQwnynRzAjX0nIbcBuZ5yuzM,2314
-dekshell/core/markers/__init__.py,sha256=bmGMbZRqsOohMKjH0AReFxZ-nIPFF6YgPJMFT6gTJEw,1725
+dekshell/core/markers/__init__.py,sha256=O5N5rURhTW0sZvnVVvtTX_w53zHYjb6KfcUShY46YmM,1762
 dekshell/core/markers/base/__init__.py,sha256=AQYr7H0F06izu5jhu8EgLYJ2ERzJh0eS38h9gtl6OZs,13067
 dekshell/core/markers/base/core.py,sha256=99aRcSXohpfTW5OSO1CUyvnptr21ueKjizCk-FK6rcM,10830
+dekshell/core/markers/commands.py,sha256=4frmkrTa7-7ZYWztXEmYprbWRkoCIuJuiy28pBGcz8A,987
 dekshell/core/markers/comment.py,sha256=28iccgLs_0bRdXLhHyQR2I_kzlWdeMSqqNUFW-2vkes,818
 dekshell/core/markers/define.py,sha256=LpMSfz9ziXq2aFJ6oMpUFFo93TpBx7GxKYNzCeht4fQ,516
 dekshell/core/markers/echo.py,sha256=1H61qQbY9tZnrKsdTI_shTmDY5ZaSGipDuBSRptAuZw,660
@@ -21,19 +22,18 @@ dekshell/core/markers/for_.py,sha256=uNOEwyDsjffttEBtUYasdlj7FP_sGnQzWuTV5d5esHY
 dekshell/core/markers/function.py,sha256=RPh56_rYbWXCTkNPiJu8zNEj-OE6txKgEw7Im9fBM3c,3592
 dekshell/core/markers/if_.py,sha256=bBG1fDCZd5alE5FSm0QhgHl6ZJn5awiqZAXnPnO-thc,1112
 dekshell/core/markers/input.py,sha256=HpqE1_PxrmeAVbWxACu0O7SeBVQpBw-aAmNIX5uWWYs,659
-dekshell/core/markers/invoke.py,sha256=sXXg0p8Dyg4HQwnWFzWgcyhZYGWvNfhDgUumrrUoWkM,1431
+dekshell/core/markers/invoke.py,sha256=To_U_FscoCbf7osvjC5MQTk2gjH5Mu_-06Kb22YQPTo,1441
 dekshell/core/markers/pip_.py,sha256=mxXa_oqcrk4Qz-HvhlkMoirsl-SbM9Fz610leNqP1o0,832
-dekshell/core/markers/redirect.py,sha256=7r0SpwIDkHkHjEDa26pNq3luOAE69fsFETyv4mKDw5k,1588
-dekshell/core/markers/shell.py,sha256=oU_APU2__BO9-LeDE4uYDXClic8MGmwambD2jujkpVc,984
-dekshell/core/markers/timout.py,sha256=sC1kNfcA_TFuKZFUaRCSnPHZ5az9Ap8rItSu5RwssUM,915
-dekshell/core/markers/var.py,sha256=UEGnKdloRDOSi1KD8aJId9k7WTYkeDIKjsuT7tBJ5Lo,4210
+dekshell/core/markers/redirect.py,sha256=ZMqHnntzJabgqlNXU7Xj1GcYNlfwOyUsZ3rrJTd1yXk,1589
+dekshell/core/markers/shell.py,sha256=6Gy59gjI-BFIQadwGxApD6w3LndIRMao_4D9pMpB5Hk,1906
+dekshell/core/markers/var.py,sha256=rj-gIdu-V8RQigmZ87skCLS-H103ndGgh3zrf3gQEZw,4571
 dekshell/core/markers/while_.py,sha256=e7lI5jsIM-qxNHMY_wUyCMvvesdXQibR5Ez2jNO9csc,1195
 dekshell/core/plugin/__init__.py,sha256=jAB_KnnHJsyJR_zIfBU_HNLngyhcyyqVv05PdlNZtF8,428
 dekshell/core/redirect.py,sha256=6YCJpG0TkQ4WMt7LBtDD_W1T-C-QkLtGRQw0S60qe54,1058
 dekshell/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 dekshell/utils/beep.py,sha256=teuQgHbWDr8BD1xCJ4Pt79X6N1-eq1tTlyGunK6wBIM,120
-dekshell/utils/cmd.py,sha256=_WG7K-CO-WQkI9ERyrhI2d4yT-DX3OjjJWbNzhmsPus,1197
+dekshell/utils/cmd.py,sha256=akykpgPCovXpvavKF28G-eNM3mOZ4TY0LlSWGozDp34,1204
 dekshell/utils/pkg.py,sha256=TgYqRqawoJfjkxt6UAHnp9ttmpjuHiWRFbqxADOS1VE,1337
 dekshell/utils/serializer.py,sha256=aIdF2Wzo-qHmIshv46jn1XD0X66vQ1JFdU-g3ZFbH2w,386
 dekshell/utils/shell.py,sha256=0NoA2-SOOMinbmZZipwzL-npBbzPOdWEfdPVYqq5G5g,92
-dekshell-0.2.4.dist-info/RECORD,,
+dekshell-0.2.5.dist-info/RECORD,,

dekshell/core/markers/timout.py

@@ -1,26 +0,0 @@
-import subprocess
-from dektools.shell import shell_timeout
-from .empty import MarkerShell, ShellCommand
-
-
-class TimeoutShellCommand(ShellCommand):
-    def shell(self, command, timeout=None, env=None, **kwargs):
-        try:
-            return shell_timeout(command, timeout, env=env, check=True)
-        except subprocess.CalledProcessError as e:
-            return e
-
-
-class TimeoutMarker(MarkerShell):
-    tag_head = "timeout"
-
-    shell_cls = TimeoutShellCommand
-
-    def execute(self, context, command, marker_node, marker_set):
-        _, timeout, command = self.split_raw(command, 2)
-        if command:
-            self.execute_core_timeout(context, command, marker_node, marker_set, timeout)
-
-    @classmethod
-    def execute_core_timeout(cls, context, command, marker_node, marker_set, timeout):
-        return cls.execute_core(context, command, marker_node, marker_set, dict(timeout=int(float(timeout))))