dekshell 0.2.20__py3-none-any.whl → 0.2.21__py3-none-any.whl

dekshell/core/markers/__init__.py

@@ -44,7 +44,7 @@ def generate_markers(*args, **kwargs):
         RedirectMarker, ShiftMarker,
         TimeoutMarker, RetryMarker,
         IgnoreMarker,
-        PrefixShellMarker,
+        IgnoreErrorShellMarker, PrefixShellMarker,
         AssignCallMarker, AssignInvokerMarker, AssignGotoMarker, AssignTimeoutMarker, AssignRetryMarker,
         AssignExecMarker, AssignEvalMarker, AssignCmdcallMarker, AssignCmdcallChainMarker,
         AssignMultiLineRawStrMarker, AssignMultiLineStrMarker, AssignRawStrMarker, AssignStrMarker,

dekshell/core/markers/base/__init__.py

@@ -20,6 +20,7 @@ class MarkerBase:
     tag_head_re = None
     tag_head_re_args = None
     tag_tail = None
+    stack_check = True
     branch_set = set()
 
     var_name_anonymous = '_'

dekshell/core/markers/base/core.py

@@ -140,7 +140,7 @@ class MarkerNode:
         self.payload = payload
 
     def __repr__(self):
-        return f'Node({self.marker.__class__.__name__})'
+        return f'Node({self.marker.__class__.__name__},line={self.line_number})'
 
     @property
     def debug_info(self):
@@ -154,6 +154,18 @@ class MarkerNode:
 
         return obj2str(walk(self))
 
+    @property
+    def ignore_stack_check(self):
+        def walk(node):
+            if not node.marker.stack_check:
+                return node
+            for child in node.children:
+                r = walk(child)
+                if r:
+                    return r
+
+        return walk(self)
+
     def is_type(self, *markers_cls):
         return isinstance(self.marker, markers_cls)
 
@@ -282,6 +294,12 @@ class MarkerSet:
         self.markers = self.transformer_cls.inject(markers)
         self.shell_exec = shell_exec
         self.shell_cmd = shell_cmd
+        self.stack_errors = {}
+
+    def check_stack_error(self, node):
+        error = self.stack_errors.get(node.index)
+        if error:
+            raise error
 
     def is_marker_branch(self, marker):
         return marker.__class__ in self.markers_branch_set
@@ -318,7 +336,14 @@ class MarkerSet:
             if marker.tag_tail is not None:  # block command
                 stack.append(node)
         if len(stack) != 1:
-            raise ValueError(f'Stack should have just a root node in final: {stack}')
+            node = stack[0].ignore_stack_check
+            error = ValueError(
+                f'Stack should have just one root node in final, your scripts contains syntax errors: {stack}')
+            if node:
+                print(error)
+                self.stack_errors[node.index] = error
+            else:
+                raise error
         return stack[0]
 
     def execute(self, commands, context, ln=None):

dekshell/core/markers/base/shell.py

@@ -0,0 +1,21 @@
+from dektools.shell import shell_command
+from . import MarkerShellBase
+
+
+class ShellCommand:
+    shell_call = shell_command
+
+    def __init__(self, kwargs):
+        self.kwargs = kwargs
+
+    def __call__(self, *args, **kwargs):
+        kwargs = kwargs | self.kwargs
+        return self.shell(*args, **kwargs)
+
+    def shell(self, *args, **kwargs):
+        return shell_command(*args, **kwargs)
+
+
+class MarkerShell(MarkerShellBase):
+    tag_head = ""
+    shell_cls = ShellCommand

dekshell/core/markers/commands.py

@@ -1,7 +1,32 @@
+import subprocess
+from dektools.shell import shell_wrapper
 from .base import MarkerWithEnd
+from .base.shell import MarkerShell, ShellCommand
 from .empty import EmptyMarker
 
 
+class PrefixShellMarker(MarkerShell):
+    tag_head = "@"
+
+    def execute(self, context, command, marker_node, marker_set):
+        _, command = self.split_raw(command, 1, self.tag_head)
+        if command:
+            self.execute_core(context, command, marker_node, marker_set)
+
+
+class IgnoreErrorShellCommand(ShellCommand):
+    def shell(self, *args, **kwargs):
+        try:
+            shell_wrapper(*args, **kwargs)
+        except subprocess.SubprocessError:
+            return None
+
+
+class IgnoreErrorShellMarker(PrefixShellMarker):
+    tag_head = "!"
+    shell_cls = IgnoreErrorShellCommand
+
+
 class CommandsMarker(MarkerWithEnd):
     tag_head = "@@"
     target_marker_cls = EmptyMarker

dekshell/core/markers/empty.py

@@ -1,31 +1,4 @@
-from dektools.shell import shell_command
-from .base import MarkerShellBase
-
-
-class ShellCommand:
-    def __init__(self, kwargs):
-        self.kwargs = kwargs
-
-    def __call__(self, *args, **kwargs):
-        kwargs = kwargs | self.kwargs
-        return self.shell(*args, **kwargs)
-
-    def shell(self, *args, **kwargs):
-        return shell_command(*args, **kwargs)
-
-
-class MarkerShell(MarkerShellBase):
-    tag_head = ""
-    shell_cls = ShellCommand
-
-
-class PrefixShellMarker(MarkerShell):
-    tag_head = "@"
-
-    def execute(self, context, command, marker_node, marker_set):
-        _, command = self.split_raw(command, 1, self.tag_head)
-        if command:
-            self.execute_core(context, command, marker_node, marker_set)
+from .base.shell import MarkerShell
 
 
 class EmptyMarker(MarkerShell):

dekshell/core/markers/redirect.py

@@ -1,5 +1,4 @@
 import os
-
 from dektools.shell import shell_wrapper
 from dektools.attr import DeepObject
 from ...core.redirect import redirect_shell_by_path_tree
@@ -14,30 +13,33 @@ class MarkerRedirect(MarkerBase):
         if not filepath:
             filepath = self.eval(context, 'fp')
         path_shell = redirect_shell_by_path_tree(filepath)
-        if path_shell:
-            self.execute_core(context, path_shell)
+        self.execute_core(context, marker_node, marker_set, path_shell)
 
-    def execute_core(self, context, path_shell):
+    def execute_core(self, context, marker_node, marker_set, path_shell):
         raise NotImplementedError
 
 
 class RedirectMarker(MarkerRedirect):
     tag_head = "redirect"
+    stack_check = False
 
-    def execute_core(self, context, path_shell):
-        shell_properties = make_shell_properties(path_shell)
-        if shell_properties['shell'] != current_shell:
-            fp = self.eval(context, "fp")
-            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)
-            shell_wrapper(f'{shell} {fp} {argv}', env=context.environ_full())
-            self.exit()
+    def execute_core(self, context, marker_node, marker_set, path_shell):
+        if path_shell:
+            shell_properties = make_shell_properties(path_shell)
+            if shell_properties['shell'] != current_shell:
+                fp = self.eval(context, "fp")
+                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)
+                shell_wrapper(f'{shell} {fp} {argv}', env=context.environ_full())
+                return self.exit()
+        marker_set.check_stack_error(marker_node)
 
 
 class ShiftMarker(MarkerRedirect):
     tag_head = "shift"
 
-    def execute_core(self, context, path_shell):
-        context.update_variables(DeepObject(make_shell_properties(path_shell)).__dict__)
+    def execute_core(self, context, marker_node, marker_set, path_shell):
+        if path_shell:
+            context.update_variables(DeepObject(make_shell_properties(path_shell)).__dict__)

dekshell/core/markers/shell.py

@@ -1,6 +1,7 @@
 import subprocess
 from dektools.shell import shell_timeout, shell_wrapper, shell_retry
-from .empty import MarkerShell, ShellCommand
+from .base.shell import ShellCommand
+from .empty import MarkerShell
 
 
 class TimeoutShellCommand(ShellCommand):

{dekshell-0.2.20.dist-info → dekshell-0.2.21.dist-info}/METADATA

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

{dekshell-0.2.20.dist-info → dekshell-0.2.21.dist-info}/RECORD

@@ -1,6 +1,6 @@
-dekshell-0.2.20.dist-info/METADATA,sha256=lyoJSBMq5T-98xmkXenuqb022cFzmAD7B9OA35SJBRQ,573
-dekshell-0.2.20.dist-info/WHEEL,sha256=tSfRZzRHthuv7vxpI4aehrdN9scLjk-dCJkPLzkHxGg,90
-dekshell-0.2.20.dist-info/entry_points.txt,sha256=d-kbfULiUTZWIBBsrQF3J_-wESncF-4K2rwHT08grlI,75
+dekshell-0.2.21.dist-info/METADATA,sha256=hMyPkDtXMgxohQMAE8K0woOezydn3-JXNBHnFD9kUdg,573
+dekshell-0.2.21.dist-info/WHEEL,sha256=tSfRZzRHthuv7vxpI4aehrdN9scLjk-dCJkPLzkHxGg,90
+dekshell-0.2.21.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
@@ -8,14 +8,15 @@ dekshell/core/__init__.py,sha256=w-IeR-tO61Mv4ubZyw9LvyagudyD8SXH0YD3yKApNXk,540
 dekshell/core/contexts/__init__.py,sha256=ynsfv37azOKfI2UKd0iPl2M6iBW-k5cb1BqSLOWuJpI,482
 dekshell/core/contexts/methods.py,sha256=6THhB6X6VqpHKLQIW3bOrd3J9yxHems2PRt8dR6xiT0,9344
 dekshell/core/contexts/properties.py,sha256=esr51c6wDTDsuFXF2uj7WfyIGSq9H0dzqDqWzeMTNQE,2382
-dekshell/core/markers/__init__.py,sha256=FyVfsvt1c8hFWoTgHuMriSJvrJg1XulK636Kt1TczjQ,1867
-dekshell/core/markers/base/__init__.py,sha256=To25RVX3h1MluV3OmktVMw2bigex79GjWHUPWtIlczI,13433
-dekshell/core/markers/base/core.py,sha256=99aRcSXohpfTW5OSO1CUyvnptr21ueKjizCk-FK6rcM,10830
-dekshell/core/markers/commands.py,sha256=4frmkrTa7-7ZYWztXEmYprbWRkoCIuJuiy28pBGcz8A,987
+dekshell/core/markers/__init__.py,sha256=yAZJEIK7eeaZvlIDwTFe2d3yKZiTUVGJQbHOnhNFOMQ,1891
+dekshell/core/markers/base/__init__.py,sha256=Rcc77ToE4cFlJvGwezRez4nAcfbdzgAhDRHaew5wvk0,13456
+dekshell/core/markers/base/core.py,sha256=ztB28fDPeqUkXCHchxjU2JO7R1klp_iUj2d6e8IlGCA,11567
+dekshell/core/markers/base/shell.py,sha256=DhaekMMTuABYP4GyZA05eejFfgxb1lQBwI88dlFv90E,479
+dekshell/core/markers/commands.py,sha256=mDRj4dSfKbDaZ_ts4lPXd6wftvGFI4VKkRoIzxV7otA,1696
 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
-dekshell/core/markers/empty.py,sha256=xMYoZIxn7Tt1RjFtLhJERisra8jqsGjJ0G7OID0oD3o,776
+dekshell/core/markers/empty.py,sha256=pWKsHlrp6uXWU6blqOs0IgN_3kYm1OmDQiKGPERabAo,79
 dekshell/core/markers/env.py,sha256=6ZtiMNdKFbGR_DBjG6C7A8L_lJsiymN5Y5AbnTzyMrE,1158
 dekshell/core/markers/exec.py,sha256=3vQc-jH7toU_89rNFTipowr0ZrNn79pqmNbYuHxCPDI,2370
 dekshell/core/markers/for_.py,sha256=uNOEwyDsjffttEBtUYasdlj7FP_sGnQzWuTV5d5esHY,2142
@@ -24,8 +25,8 @@ dekshell/core/markers/if_.py,sha256=bBG1fDCZd5alE5FSm0QhgHl6ZJn5awiqZAXnPnO-thc,
 dekshell/core/markers/input.py,sha256=O0yvGtt1uhbpE2gOReLseAmshVpZYMW3zV-OabZt0lw,1182
 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=ZMqHnntzJabgqlNXU7Xj1GcYNlfwOyUsZ3rrJTd1yXk,1589
-dekshell/core/markers/shell.py,sha256=6Gy59gjI-BFIQadwGxApD6w3LndIRMao_4D9pMpB5Hk,1906
+dekshell/core/markers/redirect.py,sha256=WGaWW-7efaCIOYhs3gQgtKJC4lmFsBx2AQ4bs5Bu_UQ,1828
+dekshell/core/markers/shell.py,sha256=43BDAAzMdmgZmemkW5buh_w4LL1GDGw-s9fNZo6vhag,1929
 dekshell/core/markers/var.py,sha256=O-lpWhnLOkKMwF1jR0rVwyHLa8YUWwacCs80wFzwfdQ,4838
 dekshell/core/markers/while_.py,sha256=e7lI5jsIM-qxNHMY_wUyCMvvesdXQibR5Ez2jNO9csc,1195
 dekshell/core/plugin/__init__.py,sha256=jAB_KnnHJsyJR_zIfBU_HNLngyhcyyqVv05PdlNZtF8,428
@@ -36,4 +37,4 @@ dekshell/utils/cmd.py,sha256=FfWNRRRdiiTs3xoXvaAyZ-3OzsWFRnd3m5k6sIexrhc,1209
 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.20.dist-info/RECORD,,
+dekshell-0.2.21.dist-info/RECORD,,