dekshell 0.2.15__tar.gz → 0.2.17__tar.gz

{dekshell-0.2.15 → dekshell-0.2.17}/PKG-INFO

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

{dekshell-0.2.15 → dekshell-0.2.17}/dekshell/core/__init__.py

@@ -7,7 +7,7 @@ from collections import OrderedDict
 from dektools.time import get_tz
 from dektools.format import format_duration
 from dektools.shell import shell_command, shell_wrapper
-from dektools.file import normal_path
+from dektools.file import normal_path, seek_py_module_path
 from dektools.escape import str_escape_wrap
 from .contexts import get_all_context
 from .markers import generate_markers, CommentConfigMarker
@@ -40,6 +40,7 @@ def shell_command_file(filepath, **kwargs):
         kwargs['context'] = (kwargs.get('context') or {}) | dict(
             fp=filepath,
             fpp=os.path.dirname(filepath),
+            fpy=seek_py_module_path(filepath),
         )
         return shell_command_batch(f.read(), **kwargs)
 

{dekshell-0.2.15 → dekshell-0.2.17}/dekshell/core/contexts/methods.py

@@ -1,6 +1,7 @@
 import os
 import shutil
 import sys
+import time
 import tempfile
 import getpass
 from importlib import import_module
@@ -10,7 +11,7 @@ from pathlib import Path
 from io import BytesIO, StringIO
 from dektools.file import sure_dir, write_file, read_text, remove_path, sure_parent_dir, normal_path, \
     format_path_desc, read_file, split_ext, path_ext, clear_dir, copy_recurse_ignore, path_is_empty, \
-    read_lines, \
+    read_lines, seek_py_module_path, \
     split_file, combine_split_files, remove_split_files, meta_split_file, tree, iglob, \
     where, where_list, which, which_list
 from dektools.hash import hash_file
@@ -23,6 +24,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.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
@@ -99,15 +101,26 @@ def _remove_path(path):
             _remove_path(item)
 
 
-_xeval_default = object()
+_eval_default = object()
 
 
-def _xeval(expression, default=_xeval_default, translate=False):
+def _eval_mixin(expression, default=_eval_default, translate=False):
     context = get_inner_vars('__inner_context__', full=True)
     try:
         return MarkerBase.eval_mixin(context, expression, translate)
     except NameError:
-        if default is _xeval_default:
+        if default is _eval_default:
+            raise
+        else:
+            return default
+
+
+def _eval_lines(expression, default=_eval_default):
+    context = get_inner_vars('__inner_context__', full=True)
+    try:
+        return MarkerBase.eval_lines(context, expression)
+    except NameError:
+        if default is _eval_default:
             raise
         else:
             return default
@@ -162,6 +175,21 @@ def _pymd(name):
     return None
 
 
+def _time_mark(begin=True, name=None):
+    var_prefix = '__time_marker__'
+    name = 'default' if name is None else name
+    marker_set = get_inner_vars('__inner_marker_set__', full=True)
+    _now = time.time_ns()
+    if begin:
+        marker_set.vars.add_item(var_prefix + name, _now)
+    else:
+        t = marker_set.vars.get_item(var_prefix + name, None)
+        if t is None:
+            return ''
+        else:
+            return format_duration(int((_now - t) / 10 ** 6))
+
+
 path_common_methods = {
     'cd': _cd,
     'cwd': lambda: os.getcwd(),
@@ -171,14 +199,14 @@ path_common_methods = {
     'where_list': where_list,
     'pybin': lambda x, p=None: search_bin_by_path_tree(p or os.getcwd(), x, False),
     'pym': _pym,
-    'pymd': _pymd
+    'pymd': _pymd,
+    'pyms': seek_py_module_path,
 }
 
 default_methods = {
     'io': _io,
     'reduce': reduce,
     'chain': chain,
-    'xeval': _xeval,
     'echo': lambda *x, **y: print(*x, **dict(flush=True) | y),
     'echos': lambda *x, **y: print(*x, **dict(end='', flush=True) | y),
     'echox': lambda *x, **y: print(*x, **dict(file=sys.stderr, flush=True) | y),
@@ -193,6 +221,8 @@ default_methods = {
         'timeout': shell_timeout,
         'retry': shell_retry,
         'run': shell_wrapper,
+        'eval': _eval_mixin,
+        'exec': _eval_lines,
     },
     'path': {
         **path_common_methods,
@@ -233,6 +263,11 @@ default_methods = {
         'hash': lambda x, name='sha256', args=None: hash_file(name, x, args=args),
     },
     **path_common_methods,
+    'time': {
+        'now': now,
+        'begin': lambda name=None: _time_mark(True, name),
+        'end': lambda name=None: _time_mark(False, name),
+    },
     'pu': {
         'ps': process_list_all,
         'kill': process_kill,

{dekshell-0.2.15 → dekshell-0.2.17}/pyproject.toml

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