mantis-cli 22.0.0__tar.gz → 22.0.2__tar.gz

{mantis_cli-22.0.0/mantis_cli.egg-info → mantis_cli-22.0.2}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.4
+Metadata-Version: 2.1
 Name: mantis_cli
-Version: 22.0.0
+Version: 22.0.2
 Summary: Management command to build and deploy webapps, especially based on Django
 Home-page: https://github.com/PragmaticMates/mantis-cli
 Author: Erik Telepovský
@@ -9,6 +9,7 @@ Maintainer: Pragmatic Mates
 Maintainer-email: info@pragmaticmates.com
 License: GNU General Public License (GPL)
 Keywords: management deployment docker command
+Platform: UNKNOWN
 Classifier: Programming Language :: Python
 Classifier: Operating System :: OS Independent
 Classifier: Environment :: Web Environment
@@ -18,26 +19,6 @@ Classifier: License :: OSI Approved :: GNU General Public License (GPL)
 Classifier: Development Status :: 5 - Production/Stable
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: cffi
-Requires-Dist: cryptography
-Requires-Dist: pycryptodome
-Requires-Dist: pydantic
-Requires-Dist: PyYAML
-Requires-Dist: rich
-Requires-Dist: typer
-Dynamic: author
-Dynamic: author-email
-Dynamic: classifier
-Dynamic: description
-Dynamic: description-content-type
-Dynamic: home-page
-Dynamic: keywords
-Dynamic: license
-Dynamic: license-file
-Dynamic: maintainer
-Dynamic: maintainer-email
-Dynamic: requires-dist
-Dynamic: summary
 
 # mantis-cli
 
@@ -481,3 +462,4 @@ Works as follows:
 ## Release notes
 
 Mantis uses semantic versioning. See more in [changelog](https://github.com/PragmaticMates/mantis-cli/blob/master/CHANGES.md).
+

mantis_cli-22.0.2/mantis/__init__.py

@@ -0,0 +1 @@
+VERSION = '22.0.2'

{mantis_cli-22.0.0 → mantis_cli-22.0.2}/mantis/extensions/django.py

@@ -1,3 +1,4 @@
+import sys
 import time
 from typing import Optional
 
@@ -67,7 +68,8 @@ class Django():
         CLI.info('Django manage...')
         args_str = ' '.join(args) if args else ''
         full_cmd = f'{cmd} {args_str}'.strip()
-        self.docker(f'exec -ti {container} python manage.py {full_cmd}')
+        tty_flag = 't' if sys.stdin.isatty() else ''
+        self.docker(f'exec -i{tty_flag} {container} python manage.py {full_cmd}')
 
     def send_test_email(self):
         """Sends test email to admins"""

{mantis_cli-22.0.0 → mantis_cli-22.0.2}/mantis/helpers.py

@@ -123,6 +123,27 @@ def random_string(n=10):
     chars = string.ascii_lowercase + string.ascii_uppercase + string.digits
     return ''.join(random.choice(chars) for _ in range(n))
 
+
+def merge_defaults(defaults, overrides):
+    """
+    Deep-merges user config over template defaults.
+
+    dict.update() is shallow, so declaring a single key of a section used to drop the rest
+    of that section's defaults: {"compose": {"command": "docker compose"}} left compose.folder
+    undefined and raised KeyError later on. Only mappings recurse — lists and scalars from
+    the user config replace the default outright.
+    """
+    merged = dict(defaults)
+
+    for key, value in overrides.items():
+        if isinstance(value, dict) and isinstance(merged.get(key), dict):
+            merged[key] = merge_defaults(merged[key], value)
+        else:
+            merged[key] = value
+
+    return merged
+
+
 def merge_json(obj1, obj2):
     # Base case: if both values are dictionaries, merge recursively
     if isinstance(obj1, dict) and isinstance(obj2, dict):

{mantis_cli-22.0.0 → mantis_cli-22.0.2}/mantis/managers.py

@@ -17,7 +17,7 @@ from rich.table import Table
 
 from mantis.cryptography import Crypto
 from mantis.environment import Environment
-from mantis.helpers import CLI, import_string, merge_json
+from mantis.helpers import CLI, import_string, merge_defaults, merge_json
 from mantis.config import find_config, load_config, check_config, load_template_config, DEFAULT_ENV_FOLDER
 
 
@@ -146,11 +146,9 @@ class AbstractManager(object):
         # Load config template file
         defaults = load_template_config()
 
-        # Merge custom config and default values
-        defaults.update(config)
-
-        # Save merged config to variable
-        self.config = defaults.copy()
+        # Merge custom config over default values. Deep merge, so declaring one key of a
+        # section keeps the rest of that section's defaults.
+        self.config = merge_defaults(defaults, config)
 
         # Detect single connection mode (connection string instead of connections dict)
         has_single_connection = self.config.get('connection') is not None

{mantis_cli-22.0.0 → mantis_cli-22.0.2/mantis_cli.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.4
-Name: mantis_cli
-Version: 22.0.0
+Metadata-Version: 2.1
+Name: mantis-cli
+Version: 22.0.2
 Summary: Management command to build and deploy webapps, especially based on Django
 Home-page: https://github.com/PragmaticMates/mantis-cli
 Author: Erik Telepovský
@@ -9,6 +9,7 @@ Maintainer: Pragmatic Mates
 Maintainer-email: info@pragmaticmates.com
 License: GNU General Public License (GPL)
 Keywords: management deployment docker command
+Platform: UNKNOWN
 Classifier: Programming Language :: Python
 Classifier: Operating System :: OS Independent
 Classifier: Environment :: Web Environment
@@ -18,26 +19,6 @@ Classifier: License :: OSI Approved :: GNU General Public License (GPL)
 Classifier: Development Status :: 5 - Production/Stable
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: cffi
-Requires-Dist: cryptography
-Requires-Dist: pycryptodome
-Requires-Dist: pydantic
-Requires-Dist: PyYAML
-Requires-Dist: rich
-Requires-Dist: typer
-Dynamic: author
-Dynamic: author-email
-Dynamic: classifier
-Dynamic: description
-Dynamic: description-content-type
-Dynamic: home-page
-Dynamic: keywords
-Dynamic: license
-Dynamic: license-file
-Dynamic: maintainer
-Dynamic: maintainer-email
-Dynamic: requires-dist
-Dynamic: summary
 
 # mantis-cli
 
@@ -481,3 +462,4 @@ Works as follows:
 ## Release notes
 
 Mantis uses semantic versioning. See more in [changelog](https://github.com/PragmaticMates/mantis-cli/blob/master/CHANGES.md).
+

{mantis_cli-22.0.0 → mantis_cli-22.0.2}/mantis_cli.egg-info/SOURCES.txt

@@ -40,4 +40,5 @@ mantis_cli.egg-info/top_level.txt
 tests/__init__.py
 tests/test_command_line.py
 tests/test_config.py
+tests/test_helpers.py
 tests/test_managers.py

{mantis_cli-22.0.0 → mantis_cli-22.0.2}/mantis_cli.egg-info/entry_points.txt

@@ -1,2 +1,3 @@
 [console_scripts]
 mantis = mantis.command_line:run
+

mantis_cli-22.0.2/tests/test_helpers.py

@@ -0,0 +1,128 @@
+"""Tests for helpers module - config default merging."""
+import pytest
+
+from mantis.config import load_template_config
+from mantis.helpers import merge_defaults
+
+
+class TestMergeDefaults:
+    """Tests for merge_defaults function."""
+
+    def test_partial_section_keeps_sibling_defaults(self):
+        """Declaring one key of a section must not drop the rest of it."""
+        defaults = {'compose': {'command': 'docker-compose', 'folder': '<MANTIS>/../compose'}}
+        overrides = {'compose': {'command': 'docker compose'}}
+
+        merged = merge_defaults(defaults, overrides)
+
+        assert merged['compose'] == {
+            'command': 'docker compose',
+            'folder': '<MANTIS>/../compose',
+        }
+
+    def test_override_wins_over_default(self):
+        """User values replace defaults of the same key."""
+        defaults = {'project_path': '~', 'compose': {'command': 'docker-compose'}}
+        overrides = {'project_path': '~/public_html/app/', 'compose': {'command': 'docker compose'}}
+
+        merged = merge_defaults(defaults, overrides)
+
+        assert merged['project_path'] == '~/public_html/app/'
+        assert merged['compose']['command'] == 'docker compose'
+
+    def test_untouched_sections_survive(self):
+        """Sections the user never mentions keep their defaults."""
+        defaults = {
+            'compose': {'command': 'docker-compose'},
+            'encryption': {'deterministic': True, 'folder': '<MANTIS>'},
+        }
+        overrides = {'compose': {'command': 'docker compose'}}
+
+        merged = merge_defaults(defaults, overrides)
+
+        assert merged['encryption'] == {'deterministic': True, 'folder': '<MANTIS>'}
+
+    def test_lists_are_replaced_not_concatenated(self):
+        """zero_downtime must be the user's list, not defaults + user."""
+        defaults = {'zero_downtime': ['web']}
+        overrides = {'zero_downtime': ['backend']}
+
+        merged = merge_defaults(defaults, overrides)
+
+        assert merged['zero_downtime'] == ['backend']
+
+    def test_new_keys_are_added(self):
+        """Keys absent from the defaults come through."""
+        defaults = {'project_path': '~'}
+        overrides = {'connections': {'production': 'ssh://user@host:22'}}
+
+        merged = merge_defaults(defaults, overrides)
+
+        assert merged['connections'] == {'production': 'ssh://user@host:22'}
+        assert merged['project_path'] == '~'
+
+    def test_nested_dicts_recurse(self):
+        """Merging descends more than one level."""
+        defaults = {'build': {'tool': 'compose', 'args': {'a': '1', 'b': '2'}}}
+        overrides = {'build': {'args': {'b': '99'}}}
+
+        merged = merge_defaults(defaults, overrides)
+
+        assert merged['build'] == {'tool': 'compose', 'args': {'a': '1', 'b': '99'}}
+
+    def test_scalar_replacing_dict(self):
+        """A scalar override replaces a dict default rather than recursing."""
+        defaults = {'connection': {'nested': True}}
+        overrides = {'connection': 'ssh://user@host:22'}
+
+        merged = merge_defaults(defaults, overrides)
+
+        assert merged['connection'] == 'ssh://user@host:22'
+
+    def test_inputs_are_not_mutated(self):
+        """Merging must not write back into the template defaults."""
+        defaults = {'compose': {'command': 'docker-compose', 'folder': 'x'}}
+        overrides = {'compose': {'command': 'docker compose'}}
+
+        merge_defaults(defaults, overrides)
+
+        assert defaults == {'compose': {'command': 'docker-compose', 'folder': 'x'}}
+
+    def test_empty_overrides_returns_defaults(self):
+        """No user config means the template stands as-is."""
+        defaults = {'compose': {'command': 'docker-compose'}}
+
+        assert merge_defaults(defaults, {}) == defaults
+
+
+class TestMergeDefaultsAgainstTemplate:
+    """Tests merge_defaults against the real mantis.tpl defaults."""
+
+    def test_partial_compose_section_keeps_folder(self):
+        """The regression this fixes: compose.command alone used to lose compose.folder."""
+        config = {
+            'compose': {'command': 'docker compose'},
+            'connections': {'production': 'ssh://user@host:2222'},
+        }
+
+        merged = merge_defaults(load_template_config(), config)
+
+        assert merged['compose']['command'] == 'docker compose'
+        assert merged['compose']['folder'] == '<MANTIS>/../compose'
+
+    def test_every_template_section_survives_a_partial_override(self):
+        """Each section with more than one key must tolerate a partial declaration."""
+        template = load_template_config()
+        sections = {
+            key: value for key, value in template.items()
+            if isinstance(value, dict) and len(value) > 1
+        }
+
+        assert sections, 'template has no multi-key sections to check'
+
+        for section, defaults in sections.items():
+            first_key = next(iter(defaults))
+            merged = merge_defaults(template, {section: {first_key: defaults[first_key]}})
+
+            assert merged[section].keys() == defaults.keys(), \
+                f'partial override of "{section}" dropped keys'

mantis_cli-22.0.0/mantis/__init__.py

@@ -1 +0,0 @@
-VERSION = '22.0.0'