Filter collectstatic output

idoru · cf-buildpacks-eng · commit 78da7851bf23 · 2017-09-29T14:59:04.000-04:00
[#150823743]

Signed-off-by: Victoria Henry &lt;vhenry@pivotal.io&gt;
diff --git a/src/python/finalize/finalize.go b/src/python/finalize/finalize.go
@@ -1,14 +1,17 @@
 package finalize
 
 import (
+	"bytes"
 	"fmt"
 	"io"
 	"io/ioutil"
 	"os"
 	"path/filepath"
+	"regexp"
 	"strings"
 
 	"github.com/cloudfoundry/libbuildpack"
+	"github.com/kr/text"
 )
 
 type Manifest interface {
@@ -76,8 +79,8 @@ func (f *Finalizer) HandleCollectstatic() error {
 	}
 
 	f.Log.Info("Running python %s collectstatic --noinput --traceback", managePyPath)
-	//TODO: should filter out empty lines or those starting with Post-processed --OR-- Copying
-	if err = f.Command.Execute(f.Stager.BuildDir(), os.Stdout, os.Stderr, "python", managePyPath, "collectstatic", "--noinput", "--traceback"); err != nil {
+	output := new(bytes.Buffer)
+	if err = f.Command.Execute(f.Stager.BuildDir(), output, text.NewIndentWriter(os.Stderr, []byte("       ")), "python", managePyPath, "collectstatic", "--noinput", "--traceback"); err != nil {
 		f.Log.Error(fmt.Sprintf(` !     Error while running '$ python %s collectstatic --noinput'.
        See traceback above for details.
 
@@ -90,9 +93,24 @@ func (f *Finalizer) HandleCollectstatic() error {
 		return err
 	}
 
+	writeFilteredCollectstaticOutput(output)
+
 	return nil
 }
 
+func writeFilteredCollectstaticOutput(output *bytes.Buffer) {
+	buffer := new(bytes.Buffer)
+	r := regexp.MustCompile("^(Copying |Post-processed ).*$")
+	lines := strings.Split(output.String(), "\n")
+	for _, line := range lines {
+		if len(line) > 0 && !r.MatchString(line) {
+			buffer.WriteString(line)
+			buffer.WriteString("\n")
+		}
+	}
+	os.Stdout.Write(buffer.Bytes())
+}
+
 func (f *Finalizer) ReplaceDepsDirWithLiteral() error {
 	dirs, err := filepath.Glob(filepath.Join(f.Stager.DepDir(), "python", "lib", "python*"))
 	if err != nil {
diff --git a/src/python/integration/deploy_a_python_app_test.go b/src/python/integration/deploy_a_python_app_test.go
@@ -95,6 +95,7 @@ var _ = Describe("CF Python Buildpack", func() {
 					Expect(app.Stdout.String()).To(ContainSubstring("Installing python 3.5"))
 					Expect(app.Stdout.String()).To(ContainSubstring("collectstatic --noinput"))
 					Expect(app.Stdout.String()).NotTo(ContainSubstring("Error while running"))
+					Expect(app.Stdout.String()).NotTo(ContainSubstring("Copying "))
 				})
 			})
 		})
