dekshell 0.2.10__tar.gz → 0.2.12__tar.gz

{dekshell-0.2.10 → dekshell-0.2.12}/PKG-INFO

@@ -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 → dekshell-0.2.12}/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-0.2.10 → dekshell-0.2.12}/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-0.2.10 → dekshell-0.2.12}/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 → dekshell-0.2.12}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "dekshell"
-version = "0.2.10"
+version = "0.2.12"
 description = ""
 authors = [
     { name = "sanzenwin", email = "sanzenwin@gmail.com" },