dekshell 0.2.21__tar.gz → 0.2.23__tar.gz

{dekshell-0.2.21 → dekshell-0.2.23}/PKG-INFO

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

{dekshell-0.2.21 → dekshell-0.2.23}/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.21 → dekshell-0.2.23}/dekshell/core/markers/__init__.py

@@ -26,7 +26,8 @@ def generate_markers(*args, **kwargs):
         ErrorEchoMarker, EchoNoWrapMarker, EchoMarker,
         InputMarker, InputOnceMarker,
         DelVarMarker,
-        ExecLinesUpdateMarker, ExecLinesMarker, ExecMarker, ExecCmdcallSimpleLinesMarker, ExecCmdcallLinesMarker,
+        ExecLinesUpdateMarker, ExecLinesMarker, ExecTranslatorMarker, ExecMarker, ExecCmdcallSimpleLinesMarker,
+        ExecCmdcallLinesMarker,
         ExecCmdcallMarker, ExecCmdcallChainMarker,
         EnvShellMarker, EnvMarker,
         IfMarker, IfElifMarker, IfElseMarker,
@@ -46,7 +47,7 @@ def generate_markers(*args, **kwargs):
         IgnoreMarker,
         IgnoreErrorShellMarker, PrefixShellMarker,
         AssignCallMarker, AssignInvokerMarker, AssignGotoMarker, AssignTimeoutMarker, AssignRetryMarker,
-        AssignExecMarker, AssignEvalMarker, AssignCmdcallMarker, AssignCmdcallChainMarker,
+        AssignExecMarker, AssignTranslatorEvalMarker, AssignEvalMarker, AssignCmdcallMarker, AssignCmdcallChainMarker,
         AssignMultiLineRawStrMarker, AssignMultiLineStrMarker, AssignRawStrMarker, AssignStrMarker,
         EmptyMarker,  # must be at the tail
     ]

{dekshell-0.2.21 → dekshell-0.2.23}/dekshell/core/markers/exec.py

@@ -12,6 +12,15 @@ class ExecMarker(MarkerNoTranslator):
             self.eval(context, args[1])
 
 
+class ExecTranslatorMarker(MarkerBase):
+    tag_head = '=:'
+
+    def execute(self, context, command, marker_node, marker_set):
+        args = self.split_raw(command, 1, self.tag_head)
+        if args[1]:
+            self.eval(context, args[1])
+
+
 class ExecLinesMarker(MarkerWithEnd, MarkerNoTranslator):
     tag_head = '=='
 

{dekshell-0.2.21 → dekshell-0.2.23}/dekshell/core/markers/redirect.py

@@ -11,13 +11,19 @@ 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')
+            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"
@@ -27,7 +33,7 @@ class RedirectMarker(MarkerRedirect):
         if path_shell:
             shell_properties = make_shell_properties(path_shell)
             if shell_properties['shell'] != current_shell:
-                fp = self.eval(context, "fp")
+                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})')

{dekshell-0.2.21 → dekshell-0.2.23}/dekshell/core/markers/var.py

@@ -61,6 +61,13 @@ class AssignEvalMarker(MarkerAssignValueBase, MarkerNoTranslator):
         return self.eval(context, expression)
 
 
+class AssignTranslatorEvalMarker(MarkerAssignValueBase):
+    tag_head_re_args = '=:'
+
+    def get_value(self, context, marker_node, marker_set, expression):
+        return self.eval(context, expression)
+
+
 class AssignExecMarker(MarkerAssignBase, MarkerWithEnd, MarkerNoTranslator):
     tag_head_re_args = '=='
 

{dekshell-0.2.21 → dekshell-0.2.23}/pyproject.toml

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