mantis-cli 7.0.0__tar.gz → 7.1.1__tar.gz

{mantis-cli-7.0.0/mantis_cli.egg-info → mantis-cli-7.1.1}/PKG-INFO

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

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

{mantis-cli-7.0.0 → mantis-cli-7.1.1}/mantis/logic.py

@@ -19,7 +19,8 @@ def parse_args():
     for arg in arguments:
         if not arg.startswith('-'):
             d['environment_id'] = arg
-        elif '=' in arg and ':' not in arg:
+        # elif '=' in arg and ':' not in arg:
+        elif '=' in arg:
             s, v = arg.split('=', maxsplit=1)
             d['settings'][s.strip('-')] = v
         else:

{mantis-cli-7.0.0 → mantis-cli-7.1.1}/mantis/manager.py

@@ -55,7 +55,7 @@ class Mantis(object):
         if hasattr(self, property_name):
             return getattr(self, property_name)
 
-        if 'dev' in self.environment_id:
+        if 'local' in self.environment_id:
             details = {
                 'host': 'localhost',
                 'user': None,
@@ -89,7 +89,7 @@ class Mantis(object):
 
     @property
     def docker_connection(self):
-        if 'dev' in self.environment_id:
+        if 'local' in self.environment_id:
             return ''
 
         if self.mode == 'remote':
@@ -165,7 +165,7 @@ class Mantis(object):
         self.htpasswd = f'{self.configs_path}/{self.WEBSERVER}/secrets/.htpasswd'
 
     def check_environment_encryption(self, env_file):
-        decrypted_environment = self.decrypt_env(env_file, return_value=True)        # .env.encrypted
+        decrypted_environment = self.decrypt_env(env_file=env_file, return_value=True)        # .env.encrypted
         loaded_environment = self.load_environment(env_file)                         # .env
 
         if decrypted_environment is None:
@@ -205,10 +205,10 @@ class Mantis(object):
                     else:
                         CLI.danger(decrypted_value, end=' ')
 
-                    print(f'[{self.environment_file_encrypted_name}]', end='\n')
+                    print(f'[{env_file}.encrypted]', end='\n')
 
         else:
-            CLI.success('Encrypted and decrypted environments DO match...')
+            CLI.success(f'Encrypted and decrypted environments DO match [{env_file}]...')
 
     def read_key(self):
         if not os.path.exists(self.key_file):
@@ -226,14 +226,14 @@ class Mantis(object):
         CLI.pink(key)
         CLI.danger(f'Save it to {self.key_file} and keep safe !!!')
 
-    def encrypt_env(self, env_file=None, params='', return_value=False):
+    def encrypt_env(self, params='', env_file=None, return_value=False):
         if env_file is None:
             CLI.info(f'Environment file not specified. Walking all environment files...')
 
             values = {}
 
             for env_file in self.environment_files:
-                value = self.encrypt_env(env_file, return_value=return_value)
+                value = self.encrypt_env(params=params, env_file=env_file, return_value=return_value)
                 if return_value:
                     values.update(value)
 
@@ -262,7 +262,7 @@ class Mantis(object):
             else:
                 encrypted_lines.append(line)
 
-            if not return_value:
+            if not return_value and 'force' not in params:
                 print(encrypted_lines[-1])
 
         if return_value:
@@ -283,14 +283,14 @@ class Mantis(object):
             else:
                 CLI.warning(f'Save it to {env_file_encrypted} manually.')
 
-    def decrypt_env(self, env_file=None, params='', return_value=False):
+    def decrypt_env(self, params='', env_file=None, return_value=False):
         if env_file is None:
             CLI.info(f'Environment file not specified. Walking all environment files...')
 
             values = {}
 
             for env_file in self.environment_files:
-                value = self.decrypt_env(env_file, return_value=return_value)
+                value = self.decrypt_env(params=params, env_file=env_file, return_value=return_value)
                 if return_value:
                     values.update(value)
 
@@ -321,7 +321,7 @@ class Mantis(object):
             else:
                 decrypted_lines.append(line)
 
-            if not return_value:
+            if not return_value and 'force' not in params:
                 print(decrypted_lines[-1])
 
         if return_value:
@@ -582,8 +582,8 @@ class Mantis(object):
         else:
             CLI.error(f'Unknown context "{context}". Available: services, compose, mantis or all')
 
-        if self.environment_id == 'dev':
-            print('Skipping for dev...')
+        if self.environment_id == 'local':
+            print('Skipping for local...')
         elif self.mode == 'host':
             CLI.warning('Not uploading due to host mode! Be sure your configs on host are up to date!')
         else:

{mantis-cli-7.0.0 → mantis-cli-7.1.1/mantis_cli.egg-info}/PKG-INFO

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

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