dekshell 0.2.38__py3-none-any.whl → 0.2.40__py3-none-any.whl

dekshell/core/contexts/methods.py

@@ -5,6 +5,7 @@ import time
 import tempfile
 import getpass
 import operator
+import base64
 from importlib import import_module
 from functools import reduce
 from itertools import chain
@@ -30,7 +31,8 @@ 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.match import GeneralMatcher, glob2re, glob_compile, glob_match
-from dektools.cmd.git import git_clean_dir, git_apply, git_parse_modules, git_fetch_min, git_list_remotes, git_head
+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
@@ -339,6 +341,10 @@ default_methods = {
     'rc4': rc4,
     'rc4file': rc4_file,
 
+    'e64': lambda sb, encode='utf-8': base64.b64encode(sb if isinstance(sb, str) else sb.encode(encode)).decode(
+        'latin-1'),
+    'd64': lambda sb: base64.b64decode(sb),
+
     'beep': lambda x=True: sound_notify(x),
 
     'invoke': lambda __placeholder__filepath, *args, **kwargs: InvokeMarker.execute_file(
@@ -366,11 +372,15 @@ default_methods = {
     },
 
     'git': {
-        'apply': git_apply,
-        'remotes': git_list_remotes,
         'modules': git_parse_modules,
-        'fetch': git_fetch_min,
         'clean': git_clean_dir,
+        'fetch': git_fetch_min,
+        'tag': {
+            'rm': git_remove_tag,
+            'latest': git_latest_tag
+        },
+        'remotes': git_list_remotes,
+        'apply': git_apply,
         'head': git_head,
     }
 }

dekshell/core/markers/function.py

@@ -35,7 +35,7 @@ class Function:
         self.body = body
 
     def __call__(self, *args, **kwargs):
-        context, marker_set = get_inner_vars('__inner_context__', '__inner_marker_set__')
+        context, marker_set = get_inner_vars('__inner_context__', '__inner_marker_set__', full=True)
         context = context.derive().update_variables(self.pack_variables(context, args, kwargs))
         return QuitContext.real(marker_set.node_cls.execute_nodes(context, marker_set, self.body[:]))
 

dekshell/core/markers/invoke.py

@@ -17,7 +17,7 @@ class MarkerInvokerBase(MarkerBase):
     @classmethod
     def execute_file(cls, marker_set, filepath, args, kwargs):
         if marker_set is None:
-            marker_set = get_inner_vars('__inner_marker_set__')
+            marker_set = get_inner_vars('__inner_marker_set__', full=True)
         return cls._run_file(marker_set, normal_path(filepath), pack_context_full(args, kwargs))
 
     @classmethod

{dekshell-0.2.38.dist-info → dekshell-0.2.40.dist-info}/METADATA

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

{dekshell-0.2.38.dist-info → dekshell-0.2.40.dist-info}/RECORD

@@ -1,12 +1,12 @@
-dekshell-0.2.38.dist-info/METADATA,sha256=doO8XiIfbnZcJEN4zy0MCPROVULDEh--kSILkDE7NWo,573
-dekshell-0.2.38.dist-info/WHEEL,sha256=tSfRZzRHthuv7vxpI4aehrdN9scLjk-dCJkPLzkHxGg,90
-dekshell-0.2.38.dist-info/entry_points.txt,sha256=d-kbfULiUTZWIBBsrQF3J_-wESncF-4K2rwHT08grlI,75
+dekshell-0.2.40.dist-info/METADATA,sha256=e3PnsS8qX_d_ecrZZoR2bXosz0n0njf8f2ea3wDNpSg,573
+dekshell-0.2.40.dist-info/WHEEL,sha256=tSfRZzRHthuv7vxpI4aehrdN9scLjk-dCJkPLzkHxGg,90
+dekshell-0.2.40.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=B8lfdJQ7hIk-InoXtI0g1JQJ6tWkzggapHFRz1D1b3c,10674
+dekshell/core/contexts/methods.py,sha256=_w4BX-d6-HRlcs_ag75mypGSrgDTWTBRXBKSEzdf9rg,11003
 dekshell/core/contexts/properties.py,sha256=yilnRe2I6FTIui4kXUBCWvH2ymvpEfc_13on8pAZwnY,3456
 dekshell/core/markers/__init__.py,sha256=yRQazZ1dxMltFao_RQnDnawSnQcjN_4B930MjJhaZ40,1968
 dekshell/core/markers/base/__init__.py,sha256=CsbNYGQ2Od3XdekR9RFMJ7mo9Roj-LlXS62SY50fiAY,16826
@@ -20,10 +20,10 @@ dekshell/core/markers/empty.py,sha256=pWKsHlrp6uXWU6blqOs0IgN_3kYm1OmDQiKGPERabA
 dekshell/core/markers/env.py,sha256=6ZtiMNdKFbGR_DBjG6C7A8L_lJsiymN5Y5AbnTzyMrE,1158
 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=V7WZ438RQ0a96wMu9AwWH-dtQMBO9IenaKTWyzRqDUo,3804
+dekshell/core/markers/function.py,sha256=rLi8Lc9nf7ex3xdj8-VdJkgC1qXpr5JVMndH1YlH4mM,3815
 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/invoke.py,sha256=ReE-i-ji2Bl90M8xLi8-kZrc-lL5mRUmjbGPoRcIoPw,1452
 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
@@ -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.38.dist-info/RECORD,,
+dekshell-0.2.40.dist-info/RECORD,,