dekshell 0.2.20__tar.gz → 0.2.22__tar.gz

{dekshell-0.2.20 → dekshell-0.2.22}/PKG-INFO

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

{dekshell-0.2.20 → dekshell-0.2.22}/dekshell/core/contexts/methods.py

@@ -175,6 +175,14 @@ def _pymd(name):
     return None
 
 
+def _pyms(path=None):
+    if not path:
+        path = _eval_mixin('fp', None)
+        if not path:
+            path = os.getcwd()
+    return seek_py_module_path(path)
+
+
 def _time_mark(begin=True, name=None):
     var_prefix = '__time_marker__'
     if name is None:
@@ -202,7 +210,7 @@ path_common_methods = {
     'pybin': lambda x, p=None: search_bin_by_path_tree(p or os.getcwd(), x, False),
     'pym': _pym,
     'pymd': _pymd,
-    'pyms': seek_py_module_path,
+    'pyms': _pyms,
 }
 
 default_methods = {

{dekshell-0.2.20 → dekshell-0.2.22}/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-0.2.20 → dekshell-0.2.22}/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-0.2.20 → dekshell-0.2.22}/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-0.2.20/dekshell/core/markers/empty.py → dekshell-0.2.22/dekshell/core/markers/base/shell.py

@@ -1,8 +1,10 @@
 from dektools.shell import shell_command
-from .base import MarkerShellBase
+from . import MarkerShellBase
 
 
 class ShellCommand:
+    shell_call = shell_command
+
     def __init__(self, kwargs):
         self.kwargs = kwargs
 
@@ -17,16 +19,3 @@ class ShellCommand:
 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)
-
-
-class EmptyMarker(MarkerShell):
-    pass

{dekshell-0.2.20 → dekshell-0.2.22}/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-0.2.22/dekshell/core/markers/empty.py

@@ -0,0 +1,5 @@
+from .base.shell import MarkerShell
+
+
+class EmptyMarker(MarkerShell):
+    pass

dekshell-0.2.22/dekshell/core/markers/redirect.py

@@ -0,0 +1,51 @@
+import os
+from dektools.shell import shell_wrapper
+from dektools.attr import DeepObject
+from ...core.redirect import redirect_shell_by_path_tree
+from ...utils.cmd import ak2cmd, key_args, key_kwargs
+from ..contexts.properties import make_shell_properties, current_shell
+from .base import MarkerBase
+
+
+class MarkerRedirect(MarkerBase):
+    def execute(self, context, command, marker_node, marker_set):
+        filepath = self.split_raw(command, 1, self.tag_head)[1]
+        if not filepath:
+            filepath = self.get_filepath(context)
+        path_shell = redirect_shell_by_path_tree(filepath)
+        self.execute_core(context, marker_node, marker_set, path_shell)
+
+    def execute_core(self, context, marker_node, marker_set, path_shell):
+        raise NotImplementedError
+
+    def get_filepath(self, context):
+        try:
+            return self.eval(context, "fp")
+        except NameError:
+            return os.getcwd()
+
+
+class RedirectMarker(MarkerRedirect):
+    tag_head = "redirect"
+    stack_check = False
+
+    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.get_filepath(context)
+                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, marker_node, marker_set, path_shell):
+        if path_shell:
+            context.update_variables(DeepObject(make_shell_properties(path_shell)).__dict__)

{dekshell-0.2.20 → dekshell-0.2.22}/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 → dekshell-0.2.22}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "dekshell"
-version = "0.2.20"
+version = "0.2.22"
 description = ""
 authors = [
     { name = "sanzenwin", email = "sanzenwin@gmail.com" },

dekshell-0.2.20/dekshell/core/markers/redirect.py

@@ -1,43 +0,0 @@
-import os
-
-from dektools.shell import shell_wrapper
-from dektools.attr import DeepObject
-from ...core.redirect import redirect_shell_by_path_tree
-from ...utils.cmd import ak2cmd, key_args, key_kwargs
-from ..contexts.properties import make_shell_properties, current_shell
-from .base import MarkerBase
-
-
-class MarkerRedirect(MarkerBase):
-    def execute(self, context, command, marker_node, marker_set):
-        filepath = self.split_raw(command, 1, self.tag_head)[1]
-        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)
-
-    def execute_core(self, context, path_shell):
-        raise NotImplementedError
-
-
-class RedirectMarker(MarkerRedirect):
-    tag_head = "redirect"
-
-    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()
-
-
-class ShiftMarker(MarkerRedirect):
-    tag_head = "shift"
-
-    def execute_core(self, context, path_shell):
-        context.update_variables(DeepObject(make_shell_properties(path_shell)).__dict__)