diff --git a/imgbom/presenter/text/presenter_test.go b/imgbom/presenter/text/imgs/presenter_test.go similarity index 100% rename from imgbom/presenter/text/presenter_test.go rename to imgbom/presenter/text/imgs/presenter_test.go diff --git a/imgbom/presenter/text/test-fixtures/image-simple/Dockerfile b/imgbom/presenter/text/imgs/test-fixtures/image-simple/Dockerfile similarity index 100% rename from imgbom/presenter/text/test-fixtures/image-simple/Dockerfile rename to imgbom/presenter/text/imgs/test-fixtures/image-simple/Dockerfile diff --git a/imgbom/presenter/text/test-fixtures/image-simple/file-1.txt b/imgbom/presenter/text/imgs/test-fixtures/image-simple/file-1.txt similarity index 100% rename from imgbom/presenter/text/test-fixtures/image-simple/file-1.txt rename to imgbom/presenter/text/imgs/test-fixtures/image-simple/file-1.txt diff --git a/imgbom/presenter/text/test-fixtures/image-simple/file-2.txt b/imgbom/presenter/text/imgs/test-fixtures/image-simple/file-2.txt similarity index 100% rename from imgbom/presenter/text/test-fixtures/image-simple/file-2.txt rename to imgbom/presenter/text/imgs/test-fixtures/image-simple/file-2.txt diff --git a/imgbom/presenter/text/test-fixtures/snapshot/TestTextPresenter.golden b/imgbom/presenter/text/imgs/test-fixtures/snapshot/TestTextPresenter.golden similarity index 100% rename from imgbom/presenter/text/test-fixtures/snapshot/TestTextPresenter.golden rename to imgbom/presenter/text/imgs/test-fixtures/snapshot/TestTextPresenter.golden diff --git a/imgbom/presenter/text/presenter.go b/imgbom/presenter/text/presenter.go deleted file mode 100644 index ef7531105..000000000 --- a/imgbom/presenter/text/presenter.go +++ /dev/null @@ -1,62 +0,0 @@ -package text - -import ( - "fmt" - "io" - "text/tabwriter" - - "github.com/anchore/imgbom/imgbom/pkg" - stereoscopeImg "github.com/anchore/stereoscope/pkg/image" -) - -// Presenter holds the Present method to produce output -type Presenter struct { - img *stereoscopeImg.Image - catalog *pkg.Catalog -} - -// NewPresenter is a constructor for a Presenter -func NewPresenter(img *stereoscopeImg.Image, catalog *pkg.Catalog) *Presenter { - return &Presenter{ - img: img, - catalog: catalog, - } -} - -// Present is a method that is in charge of writing to an output buffer -func (pres *Presenter) Present(output io.Writer) error { - tags := make([]string, len(pres.img.Metadata.Tags)) - for idx, tag := range pres.img.Metadata.Tags { - tags[idx] = tag.String() - } - - // init the tabular writer - w := new(tabwriter.Writer) - w.Init(output, 0, 8, 0, '\t', tabwriter.AlignRight) - - fmt.Fprintln(w, "[Image]") - - for idx, l := range pres.img.Layers { - fmt.Fprintln(w, " Layer:\t", idx) - fmt.Fprintln(w, " Digest:\t", l.Metadata.Digest) - fmt.Fprintln(w, " Size:\t", l.Metadata.Size) - fmt.Fprintln(w, " MediaType:\t", l.Metadata.MediaType) - fmt.Fprintln(w) - w.Flush() - } - - // populate artifacts... - for p := range pres.catalog.Enumerate() { - fmt.Fprintln(w, fmt.Sprintf("[%s]", p.Name)) - fmt.Fprintln(w, " Version:\t", p.Version) - fmt.Fprintln(w, " Type:\t", p.Type.String()) - if p.Metadata != nil { - fmt.Fprintf(w, " Metadata:\t%+v\n", p.Metadata) - } - fmt.Fprintln(w, " Found by:\t", p.FoundBy) - fmt.Fprintln(w) - w.Flush() - } - - return nil -}