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

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/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/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/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/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.dist-info → dekshell-0.2.23.dist-info}/METADATA

@@ -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.dist-info → dekshell-0.2.23.dist-info}/RECORD

@@ -1,14 +1,14 @@
-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-0.2.23.dist-info/METADATA,sha256=-yW7n04nStm4XlwzlCpJAdpY7BLC3qG0Gg2pTgJzmWs,573
+dekshell-0.2.23.dist-info/WHEEL,sha256=tSfRZzRHthuv7vxpI4aehrdN9scLjk-dCJkPLzkHxGg,90
+dekshell-0.2.23.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=w-IeR-tO61Mv4ubZyw9LvyagudyD8SXH0YD3yKApNXk,5405
 dekshell/core/contexts/__init__.py,sha256=ynsfv37azOKfI2UKd0iPl2M6iBW-k5cb1BqSLOWuJpI,482
-dekshell/core/contexts/methods.py,sha256=6THhB6X6VqpHKLQIW3bOrd3J9yxHems2PRt8dR6xiT0,9344
+dekshell/core/contexts/methods.py,sha256=J1xYu469PCDiCHcktBzERn_ankONavPmJVYerFBVjzQ,9499
 dekshell/core/contexts/properties.py,sha256=esr51c6wDTDsuFXF2uj7WfyIGSq9H0dzqDqWzeMTNQE,2382
-dekshell/core/markers/__init__.py,sha256=yAZJEIK7eeaZvlIDwTFe2d3yKZiTUVGJQbHOnhNFOMQ,1891
+dekshell/core/markers/__init__.py,sha256=_HJsxjjsyYbL7Pj6jhoeJ1WJI92qwCbdl-BKvQcGHlA,1949
 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
@@ -18,16 +18,16 @@ dekshell/core/markers/define.py,sha256=LpMSfz9ziXq2aFJ6oMpUFFo93TpBx7GxKYNzCeht4
 dekshell/core/markers/echo.py,sha256=1H61qQbY9tZnrKsdTI_shTmDY5ZaSGipDuBSRptAuZw,660
 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/exec.py,sha256=CiDqcwY4T1kMFNwSXTniJZezv4Qa_rA09ieFP5VJhiA,2616
 dekshell/core/markers/for_.py,sha256=uNOEwyDsjffttEBtUYasdlj7FP_sGnQzWuTV5d5esHY,2142
 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=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=WGaWW-7efaCIOYhs3gQgtKJC4lmFsBx2AQ4bs5Bu_UQ,1828
+dekshell/core/markers/redirect.py,sha256=3vfkRQ2tnQ6rSGGn7csgUlpDi0s2ep5X7JU7NVvo0eI,1984
 dekshell/core/markers/shell.py,sha256=43BDAAzMdmgZmemkW5buh_w4LL1GDGw-s9fNZo6vhag,1929
-dekshell/core/markers/var.py,sha256=O-lpWhnLOkKMwF1jR0rVwyHLa8YUWwacCs80wFzwfdQ,4838
+dekshell/core/markers/var.py,sha256=_7Z4gMxm63Q0eVgg71hFSy1nGUz7Tf5Kp02ek16c3Cc,5043
 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
@@ -37,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.21.dist-info/RECORD,,
+dekshell-0.2.23.dist-info/RECORD,,