dekshell 0.2.49__py3-none-any.whl → 0.2.51__py3-none-any.whl

dekshell/core/contexts/methods.py

@@ -30,12 +30,11 @@ from dektools.ps.process import process_print_all, process_print_detail, process
 from dektools.time import now
 from dektools.str import shlex_split, shlex_quote, str_split, split_table_line
 from dektools.format import format_duration
-from dektools.shell import shell_wrapper, is_user_admin, shell_timeout, shell_retry
+from dektools.shell import shell_wrapper, is_user_admin, shell_timeout, shell_retry, shell_command
 from dektools.match import GeneralMatcher, glob2re, glob_compile, glob_match
 from dektools.cmd.git import git_parse_modules, git_clean_dir, git_fetch_min, git_remove_tag, git_latest_tag, \
     git_list_remotes, git_apply, git_head
 from ...utils.beep import sound_notify
-from ...utils.cmd import pack_context_full
 from ..markers.base.core import MarkerBase, get_inner_vars
 from ..markers.invoke import InvokeMarker, GotoMarker, ImportMarker
 from ..redirect import search_bin_by_path_tree
@@ -268,6 +267,7 @@ default_methods = {
         'timeout': shell_timeout,
         'retry': shell_retry,
         'run': shell_wrapper,
+        'cmd': shell_command,
         'env': {
             None: lambda k, v: _env_update({k: v}),
             'update': _env_update,

dekshell/core/markers/__init__.py

@@ -52,6 +52,6 @@ def generate_markers(*args, **kwargs):
         AssignCommandRcSilenceMarker, AssignCommandRcMarker, AssignCommandOutputMarker,
         AssignDecodeMarker, AssignEncodeMarker,
         AssignEnvMarker, AssignEnvFullMarker, AssignCmdcallMarker, AssignCmdcallChainMarker,
-        AssignMultiLineRawStrMarker, AssignMultiLineStrMarker, AssignRawStrMarker, AssignStrMarker,
+        AssignMultiLineRawStrMarker, AssignMultiLineStrMarker, AssignRawStrMarker, AssignStrMarker, AssignUnpackMarker,
         EmptyMarker,  # must be at the tail
     ]

dekshell/core/markers/comment.py

@@ -1,5 +1,5 @@
 import re
-from .base import MarkerNoTranslator, MarkerWithEnd
+from .base import MarkerBase, MarkerNoTranslator, MarkerWithEnd
 
 
 class MarkerCommentBase(MarkerNoTranslator):
@@ -40,3 +40,7 @@ class TextContentMarker(MarkerCommentBase):
 
     def text_content(self, command):
         return command[len(self.tag_head):]
+
+
+class IgnoreMarker(MarkerBase):
+    tag_head = ':'

dekshell/core/markers/var.py

@@ -9,15 +9,19 @@ from .invoke import MarkerInvokerBase, InvokeMarker, GotoMarker, ImportMarker
 class MarkerAssignBase(MarkerBase):
     tag_head_re = r"[^\W\d]\w*[ \t\f\r]*%s"
 
-
-class MarkerAssignValueBase(MarkerAssignBase):
-    def execute(self, context, command, marker_node, marker_set):
+    def get_vr(self, command):
         command = command.lstrip()
         index = re.match(self.tag_head_re % '', command).span()[1]
         var_name = command[:index].rstrip()
         rest = command[index:]
         index = re.match(self.tag_head_re_args, rest).span()[1]
-        return self.assign_value(context, marker_node, marker_set, var_name, rest[index:].strip())
+        return var_name, rest[index:].strip()
+
+
+class MarkerAssignValueBase(MarkerAssignBase):
+    def execute(self, context, command, marker_node, marker_set):
+        var_name, rest = self.get_vr(command)
+        return self.assign_value(context, marker_node, marker_set, var_name, rest)
 
     def assign_value(self, context, marker_node, marker_set, var_name, expression):
         self.set_var_raw(context, var_name, self.get_value(context, marker_node, marker_set, expression))
@@ -26,8 +30,31 @@ class MarkerAssignValueBase(MarkerAssignBase):
         pass
 
 
-class IgnoreMarker(MarkerBase):
-    tag_head = ':'
+class AssignUnpackMarker(MarkerAssignBase):
+    tag_head_re_args = ','
+
+    def execute(self, context, command, marker_node, marker_set):
+        var_names = []
+        cursor = command
+        while True:
+            var_name, rest = self.get_vr(cursor)
+            var_names.append(var_name)
+            marker = marker_set.find_marker_by_command(rest)
+            if isinstance(marker, MarkerAssignBase):
+                if not isinstance(marker, AssignUnpackMarker):
+                    var_name_final = marker.get_vr(rest)[0]
+                    var_names.append(var_name_final)
+                    node = marker_set.node_cls(marker, rest, marker_node.index)
+                    marker.execute(context, rest, node, marker_set)
+                    value = self.eval(context, var_name_final)
+                    if len(var_names) != len(value):
+                        raise ValueError(f'Wrong values to unpack (expected {len(var_names)}, got {len(value)})')
+                    for i, name in enumerate(var_names):
+                        self.set_var_raw(context, name, value[i])
+                    break
+                cursor = rest
+            else:
+                raise ValueError('Need a assignable expression')
 
 
 class AssignStrMarker(MarkerAssignValueBase):

{dekshell-0.2.49.dist-info → dekshell-0.2.51.dist-info}/METADATA

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

{dekshell-0.2.49.dist-info → dekshell-0.2.51.dist-info}/RECORD

@@ -1,19 +1,19 @@
-dekshell-0.2.49.dist-info/METADATA,sha256=B57a2ZJyDlUu9H5Bd3LO7oy-NnrPQawYhl7uNBznU8A,573
-dekshell-0.2.49.dist-info/WHEEL,sha256=tSfRZzRHthuv7vxpI4aehrdN9scLjk-dCJkPLzkHxGg,90
-dekshell-0.2.49.dist-info/entry_points.txt,sha256=d-kbfULiUTZWIBBsrQF3J_-wESncF-4K2rwHT08grlI,75
+dekshell-0.2.51.dist-info/METADATA,sha256=lt0cL9hdu0uQfg3bUBJk1kMvx9P4Adp2W6Jty2Qw1dY,573
+dekshell-0.2.51.dist-info/WHEEL,sha256=tSfRZzRHthuv7vxpI4aehrdN9scLjk-dCJkPLzkHxGg,90
+dekshell-0.2.51.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=r-AHdO9CEEVvTN20-8Jozr6Zh8XSv_BnktYRwrlhtrE,2046
 dekshell/core/__init__.py,sha256=isDEKwk1odLdvTQNCILCtVNBuXp1uFVPz_uTDNihkVU,5547
 dekshell/core/contexts/__init__.py,sha256=ynsfv37azOKfI2UKd0iPl2M6iBW-k5cb1BqSLOWuJpI,482
-dekshell/core/contexts/methods.py,sha256=t95CU8pjivYq5DtyjH__V7SH3HVj9iSJVI0Oy-esoUQ,11897
+dekshell/core/contexts/methods.py,sha256=tv8wKK114zQlXiJrU9eS0NHyvh6qDbY_Bx0GCVklexM,11899
 dekshell/core/contexts/properties.py,sha256=TQonN3T_K2cB2uakq_DVVB13B-IFwoM6t2ZkL_OMekw,3365
-dekshell/core/markers/__init__.py,sha256=mK6OiZMWmUTrkAL0Bc1XqRTSb-NNhBgpHb7GLivLAlk,2235
+dekshell/core/markers/__init__.py,sha256=1oq4wlBOJV56hsshPe0ZZZMvoItCV2Xs2RN08HTrbiY,2255
 dekshell/core/markers/base/__init__.py,sha256=0LYnOVNXPBHfRQII00ZGkESTFX82TgHdSaTcHJoebXc,18051
 dekshell/core/markers/base/core.py,sha256=5TYAg7JWX58669RBUOMgJxCUMuOARPDL7GENNtNAYls,12558
 dekshell/core/markers/base/shell.py,sha256=fiFsTUDI8pSDDUCk834OI4ajri2qNWFJkLVhmUk2uAs,484
 dekshell/core/markers/commands.py,sha256=mDRj4dSfKbDaZ_ts4lPXd6wftvGFI4VKkRoIzxV7otA,1696
-dekshell/core/markers/comment.py,sha256=U1U3Xc4-giTqSEAPa4E_DmilZM9hs9zG-PCJ9nn4y5U,965
+dekshell/core/markers/comment.py,sha256=rBzxcyvTv7qgy5jc0NWT4pi5M7xEf9Wwa2mv96kJ0gc,1030
 dekshell/core/markers/define.py,sha256=Xlw_YPOWlmbopVIHhIeAKWSZhHhXmqb3gCbXxvuH4BQ,522
 dekshell/core/markers/echo.py,sha256=1H61qQbY9tZnrKsdTI_shTmDY5ZaSGipDuBSRptAuZw,660
 dekshell/core/markers/empty.py,sha256=pWKsHlrp6uXWU6blqOs0IgN_3kYm1OmDQiKGPERabAo,79
@@ -27,7 +27,7 @@ dekshell/core/markers/invoke.py,sha256=ESL2DE9DTaq33AnrXpvEudp1qtoeZFKOhLL12OQpc
 dekshell/core/markers/pip_.py,sha256=mxXa_oqcrk4Qz-HvhlkMoirsl-SbM9Fz610leNqP1o0,832
 dekshell/core/markers/redirect.py,sha256=cpTQaXFAuSwprsrhUNP0xTGDmu06HGNQVcwKsETEjas,1981
 dekshell/core/markers/shell.py,sha256=43BDAAzMdmgZmemkW5buh_w4LL1GDGw-s9fNZo6vhag,1929
-dekshell/core/markers/var.py,sha256=I1GQqDRDmWKV38Exfn_5MtRDz58FKo_6x8NIVHqPAPU,6901
+dekshell/core/markers/var.py,sha256=yA2T8dq4vbfyeaV1KOUt3YZp51WTC623NviMAJTOdOQ,8182
 dekshell/core/markers/while_.py,sha256=Q0SaElyXSrxg-wS_rfCcxMsmw9jf-0SgN1ICn860T4A,1201
 dekshell/core/plugin/__init__.py,sha256=jAB_KnnHJsyJR_zIfBU_HNLngyhcyyqVv05PdlNZtF8,428
 dekshell/core/redirect.py,sha256=jgLdcPtc4RKs63Lf2I0LXJRr9jRfNu03aDB_tIWvcrU,1117
@@ -37,4 +37,4 @@ dekshell/utils/cmd.py,sha256=K9FbXgHcGFchHA58xI0_t4YK4yb8XkWbxsNoztYRx3Y,518
 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.49.dist-info/RECORD,,
+dekshell-0.2.51.dist-info/RECORD,,