builder/vmware: new artifact type that is common

builder/vmware/common/artifact.go

@@ -0,0 +1,61 @@
+package common
+
+import (
+	"fmt"
+	"os"
+	"path/filepath"
+
+	"github.com/mitchellh/packer/packer"
+)
+
+// BuilderId for the local artifacts
+const BuilderId = "mitchellh.vmware"
+
+// Artifact is the result of running the VMware builder, namely a set
+// of files associated with the resulting machine.
+type localArtifact struct {
+	dir string
+	f   []string
+}
+
+// NewLocalArtifact returns a VMware artifact containing the files
+// in the given directory.
+func NewLocalArtifact(dir string) (packer.Artifact, error) {
+	files := make([]string, 0, 5)
+	visit := func(path string, info os.FileInfo, err error) error {
+		if !info.IsDir() {
+			files = append(files, path)
+		}
+
+		return err
+	}
+
+	if err := filepath.Walk(dir, visit); err != nil {
+		return nil, err
+	}
+
+	return &localArtifact{
+		dir: dir,
+		f:   files,
+	}, nil
+}
+
+func (a *localArtifact) BuilderId() string {
+	return BuilderId
+}
+
+func (a *localArtifact) Files() []string {
+	return a.f
+}
+
+func (*localArtifact) Id() string {
+	return "VM"
+}
+
+func (a *localArtifact) String() string {
+	return fmt.Sprintf("VM files in directory: %s", a.dir)
+}
+
+func (a *localArtifact) Destroy() error {
+	return os.RemoveAll(a.dir)
+}

builder/vmware/common/artifact_test.go

@@ -0,0 +1,43 @@
+package common
+
+import (
+	"io/ioutil"
+	"os"
+	"path/filepath"
+	"testing"
+
+	"github.com/mitchellh/packer/packer"
+)
+
+func TestLocalArtifact_impl(t *testing.T) {
+	var _ packer.Artifact = new(localArtifact)
+}
+
+func TestNewLocalArtifact(t *testing.T) {
+	td, err := ioutil.TempDir("", "packer")
+	if err != nil {
+		t.Fatalf("err: %s", err)
+	}
+	defer os.RemoveAll(td)
+
+	err = ioutil.WriteFile(filepath.Join(td, "a"), []byte("foo"), 0644)
+	if err != nil {
+		t.Fatalf("err: %s", err)
+	}
+
+	if err := os.Mkdir(filepath.Join(td, "b"), 0755); err != nil {
+		t.Fatalf("err: %s", err)
+	}
+
+	a, err := NewLocalArtifact(td)
+	if err != nil {
+		t.Fatalf("err: %s", err)
+	}
+
+	if a.BuilderId() != BuilderId {
+		t.Fatalf("bad: %#v", a.BuilderId())
+	}
+	if len(a.Files()) != 1 {
+		t.Fatalf("should length 1: %d", len(a.Files()))
+	}
+}

builder/vmware/iso/artifact.go

@@ -2,14 +2,13 @@ package iso
 
 import (
 	"fmt"
-	"os"
 )
 
 // Artifact is the result of running the VMware builder, namely a set
 // of files associated with the resulting machine.
 type Artifact struct {
 	builderId string
-	dir       string
+	dir       OutputDir
 	f         []string
 }
 
@@ -30,5 +29,5 @@ func (a *Artifact) String() string {
 }
 
 func (a *Artifact) Destroy() error {
-	return os.RemoveAll(a.dir)
+	return a.dir.RemoveAll()
 }

builder/vmware/iso/builder.go

@@ -16,7 +16,6 @@ import (
 	"time"
 )
 
-const BuilderId = "mitchellh.vmware"
 const BuilderIdESX = "mitchellh.vmware-esx"
 
 type Builder struct {
@@ -454,14 +453,14 @@ func (b *Builder) Run(ui packer.Ui, hook packer.Hook, cache packer.Cache) (packe
 	}
 
 	// Set the proper builder ID
-	builderId := BuilderId
+	builderId := vmwcommon.BuilderId
 	if b.config.RemoteType != "" {
 		builderId = BuilderIdESX
 	}
 
 	return &Artifact{
 		builderId: builderId,
-		dir:       b.config.OutputDir,
+		dir:       dir,
 		f:         files,
 	}, nil
 }

builder/vmware/iso/output_dir.go

@@ -60,3 +60,7 @@ func (d *localOutputDir) RemoveAll() error {
 func (d *localOutputDir) SetOutputDir(path string) {
 	d.dir = path
 }
+
+func (d *localOutputDir) String() string {
+	return d.dir
+}