mantis-cli 13.3.1__tar.gz → 14.0.1__tar.gz

{mantis-cli-13.3.1/mantis_cli.egg-info → mantis-cli-14.0.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: mantis-cli
-Version: 13.3.1
+Version: 14.0.1
 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.1/mantis/__init__.py

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

{mantis-cli-13.3.1 → mantis-cli-14.0.1}/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-13.3.1 → mantis-cli-14.0.1}/mantis/managers.py

@@ -35,7 +35,7 @@ class BaseManager(object):
         self.init_environment()
 
         self.KEY = self.read_key()
-        self.encrypt_deterministically = self.config.get('encrypt_deterministically', False)
+        self.encrypt_deterministically = self.config.get('encryption', {}).get('deterministic', True)
 
     @property
     def host(self):
@@ -118,18 +118,21 @@ class BaseManager(object):
 
     def init_config(self, config):
         self.config = config
-        self.configs_path = self.config.get('configs', {}).get('folder', 'configs/')
+        self.config_file_path = path.normpath(path.join(self.config_file, os.pardir))
+        self.key_path = self.config.get('encryption', {}).get('folder', '<MANTIS>').replace('<MANTIS>', self.config_file_path)
+        self.configs_path = self.config.get('configs', {}).get('folder', '<MANTIS>/configs').replace('<MANTIS>', self.config_file_path)
+        self.environment_path = self.config.get('environment', {}).get('folder', '<MANTIS>/environments').replace('<MANTIS>', self.config_file_path)
+        self.compose_path = self.config.get('compose', {}).get('folder', '<MANTIS>/configs/compose').replace('<MANTIS>', self.config_file_path)
         self.compose_command = self.config.get('compose', {}).get('command', 'docker compose')
-        self.compose_path = self.config.get('compose', {}).get('folder', 'configs/compose')
-        self.key_file = path.join(f'{dirname(self.config_file)}', 'mantis.key')
-
+        self.key_file = path.normpath(path.join(self.key_path, 'mantis.key'))
+        
         # Get environment settings
         self.PROJECT_NAME = self.config['project_name']
 
     def init_environment(self):
         self.env = Environment(
             environment_id=self.environment_id,
-            folder=self.config.get('environment', {}).get('folder', 'environments'),
+            folder=self.environment_path,
         )
 
         # connection

{mantis-cli-13.3.1 → mantis-cli-14.0.1/mantis_cli.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: mantis-cli
-Version: 13.3.1
+Version: 14.0.1
 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-13.3.1/mantis/__init__.py

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