dekshell 0.2.33__py3-none-any.whl → 0.2.35__py3-none-any.whl

dekshell/core/contexts/methods.py

@@ -15,7 +15,7 @@ from dektools.file import sure_dir, write_file, read_text, remove_path, sure_par
     read_lines, seek_py_module_path, come_real_path, status_of_dir, diff_of_dir, path_parent, \
     split_file, combine_split_files, remove_split_files, meta_split_file, tree, iglob, \
     iter_dir_type, iter_dir_type_one, \
-    where, where_list, which, which_list
+    where, which, those
 from dektools.hash import hash_file
 from dektools.zip import compress_files, decompress_files
 from dektools.output import pprint, obj2str
@@ -23,9 +23,9 @@ from dektools.net import get_available_port
 from dektools.func import FuncAnyArgs
 from dektools.fetch import download_file, download_content
 from dektools.download import download_from_http
-from dektools.ps.process import process_detail, process_kill, process_list_all
+from dektools.ps.process import process_print_all, process_print_detail, process_detail, process_query, process_username
 from dektools.time import now
-from dektools.str import shlex_split, shlex_quote
+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
@@ -218,10 +218,9 @@ def _time_mark(begin=True, name=None):
 path_common_methods = {
     'cd': _cd,
     'cwd': lambda: os.getcwd(),
-    'which': lambda *x: which(*x) or '',
-    'where': lambda *x: where(*x) or '',
-    'which_list': which_list,
-    'where_list': where_list,
+    'where': where,
+    'which': lambda *x, **y: which(*x, **y) or '',
+    'those': those,
     'pybin': lambda x, p=None: search_bin_by_path_tree(p or os.getcwd(), x, False),
     'pym': _pym,
     'pymd': _pymd,
@@ -242,6 +241,10 @@ default_methods = {
     'getpass': getpass.getpass,
     'install': _install,
     'Path': Path,
+    'split': {
+        'str': lambda x, y=None: str_split(x, y),
+        'tab': split_table_line,
+    },
     'sh': {
         'admin': is_user_admin,
         'timeout': shell_timeout,
@@ -301,9 +304,10 @@ default_methods = {
         'end': lambda name=None: _time_mark(False, name),
     },
     'pu': {
-        'ps': process_list_all,
-        'kill': process_kill,
-        'pi': process_detail,
+        'ps': process_print_all,
+        'pd': process_print_detail,
+        'detail': process_detail,
+        'query': lambda x: list(process_query(x)),
     },
 
     'sys': {

dekshell/core/contexts/properties.py

@@ -4,6 +4,7 @@ import shutil
 import tempfile
 import sysconfig
 import platform
+import getpass
 from pathlib import Path
 from sysconfig import get_paths
 from importlib import metadata
@@ -12,6 +13,8 @@ from dektools.module import ModuleProxy
 from dektools.time import DateTime
 from dektools.file import read_text
 from dektools.env import is_on_cicd
+from dektools.ps.process import process_attrs
+from dektools.extraction.filter.utils import Method, MethodSimple, AttrProxy
 from ...utils.serializer import serializer
 from ..redirect import shell_name
 from ..markers.base.core import get_inner_vars
@@ -82,6 +85,7 @@ default_properties = {
         'pid': os.getpid(),
         'ps': os.pathsep,
         'cicd': is_on_cicd(),
+        'username': getpass.getuser(),
     },
     'platform': {
         'cygwin': sys.platform == 'cygwin',
@@ -100,9 +104,15 @@ default_properties = {
         'temp': Path(tempfile.gettempdir()),
         'sep': os.sep
     },
+    'pu': {
+        'attrs': process_attrs
+    },
     'obj': serializer,
     'mp': ModuleProxy(),
     'date': DateTime(),
     'env': _Env(),
     'envs': _EnvS(),
+    'm': Method(),
+    'mm': MethodSimple(),
+    'a': AttrProxy(),
 }

{dekshell-0.2.33.dist-info → dekshell-0.2.35.dist-info}/METADATA

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

{dekshell-0.2.33.dist-info → dekshell-0.2.35.dist-info}/RECORD

@@ -1,13 +1,13 @@
-dekshell-0.2.33.dist-info/METADATA,sha256=PJWyrsTeOz1Hd2RZ9dZto3UTG18hZBNSoJT-x0naKzs,573
-dekshell-0.2.33.dist-info/WHEEL,sha256=tSfRZzRHthuv7vxpI4aehrdN9scLjk-dCJkPLzkHxGg,90
-dekshell-0.2.33.dist-info/entry_points.txt,sha256=d-kbfULiUTZWIBBsrQF3J_-wESncF-4K2rwHT08grlI,75
+dekshell-0.2.35.dist-info/METADATA,sha256=hDvwRVi1ZNokJ-7ORpier5GMGRIADdI1qi8DJyFoU5c,573
+dekshell-0.2.35.dist-info/WHEEL,sha256=tSfRZzRHthuv7vxpI4aehrdN9scLjk-dCJkPLzkHxGg,90
+dekshell-0.2.35.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=SukHnNNvxnRPySGB6xQNf2eXX-3FaaQBetBJFjN9Fso,10378
-dekshell/core/contexts/properties.py,sha256=wT_gvK89JDU3NDOwiQKz4e2ukrLG6yXUhBsOk8NMQpE,3123
+dekshell/core/contexts/methods.py,sha256=KxCVtJV3NXFKuCB-MYnQ2EJgFoegRwx5gtTGsmN-64g,10548
+dekshell/core/contexts/properties.py,sha256=R6TBvQAH4IIkLZV8wfroUXguy9cxYsKmPEE_FCV2dA8,3417
 dekshell/core/markers/__init__.py,sha256=yRQazZ1dxMltFao_RQnDnawSnQcjN_4B930MjJhaZ40,1968
 dekshell/core/markers/base/__init__.py,sha256=W5f_Mcn9MLM8kOVqu05NUaDpn3xUNURe_NYerUoH6Js,16021
 dekshell/core/markers/base/core.py,sha256=InsUA3md2gC6GyXQsvARfeNTrfbVD3gGOYxTM8VqqPA,11679
@@ -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.33.dist-info/RECORD,,
+dekshell-0.2.35.dist-info/RECORD,,