dekshell 0.2.22__py3-none-any.whl → 0.2.24__py3-none-any.whl

dekshell/core/contexts/methods.py

@@ -126,6 +126,11 @@ def _eval_lines(expression, default=_eval_default):
             return default
 
 
+def _defined(name):
+    default = object()
+    return _eval_mixin(name, default=default) is not default
+
+
 def _install(name):
     def posix(exe):
         s = f"{exe} install -y {name}"
@@ -214,6 +219,7 @@ path_common_methods = {
 }
 
 default_methods = {
+    'defined': _defined,
     'io': _io,
     'reduce': reduce,
     'chain': chain,

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/base/__init__.py

@@ -11,6 +11,7 @@ cmd_call_prefix_simple = '>'
 cmd_call_prefix = cmd_call_prefix_simple * 2
 cmd_call_prefix_chain = '*'
 cmd_call_eval_prefix = '='
+cmd_call_eval_trans_prefix = cmd_call_eval_prefix + ':'
 cmd_call_eval_escape = '\\'
 
 
@@ -268,7 +269,10 @@ class MarkerBase:
                     value = f(*value)
             return value
         else:
-            if expression.startswith(cmd_call_eval_prefix):
+            if expression.startswith(cmd_call_eval_trans_prefix):
+                expression = expression[len(cmd_call_eval_trans_prefix):]
+                expression = cls.translate_case(context, expression, True)
+            elif expression.startswith(cmd_call_eval_prefix):
                 expression = expression[len(cmd_call_eval_prefix):]
             return cls.eval(context, expression)
 

dekshell/core/markers/exec.py

@@ -1,10 +1,19 @@
 from .base import MarkerBase, MarkerWithEnd, MarkerNoTranslator, cmd_call_prefix_simple, \
-    cmd_call_prefix_chain
+    cmd_call_prefix_chain, cmd_call_eval_prefix, cmd_call_eval_trans_prefix
 from .empty import EmptyMarker
 
 
 class ExecMarker(MarkerNoTranslator):
-    tag_head = '='
+    tag_head = cmd_call_eval_prefix
+
+    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 ExecTranslatorMarker(MarkerBase):
+    tag_head = cmd_call_eval_trans_prefix
 
     def execute(self, context, command, marker_node, marker_set):
         args = self.split_raw(command, 1, self.tag_head)

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

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

{dekshell-0.2.22.dist-info → dekshell-0.2.24.dist-info}/RECORD

@@ -1,15 +1,15 @@
-dekshell-0.2.22.dist-info/METADATA,sha256=hcdopnmJAgC5TP6poIc9yTy4ETlQeFMJ-al3Z0kAD6g,573
-dekshell-0.2.22.dist-info/WHEEL,sha256=tSfRZzRHthuv7vxpI4aehrdN9scLjk-dCJkPLzkHxGg,90
-dekshell-0.2.22.dist-info/entry_points.txt,sha256=d-kbfULiUTZWIBBsrQF3J_-wESncF-4K2rwHT08grlI,75
+dekshell-0.2.24.dist-info/METADATA,sha256=f-mIEj9boAs1HVZhe7DCujOQ6Kjst9S8Hz0pESrZR7Q,573
+dekshell-0.2.24.dist-info/WHEEL,sha256=tSfRZzRHthuv7vxpI4aehrdN9scLjk-dCJkPLzkHxGg,90
+dekshell-0.2.24.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=J1xYu469PCDiCHcktBzERn_ankONavPmJVYerFBVjzQ,9499
+dekshell/core/contexts/methods.py,sha256=-wyKam6IZIjk2269D8rXf85psOzFTMpCjfO_ZMd81yI,9630
 dekshell/core/contexts/properties.py,sha256=esr51c6wDTDsuFXF2uj7WfyIGSq9H0dzqDqWzeMTNQE,2382
-dekshell/core/markers/__init__.py,sha256=yAZJEIK7eeaZvlIDwTFe2d3yKZiTUVGJQbHOnhNFOMQ,1891
-dekshell/core/markers/base/__init__.py,sha256=Rcc77ToE4cFlJvGwezRez4nAcfbdzgAhDRHaew5wvk0,13456
+dekshell/core/markers/__init__.py,sha256=_HJsxjjsyYbL7Pj6jhoeJ1WJI92qwCbdl-BKvQcGHlA,1949
+dekshell/core/markers/base/__init__.py,sha256=DDYlAIiVwmXCv4PiH042FRTwxn6Wxdnt0PsV_BSbYaY,13729
 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
@@ -18,7 +18,7 @@ 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=4_7FRUEgbAtt0_9r8TmOar_Zi6VXxe6E7p3RL6sVgQg,2705
 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
@@ -27,7 +27,7 @@ dekshell/core/markers/invoke.py,sha256=To_U_FscoCbf7osvjC5MQTk2gjH5Mu_-06Kb22YQP
 dekshell/core/markers/pip_.py,sha256=mxXa_oqcrk4Qz-HvhlkMoirsl-SbM9Fz610leNqP1o0,832
 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.22.dist-info/RECORD,,
+dekshell-0.2.24.dist-info/RECORD,,