dekshell 0.2.23__py3-none-any.whl → 0.2.25__py3-none-any.whl

dekshell/core/contexts/methods.py

@@ -4,6 +4,7 @@ import sys
 import time
 import tempfile
 import getpass
+import operator
 from importlib import import_module
 from functools import reduce
 from itertools import chain
@@ -11,7 +12,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, seek_py_module_path, come_real_path, status_of_dir, diff_of_dir, \
+    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, \
     where, where_list, which, which_list
 from dektools.hash import hash_file
@@ -41,13 +42,6 @@ def _is_true(x):
     return x not in {'false', '0', 'none', 'null', '', ' ', False, 0, None, b'', b'\0'}
 
 
-def _parent_dir(path, num=1):
-    cursor = path
-    for i in range(int(num)):
-        cursor = os.path.dirname(cursor)
-    return cursor
-
-
 def _list_dir_one(path, file):
     path = normal_path(path)
     for item in os.listdir(path):
@@ -126,6 +120,11 @@ def _eval_lines(expression, default=_eval_default):
             return default
 
 
+def _defined(name):
+    default = object()
+    return _eval_mixin(name, default=default) is not default
+
+
 def _install(name):
     def posix(exe):
         s = f"{exe} install -y {name}"
@@ -214,6 +213,7 @@ path_common_methods = {
 }
 
 default_methods = {
+    'defined': _defined,
     'io': _io,
     'reduce': reduce,
     'chain': chain,
@@ -239,7 +239,7 @@ default_methods = {
         'tree': _tree,
         'exists': os.path.exists,
         'empty': path_is_empty,
-        'parent': _parent_dir,
+        'parent': path_parent,
         'abs': normal_path,
         'rel': os.path.relpath,
         'cr': come_real_path,
@@ -300,11 +300,18 @@ default_methods = {
 
     'me': lambda x: x,
     'first': lambda x, default=None: next(iter(x), default),
+
     'true': lambda x=True: _is_true(x),
     'false': lambda x=False: not _is_true(x),
 
-    'equal': lambda x, y: x == y,
-    'notequal': lambda x, y: x != y,
+    'not_': lambda x: not x,
+    'or_': lambda *x: reduce(operator.or_, x),
+    'and_': lambda *x: reduce(operator.and_, x),
+    'eq': lambda x, y: x == y,
+    'neq': lambda x, y: x != y,
+    'is_': lambda x, y: x is y,
+    'nis': lambda x, y: x is not y,
+
     'beep': lambda x=True: sound_notify(x),
 
     'invoke': lambda __placeholder__filepath, *args, **kwargs: InvokeMarker.execute_file(

dekshell/core/markers/base/__init__.py

@@ -11,6 +11,7 @@ cmd_call_prefix_simple = '>'
 cmd_call_prefix = cmd_call_prefix_simple * 2
 cmd_call_prefix_chain = '*'
 cmd_call_eval_prefix = '='
+cmd_call_eval_trans_prefix = cmd_call_eval_prefix + ':'
 cmd_call_eval_escape = '\\'
 
 
@@ -268,7 +269,10 @@ class MarkerBase:
                     value = f(*value)
             return value
         else:
-            if expression.startswith(cmd_call_eval_prefix):
+            if expression.startswith(cmd_call_eval_trans_prefix):
+                expression = expression[len(cmd_call_eval_trans_prefix):]
+                expression = cls.translate_case(context, expression, True)
+            elif expression.startswith(cmd_call_eval_prefix):
                 expression = expression[len(cmd_call_eval_prefix):]
             return cls.eval(context, expression)
 

dekshell/core/markers/exec.py

@@ -1,10 +1,10 @@
 from .base import MarkerBase, MarkerWithEnd, MarkerNoTranslator, cmd_call_prefix_simple, \
-    cmd_call_prefix_chain
+    cmd_call_prefix_chain, cmd_call_eval_prefix, cmd_call_eval_trans_prefix
 from .empty import EmptyMarker
 
 
 class ExecMarker(MarkerNoTranslator):
-    tag_head = '='
+    tag_head = cmd_call_eval_prefix
 
     def execute(self, context, command, marker_node, marker_set):
         args = self.split_raw(command, 1, self.tag_head)
@@ -13,7 +13,7 @@ class ExecMarker(MarkerNoTranslator):
 
 
 class ExecTranslatorMarker(MarkerBase):
-    tag_head = '=:'
+    tag_head = cmd_call_eval_trans_prefix
 
     def execute(self, context, command, marker_node, marker_set):
         args = self.split_raw(command, 1, self.tag_head)

{dekshell-0.2.23.dist-info → dekshell-0.2.25.dist-info}/METADATA

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

{dekshell-0.2.23.dist-info → dekshell-0.2.25.dist-info}/RECORD

@@ -1,15 +1,15 @@
-dekshell-0.2.23.dist-info/METADATA,sha256=-yW7n04nStm4XlwzlCpJAdpY7BLC3qG0Gg2pTgJzmWs,573
-dekshell-0.2.23.dist-info/WHEEL,sha256=tSfRZzRHthuv7vxpI4aehrdN9scLjk-dCJkPLzkHxGg,90
-dekshell-0.2.23.dist-info/entry_points.txt,sha256=d-kbfULiUTZWIBBsrQF3J_-wESncF-4K2rwHT08grlI,75
+dekshell-0.2.25.dist-info/METADATA,sha256=UFqA_plZ8cNmlxdtBwbPzo7pnm2a8FZ91rk5IyuUfHg,573
+dekshell-0.2.25.dist-info/WHEEL,sha256=tSfRZzRHthuv7vxpI4aehrdN9scLjk-dCJkPLzkHxGg,90
+dekshell-0.2.25.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=w-IeR-tO61Mv4ubZyw9LvyagudyD8SXH0YD3yKApNXk,5405
 dekshell/core/contexts/__init__.py,sha256=ynsfv37azOKfI2UKd0iPl2M6iBW-k5cb1BqSLOWuJpI,482
-dekshell/core/contexts/methods.py,sha256=J1xYu469PCDiCHcktBzERn_ankONavPmJVYerFBVjzQ,9499
+dekshell/core/contexts/methods.py,sha256=7z2c0kHY5ktMiMje4fCueAHWhl4sWsjQVivSD8OSNaQ,9707
 dekshell/core/contexts/properties.py,sha256=esr51c6wDTDsuFXF2uj7WfyIGSq9H0dzqDqWzeMTNQE,2382
 dekshell/core/markers/__init__.py,sha256=_HJsxjjsyYbL7Pj6jhoeJ1WJI92qwCbdl-BKvQcGHlA,1949
-dekshell/core/markers/base/__init__.py,sha256=Rcc77ToE4cFlJvGwezRez4nAcfbdzgAhDRHaew5wvk0,13456
+dekshell/core/markers/base/__init__.py,sha256=DDYlAIiVwmXCv4PiH042FRTwxn6Wxdnt0PsV_BSbYaY,13729
 dekshell/core/markers/base/core.py,sha256=ztB28fDPeqUkXCHchxjU2JO7R1klp_iUj2d6e8IlGCA,11567
 dekshell/core/markers/base/shell.py,sha256=DhaekMMTuABYP4GyZA05eejFfgxb1lQBwI88dlFv90E,479
 dekshell/core/markers/commands.py,sha256=mDRj4dSfKbDaZ_ts4lPXd6wftvGFI4VKkRoIzxV7otA,1696
@@ -18,7 +18,7 @@ dekshell/core/markers/define.py,sha256=LpMSfz9ziXq2aFJ6oMpUFFo93TpBx7GxKYNzCeht4
 dekshell/core/markers/echo.py,sha256=1H61qQbY9tZnrKsdTI_shTmDY5ZaSGipDuBSRptAuZw,660
 dekshell/core/markers/empty.py,sha256=pWKsHlrp6uXWU6blqOs0IgN_3kYm1OmDQiKGPERabAo,79
 dekshell/core/markers/env.py,sha256=6ZtiMNdKFbGR_DBjG6C7A8L_lJsiymN5Y5AbnTzyMrE,1158
-dekshell/core/markers/exec.py,sha256=CiDqcwY4T1kMFNwSXTniJZezv4Qa_rA09ieFP5VJhiA,2616
+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=RPh56_rYbWXCTkNPiJu8zNEj-OE6txKgEw7Im9fBM3c,3592
 dekshell/core/markers/if_.py,sha256=bBG1fDCZd5alE5FSm0QhgHl6ZJn5awiqZAXnPnO-thc,1112
@@ -37,4 +37,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.23.dist-info/RECORD,,
+dekshell-0.2.25.dist-info/RECORD,,