dekshell 0.2.10__py3-none-any.whl → 0.2.12__py3-none-any.whl

dekshell/core/contexts/methods.py

@@ -22,7 +22,7 @@ from dektools.download import download_from_http
 from dektools.ps.process import process_detail, process_kill, process_list_all
 from dektools.time import now
 from dektools.str import shlex_split, shlex_quote
-from dektools.shell import shell_wrapper, is_user_admin
+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 ...utils.beep import sound_notify
@@ -169,6 +169,12 @@ default_methods = {
     'getpass': getpass.getpass,
     'install': _install,
     'Path': Path,
+    'sh': {
+        'admin': is_user_admin,
+        'timeout': shell_timeout,
+        'retry': shell_retry,
+        'run': shell_wrapper,
+    },
     'path': {
         **path_common_methods,
         'tree': _tree,
@@ -216,7 +222,7 @@ default_methods = {
 
     'sys': {
         'utf8': lambda: sys.stdout.reconfigure(encoding='utf-8'),
-        'ak':ak2cmd,
+        'ak': ak2cmd,
     },
 
     'compress': compress_files,
@@ -225,7 +231,7 @@ default_methods = {
     'func': FuncAnyArgs,
 
     'me': lambda x: x,
-    'first': lambda x: x[0] if x else None,
+    'first': lambda x, default=None: next(iter(x), default),
     'true': lambda x=True: _is_true(x),
     'false': lambda x=False: not _is_true(x),
 

dekshell/core/markers/__init__.py

@@ -24,7 +24,7 @@ def generate_markers(*args, **kwargs):
         *args,
         *get_markers_from_modules(**kwargs),
         ErrorEchoMarker, EchoNoWrapMarker, EchoMarker,
-        InputMarker,
+        InputMarker, InputOnceMarker,
         DelVarMarker,
         ExecLinesUpdateMarker, ExecLinesMarker, ExecMarker, ExecCmdcallSimpleLinesMarker, ExecCmdcallLinesMarker,
         ExecCmdcallMarker, ExecCmdcallChainMarker,

dekshell/core/markers/input.py

@@ -1,10 +1,10 @@
 import subprocess
-from dektools.shell import shell_with_input
+from dektools.shell import shell_with_input, shell_with_input_once
 from .base import MarkerWithEnd, MarkerNoTranslator
 
 
 class InputMarker(MarkerWithEnd, MarkerNoTranslator):
-    tag_head = 'input'
+    tag_head = 'inputs'
 
     def execute(self, context, command, marker_node, marker_set):
         command_text = self.get_inner_content(context, marker_node, sep='', translate=True).strip()
@@ -14,3 +14,15 @@ class InputMarker(MarkerWithEnd, MarkerNoTranslator):
         if rc:
             raise subprocess.CalledProcessError(rc, command_text)
         return []
+
+
+class InputOnceMarker(MarkerWithEnd, MarkerNoTranslator):
+    tag_head = 'input'
+
+    def execute(self, context, command, marker_node, marker_set):
+        command_text = self.get_inner_content(context, marker_node, sep='', translate=True).strip()
+        inputs = self.split_raw(command, 1, self.tag_head)[1]
+        rc = shell_with_input_once(command_text, inputs, env=context.environ_full())[0]
+        if rc:
+            raise subprocess.CalledProcessError(rc, command_text)
+        return []

{dekshell-0.2.10.dist-info → dekshell-0.2.12.dist-info}/METADATA

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

{dekshell-0.2.10.dist-info → dekshell-0.2.12.dist-info}/RECORD

@@ -1,14 +1,14 @@
-dekshell-0.2.10.dist-info/METADATA,sha256=cRd7RWmafj5szwIsLrVLXREM-GfEgetWHiLzrBiPpIk,573
-dekshell-0.2.10.dist-info/WHEEL,sha256=tSfRZzRHthuv7vxpI4aehrdN9scLjk-dCJkPLzkHxGg,90
-dekshell-0.2.10.dist-info/entry_points.txt,sha256=d-kbfULiUTZWIBBsrQF3J_-wESncF-4K2rwHT08grlI,75
+dekshell-0.2.12.dist-info/METADATA,sha256=QfVeZ-S44zba2LfkIfo6Kl2xiWfr6kE5vJwK0f8YkpY,573
+dekshell-0.2.12.dist-info/WHEEL,sha256=tSfRZzRHthuv7vxpI4aehrdN9scLjk-dCJkPLzkHxGg,90
+dekshell-0.2.12.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=ZAJtMPFCVClHCPkoP5rmTq1vVLLMQRa8MP-QJXLBgNM,5337
 dekshell/core/contexts/__init__.py,sha256=ynsfv37azOKfI2UKd0iPl2M6iBW-k5cb1BqSLOWuJpI,482
-dekshell/core/contexts/methods.py,sha256=nCOhaUdg1uVm1c-70wgHjzF-s3TL6S7E3U52I9nocGE,7539
+dekshell/core/contexts/methods.py,sha256=lUG5ZKN0khznqkFA2E_vkuj9V1DLNRTaslT0P60WReQ,7730
 dekshell/core/contexts/properties.py,sha256=6rEQjExvAmZ69OfhPLLIQwnynRzAjX0nIbcBuZ5yuzM,2314
-dekshell/core/markers/__init__.py,sha256=BRp4z_IkbwV7xQr-5wugd7GCCyGp8k4z_p8qRgVjKxw,1850
+dekshell/core/markers/__init__.py,sha256=FyVfsvt1c8hFWoTgHuMriSJvrJg1XulK636Kt1TczjQ,1867
 dekshell/core/markers/base/__init__.py,sha256=To25RVX3h1MluV3OmktVMw2bigex79GjWHUPWtIlczI,13433
 dekshell/core/markers/base/core.py,sha256=99aRcSXohpfTW5OSO1CUyvnptr21ueKjizCk-FK6rcM,10830
 dekshell/core/markers/commands.py,sha256=4frmkrTa7-7ZYWztXEmYprbWRkoCIuJuiy28pBGcz8A,987
@@ -21,7 +21,7 @@ dekshell/core/markers/exec.py,sha256=3vQc-jH7toU_89rNFTipowr0ZrNn79pqmNbYuHxCPDI
 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=HpqE1_PxrmeAVbWxACu0O7SeBVQpBw-aAmNIX5uWWYs,659
+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=ZMqHnntzJabgqlNXU7Xj1GcYNlfwOyUsZ3rrJTd1yXk,1589
@@ -36,4 +36,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.10.dist-info/RECORD,,
+dekshell-0.2.12.dist-info/RECORD,,