mantis-cli 12.2.0__tar.gz → 12.4.0__tar.gz

{mantis-cli-12.2.0/mantis_cli.egg-info → mantis-cli-12.4.0}/PKG-INFO

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

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

{mantis-cli-12.2.0 → mantis-cli-12.4.0}/mantis/environment.py

@@ -16,6 +16,9 @@ class Environment(object):
         # environment files
         self.path = self._get_path(self.id)
 
+        if not self.path:
+            return
+
         if not os.path.exists(self.path):
             CLI.error(f"Environment path '{self.path}' does not exist")
 
@@ -40,7 +43,7 @@ class Environment(object):
                 CLI.info(f"Found environment path: '{environment_path}'")
                 return environment_path
 
-        CLI.error(f"Environment path not found. Tried: {', '.join(possible_folders)}")
+        CLI.danger(f"Environment path not found. Tried: {', '.join(possible_folders)}")
 
     def read(self, path):
         if not os.path.exists(path):

mantis-cli-12.4.0/mantis/extensions/django.py

@@ -0,0 +1,21 @@
+from mantis.helpers import CLI
+
+
+class Django():
+    django_service = 'django'
+
+    @property
+    def django_container(self):
+        return f"{self.CONTAINER_PREFIX}{self.get_container_suffix(self.django_service)}"
+
+    def shell(self):
+        CLI.info('Connecting to Django shell...')
+        self.docker(f'exec -i {self.django_container} python manage.py shell')
+
+    def manage(self, params):
+        CLI.info('Django manage...')
+        self.docker(f'exec -ti {self.django_container} python manage.py {params}')
+
+    def send_test_email(self):
+        CLI.info('Sending test email...')
+        self.docker(f'exec -i {self.django_container} python manage.py sendtestemail --admins')

mantis-cli-12.4.0/mantis/extensions/nginx.py

@@ -0,0 +1,13 @@
+from mantis.helpers import CLI
+
+
+class Nginx():
+    nginx_service = 'nginx'
+
+    @property
+    def nginx_container(self):
+        return f"{self.CONTAINER_PREFIX}{self.get_container_suffix(self.nginx_service)}"
+
+    def reload_webserver(self):
+        CLI.info('Reloading nginx...')
+        self.docker(f'exec {self.nginx_container} nginx -s reload')

mantis-cli-12.2.0/mantis/extensions.py → mantis-cli-12.4.0/mantis/extensions/postgres.py

@@ -1,26 +1,6 @@
 from mantis.helpers import CLI
 
 
-class Django():
-    django_service = 'django'
-
-    @property
-    def django_container(self):
-        return f"{self.CONTAINER_PREFIX}{self.get_container_suffix(self.django_service)}"
-
-    def shell(self):
-        CLI.info('Connecting to Django shell...')
-        self.docker(f'exec -i {self.django_container} python manage.py shell')
-
-    def manage(self, params):
-        CLI.info('Django manage...')
-        self.docker(f'exec -ti {self.django_container} python manage.py {params}')
-
-    def send_test_email(self):
-        CLI.info('Sending test email...')
-        self.docker(f'exec -i {self.django_container} python manage.py sendtestemail --admins')
-
-
 class Postgres():
     postgres_service = 'postgres'
 
@@ -79,15 +59,3 @@ class Postgres():
     def pg_restore_data(self, params):
         filename, table = params.split(',')
         self.pg_restore(filename=filename, table=table)
-
-
-class Nginx():
-    nginx_service = 'nginx'
-
-    @property
-    def nginx_container(self):
-        return f"{self.CONTAINER_PREFIX}{self.get_container_suffix(self.nginx_service)}"
-
-    def reload_webserver(self):
-        CLI.info('Reloading nginx...')
-        self.docker(f'exec {self.nginx_container} nginx -s reload')

{mantis-cli-12.2.0 → mantis-cli-12.4.0}/mantis/logic.py

@@ -46,7 +46,7 @@ def get_extension_classes(extensions):
 
     # extensions
     for extension in extensions:
-        extension_class_name = extension if '.' in extension else f"mantis.extensions.{extension}"
+        extension_class_name = extension if '.' in extension else f"mantis.extensions.{extension.lower()}.{extension}"
         extension_class = import_string(extension_class_name)
         extension_classes.append(extension_class)
 
@@ -188,7 +188,7 @@ def execute(manager, command, params):
         # commands = '\n'.join(manager_methods.keys())
         # CLI.error(f'\n\nUsage: mantis <ENVIRONMENT> \n{commands}')
     else:
-        methods_without_environment = ['contexts', 'create_context', 'generate_key']
+        methods_without_environment = ['contexts', 'create_context', 'generate_key', 'read_key']
 
         if manager.environment_id is None and manager_method not in methods_without_environment:
             CLI.error('Missing environment')

{mantis-cli-12.2.0 → mantis-cli-12.4.0}/mantis/managers.py

@@ -190,7 +190,8 @@ class BaseManager(object):
 
     def read_key(self):
         if not os.path.exists(self.key_file):
-            return None
+            CLI.warning(f'File {self.key_file} does not exist. Reading key from $MANTIS_KEY...')
+            return os.environ.get('MANTIS_KEY', None)
 
         with open(self.key_file, "r") as f:
             return f.read()
@@ -325,12 +326,18 @@ class BaseManager(object):
                 CLI.warning(f'Save it to {env_file} manually.')
 
     def check_env(self):
+        if not hasattr(self.env, 'encrypted_files'):
+            CLI.error('No encrypted files')
+
         # check if pair file exists
         for encrypted_env_file in self.env.encrypted_files:
             env_file = encrypted_env_file.rstrip('.encrypted')
             if not os.path.exists(env_file):
                 CLI.warning(f'Environment file {env_file} does not exist')
 
+        if not hasattr(self.env, 'files'):
+            CLI.error('No environment files')
+
         for env_file in self.env.files:
             env_file_encrypted = f'{env_file}.encrypted'
 
@@ -482,8 +489,42 @@ class BaseManager(object):
 
         CLI.info(f'Args = {build_args}')
 
-        # Build using docker compose
-        self.docker_compose(f'build {build_args} {params} --pull', use_connection=False)
+        build_tool = self.config.get('build', {}).get('tool', 'compose')
+
+        if build_tool == 'compose':
+            # Build all services using docker compose
+            self.docker_compose(f'build {build_args} {params} --pull', use_connection=False)
+        elif build_tool == 'docker':
+            for service, info in self.services_to_build().items():
+                platform = f"--platform={info['platform']}" if info['platform'] != '' else ''
+                image = f"-t {info['image']}" if info['image'] != '' else ''
+
+                # Build service using docker
+                self.docker(f"build {info['context']} {build_args} {platform} {image} -f {info['dockerfile']} {params}", use_connection=False)
+        else:
+            CLI.error(f'Unknown build tool: {build_tool}')
+
+    def services_to_build(self):
+        import yaml
+
+        with open(self.compose_file, 'r') as file:
+            compose_data = yaml.safe_load(file)
+
+        data = {}
+
+        services = compose_data.get('services', {})
+        for service_name, service_config in services.items():
+            build = service_config.get('build', None)
+
+            if build:
+                data[service_name] = {
+                    'dockerfile': build.get('dockerfile', 'Dockerfile'),
+                    'context': build.get('context', '.'),
+                    'image': service_config.get('image', ''),
+                    'platform': service_config.get('platform', '')
+                }
+
+        return data
 
     def push(self, params=''):
         CLI.info(f'Pushing...')
@@ -844,11 +885,13 @@ class BaseManager(object):
 
         return None
 
-    def docker(self, command, return_output=False):
+    def docker(self, command, return_output=False, use_connection=True):
+        docker_connection = self.docker_connection if use_connection else ''
+
         if return_output:
-            return os.popen(f'{self.docker_connection} docker {command}').read()
+            return os.popen(f'{docker_connection} docker {command}').read()
 
-        self.cmd(f'{self.docker_connection} docker {command}')
+        self.cmd(f'{docker_connection} docker {command}')
 
     def docker_compose(self, command, use_connection=True):
         docker_connection = self.docker_connection if use_connection else ''

{mantis-cli-12.2.0 → mantis-cli-12.4.0/mantis_cli.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: mantis-cli
-Version: 12.2.0
+Version: 12.4.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-12.2.0 → mantis-cli-12.4.0}/mantis_cli.egg-info/SOURCES.txt

@@ -10,10 +10,13 @@ mantis/__main__.py
 mantis/command_line.py
 mantis/crypto.py
 mantis/environment.py
-mantis/extensions.py
 mantis/helpers.py
 mantis/logic.py
 mantis/managers.py
+mantis/extensions/__init__.py
+mantis/extensions/django.py
+mantis/extensions/nginx.py
+mantis/extensions/postgres.py
 mantis_cli.egg-info/PKG-INFO
 mantis_cli.egg-info/SOURCES.txt
 mantis_cli.egg-info/dependency_links.txt

mantis-cli-12.2.0/mantis/__init__.py

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