port text presenter to a format object (#604)

Signed-off-by: Alex Goodman <alex.goodman@anchore.com>

internal/presenter/packages/test-fixtures/snapshot/TestTextDirectoryPresenter.golden

@@ -1,11 +0,0 @@
-[Path: /some/path]
-[package-1]
- Version:	 1.0.1
- Type:		 python
- Found by:	 the-cataloger-1
-
-[package-2]
- Version:	 2.0.1
- Type:		 deb
- Found by:	 the-cataloger-2
-

internal/presenter/packages/test-fixtures/snapshot/TestTextImagePresenter.golden

@@ -1,21 +0,0 @@
-[Image]
- Layer:		 0
- Digest:	 sha256:fb6beecb75b39f4bb813dbf177e501edd5ddb3e69bb45cedeb78c676ee1b7a59
- Size:		 22
- MediaType:	 application/vnd.docker.image.rootfs.diff.tar.gzip
-
- Layer:		 1
- Digest:	 sha256:319b588ce64253a87b533c8ed01cf0025e0eac98e7b516e12532957e1244fdec
- Size:		 16
- MediaType:	 application/vnd.docker.image.rootfs.diff.tar.gzip
-
-[package-1]
- Version:	 1.0.1
- Type:		 python
- Found by:	 the-cataloger-1
-
-[package-2]
- Version:	 2.0.1
- Type:		 deb
- Found by:	 the-cataloger-2
-

internal/presenter/packages/text_presenter.go

@@ -1,69 +0,0 @@
-package packages
-
-import (
-	"fmt"
-
-	"io"
-	"text/tabwriter"
-
-	"github.com/anchore/syft/syft/pkg"
-	"github.com/anchore/syft/syft/source"
-)
-
-// TextPresenter is a human-friendly text presenter to represent package and source data.
-type TextPresenter struct {
-	catalog     *pkg.Catalog
-	srcMetadata source.Metadata
-}
-
-// NewTextPresenter creates a new presenter for the given set of catalog and image data.
-func NewTextPresenter(catalog *pkg.Catalog, srcMetadata source.Metadata) *TextPresenter {
-	return &TextPresenter{
-		catalog:     catalog,
-		srcMetadata: srcMetadata,
-	}
-}
-
-// Present is a method that is in charge of writing to an output buffer
-func (pres *TextPresenter) Present(output io.Writer) error {
-	// init the tabular writer
-	w := new(tabwriter.Writer)
-	w.Init(output, 0, 8, 0, '\t', tabwriter.AlignRight)
-
-	switch pres.srcMetadata.Scheme {
-	case source.DirectoryScheme:
-		fmt.Fprintf(w, "[Path: %s]\n", pres.srcMetadata.Path)
-	case source.ImageScheme:
-		fmt.Fprintln(w, "[Image]")
-
-		for idx, l := range pres.srcMetadata.ImageMetadata.Layers {
-			fmt.Fprintln(w, " Layer:\t", idx)
-			fmt.Fprintln(w, " Digest:\t", l.Digest)
-			fmt.Fprintln(w, " Size:\t", l.Size)
-			fmt.Fprintln(w, " MediaType:\t", l.MediaType)
-			fmt.Fprintln(w)
-			w.Flush()
-		}
-	default:
-		return fmt.Errorf("unsupported source: %T", pres.srcMetadata.Scheme)
-	}
-
-	// populate artifacts...
-	rows := 0
-	for _, p := range pres.catalog.Sorted() {
-		fmt.Fprintf(w, "[%s]\n", p.Name)
-		fmt.Fprintln(w, " Version:\t", p.Version)
-		fmt.Fprintln(w, " Type:\t", string(p.Type))
-		fmt.Fprintln(w, " Found by:\t", p.FoundBy)
-		fmt.Fprintln(w)
-		w.Flush()
-		rows++
-	}
-
-	if rows == 0 {
-		fmt.Fprintln(output, "No packages discovered")
-		return nil
-	}
-
-	return nil
-}

internal/presenter/packages/text_presenter_test.go

@@ -1,28 +0,0 @@
-package packages
-
-import (
-	"flag"
-	"testing"
-
-	"github.com/anchore/syft/internal/formats/common/testutils"
-)
-
-var updateTextPresenterGoldenFiles = flag.Bool("update-text", false, "update the *.golden files for text presenters")
-
-func TestTextDirectoryPresenter(t *testing.T) {
-	catalog, metadata, _ := testutils.DirectoryInput(t)
-	testutils.AssertPresenterAgainstGoldenSnapshot(t,
-		NewTextPresenter(catalog, metadata),
-		*updateTextPresenterGoldenFiles,
-	)
-}
-
-func TestTextImagePresenter(t *testing.T) {
-	testImage := "image-simple"
-	catalog, metadata, _ := testutils.ImageInput(t, testImage, testutils.FromSnapshot())
-	testutils.AssertPresenterAgainstGoldenImageSnapshot(t,
-		NewTextPresenter(catalog, metadata),
-		testImage,
-		*updateTextPresenterGoldenFiles,
-	)
-}