mantis-cli 17.0.0__tar.gz → 19.0.0__tar.gz

{mantis-cli-17.0.0/mantis_cli.egg-info → mantis-cli-19.0.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: mantis-cli
-Version: 17.0.0
+Version: 19.0.0
 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,11 +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: PyYAML
-Requires-Dist: prettytable
 
 # mantis-cli
 
@@ -341,3 +337,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-19.0.0/mantis/__init__.py

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

{mantis-cli-17.0.0 → mantis-cli-19.0.0}/mantis/logic.py

@@ -102,11 +102,15 @@ def load_config(config_file):
             CLI.error(f"Failed to load config from file {config_file}: {e}")
 
 
-def check_config(config):
-    # Load config template file
+def load_template_config():
     current_directory = dirname(abspath(__file__))
     template_path = normpath(f'{current_directory}/mantis.tpl')
-    template = load_config(template_path)
+    return load_config(template_path)
+
+
+def check_config(config):
+    # Load config template file
+    template = load_template_config()
 
     # validate config file
     config_keys_only = find_keys_only_in_config(config, template)

{mantis-cli-17.0.0 → mantis-cli-19.0.0}/mantis/managers.py

@@ -2,6 +2,7 @@ import json
 import os
 import time
 import yaml
+from collections import defaultdict
 from os import path
 from os.path import dirname, normpath
 from time import sleep
@@ -9,7 +10,7 @@ from time import sleep
 from mantis.crypto import Crypto
 from mantis.environment import Environment
 from mantis.helpers import CLI, Colors
-from mantis.logic import find_config, load_config, check_config
+from mantis.logic import find_config, load_config, check_config, load_template_config
 
 
 class AbstractManager(object):
@@ -37,7 +38,7 @@ class AbstractManager(object):
         self.init_environment()
 
         self.KEY = self.read_key()
-        self.encrypt_deterministically = self.config.get('encryption', {}).get('deterministic', True)
+        self.encrypt_deterministically = self.config['encryption']['deterministic']
 
     @property
     def host(self):
@@ -101,7 +102,7 @@ class AbstractManager(object):
         setattr(self, property_name, details)
 
         # set project path
-        self.project_path = self.config.get('project_path', f'/home/{self.user}/public_html/web')
+        self.project_path = self.config['project_path']
 
         return details
 
@@ -122,19 +123,24 @@ class AbstractManager(object):
         return ''
 
     def init_config(self, config):
-        self.config = config
-        check_config(self.config)
-        self.config_file_path = path.normpath(path.join(self.config_file, os.pardir))
+        check_config(config)
+        config_file_path = path.normpath(path.join(self.config_file, os.pardir))
 
         def normalize(path):
-            return os.path.normpath(path.replace('<MANTIS>', self.config_file_path))
+            return os.path.normpath(path.replace('<MANTIS>', config_file_path))
+
+        # Load config template file
+        defaults = load_template_config()
+
+        # Merge custom config and default values
+        defaults.update(config)
 
-        self.key_path = normalize(self.config.get('encryption', {}).get('folder', '<MANTIS>'))
-        self.key_file = normalize(path.join(self.key_path, 'mantis.key'))
-        self.configs_path = normalize(self.config.get('configs', {}).get('folder', '<MANTIS>/configs'))
-        self.environment_path = normalize(self.config.get('environment', {}).get('folder', '<MANTIS>/environments'))
-        self.compose_path = normalize(self.config.get('compose', {}).get('folder', '<MANTIS>/configs/compose'))
-        self.compose_command = self.config.get('compose', {}).get('command', 'docker compose')
+        # Save merged config to variable
+        self.config = defaults.copy()
+
+        self.key_file = normalize(path.join(self.config['encryption']['folder'], 'mantis.key'))
+        self.environment_path = normalize(self.config['environment']['folder'])
+        self.compose_path = normalize(path.join(self.config['compose']['folder'], self.environment_id))
 
     def init_environment(self):
         self.env = Environment(
@@ -143,16 +149,13 @@ class AbstractManager(object):
         )
 
         # connection
-        self.connection = self.config.get('connections', {}).get(self.env.id, None)
+        self.connection = self.config['connections'].get(self.env.id, None)
 
-        # compose file
-        compose_prefix = f"docker-compose.{self.config.get('compose', {}).get('name', '')}".rstrip('.')
-        self.compose_file = os.path.join(self.compose_path, f'{compose_prefix}.{self.env.id}.yml')
+        # compose files
+        compose_file_paths = os.popen(f'find {self.compose_path} -name "*.yml" -o -name "*.yaml"').read().strip().split('\n')
 
-        # containers
-        self.PROJECT_NAME = self.project_name()
-        self.CONTAINER_PREFIX = self.PROJECT_NAME
-        self.IMAGE_PREFIX = self.PROJECT_NAME
+        # Remove empty strings
+        self.compose_files = list(filter(None, compose_file_paths))
 
     def check_environment_encryption(self, env_file):
         decrypted_environment = self.decrypt_env(env_file=env_file, return_value=True)  # .env.encrypted
@@ -233,8 +236,12 @@ class AbstractManager(object):
         )
 
     def docker_compose(self, command, return_output=False, use_connection=True):
+        compose_command = self.config['compose']['command']
+
+        compose_files = ' '.join([f'-f {compose_file}' for compose_file in self.compose_files])
+
         return self.docker_command(
-            command=f'{self.compose_command} -f {self.compose_file} {command}',
+            command=f'{compose_command} {compose_files} {command}',
             return_output=return_output,
             use_connection=use_connection
         )
@@ -267,7 +274,7 @@ class AbstractManager(object):
         containers = list(filter(None, containers))
 
         # get project containers only
-        containers = list(filter(lambda c: self.get_container_project(c) == self.PROJECT_NAME, containers))
+        containers = list(filter(lambda c: self.get_container_project(c) in self.project_services().keys(), containers))
 
         # find containers starting with custom prefix
         containers = list(filter(lambda s: s.startswith(prefix), containers))
@@ -526,7 +533,8 @@ class BaseManager(AbstractManager):
         Constructs container name with project prefix for given service
         """
         suffix = self.get_container_suffix(service)
-        return f'{self.CONTAINER_PREFIX}{suffix}'.replace('_', '-')
+        prefix = self.get_project_by_service(service)
+        return f'{prefix}{suffix}'.replace('_', '-')
 
     def get_service_containers(self, service):
         """
@@ -553,7 +561,8 @@ class BaseManager(AbstractManager):
         Constructs image name for given service
         """
         suffix = self.get_image_suffix(service)
-        return f'{self.IMAGE_PREFIX}{suffix}'.replace('-', '_')
+        prefix = self.get_project_by_service(service)
+        return f'{prefix}{suffix}'.replace('-', '_')
 
     def has_healthcheck(self, container):
         """
@@ -647,7 +656,7 @@ class BaseManager(AbstractManager):
         CLI.info(f'Params = {params}')
 
         # Construct build args from config
-        build_args = self.config.get('build', {}).get('args', {})
+        build_args = self.config['build']['args']
         build_args = ','.join(map('='.join, build_args.items()))
 
         if build_args != '':
@@ -657,7 +666,7 @@ class BaseManager(AbstractManager):
 
         CLI.info(f'Args = {build_args}')
 
-        build_tool = self.config.get('build', {}).get('tool', 'compose')
+        build_tool = self.config['build']['tool']
         available_tools = ['compose', 'docker']
 
         if build_tool == 'compose':
@@ -671,7 +680,7 @@ class BaseManager(AbstractManager):
                 image = info['image'] if info['image'] != '' else f"{info['project_name']}-{service}".lstrip('-')
 
                 # build paths for docker build command (paths in compose are relative to compose file, but paths for docker command are relative to $PWD)
-                context = normpath(path.join(dirname(self.compose_file), info['context']))
+                context = normpath(path.join(dirname(self.compose_path), info['context']))
                 dockerfile = normpath(path.join(context, info['dockerfile']))
 
                 # Build service using docker
@@ -680,47 +689,73 @@ class BaseManager(AbstractManager):
         else:
             CLI.error(f'Unknown build tool: {build_tool}. Available tools: {", ".join(available_tools)}')
 
-    def project_name(self):
+    def project_services(self):
         """
-        Returns project name by compose name
+        Returns project names by compose files
         """
-        with open(self.compose_file, 'r') as file:
-            compose_data = yaml.safe_load(file)
+        projects = defaultdict(list)
+
+        for compose_file in self.compose_files:
+            with open(compose_file, 'r') as file:
+                compose_data = yaml.safe_load(file)
+                name = compose_data.get('name', '')
+                services = compose_data.get('services', {}).keys()
+                projects[name].extend(services)
+
+        return projects
+
+    def get_project_by_service(self, service):
+        project_services = self.project_services()
+
+        for project, services in project_services.items():
+            if service in services:
+                return project
 
-        return compose_data.get('name', '')
+        return None
 
-    def services(self):
+    def services(self, compose_file=None):
         """
-        Prints all defined services
+        Returns all defined services
         """
-        with open(self.compose_file, 'r') as file:
-            compose_data = yaml.safe_load(file)
+        services = []
+
+        compose_files = [compose_file] if compose_file else self.compose_files
+
+        for compose_file in compose_files:
+            with open(compose_file, 'r') as file:
+                compose_data = yaml.safe_load(file)
+                compose_services = compose_data.get('services', {}).keys()
 
-        return compose_data.get('services', {}).keys()
+                services += compose_services
 
-    def services_to_build(self):
+        return services
+
+    def services_to_build(self, compose_file=None):
         """
         Prints all services which will be build
         """
-        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] = {
-                    'project_name': compose_data.get('name', ''),
-                    'dockerfile': build.get('dockerfile', 'Dockerfile'),
-                    'context': build.get('context', '.'),
-                    'cache_from': build.get('cache_from', []),
-                    'args': build.get('args', {}),
-                    'image': service_config.get('image', ''),
-                    'platform': service_config.get('platform', '')
-                }
+        compose_files = [compose_file] if compose_file else self.compose_files
+
+        for compose_file in compose_files:
+            with open(compose_file, 'r') as file:
+                compose_data = yaml.safe_load(file)
+
+            services = compose_data.get('services', {})
+            for service_name, service_config in services.items():
+                build = service_config.get('build', None)
+
+                if build:
+                    data[service_name] = {
+                        'project_name': compose_data.get('name', ''),
+                        'dockerfile': build.get('dockerfile', 'Dockerfile'),
+                        'context': build.get('context', '.'),
+                        'cache_from': build.get('cache_from', []),
+                        'args': build.get('args', {}),
+                        'image': service_config.get('image', ''),
+                        'platform': service_config.get('platform', '')
+                    }
 
         return data
 
@@ -757,7 +792,7 @@ class BaseManager(AbstractManager):
         elif self.mode == 'ssh':
             CLI.info('Uploading docker compose configs, environment files and mantis')
 
-            files_to_upload = [self.config_file, self.compose_file] + self.env.files
+            files_to_upload = [self.config_file] + self.compose_files + self.env.files
 
             # mantis config file
             for file in files_to_upload:
@@ -834,7 +869,7 @@ class BaseManager(AbstractManager):
         Runs zero-downtime deployment of services (or given service)
         """
         if not service:
-            zero_downtime_services = self.config.get('zero_downtime', [])
+            zero_downtime_services = self.config['zero_downtime']
             for index, service in enumerate(zero_downtime_services):
                 CLI.step(index + 1, len(zero_downtime_services), f'Zero downtime services: {zero_downtime_services}')
                 self.zero_downtime(service)
@@ -1127,10 +1162,15 @@ class BaseManager(AbstractManager):
         """
         Returns default number of deploy replicas of given services
         """
-        with open(self.compose_file, 'r') as file:
-            compose_data = yaml.safe_load(file)
+        replicas = 1
 
-        try:
-            return compose_data['services'][service]['deploy']['replicas']
-        except KeyError:
-            return 1
+        for compose_file in self.compose_files:
+            with open(compose_file, 'r') as file:
+                compose_data = yaml.safe_load(file)
+
+            try:
+                replicas = compose_data['services'][service]['deploy']['replicas']
+            except KeyError:
+                pass
+
+        return replicas

{mantis-cli-17.0.0 → mantis-cli-19.0.0}/mantis/mantis.tpl

@@ -12,25 +12,25 @@
   },
   "encryption": {
     "deterministic": true,
-    "folder": ""
+    "folder": "<MANTIS>"
   },
   "configs": {
-    "folder": "./"
+    "folder": "<MANTIS>/.."
   },
   "build": {
-    "tool": "docker"
+    "tool": "compose",
+    "args": {}
   },
   "compose": {
     "command": "docker-compose",
-    "name": "",
-    "folder": ""
+    "folder": "<MANTIS>/../compose"
   },
   "environment": {
-    "folder": "env",
+    "folder": "<MANTIS>/../environments",
     "file_prefix": ""
   },
   "zero_downtime": [],
-  "project_path": "",
+  "project_path": "~",
   "connections": {
   }
 }

{mantis-cli-17.0.0 → mantis-cli-19.0.0/mantis_cli.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: mantis-cli
-Version: 17.0.0
+Version: 19.0.0
 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,11 +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: PyYAML
-Requires-Dist: prettytable
 
 # mantis-cli
 
@@ -341,3 +337,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-17.0.0 → mantis-cli-19.0.0}/mantis_cli.egg-info/entry_points.txt

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

mantis-cli-17.0.0/mantis/__init__.py

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