mantis-cli 9.0.1__tar.gz → 9.0.3__tar.gz

{mantis-cli-9.0.1/mantis_cli.egg-info → mantis-cli-9.0.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 1.2
 Name: mantis-cli
-Version: 9.0.1
+Version: 9.0.3
 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-9.0.3/mantis/__init__.py

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

{mantis-cli-9.0.1 → mantis-cli-9.0.3}/mantis/logic.py

@@ -88,6 +88,12 @@ def main():
     # check params
     params = parse_args()
 
+    # version info
+    version_info = f'Mantis (v{VERSION})'
+
+    if params['commands'] == ['--version']:
+        exit(version_info)
+
     if len(params['commands']) == 0:
         CLI.error('Missing commands')
 
@@ -129,7 +135,7 @@ def main():
     else:
         host_intro = ''
 
-    heading = f'Mantis (v{VERSION}) '\
+    heading = f'{version_info} '\
               f'{environment_intro}'\
               f'{host_intro}'\
               f'mode: {Colors.GREEN}{manager.mode}{Colors.ENDC}, '\

{mantis-cli-9.0.1 → mantis-cli-9.0.3}/mantis/managers.py

@@ -163,7 +163,8 @@ class DefaultManager(object):
         loaded_environment = self.load_environment(env_file)                         # .env
 
         if decrypted_environment is None:
-            CLI.error(f'Decrypted environment {env_file} is empty!')
+            env_file_encrypted = f'{env_file}.encrypted'
+            CLI.error(f'Encrypted environment {env_file_encrypted} is empty!')
 
         if loaded_environment is None:
             CLI.error(f'Loaded environment {env_file} is empty!')
@@ -301,9 +302,12 @@ class DefaultManager(object):
 
         encrypted_lines = self.read_environment(env_file_encrypted)
 
-        if not encrypted_lines:
+        if encrypted_lines is None:
             return None
 
+        if not encrypted_lines:
+            return {}
+
         decrypted_lines = []
         decrypted_env = {}
 
@@ -532,7 +536,6 @@ class DefaultManager(object):
         image = service_build.get('image', self.get_image_name(service))
         dockerfile = f"{self.config['build'].get('context', '.')}{service_build['dockerfile']}"
         CLI.info(f'Building image {image} from {dockerfile}...')
-        steps = 1
 
         if not os.path.exists(dockerfile):
             CLI.error(f'Dockerfile {dockerfile} not found')
@@ -541,7 +544,7 @@ class DefaultManager(object):
         DOCKER_TAG = self.config['build']['tag']
         DOCKER_REPOSITORY_AND_TAG = f'{DOCKER_REPOSITORY}:{DOCKER_TAG}'
 
-        CLI.step(1, steps, f'Building Docker image [{DOCKER_REPOSITORY_AND_TAG}]...')
+        CLI.warning(f'Building Docker image [{DOCKER_REPOSITORY_AND_TAG}]...')
 
         build_args = self.config['build']['args']
         build_args = ','.join(map('='.join, build_args.items()))
@@ -593,8 +596,6 @@ class DefaultManager(object):
         if not self.connection:
             return CLI.warning('Connection not defined. Skipping uploading files')
 
-        steps = 1
-
         mapping = {
             'services': {
                 self.database_config: f'{self.project_path}/{self.configs_path}/{self.DATABASE}/',
@@ -614,11 +615,11 @@ class DefaultManager(object):
             self.upload('compose')
             self.upload('mantis')
         elif context == 'services':
-            CLI.step(1, steps, 'Uploading configs for context "services" [webserver, database, cache, htpasswd]')
+            CLI.warning('Uploading configs for context "services" [webserver, database, cache, htpasswd]')
         elif context == 'compose':
-            CLI.step(1, steps, 'Uploading configs for context "compose" [docker compose configs and environment]')
+            CLI.warning('Uploading configs for context "compose" [docker compose configs and environment]')
         elif context == 'mantis':
-            CLI.step(1, steps, 'Uploading configs for mantis [mantis.json]')
+            CLI.warning('Uploading configs for mantis [mantis.json]')
         else:
             CLI.error(f'Unknown context "{context}". Available: services, compose, mantis or all')
 
@@ -657,30 +658,28 @@ class DefaultManager(object):
 
     def restart(self):
         CLI.info('Restarting...')
-        steps = 3
+        steps = 4
 
-        CLI.step(1, steps, 'Stopping and removing Docker containers...')
+        # run down project containers
+        CLI.step(1, steps, 'Running down project containers...')
+        self.down()
 
-        # stop and remove all containers with project prefix
-        # containers = self.get_containers_starting_with(self.CONTAINER_PREFIX)
+        # stop and remove all other containers
+        CLI.step(2, steps, 'Stopping and removing remaining containers...')
 
-        # stop and remove all containers
         containers = self.get_containers()
 
         for container in containers:
             self.docker(f'container stop {container}', return_output=True)
             self.docker(f'container rm {container}')
 
-        # for service in self.config['containers']['deploy']['zero_downtime'] + self.config['containers']['deploy']['restart']:
-        #     container = self.get_container_name(service)
-        #     self.docker(f'container stop {container}', return_output=True)
-        #     self.docker(f'container rm {container}')
+        # recreate project
+        CLI.step(3, steps, 'Recreating project containers...')
+        self.up()
 
-        CLI.step(2, steps, 'Recreating Docker containers...')
-        self.docker_compose(f'--project-name={self.PROJECT_NAME} up -d')
-
-        CLI.step(3, steps, 'Prune Docker images and volumes')
-        self.docker(f'system prune --volumes --force')
+        # clean
+        CLI.step(4, steps, 'Prune Docker images and volumes')
+        self.clean()
 
     def deploy(self):
         CLI.info('Deploying...')
@@ -710,8 +709,6 @@ class DefaultManager(object):
             num_retries = 30
             # num_retries = 20
 
-            print(self.get_containers())
-
             self.healthcheck(retries=num_retries, service=f'{service}-new', break_if_successful=True)
 
             # rename old container
@@ -789,24 +786,15 @@ class DefaultManager(object):
             self.docker(f'container start {container}')
 
     def run(self, params):
-        CLI.info('Run...')
-        steps = 1
-
-        CLI.step(1, steps, f'Running {params}...')
+        CLI.info(f'Running {params}...')
         self.docker_compose(f'--project-name={self.PROJECT_NAME} run {params}')
 
     def up(self, params=''):
-        CLI.info('Up...')
-        steps = 1
-
-        CLI.step(1, steps, f'Starting up {params}...')
+        CLI.info(f'Starting up {params}...')
         self.docker_compose(f'--project-name={self.PROJECT_NAME} up {params} -d')
 
     def down(self, params=''):
-        CLI.info('Down...')
-        steps = 1
-
-        CLI.step(1, steps, f'Running down {params}...')
+        CLI.info(f'Running down {params}...')
         self.docker_compose(f'--project-name={self.PROJECT_NAME} down {params}')
 
     def remove(self, params=''):
@@ -822,9 +810,6 @@ class DefaultManager(object):
 
     def clean(self):  # todo clean on all nodes
         CLI.info('Cleaning...')
-        steps = 1
-
-        CLI.step(1, steps, 'Prune Docker images and volumes')
         # self.docker(f'builder prune')
         self.docker(f'system prune --volumes --force')
         # self.docker(f'container prune')
@@ -834,14 +819,6 @@ class DefaultManager(object):
         CLI.info('Reloading webserver...')
         self.docker(f'exec -it {self.CONTAINER_WEBSERVER} {self.WEBSERVER} -s reload')
 
-    # TODO: Extension
-    # def restart_proxy(self):
-    #     CLI.info('Restarting proxy...')
-    #     steps = 1
-    #
-    #     CLI.step(1, steps, 'Reloading proxy container...')
-    #     self.cmd(f'{self.docker_connection} docker compose -f configs/{self.configs_compose_folder}/docker-compose.proxy.yml --project-name=reverse up -d')
-
     def status(self):
         CLI.info('Getting status...')
         steps = 2
@@ -854,9 +831,7 @@ class DefaultManager(object):
 
     def networks(self):
         CLI.info('Getting networks...')
-        steps = 1
-
-        CLI.step(1, steps, 'List of Docker networks')
+        CLI.warning('List of Docker networks')
 
         networks = self.docker('network ls', return_output=True)
         networks = networks.strip().split('\n')
@@ -901,7 +876,7 @@ class DefaultManager(object):
         containers = self.docker(f'container ls -a --format \'{{{{.Names}}}}\'', return_output=True)
         print(containers)
         containers = containers.strip().split('\n')
-        containers = list(filter(lambda x: x.startswith(self.CONTAINER_PREFIX), containers))
+        # containers = list(filter(lambda x: x.startswith(self.CONTAINER_PREFIX), containers))
         return containers
 
     def get_containers_starting_with(self, start_with):

{mantis-cli-9.0.1 → mantis-cli-9.0.3/mantis_cli.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 1.2
 Name: mantis-cli
-Version: 9.0.1
+Version: 9.0.3
 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-9.0.1/mantis/__init__.py

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