mantis-cli 22.3.0__tar.gz → 22.4.0__tar.gz

{mantis_cli-22.3.0/mantis_cli.egg-info → mantis_cli-22.4.0}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.4
+Metadata-Version: 2.1
 Name: mantis_cli
-Version: 22.3.0
+Version: 22.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ý
@@ -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,27 +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: click
-Requires-Dist: cryptography
-Requires-Dist: pycryptodome
-Requires-Dist: pydantic
-Requires-Dist: PyYAML
-Requires-Dist: rich
-Requires-Dist: typer
-Dynamic: author
-Dynamic: author-email
-Dynamic: classifier
-Dynamic: description
-Dynamic: description-content-type
-Dynamic: home-page
-Dynamic: keywords
-Dynamic: license
-Dynamic: license-file
-Dynamic: maintainer
-Dynamic: maintainer-email
-Dynamic: requires-dist
-Dynamic: summary
 
 # mantis-cli
 
@@ -611,3 +591,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-22.4.0/mantis/__init__.py

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

{mantis_cli-22.3.0 → mantis_cli-22.4.0}/mantis/managers.py

@@ -521,6 +521,16 @@ class AbstractManager(object):
         except OSError as e:
             CLI.error(f"{error_message}: {e}")
 
+    @property
+    def quiet_flag(self) -> str:
+        """
+        Layer progress is meant to be repainted in place, which needs a terminal. Redirected
+        to a log file or a CI pipe, docker prints every progress event on its own line
+        instead -- hundreds per image -- so ask for no progress at all when there is nobody
+        to watch it move. Errors and the final result are not progress and still print.
+        """
+        return '' if sys.stdout.isatty() else '--quiet'
+
     def build_docker_command(self, command: str, use_connection: bool = True) -> str:
         docker_connection = self.docker_connection if use_connection else ''
 
@@ -1229,7 +1239,7 @@ class BaseManager(AbstractManager):
         CLI.info(f'Services = {params}')
 
         # Push using docker compose
-        self.docker_compose(f'push {params}', use_connection=False)
+        self.docker_compose(f'push {self.quiet_flag} {params}', use_connection=False)
 
     def pull(self, services: Optional[List[str]] = None) -> None:
         """
@@ -1240,7 +1250,7 @@ class BaseManager(AbstractManager):
         CLI.info(f'Services = {params}')
 
         # Pull using docker compose
-        self.docker_compose(f'pull {params}')
+        self.docker_compose(f'pull {self.quiet_flag} {params}')
 
     def upload(self) -> None:
         """

{mantis_cli-22.3.0 → mantis_cli-22.4.0/mantis_cli.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.4
-Name: mantis_cli
-Version: 22.3.0
+Metadata-Version: 2.1
+Name: mantis-cli
+Version: 22.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ý
@@ -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,27 +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: click
-Requires-Dist: cryptography
-Requires-Dist: pycryptodome
-Requires-Dist: pydantic
-Requires-Dist: PyYAML
-Requires-Dist: rich
-Requires-Dist: typer
-Dynamic: author
-Dynamic: author-email
-Dynamic: classifier
-Dynamic: description
-Dynamic: description-content-type
-Dynamic: home-page
-Dynamic: keywords
-Dynamic: license
-Dynamic: license-file
-Dynamic: maintainer
-Dynamic: maintainer-email
-Dynamic: requires-dist
-Dynamic: summary
 
 # mantis-cli
 
@@ -611,3 +591,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-22.3.0 → mantis_cli-22.4.0}/mantis_cli.egg-info/entry_points.txt

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

{mantis_cli-22.3.0 → mantis_cli-22.4.0}/tests/test_managers.py

@@ -512,3 +512,38 @@ class TestResolveContainers:
         manager.get_containers = lambda *args, **kwargs: pytest.fail('containers listed again')
 
         assert manager.resolve_container('app', ['itfitness-app']) == 'itfitness-app'
+
+
+class TestQuietProgress:
+    """Layer progress is repainted in place, which only works on a terminal."""
+
+    @staticmethod
+    def _manager():
+        manager = BaseManager.__new__(BaseManager)
+        manager.commands = []
+        manager.docker_compose = lambda command, **kwargs: manager.commands.append(
+            ' '.join(command.split())
+        )
+        return manager
+
+    @patch('sys.stdout', new_callable=MagicMock)
+    def test_push_and_pull_are_quiet_off_a_terminal(self, mock_stdout):
+        """A log file or a CI pipe would otherwise get every progress event as its own line."""
+        mock_stdout.isatty.return_value = False
+        manager = self._manager()
+
+        manager.push()
+        manager.pull()
+
+        assert manager.commands == ['push --quiet', 'pull --quiet']
+
+    @patch('sys.stdout', new_callable=MagicMock)
+    def test_push_and_pull_keep_progress_on_a_terminal(self, mock_stdout):
+        """Interactively the progress is the point, so nothing changes."""
+        mock_stdout.isatty.return_value = True
+        manager = self._manager()
+
+        manager.push(['app'])
+        manager.pull(['app'])
+
+        assert manager.commands == ['push app', 'pull app']

mantis_cli-22.3.0/mantis/__init__.py

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