PyPI - ae-shell - Versions diffs - 0.3.11__tar.gz → 0.3.13__tar.gz - Mend

ae-shell 0.3.11tar.gz → 0.3.13tar.gz

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (14) hide show

{ae_shell-0.3.11 → ae_shell-0.3.13}/LICENSE.md RENAMED Viewed

@@ -1,4 +1,4 @@
-<!-- THIS FILE IS EXCLUSIVELY MAINTAINED by the project aedev.project_tpls v0.3.72 -->
+<!-- THIS FILE IS EXCLUSIVELY MAINTAINED by the project aedev.project_tpls v0.3.77 -->
 ### GNU GENERAL PUBLIC LICENSE
 Version 3, 29 June 2007

{ae_shell-0.3.11/ae_shell.egg-info → ae_shell-0.3.13}/PKG-INFO RENAMED Viewed

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ae_shell
-Version: 0.3.11
+Version: 0.3.13
 Summary: ae namespace module portion shell: shell execution and environment helpers
 Home-page: https://gitlab.com/ae-group/ae_shell
 Author: AndiEcker
@@ -29,25 +29,21 @@ Provides-Extra: dev
 Requires-Dist: aedev_project_tpls; extra == "dev"
 Requires-Dist: ae_ae; extra == "dev"
 Requires-Dist: anybadge; extra == "dev"
-Requires-Dist: coverage-badge; extra == "dev"
 Requires-Dist: flake8; extra == "dev"
 Requires-Dist: mypy; extra == "dev"
 Requires-Dist: pylint; extra == "dev"
 Requires-Dist: pytest; extra == "dev"
 Requires-Dist: pytest-cov; extra == "dev"
-Requires-Dist: pytest-django; extra == "dev"
 Requires-Dist: typing; extra == "dev"
 Requires-Dist: types-setuptools; extra == "dev"
 Provides-Extra: docs
 Provides-Extra: tests
 Requires-Dist: anybadge; extra == "tests"
-Requires-Dist: coverage-badge; extra == "tests"
 Requires-Dist: flake8; extra == "tests"
 Requires-Dist: mypy; extra == "tests"
 Requires-Dist: pylint; extra == "tests"
 Requires-Dist: pytest; extra == "tests"
 Requires-Dist: pytest-cov; extra == "tests"
-Requires-Dist: pytest-django; extra == "tests"
 Requires-Dist: typing; extra == "tests"
 Requires-Dist: types-setuptools; extra == "tests"
 Dynamic: author
@@ -65,15 +61,15 @@ Dynamic: requires-dist
 Dynamic: requires-python
 Dynamic: summary
-<!-- THIS FILE IS EXCLUSIVELY MAINTAINED by the project ae.ae v0.3.101 -->
+<!-- THIS FILE IS EXCLUSIVELY MAINTAINED by the project ae.ae v0.3.103 -->
 <!-- THIS FILE IS EXCLUSIVELY MAINTAINED by the project aedev.namespace_root_tpls v0.3.22 -->
-# shell 0.3.11
+# shell 0.3.13
 [![GitLab develop](https://img.shields.io/gitlab/pipeline/ae-group/ae_shell/develop?logo=python)](
     https://gitlab.com/ae-group/ae_shell)
 [![LatestPyPIrelease](
-    https://img.shields.io/gitlab/pipeline/ae-group/ae_shell/release0.3.11?logo=python)](
-    https://gitlab.com/ae-group/ae_shell/-/tree/release0.3.11)
+    https://img.shields.io/gitlab/pipeline/ae-group/ae_shell/release0.3.13?logo=python)](
+    https://gitlab.com/ae-group/ae_shell/-/tree/release0.3.13)
 [![PyPIVersions](https://img.shields.io/pypi/v/ae_shell)](
     https://pypi.org/project/ae-shell/#history)
@@ -121,7 +117,7 @@ following command in the root folder of this repository
 (ae_shell):
 ```shell script
-pip install -e .[dev]
+pip install --editable .[dev]
 ```
 the last command will install this module portion, along with the tools you need

{ae_shell-0.3.11 → ae_shell-0.3.13}/README.md RENAMED Viewed

@@ -1,12 +1,12 @@
-<!-- THIS FILE IS EXCLUSIVELY MAINTAINED by the project ae.ae v0.3.101 -->
+<!-- THIS FILE IS EXCLUSIVELY MAINTAINED by the project ae.ae v0.3.103 -->
 <!-- THIS FILE IS EXCLUSIVELY MAINTAINED by the project aedev.namespace_root_tpls v0.3.22 -->
-# shell 0.3.11
+# shell 0.3.13
 [![GitLab develop](https://img.shields.io/gitlab/pipeline/ae-group/ae_shell/develop?logo=python)](
     https://gitlab.com/ae-group/ae_shell)
 [![LatestPyPIrelease](
-    https://img.shields.io/gitlab/pipeline/ae-group/ae_shell/release0.3.11?logo=python)](
-    https://gitlab.com/ae-group/ae_shell/-/tree/release0.3.11)
+    https://img.shields.io/gitlab/pipeline/ae-group/ae_shell/release0.3.13?logo=python)](
+    https://gitlab.com/ae-group/ae_shell/-/tree/release0.3.13)
 [![PyPIVersions](https://img.shields.io/pypi/v/ae_shell)](
     https://pypi.org/project/ae-shell/#history)
@@ -54,7 +54,7 @@ following command in the root folder of this repository
 (ae_shell):
 ```shell script
-pip install -e .[dev]
+pip install --editable .[dev]
 ```
 the last command will install this module portion, along with the tools you need

{ae_shell-0.3.11 → ae_shell-0.3.13}/ae/shell.py RENAMED Viewed

@@ -31,7 +31,7 @@ from ae.core import main_app_instance, AppBase
 from ae.console import MAIN_SECTION_NAME, ConsoleApp                                        # type: ignore
-__version__ = '0.3.11'
+__version__ = '0.3.13'
 STDERR_BEG_MARKER = "vvv   STDERR   vvv"                #: :paramref:`ae.shell.sh_exec.lines_output` begin stderr lines
@@ -123,11 +123,11 @@ def mask_token(text: list[str]) -> list[str]: ...
 def mask_token(text: Union[str, list[str]]) -> Union[str, list[str]]:
-    """ hide most parts of any Codeberg/GitHub/GitHub tokens found in the specified text/-lines.
+    """ hide most parts of any Codeberg/GitHub/GitHub URL tokens found in the specified text/-lines.
-    :param text:                text block, specified either as str object or as a list of str objects (lines),
-                                to detect tokens within, to hide/mask the most part of them.
-    :return:                    text block with without the complete tokens.
+    :param text:                text, specified either as str object or as a list of str objects (lines),
+                                each str/line get searched for URL tokens, to hide/mask the most part of them.
+    :return:                    text with masked URL tokens (only leaving the first/last 3 token characters unmasked).
     .. note:: see also :func:`ae.base.mask_url` of a more generic way to hide passwords and tokens in URLs.
     """
@@ -136,14 +136,15 @@ def mask_token(text: Union[str, list[str]]) -> Union[str, list[str]]:
     else:
         lines = list(text)  # copy to not change text list content
+    url_beg = 'https://'  # PDV_REPO_HOST_PROTOCOL
+    url_beg_len = len(url_beg)
     for tok_beg, tok_end in ((':', '@codeberg.org'), ('glpat-', '@gitlab.com'), ('ghp_', '@github.com')):
         for idx, line in enumerate(lines):
-            while tok_beg in line:  # hide the GitLab/GitHub private token, e.g. from git-push-urls with authentication
-                start = line.index(tok_beg)
-                end = line.find(tok_end, start)
-                if end == -1:
-                    break
-                line = line[:start + 3] + "***-masked-token-***" + line[end - 3:]
+            beg = -1
+            while ((beg := line.find(url_beg, beg + 1)) != -1 and
+                   (beg := line.find(tok_beg, beg + url_beg_len)) != -1 and
+                   (end := line.find(tok_end, beg)) != -1):
+                line = line[:beg + 3] + "***-masked-token-***" + line[end - 3:]
             lines[idx] = line
     return lines[0] if is_str_arg else lines
@@ -198,10 +199,10 @@ def sh_exec(command_line: str, extra_args: Iterable[str] = (), console_input: st
     if ret_out:
         assert isinstance(lines_output, list), "silly mypy doesn't recognize ret_out"
         if result.stdout:
-            lines_output.extend([line for line in result.stdout.decode().split(os.linesep) if line])
+            lines_output.extend([line for line in result.stdout.decode().splitlines() if line.strip()])
         if not merge_err and result.stderr:
             lines_output.append(STDERR_BEG_MARKER)
-            lines_output.extend([line for line in result.stderr.decode().split(os.linesep) if line])
+            lines_output.extend([line for line in result.stderr.decode().splitlines() if line.strip()])
             lines_output.append(STDERR_END_MARKER)
     return result.returncode

{ae_shell-0.3.11 → ae_shell-0.3.13/ae_shell.egg-info}/PKG-INFO RENAMED Viewed

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ae_shell
-Version: 0.3.11
+Version: 0.3.13
 Summary: ae namespace module portion shell: shell execution and environment helpers
 Home-page: https://gitlab.com/ae-group/ae_shell
 Author: AndiEcker
@@ -29,25 +29,21 @@ Provides-Extra: dev
 Requires-Dist: aedev_project_tpls; extra == "dev"
 Requires-Dist: ae_ae; extra == "dev"
 Requires-Dist: anybadge; extra == "dev"
-Requires-Dist: coverage-badge; extra == "dev"
 Requires-Dist: flake8; extra == "dev"
 Requires-Dist: mypy; extra == "dev"
 Requires-Dist: pylint; extra == "dev"
 Requires-Dist: pytest; extra == "dev"
 Requires-Dist: pytest-cov; extra == "dev"
-Requires-Dist: pytest-django; extra == "dev"
 Requires-Dist: typing; extra == "dev"
 Requires-Dist: types-setuptools; extra == "dev"
 Provides-Extra: docs
 Provides-Extra: tests
 Requires-Dist: anybadge; extra == "tests"
-Requires-Dist: coverage-badge; extra == "tests"
 Requires-Dist: flake8; extra == "tests"
 Requires-Dist: mypy; extra == "tests"
 Requires-Dist: pylint; extra == "tests"
 Requires-Dist: pytest; extra == "tests"
 Requires-Dist: pytest-cov; extra == "tests"
-Requires-Dist: pytest-django; extra == "tests"
 Requires-Dist: typing; extra == "tests"
 Requires-Dist: types-setuptools; extra == "tests"
 Dynamic: author
@@ -65,15 +61,15 @@ Dynamic: requires-dist
 Dynamic: requires-python
 Dynamic: summary
-<!-- THIS FILE IS EXCLUSIVELY MAINTAINED by the project ae.ae v0.3.101 -->
+<!-- THIS FILE IS EXCLUSIVELY MAINTAINED by the project ae.ae v0.3.103 -->
 <!-- THIS FILE IS EXCLUSIVELY MAINTAINED by the project aedev.namespace_root_tpls v0.3.22 -->
-# shell 0.3.11
+# shell 0.3.13
 [![GitLab develop](https://img.shields.io/gitlab/pipeline/ae-group/ae_shell/develop?logo=python)](
     https://gitlab.com/ae-group/ae_shell)
 [![LatestPyPIrelease](
-    https://img.shields.io/gitlab/pipeline/ae-group/ae_shell/release0.3.11?logo=python)](
-    https://gitlab.com/ae-group/ae_shell/-/tree/release0.3.11)
+    https://img.shields.io/gitlab/pipeline/ae-group/ae_shell/release0.3.13?logo=python)](
+    https://gitlab.com/ae-group/ae_shell/-/tree/release0.3.13)
 [![PyPIVersions](https://img.shields.io/pypi/v/ae_shell)](
     https://pypi.org/project/ae-shell/#history)
@@ -121,7 +117,7 @@ following command in the root folder of this repository
 (ae_shell):
 ```shell script
-pip install -e .[dev]
+pip install --editable .[dev]
 ```
 the last command will install this module portion, along with the tools you need

{ae_shell-0.3.11 → ae_shell-0.3.13}/ae_shell.egg-info/requires.txt RENAMED Viewed

@@ -6,13 +6,11 @@ ae_console
 aedev_project_tpls
 ae_ae
 anybadge
-coverage-badge
 flake8
 mypy
 pylint
 pytest
 pytest-cov
-pytest-django
 typing
 types-setuptools
@@ -20,12 +18,10 @@ types-setuptools
 [tests]
 anybadge
-coverage-badge
 flake8
 mypy
 pylint
 pytest
 pytest-cov
-pytest-django
 typing
 types-setuptools

{ae_shell-0.3.11 → ae_shell-0.3.13}/pyproject.toml RENAMED Viewed

@@ -1,4 +1,4 @@
-# THIS FILE IS EXCLUSIVELY MAINTAINED by the project aedev.project_tpls v0.3.72
+# THIS FILE IS EXCLUSIVELY MAINTAINED by the project aedev.project_tpls v0.3.77
 [build-system]
 requires = ["setuptools>=42", "wheel"]
 build-backend = "setuptools.build_meta"

{ae_shell-0.3.11 → ae_shell-0.3.13}/setup.py RENAMED Viewed

@@ -1,4 +1,4 @@
-# THIS FILE IS EXCLUSIVELY MAINTAINED by the project aedev.project_tpls v0.3.72
+# THIS FILE IS EXCLUSIVELY MAINTAINED by the project aedev.project_tpls v0.3.77
 """ setup of ae namespace module portion shell: shell execution and environment helpers. """
 import sys
 # noinspection PyUnresolvedReferences
@@ -28,26 +28,22 @@ setup_kwargs = {
             'aedev_project_tpls',
             'ae_ae',
             'anybadge',
-            'coverage-badge',
             'flake8',
             'mypy',
             'pylint',
             'pytest',
             'pytest-cov',
-            'pytest-django',
             'typing',
             'types-setuptools',
         ],
         'docs': [],
         'tests': [
             'anybadge',
-            'coverage-badge',
             'flake8',
             'mypy',
             'pylint',
             'pytest',
             'pytest-cov',
-            'pytest-django',
             'typing',
             'types-setuptools',
         ],
@@ -81,7 +77,7 @@ setup_kwargs = {
     },
     'python_requires': '>=3.12',
     'url': 'https://gitlab.com/ae-group/ae_shell',
-    'version': '0.3.11',
+    'version': '0.3.13',
     'zip_safe': True,
 }

{ae_shell-0.3.11 → ae_shell-0.3.13}/tests/test_shell.py RENAMED Viewed

@@ -210,19 +210,33 @@ class TestHelpers:
         assert os.environ == os_env
     def test_mask_token(self):
+        url_prefix_str = "https://"  # PDV_REPO_HOST_PROTOCOL
+        token = "codeberg token does not have a prefix and only contains hex-digits followed by @ and codeberg.org"
+        text = f"a text block containing a codeberg URL with a token: {url_prefix_str}UsaNäm:{token}@codeberg.org"
+        assert token not in mask_token(text)
+        assert token not in mask_token([text])[0]
+        assert mask_token(text).count('codeberg.org') == 1
+        assert mask_token(text).count(':') == 3
         token = "glpat-gitlab token format ending at the @/ampersand directly followed by the gitlab.com domain"
-        text = "a text block containing a gitlab URL with a token: https://UsaNäm:" + token + "@gitlab.com"
+        text = "a text block containing a gitlab URL with a glpat-token: https://UsaNäm:" + token + "@gitlab.com"
         assert token not in mask_token(text)
         assert token not in mask_token([text])[0]
+        assert mask_token(text).count('gitlab.com') == 1
+        assert mask_token(text).count('glpat-') == 1
         token = "ghp_-github token format ending at the @/ampersand directly followed by the github.com domain"
-        text = "a text block containing a github URL with a token: https://YouSaNem:" + token + "@github.com"
+        text = "a text block containing a github URL with a ghp_-token: https://YouSaNem:" + token + "@github.com"
         assert token not in mask_token(text)
         assert token not in mask_token([text])[0]
+        assert mask_token(text).count('github.com') == 1
+        assert mask_token(text).count('ghp_') == 1
-        text = "skip masking of text blocks with a start token like ghp_ or glpat- but missing end token"
+        text = "NO masking if @codeberg.org/@github.com/@gitlab.com domains before token start str ':', ghp_ or glpat-:"
         assert mask_token(text) == text     # neither throws str.index()-ValueError nor stuck in endless-loop

{ae_shell-0.3.11 → ae_shell-0.3.13}/ae_shell.egg-info/SOURCES.txt RENAMED Viewed

File without changes

{ae_shell-0.3.11 → ae_shell-0.3.13}/ae_shell.egg-info/dependency_links.txt RENAMED Viewed

File without changes

{ae_shell-0.3.11 → ae_shell-0.3.13}/ae_shell.egg-info/top_level.txt RENAMED Viewed

File without changes

{ae_shell-0.3.11 → ae_shell-0.3.13}/ae_shell.egg-info/zip-safe RENAMED Viewed

File without changes

{ae_shell-0.3.11 → ae_shell-0.3.13}/setup.cfg RENAMED Viewed

File without changes

ae-shell 0.3.11__tar.gz → 0.3.13__tar.gz

ae-shell 0.3.11tar.gz → 0.3.13tar.gz