mantis-cli 14.0.0__tar.gz → 14.1.0__tar.gz

{mantis-cli-14.0.0/mantis_cli.egg-info → mantis-cli-14.1.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: mantis-cli
-Version: 14.0.0
+Version: 14.1.0
 Summary: Management command to build and deploy webapps, especially based on Django
 Home-page: https://github.com/PragmaticMates/mantis-cli
 Author: Erik Telepovský

mantis-cli-14.1.0/mantis/__init__.py

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

{mantis-cli-14.0.0 → mantis-cli-14.1.0}/mantis/crypto.py

@@ -2,15 +2,12 @@ from base64 import b64encode, b64decode
 
 try:
     from Crypto.Cipher import AES
-    from Crypto.Random import get_random_bytes
     from cryptography.fernet import Fernet
 except ImportError:
     # not using cryptography
-    # pip install pycryptodome>=3.11.0
-    # TODO: only if using environment encryption!
     raise ImportError('Install pycryptodome and cryptography!')
 
-from mantis.helpers import CLI
+from mantis.helpers import CLI, random_string
 
 
 class Crypto(object):
@@ -18,10 +15,8 @@ class Crypto(object):
     def generate_key(deterministically=False):
         if deterministically:
             # deterministically: length has to be 32, 48 or 64
-            x = random_string(64)
-            from icecream import ic
-            return x
-
+            return random_string(64)
+            
         return Fernet.generate_key()
 
     @staticmethod

{mantis-cli-14.0.0 → mantis-cli-14.1.0}/mantis/managers.py

@@ -529,6 +529,12 @@ class BaseManager(object):
         else:
             CLI.error(f'Unknown build tool: {build_tool}. Available tools: {", ".join(available_tools)}')
 
+    def services(self):
+        with open(self.compose_file, 'r') as file:
+            compose_data = yaml.safe_load(file)
+
+        return compose_data.get('services', {}).keys()
+    
     def services_to_build(self):
         with open(self.compose_file, 'r') as file:
             compose_data = yaml.safe_load(file)
@@ -671,9 +677,10 @@ class BaseManager(object):
     def remove_suffixes(self, prefix=''):
         for container in self.get_containers(prefix=prefix):
             if container.split('-')[-1].isdigit():
-                CLI.info(f'Removing suffix of container {container}')
-                new_container = container.rsplit('-', maxsplit=1)[0]
-                self.docker(f'container rename {container} {new_container}')
+                if container not in self.services():
+                    CLI.info(f'Removing suffix of container {container}')
+                    new_container = container.rsplit('-', maxsplit=1)[0]
+                    self.docker(f'container rename {container} {new_container}')
 
     def restart_service(self, service):
         container = self.get_container_name(service)
@@ -757,10 +764,10 @@ class BaseManager(object):
             CLI.step(index + 1, steps, f'Removing {container}')
             self.docker(f'container rm {container}')
 
-    def clean(self):  # todo clean on all nodes
+    def clean(self, params=''):  # todo clean on all nodes
         CLI.info('Cleaning...')
         # self.docker(f'builder prune')
-        self.docker(f'system prune --volumes --force')
+        self.docker(f'system prune {params} --force')
         # self.docker(f'container prune')
         # self.docker(f'container prune --force')
 

{mantis-cli-14.0.0 → mantis-cli-14.1.0/mantis_cli.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: mantis-cli
-Version: 14.0.0
+Version: 14.1.0
 Summary: Management command to build and deploy webapps, especially based on Django
 Home-page: https://github.com/PragmaticMates/mantis-cli
 Author: Erik Telepovský

mantis-cli-14.0.0/mantis/__init__.py

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