Output docker-compose up to stdout without buffering

Gustavo Narea · Gustavo Narea · commit ee010cd0bd4d · 2016-08-22T16:15:23.000+01:00
diff --git a/VERSION.txt b/VERSION.txt
@@ -1 +1 @@
-1.0a2
+1.0a3
diff --git a/docker_dev/docker_interface.py b/docker_dev/docker_interface.py
@@ -21,12 +21,18 @@ def run_docker_compose_subcommand(
     subcommand_name,
     subcommand_args,
     docker_compose_file_path,
-    project_name
+    project_name,
+    return_stdout=True,
 ):
     project_file_arg = '--file={}'.format(docker_compose_file_path)
     command_args = [project_file_arg, subcommand_name] + subcommand_args
     command_environ = {'COMPOSE_PROJECT_NAME': project_name}
-    output = run_command('docker-compose', command_args, command_environ)
+    output = run_command(
+        'docker-compose',
+        command_args,
+        command_environ,
+        return_stdout,
+    )
     return output
 
 
diff --git a/docker_dev/projects.py b/docker_dev/projects.py
@@ -49,6 +49,7 @@ def run_project(docker_compose_file_path, project_name):
         ['--force-recreate', '--abort-on-container-exit'],
         docker_compose_file_path,
         project_name,
+        return_stdout=False,
     )
 
 
diff --git a/docker_dev/subprocess.py b/docker_dev/subprocess.py
@@ -13,10 +13,11 @@
 # INFRINGEMENT, AND FITNESS FOR A PARTICULAR PURPOSE.
 #
 ##############################################################################
+from io import BytesIO
 from locale import getpreferredencoding
 from os import environ
-from subprocess import CalledProcessError
-from subprocess import check_output
+from subprocess import CalledProcessError, check_call
+from sys import stdout
 from tempfile import TemporaryFile
 
 from docker_dev.exceptions import SubprocessError, \
@@ -26,15 +27,23 @@
 _SYSTEM_ENCODING = getpreferredencoding()
 
 
-def run_command(command_name, command_args, additional_environ=None, **kwargs):
+def run_command(
+    command_name,
+    command_args,
+    additional_environ=None,
+    return_stdout=True,
+    **kwargs
+):
     command_parts = [command_name] + command_args
     additional_environ = additional_environ or {}
     command_environ = dict(additional_environ, PATH=environ['PATH'])
+    command_stdout = BytesIO() if return_stdout else stdout
     command_stderr = TemporaryFile()
     try:
-        command_stdout_bytes = check_output(
+        check_call(
             command_parts,
             env=command_environ,
+            stdout=command_stdout,
             stderr=command_stderr,
             **kwargs
         )
@@ -47,6 +56,8 @@ def run_command(command_name, command_args, additional_environ=None, **kwargs):
         )
     except FileNotFoundError:
         raise MissingCommandError(command_name)
-    else:
+
+    if return_stdout:
+        command_stdout_bytes = command_stdout.getvalue()
         command_stdout_str = command_stdout_bytes.decode(_SYSTEM_ENCODING)
         return command_stdout_str.rstrip()

Original file line number	Diff line number	Diff line change
`@@ -49,6 +49,7 @@ def run_project(docker_compose_file_path, project_name):`
`49`	`49`	`['--force-recreate', '--abort-on-container-exit'],`
`50`	`50`	`docker_compose_file_path,`
`51`	`51`	`project_name,`
	`52`	`+ return_stdout=False,`
`52`	`53`	`)`
`53`	`54`
`54`	`55`