v0.1.3

[GH-91]

.gitignore

@@ -1,5 +1,6 @@
 /bin
 /local
 /pkg
+/src
 /website/.sass-cache
 /website/build

CHANGELOG.md

@@ -1,3 +1,25 @@
+## 0.1.3 (July 1, 2013)
+
+FEATURES:
+
+* The VMware builder can now upload the VMware tools for you into
+  the VM. This is opt-in, you must specify the `tools_upload_flavor`
+  option. See the website for more documentation.
+
+IMPROVEMENTS:
+
+* digitalocean: Errors contain human-friendly error messages. [GH-85]
+
+BUG FIXES:
+
+* core: More plugin server fixes that avoid hangs on OS X 10.7 [GH-87]
+* vagrant: AWS boxes will keep the AMI artifact around [GH-55]
+* virtualbox: More robust version parsing for uploading guest additions. [GH-69]
+* virtualbox: Output dir and VM name defaults depend on build name,
+  avoiding collisions. [GH-91]
+* vmware: Output dir and VM name defaults depend on build name,
+  avoiding collisions. [GH-91]
+
 ## 0.1.2 (June 29, 2013)
 
 IMPROVEMENTS:

Makefile

@@ -1,7 +1,7 @@
-NO_COLOR=\x1b[0m
-OK_COLOR=\x1b[32;01m
-ERROR_COLOR=\x1b[31;01m
-WARN_COLOR=\x1b[33;01m
+NO_COLOR=\033[0m
+OK_COLOR=\033[32;01m
+ERROR_COLOR=\033[31;01m
+WARN_COLOR=\033[33;01m
 
 all:
 	@mkdir -p bin/

README.md

@@ -11,7 +11,7 @@ Packer is lightweight, runs on every major operating system, and is highly
 performant, creating machine images for multiple platforms in parallel.
 Packer comes out of the box with support for creating AMIs (EC2), VMware
 images, and VirtualBox images. Support for more platforms can be added via
-plugins. 
+plugins.
 
 The images that Packer creates can easily be turned into
 [Vagrant](http://www.vagrantup.com) boxes.
@@ -70,8 +70,15 @@ http://www.packer.io/docs
 ## Developing Packer
 
 If you wish to work on Packer itself, you'll first need [Go](http://golang.org)
-installed (version 1.1+ is _required_). Next, clone this repository then just type `make`.
-In a few moments, you'll have a working `packer` executable:
+installed (version 1.1+ is _required_). Make sure you have Go properly installed,
+including setting up your [GOPATH](http://golang.org/doc/code.html#GOPATH).
+
+For some additional dependencies, Go needs [Mercurial](http://mercurial.selenic.com/)
+to be installed. Packer itself doesn't require this but a dependency of a
+dependency does.
+
+Next, clone this repository then just type `make`. In a few moments,
+you'll have a working `packer` executable:
 
 ```
 $ make
@@ -80,6 +87,6 @@ $ bin/packer
 ...
 ```
 
-You can run tests by typing `make test`. 
+You can run tests by typing `make test`.
 
 This will run tests for Packer core along with all the core builders and commands and such that come with Packer.

builder/digitalocean/api.go

@@ -189,28 +189,25 @@ func NewRequest(d DigitalOceanClient, path string, params string) (map[string]in
 		return decodedResponse, err
 	}
 
+	log.Printf("response from digitalocean: %s", body)
+
 	err = json.Unmarshal(body, &decodedResponse)
 
-	log.Printf("response from digitalocean: %v", decodedResponse)
-
-	// Catch all non-200 status and return an error
-	if resp.StatusCode != 200 {
-		err = errors.New(fmt.Sprintf("Received non-200 HTTP status from DigitalOcean: %v", resp.StatusCode))
-		return decodedResponse, err
-	}
-
+	// Check for bad JSON
 	if err != nil {
+		err = errors.New(fmt.Sprintf("Failed to decode JSON response (HTTP %v) from DigitalOcean: %s",
+			resp.StatusCode, body))
 		return decodedResponse, err
 	}
 
-	// Catch all non-OK statuses from DO and return an error
+	// Check for errors sent by digitalocean
 	status := decodedResponse["status"]
 	if status != "OK" {
 		// Get the actual error message if there is one
 		if status == "ERROR" {
 			status = decodedResponse["error_message"]
 		}
-		err = errors.New(fmt.Sprintf("Received bad status from DigitalOcean: %v", status))
+		err = errors.New(fmt.Sprintf("Received bad response (HTTP %v) from DigitalOcean: %s", resp.StatusCode, status))
 		return decodedResponse, err
 	}
 

builder/virtualbox/builder.go

@@ -48,7 +48,8 @@ type config struct {
 	VBoxManage         [][]string    `mapstructure:"vboxmanage"`
 	VMName             string        `mapstructure:"vm_name"`
 
-	PackerDebug bool `mapstructure:"packer_debug"`
+	PackerBuildName string `mapstructure:"packer_build_name"`
+	PackerDebug     bool   `mapstructure:"packer_debug"`
 
 	RawBootWait        string `mapstructure:"boot_wait"`
 	RawShutdownTimeout string `mapstructure:"shutdown_timeout"`
@@ -86,7 +87,7 @@ func (b *Builder) Prepare(raws ...interface{}) error {
 	}
 
 	if b.config.OutputDir == "" {
-		b.config.OutputDir = "virtualbox"
+		b.config.OutputDir = fmt.Sprintf("output-%s", b.config.PackerBuildName)
 	}
 
 	if b.config.RawBootWait == "" {
@@ -114,7 +115,7 @@ func (b *Builder) Prepare(raws ...interface{}) error {
 	}
 
 	if b.config.VMName == "" {
-		b.config.VMName = "packer"
+		b.config.VMName = fmt.Sprintf("packer-%s", b.config.PackerBuildName)
 	}
 
 	errs := make([]error, 0)

builder/virtualbox/builder_test.go

@@ -13,6 +13,8 @@ func testConfig() map[string]interface{} {
 		"iso_md5":      "foo",
 		"iso_url":      "http://www.google.com/",
 		"ssh_username": "foo",
+
+		packer.BuildNameConfigKey: "foo",
 	}
 }
 
@@ -36,7 +38,7 @@ func TestBuilderPrepare_Defaults(t *testing.T) {
 		t.Errorf("bad guest OS type: %s", b.config.GuestOSType)
 	}
 
-	if b.config.OutputDir != "virtualbox" {
+	if b.config.OutputDir != "output-foo" {
 		t.Errorf("bad output dir: %s", b.config.OutputDir)
 	}
 
@@ -52,7 +54,7 @@ func TestBuilderPrepare_Defaults(t *testing.T) {
 		t.Errorf("bad ssh port: %d", b.config.SSHPort)
 	}
 
-	if b.config.VMName != "packer" {
+	if b.config.VMName != "packer-foo" {
 		t.Errorf("bad vm name: %s", b.config.VMName)
 	}
 }

builder/virtualbox/driver.go

@@ -124,11 +124,12 @@ func (d *VBox42Driver) Version() (string, error) {
 		return "", err
 	}
 
-	log.Printf("VBoxManage --version output: %s", stdout.String())
+	versionOutput := strings.TrimSpace(stdout.String())
+	log.Printf("VBoxManage --version output: %s", versionOutput)
 	versionRe := regexp.MustCompile("[^.0-9]")
-	matches := versionRe.Split(stdout.String(), 2)
+	matches := versionRe.Split(versionOutput, 2)
 	if len(matches) == 0 {
-		return "", fmt.Errorf("No version found: %s", stdout.String())
+		return "", fmt.Errorf("No version found: %s", versionOutput)
 	}
 
 	log.Printf("VirtualBox version: %s", matches[0])

builder/vmware/builder.go

@@ -13,6 +13,7 @@ import (
 	"os"
 	"path/filepath"
 	"strings"
+	"text/template"
 	"time"
 )
 
@@ -25,29 +26,32 @@ type Builder struct {
 }
 
 type config struct {
-	DiskName        string            `mapstructure:"vmdk_name"`
-	DiskSize        uint              `mapstructure:"disk_size"`
-	GuestOSType     string            `mapstructure:"guest_os_type"`
-	ISOMD5          string            `mapstructure:"iso_md5"`
-	ISOUrl          string            `mapstructure:"iso_url"`
-	VMName          string            `mapstructure:"vm_name"`
-	OutputDir       string            `mapstructure:"output_directory"`
-	HTTPDir         string            `mapstructure:"http_directory"`
-	HTTPPortMin     uint              `mapstructure:"http_port_min"`
-	HTTPPortMax     uint              `mapstructure:"http_port_max"`
-	BootCommand     []string          `mapstructure:"boot_command"`
-	BootWait        time.Duration     ``
-	ShutdownCommand string            `mapstructure:"shutdown_command"`
-	ShutdownTimeout time.Duration     ``
-	SSHUser         string            `mapstructure:"ssh_username"`
-	SSHPassword     string            `mapstructure:"ssh_password"`
-	SSHPort         uint              `mapstructure:"ssh_port"`
-	SSHWaitTimeout  time.Duration     ``
-	VMXData         map[string]string `mapstructure:"vmx_data"`
-	VNCPortMin      uint              `mapstructure:"vnc_port_min"`
-	VNCPortMax      uint              `mapstructure:"vnc_port_max"`
+	DiskName          string            `mapstructure:"vmdk_name"`
+	DiskSize          uint              `mapstructure:"disk_size"`
+	GuestOSType       string            `mapstructure:"guest_os_type"`
+	ISOMD5            string            `mapstructure:"iso_md5"`
+	ISOUrl            string            `mapstructure:"iso_url"`
+	VMName            string            `mapstructure:"vm_name"`
+	OutputDir         string            `mapstructure:"output_directory"`
+	HTTPDir           string            `mapstructure:"http_directory"`
+	HTTPPortMin       uint              `mapstructure:"http_port_min"`
+	HTTPPortMax       uint              `mapstructure:"http_port_max"`
+	BootCommand       []string          `mapstructure:"boot_command"`
+	BootWait          time.Duration     ``
+	ShutdownCommand   string            `mapstructure:"shutdown_command"`
+	ShutdownTimeout   time.Duration     ``
+	SSHUser           string            `mapstructure:"ssh_username"`
+	SSHPassword       string            `mapstructure:"ssh_password"`
+	SSHPort           uint              `mapstructure:"ssh_port"`
+	SSHWaitTimeout    time.Duration     ``
+	ToolsUploadFlavor string            `mapstructure:"tools_upload_flavor"`
+	ToolsUploadPath   string            `mapstructure:"tools_upload_path"`
+	VMXData           map[string]string `mapstructure:"vmx_data"`
+	VNCPortMin        uint              `mapstructure:"vnc_port_min"`
+	VNCPortMax        uint              `mapstructure:"vnc_port_max"`
 
-	PackerDebug bool `mapstructure:"packer_debug"`
+	PackerBuildName string `mapstructure:"packer_build_name"`
+	PackerDebug     bool   `mapstructure:"packer_debug"`
 
 	RawBootWait        string `mapstructure:"boot_wait"`
 	RawShutdownTimeout string `mapstructure:"shutdown_timeout"`
@@ -75,7 +79,7 @@ func (b *Builder) Prepare(raws ...interface{}) error {
 	}
 
 	if b.config.VMName == "" {
-		b.config.VMName = "packer"
+		b.config.VMName = fmt.Sprintf("packer-%s", b.config.PackerBuildName)
 	}
 
 	if b.config.HTTPPortMin == 0 {
@@ -99,13 +103,17 @@ func (b *Builder) Prepare(raws ...interface{}) error {
 	}
 
 	if b.config.OutputDir == "" {
-		b.config.OutputDir = "vmware"
+		b.config.OutputDir = fmt.Sprintf("output-%s", b.config.PackerBuildName)
 	}
 
 	if b.config.SSHPort == 0 {
 		b.config.SSHPort = 22
 	}
 
+	if b.config.ToolsUploadPath == "" {
+		b.config.ToolsUploadPath = "{{ .Flavor }}.iso"
+	}
+
 	// Accumulate any errors
 	var err error
 	errs := make([]error, 0)
@@ -192,6 +200,10 @@ func (b *Builder) Prepare(raws ...interface{}) error {
 		errs = append(errs, fmt.Errorf("Failed parsing ssh_wait_timeout: %s", err))
 	}
 
+	if _, err := template.New("path").Parse(b.config.ToolsUploadPath); err != nil {
+		errs = append(errs, fmt.Errorf("tools_upload_path invalid: %s", err))
+	}
+
 	if b.config.VNCPortMin > b.config.VNCPortMax {
 		errs = append(errs, fmt.Errorf("vnc_port_min must be less than vnc_port_max"))
 	}
@@ -213,6 +225,7 @@ func (b *Builder) Run(ui packer.Ui, hook packer.Hook, cache packer.Cache) (packe
 	rand.Seed(time.Now().UTC().UnixNano())
 
 	steps := []multistep.Step{
+		&stepPrepareTools{},
 		&stepDownloadISO{},
 		&stepPrepareOutputDir{},
 		&stepCreateDisk{},
@@ -222,6 +235,7 @@ func (b *Builder) Run(ui packer.Ui, hook packer.Hook, cache packer.Cache) (packe
 		&stepRun{},
 		&stepTypeBootCommand{},
 		&stepWaitForSSH{},
+		&stepUploadTools{},
 		&stepProvision{},
 		&stepShutdown{},
 		&stepCleanFiles{},

builder/vmware/builder_test.go

@@ -13,6 +13,8 @@ func testConfig() map[string]interface{} {
 		"iso_md5":      "foo",
 		"iso_url":      "http://www.packer.io",
 		"ssh_username": "foo",
+
+		packer.BuildNameConfigKey: "foo",
 	}
 }
 
@@ -66,7 +68,7 @@ func TestBuilderPrepare_Defaults(t *testing.T) {
 		t.Errorf("bad disk name: %s", b.config.DiskName)
 	}
 
-	if b.config.OutputDir != "vmware" {
+	if b.config.OutputDir != "output-foo" {
 		t.Errorf("bad output dir: %s", b.config.OutputDir)
 	}
 
@@ -74,7 +76,7 @@ func TestBuilderPrepare_Defaults(t *testing.T) {
 		t.Errorf("bad wait timeout: %s", b.config.SSHWaitTimeout)
 	}
 
-	if b.config.VMName != "packer" {
+	if b.config.VMName != "packer-foo" {
 		t.Errorf("bad vm name: %s", b.config.VMName)
 	}
 }
@@ -309,6 +311,36 @@ func TestBuilderPrepare_SSHWaitTimeout(t *testing.T) {
 	}
 }
 
+func TestBuilderPrepare_ToolsUploadPath(t *testing.T) {
+	var b Builder
+	config := testConfig()
+
+	// Test a default
+	delete(config, "tools_upload_path")
+	err := b.Prepare(config)
+	if err != nil {
+		t.Fatalf("err: %s", err)
+	}
+
+	if b.config.ToolsUploadPath == "" {
+		t.Fatalf("bad value: %s", b.config.ToolsUploadPath)
+	}
+
+	// Test with a bad value
+	config["tools_upload_path"] = "{{{nope}"
+	err = b.Prepare(config)
+	if err == nil {
+		t.Fatal("should have error")
+	}
+
+	// Test with a good one
+	config["tools_upload_path"] = "hey"
+	err = b.Prepare(config)
+	if err != nil {
+		t.Fatalf("should not have error: %s", err)
+	}
+}
+
 func TestBuilderPrepare_VNCPort(t *testing.T) {
 	var b Builder
 	config := testConfig()

builder/vmware/driver.go

@@ -24,6 +24,9 @@ type Driver interface {
 	// Stop stops a VM specified by the path to the VMX given.
 	Stop(string) error
 
+	// Get the path to the VMware ISO for the given flavor.
+	ToolsIsoPath(string) string
+
 	// Verify checks to make sure that this driver should function
 	// properly. This should check that all the files it will use
 	// appear to exist and so on. If everything is okay, this doesn't
@@ -121,6 +124,10 @@ func (d *Fusion5Driver) vmrunPath() string {
 	return filepath.Join(d.AppPath, "Contents", "Library", "vmrun")
 }
 
+func (d *Fusion5Driver) ToolsIsoPath(k string) string {
+	return filepath.Join(d.AppPath, "Contents", "Library", "isoimages", k+".iso")
+}
+
 func (d *Fusion5Driver) runAndLog(cmd *exec.Cmd) (string, string, error) {
 	var stdout, stderr bytes.Buffer
 

builder/vmware/step_prepare_tools.go

@@ -0,0 +1,33 @@
+package vmware
+
+import (
+	"fmt"
+	"github.com/mitchellh/multistep"
+	"os"
+)
+
+type stepPrepareTools struct{}
+
+func (*stepPrepareTools) Run(state map[string]interface{}) multistep.StepAction {
+	config := state["config"].(*config)
+	driver := state["driver"].(Driver)
+
+	if config.ToolsUploadFlavor == "" {
+		return multistep.ActionContinue
+	}
+
+	path := driver.ToolsIsoPath(config.ToolsUploadFlavor)
+	if _, err := os.Stat(path); err != nil {
+		state["error"] = fmt.Errorf(
+			"Couldn't find VMware tools for '%s'! VMware often downloads these\n"+
+				"tools on-demand. However, to do this, you need to create a fake VM\n"+
+				"of the proper type then click the 'install tools' option in the\n"+
+				"VMware GUI.", config.ToolsUploadFlavor)
+		return multistep.ActionHalt
+	}
+
+	state["tools_upload_source"] = path
+	return multistep.ActionContinue
+}
+
+func (*stepPrepareTools) Cleanup(map[string]interface{}) {}

builder/vmware/step_upload_tools.go

@@ -0,0 +1,49 @@
+package vmware
+
+import (
+	"bytes"
+	"fmt"
+	"github.com/mitchellh/multistep"
+	"github.com/mitchellh/packer/packer"
+	"os"
+	"text/template"
+)
+
+type toolsUploadPathTemplate struct {
+	Flavor string
+}
+
+type stepUploadTools struct{}
+
+func (*stepUploadTools) Run(state map[string]interface{}) multistep.StepAction {
+	config := state["config"].(*config)
+	if config.ToolsUploadFlavor == "" {
+		return multistep.ActionContinue
+	}
+
+	comm := state["communicator"].(packer.Communicator)
+	tools_source := state["tools_upload_source"].(string)
+	ui := state["ui"].(packer.Ui)
+
+	ui.Say(fmt.Sprintf("Uploading the '%s' VMware Tools", config.ToolsUploadFlavor))
+	f, err := os.Open(tools_source)
+	if err != nil {
+		state["error"] = fmt.Errorf("Error opening VMware Tools ISO: %s", err)
+		return multistep.ActionHalt
+	}
+	defer f.Close()
+
+	tplData := &toolsUploadPathTemplate{Flavor: config.ToolsUploadFlavor}
+	var processedPath bytes.Buffer
+	t := template.Must(template.New("path").Parse(config.ToolsUploadPath))
+	t.Execute(&processedPath, tplData)
+
+	if err := comm.Upload(processedPath.String(), f); err != nil {
+		state["error"] = fmt.Errorf("Error uploading VMware Tools: %s", err)
+		return multistep.ActionHalt
+	}
+
+	return multistep.ActionContinue
+}
+
+func (*stepUploadTools) Cleanup(map[string]interface{}) {}

packer.go

@@ -27,6 +27,9 @@ func main() {
 		runtime.GOMAXPROCS(runtime.NumCPU())
 	}
 
+	log.Printf("Packer Version: %s %s", packer.Version, packer.VersionPrerelease)
+	log.Printf("Packer Target OS/Arch: %s %s", runtime.GOOS, runtime.GOARCH)
+
 	config, err := loadConfig()
 	if err != nil {
 		fmt.Fprintf(os.Stderr, "Error loading configuration: \n\n%s\n", err)

packer/build.go

@@ -6,6 +6,10 @@ import (
 	"sync"
 )
 
+// This is the key in configurations that is set to the name of the
+// build.
+const BuildNameConfigKey = "packer_build_name"
+
 // This is the key in configurations that is set to "true" when Packer
 // debugging is enabled.
 const DebugConfigKey = "packer_debug"
@@ -91,12 +95,13 @@ func (b *coreBuild) Prepare() (err error) {
 
 	b.prepareCalled = true
 
-	debugConfig := map[string]interface{}{
-		DebugConfigKey: b.debug,
+	packerConfig := map[string]interface{}{
+		BuildNameConfigKey: b.name,
+		DebugConfigKey:     b.debug,
 	}
 
 	// Prepare the builder
-	err = b.builder.Prepare(b.builderConfig, debugConfig)
+	err = b.builder.Prepare(b.builderConfig, packerConfig)
 	if err != nil {
 		log.Printf("Build '%s' prepare failure: %s\n", b.name, err)
 		return
@@ -106,7 +111,7 @@ func (b *coreBuild) Prepare() (err error) {
 	for _, coreProv := range b.provisioners {
 		configs := make([]interface{}, len(coreProv.config), len(coreProv.config)+1)
 		copy(configs, coreProv.config)
-		configs = append(configs, debugConfig)
+		configs = append(configs, packerConfig)
 
 		if err = coreProv.provisioner.Prepare(configs...); err != nil {
 			return
@@ -189,7 +194,7 @@ PostProcessorRunSeqLoop:
 			}
 
 			builderUi.Say(fmt.Sprintf("Running post-processor: %s", corePP.processorType))
-			artifact, err := corePP.processor.PostProcess(ppUi, priorArtifact)
+			artifact, keep, err := corePP.processor.PostProcess(ppUi, priorArtifact)
 			if err != nil {
 				errors = append(errors, fmt.Errorf("Post-processor failed: %s", err))
 				continue PostProcessorRunSeqLoop
@@ -200,11 +205,12 @@ PostProcessorRunSeqLoop:
 				continue PostProcessorRunSeqLoop
 			}
 
+			keep = keep || corePP.keepInputArtifact
 			if i == 0 {
 				// This is the first post-processor. We handle deleting
 				// previous artifacts a bit different because multiple
 				// post-processors may be using the original and need it.
-				if !keepOriginalArtifact && corePP.keepInputArtifact {
+				if !keepOriginalArtifact && keep {
 					log.Printf(
 						"Flagging to keep original artifact from post-processor '%s'",
 						corePP.processorType)
@@ -213,7 +219,7 @@ PostProcessorRunSeqLoop:
 			} else {
 				// We have a prior artifact. If we want to keep it, we append
 				// it to the results list. Otherwise, we destroy it.
-				if corePP.keepInputArtifact {
+				if keep {
 					artifacts = append(artifacts, priorArtifact)
 				} else {
 					log.Printf("Deleting prior artifact from post-processor '%s'", corePP.processorType)

packer/build_test.go

@@ -39,19 +39,22 @@ func TestBuild_Name(t *testing.T) {
 func TestBuild_Prepare(t *testing.T) {
 	assert := asserts.NewTestingAsserts(t, true)
 
-	debugFalseConfig := map[string]interface{}{DebugConfigKey: false}
+	packerConfig := map[string]interface{}{
+		BuildNameConfigKey: "test",
+		DebugConfigKey:     false,
+	}
 
 	build := testBuild()
 	builder := build.builder.(*TestBuilder)
 
 	build.Prepare()
 	assert.True(builder.prepareCalled, "prepare should be called")
-	assert.Equal(builder.prepareConfig, []interface{}{42, debugFalseConfig}, "prepare config should be 42")
+	assert.Equal(builder.prepareConfig, []interface{}{42, packerConfig}, "prepare config should be 42")
 
 	coreProv := build.provisioners[0]
 	prov := coreProv.provisioner.(*TestProvisioner)
 	assert.True(prov.prepCalled, "prepare should be called")
-	assert.Equal(prov.prepConfigs, []interface{}{42, debugFalseConfig}, "prepare should be called with proper config")
+	assert.Equal(prov.prepConfigs, []interface{}{42, packerConfig}, "prepare should be called with proper config")
 
 	corePP := build.postProcessors[0][0]
 	pp := corePP.processor.(*TestPostProcessor)
@@ -82,7 +85,10 @@ func TestBuild_Prepare_Twice(t *testing.T) {
 func TestBuild_Prepare_Debug(t *testing.T) {
 	assert := asserts.NewTestingAsserts(t, true)
 
-	debugConfig := map[string]interface{}{DebugConfigKey: true}
+	packerConfig := map[string]interface{}{
+		BuildNameConfigKey: "test",
+		DebugConfigKey:     true,
+	}
 
 	build := testBuild()
 	builder := build.builder.(*TestBuilder)
@@ -90,12 +96,12 @@ func TestBuild_Prepare_Debug(t *testing.T) {
 	build.SetDebug(true)
 	build.Prepare()
 	assert.True(builder.prepareCalled, "prepare should be called")
-	assert.Equal(builder.prepareConfig, []interface{}{42, debugConfig}, "prepare config should be 42")
+	assert.Equal(builder.prepareConfig, []interface{}{42, packerConfig}, "prepare config should be 42")
 
 	coreProv := build.provisioners[0]
 	prov := coreProv.provisioner.(*TestProvisioner)
 	assert.True(prov.prepCalled, "prepare should be called")
-	assert.Equal(prov.prepConfigs, []interface{}{42, debugConfig}, "prepare should be called with proper config")
+	assert.Equal(prov.prepConfigs, []interface{}{42, packerConfig}, "prepare should be called with proper config")
 }
 
 func TestBuild_Run(t *testing.T) {
@@ -239,6 +245,33 @@ func TestBuild_Run_Artifacts(t *testing.T) {
 	if !reflect.DeepEqual(artifactIds, expectedIds) {
 		t.Fatalf("unexpected ids: %#v", artifactIds)
 	}
+
+	// Test case: Test that with a single post-processor that forcibly
+	// keeps inputs, that the artifacts are kept.
+	build = testBuild()
+	build.postProcessors = [][]coreBuildPostProcessor{
+		[]coreBuildPostProcessor{
+			coreBuildPostProcessor{
+				&TestPostProcessor{artifactId: "pp", keep: true}, "pp", 42, false,
+			},
+		},
+	}
+
+	build.Prepare()
+	artifacts, err = build.Run(ui, cache)
+	if err != nil {
+		t.Fatalf("err: %s", err)
+	}
+
+	expectedIds = []string{"b", "pp"}
+	artifactIds = make([]string, len(artifacts))
+	for i, artifact := range artifacts {
+		artifactIds[i] = artifact.Id()
+	}
+
+	if !reflect.DeepEqual(artifactIds, expectedIds) {
+		t.Fatalf("unexpected ids: %#v", artifactIds)
+	}
 }
 
 func TestBuild_RunBeforePrepare(t *testing.T) {

packer/plugin/client.go

@@ -252,7 +252,7 @@ func (c *Client) Start() (address string, err error) {
 	timeout := time.After(c.config.StartTimeout)
 
 	// Start looking for the address
-	log.Println("Waiting for RPC address for: %s", cmd.Path)
+	log.Printf("Waiting for RPC address for: %s", cmd.Path)
 	for done := false; !done; {
 		select {
 		case <-timeout:

packer/plugin/post_processor.go

@@ -19,7 +19,7 @@ func (c *cmdPostProcessor) Configure(config interface{}) error {
 	return c.p.Configure(config)
 }
 
-func (c *cmdPostProcessor) PostProcess(ui packer.Ui, a packer.Artifact) (packer.Artifact, error) {
+func (c *cmdPostProcessor) PostProcess(ui packer.Ui, a packer.Artifact) (packer.Artifact, bool, error) {
 	defer func() {
 		r := recover()
 		c.checkExit(r, nil)

packer/plugin/post_processor_test.go

@@ -12,8 +12,8 @@ func (helperPostProcessor) Configure(interface{}) error {
 	return nil
 }
 
-func (helperPostProcessor) PostProcess(packer.Ui, packer.Artifact) (packer.Artifact, error) {
-	return nil, nil
+func (helperPostProcessor) PostProcess(packer.Ui, packer.Artifact) (packer.Artifact, bool, error) {
+	return nil, false, nil
 }
 
 func TestPostProcessor_NoExist(t *testing.T) {

packer/post_processor.go

@@ -12,6 +12,7 @@ type PostProcessor interface {
 	Configure(interface{}) error
 
 	// PostProcess takes a previously created Artifact and produces another
-	// Artifact. If an error occurs, it should return that error.
-	PostProcess(Ui, Artifact) (Artifact, error)
+	// Artifact. If an error occurs, it should return that error. If `keep`
+	// is to true, then the previous artifact is forcibly kept.
+	PostProcess(Ui, Artifact) (a Artifact, keep bool, err error)
 }

packer/post_processor_test.go

@@ -2,6 +2,7 @@ package packer
 
 type TestPostProcessor struct {
 	artifactId   string
+	keep         bool
 	configCalled bool
 	configVal    interface{}
 	ppCalled     bool
@@ -15,9 +16,9 @@ func (pp *TestPostProcessor) Configure(v interface{}) error {
 	return nil
 }
 
-func (pp *TestPostProcessor) PostProcess(ui Ui, a Artifact) (Artifact, error) {
+func (pp *TestPostProcessor) PostProcess(ui Ui, a Artifact) (Artifact, bool, error) {
 	pp.ppCalled = true
 	pp.ppArtifact = a
 	pp.ppUi = ui
-	return &TestArtifact{id: pp.artifactId}, nil
+	return &TestArtifact{id: pp.artifactId}, pp.keep, nil
 }

packer/rpc/port.go

@@ -20,7 +20,7 @@ func PortRange(min, max int) {
 // bound to that port.
 func netListenerInRange(min, max int) net.Listener {
 	for port := min; port <= max; port++ {
-		l, err := net.Listen("tcp", fmt.Sprintf(":%d", port))
+		l, err := net.Listen("tcp", fmt.Sprintf("127.0.0.1:%d", port))
 		if err == nil {
 			return l
 		}

packer/rpc/port_test.go

@@ -16,7 +16,7 @@ func Test_netListenerInRange(t *testing.T) {
 	assert := asserts.NewTestingAsserts(t, true)
 
 	// Open up port 10000 so that we take up a port
-	L1000, err := net.Listen("tcp", ":11000")
+	L1000, err := net.Listen("tcp", "127.0.0.1:11000")
 	defer L1000.Close()
 	assert.Nil(err, "should be able to bind to port 10000")
 

packer/rpc/post_processor.go

@@ -19,6 +19,7 @@ type PostProcessorServer struct {
 
 type PostProcessorProcessResponse struct {
 	Err        error
+	Keep       bool
 	RPCAddress string
 }
 
@@ -33,30 +34,30 @@ func (p *postProcessor) Configure(raw interface{}) (err error) {
 	return
 }
 
-func (p *postProcessor) PostProcess(ui packer.Ui, a packer.Artifact) (packer.Artifact, error) {
+func (p *postProcessor) PostProcess(ui packer.Ui, a packer.Artifact) (packer.Artifact, bool, error) {
 	server := rpc.NewServer()
 	RegisterArtifact(server, a)
 	RegisterUi(server, ui)
 
 	var response PostProcessorProcessResponse
 	if err := p.client.Call("PostProcessor.PostProcess", serveSingleConn(server), &response); err != nil {
-		return nil, err
+		return nil, false, err
 	}
 
 	if response.Err != nil {
-		return nil, response.Err
+		return nil, false, response.Err
 	}
 
 	if response.RPCAddress == "" {
-		return nil, nil
+		return nil, false, nil
 	}
 
 	client, err := rpc.Dial("tcp", response.RPCAddress)
 	if err != nil {
-		return nil, err
+		return nil, false, err
 	}
 
-	return Artifact(client), nil
+	return Artifact(client), response.Keep, nil
 }
 
 func (p *PostProcessorServer) Configure(raw *interface{}, reply *error) error {
@@ -76,7 +77,7 @@ func (p *PostProcessorServer) PostProcess(address string, reply *PostProcessorPr
 
 	responseAddress := ""
 
-	artifact, err := p.p.PostProcess(&Ui{client}, Artifact(client))
+	artifact, keep, err := p.p.PostProcess(&Ui{client}, Artifact(client))
 	if err == nil && artifact != nil {
 		server := rpc.NewServer()
 		RegisterArtifact(server, artifact)
@@ -89,6 +90,7 @@ func (p *PostProcessorServer) PostProcess(address string, reply *PostProcessorPr
 
 	*reply = PostProcessorProcessResponse{
 		Err:        err,
+		Keep:       keep,
 		RPCAddress: responseAddress,
 	}
 

packer/rpc/post_processor_test.go

@@ -22,11 +22,11 @@ func (pp *TestPostProcessor) Configure(v interface{}) error {
 	return nil
 }
 
-func (pp *TestPostProcessor) PostProcess(ui packer.Ui, a packer.Artifact) (packer.Artifact, error) {
+func (pp *TestPostProcessor) PostProcess(ui packer.Ui, a packer.Artifact) (packer.Artifact, bool, error) {
 	pp.ppCalled = true
 	pp.ppArtifact = a
 	pp.ppUi = ui
-	return testPostProcessorArtifact, nil
+	return testPostProcessorArtifact, false, nil
 }
 
 func TestPostProcessorRPC(t *testing.T) {
@@ -63,7 +63,7 @@ func TestPostProcessorRPC(t *testing.T) {
 	// Test PostProcess
 	a := new(testArtifact)
 	ui := new(testUi)
-	artifact, err := pClient.PostProcess(ui, a)
+	artifact, _, err := pClient.PostProcess(ui, a)
 	if err != nil {
 		t.Fatalf("err: %s", err)
 	}

post-processor/vagrant/aws.go

@@ -33,7 +33,7 @@ func (p *AWSBoxPostProcessor) Configure(raw interface{}) error {
 	return nil
 }
 
-func (p *AWSBoxPostProcessor) PostProcess(ui packer.Ui, artifact packer.Artifact) (packer.Artifact, error) {
+func (p *AWSBoxPostProcessor) PostProcess(ui packer.Ui, artifact packer.Artifact) (packer.Artifact, bool, error) {
 	// Determine the regions...
 	tplData := &AWSVagrantfileTemplate{
 		Images: make(map[string]string),
@@ -42,7 +42,7 @@ func (p *AWSBoxPostProcessor) PostProcess(ui packer.Ui, artifact packer.Artifact
 	for _, regions := range strings.Split(artifact.Id(), ",") {
 		parts := strings.Split(regions, ":")
 		if len(parts) != 2 {
-			return nil, fmt.Errorf("Poorly formatted artifact ID: %s", artifact.Id())
+			return nil, false, fmt.Errorf("Poorly formatted artifact ID: %s", artifact.Id())
 		}
 
 		tplData.Images[parts[0]] = parts[1]
@@ -51,20 +51,20 @@ func (p *AWSBoxPostProcessor) PostProcess(ui packer.Ui, artifact packer.Artifact
 	// Compile the output path
 	outputPath, err := ProcessOutputPath(p.config.OutputPath, "aws", artifact)
 	if err != nil {
-		return nil, err
+		return nil, false, err
 	}
 
 	// Create a temporary directory for us to build the contents of the box in
 	dir, err := ioutil.TempDir("", "packer")
 	if err != nil {
-		return nil, err
+		return nil, false, err
 	}
 	defer os.RemoveAll(dir)
 
 	// Create the Vagrantfile from the template
 	vf, err := os.Create(filepath.Join(dir, "Vagrantfile"))
 	if err != nil {
-		return nil, err
+		return nil, false, err
 	}
 	defer vf.Close()
 
@@ -72,13 +72,13 @@ func (p *AWSBoxPostProcessor) PostProcess(ui packer.Ui, artifact packer.Artifact
 	if p.config.VagrantfileTemplate != "" {
 		f, err := os.Open(p.config.VagrantfileTemplate)
 		if err != nil {
-			return nil, err
+			return nil, false, err
 		}
 		defer f.Close()
 
 		contents, err := ioutil.ReadAll(f)
 		if err != nil {
-			return nil, err
+			return nil, false, err
 		}
 
 		vagrantfileContents = string(contents)
@@ -91,15 +91,15 @@ func (p *AWSBoxPostProcessor) PostProcess(ui packer.Ui, artifact packer.Artifact
 	// Create the metadata
 	metadata := map[string]string{"provider": "aws"}
 	if err := WriteMetadata(dir, metadata); err != nil {
-		return nil, err
+		return nil, false, err
 	}
 
 	// Compress the directory to the given output path
 	if err := DirToBox(outputPath, dir); err != nil {
-		return nil, err
+		return nil, false, err
 	}
 
-	return NewArtifact("aws", outputPath), nil
+	return NewArtifact("aws", outputPath), true, nil
 }
 
 var defaultAWSVagrantfile = `

post-processor/vagrant/post-processor.go

@@ -68,10 +68,10 @@ func (p *PostProcessor) Configure(raw interface{}) error {
 	return nil
 }
 
-func (p *PostProcessor) PostProcess(ui packer.Ui, artifact packer.Artifact) (packer.Artifact, error) {
+func (p *PostProcessor) PostProcess(ui packer.Ui, artifact packer.Artifact) (packer.Artifact, bool, error) {
 	ppName, ok := builtins[artifact.BuilderId()]
 	if !ok {
-		return nil, fmt.Errorf("Unknown artifact type, can't build box: %s", artifact.BuilderId())
+		return nil, false, fmt.Errorf("Unknown artifact type, can't build box: %s", artifact.BuilderId())
 	}
 
 	// Use the premade PostProcessor if we have one. Otherwise, we
@@ -81,12 +81,12 @@ func (p *PostProcessor) PostProcess(ui packer.Ui, artifact packer.Artifact) (pac
 		log.Printf("Premade post-processor for '%s' not found. Creating.", ppName)
 		pp = keyToPostProcessor(ppName)
 		if pp == nil {
-			return nil, fmt.Errorf("Vagrant box post-processor not found: %s", ppName)
+			return nil, false, fmt.Errorf("Vagrant box post-processor not found: %s", ppName)
 		}
 
 		config := map[string]string{"output": p.config.OutputPath}
 		if err := pp.Configure(config); err != nil {
-			return nil, err
+			return nil, false, err
 		}
 	}
 

post-processor/vagrant/virtualbox.go

@@ -37,24 +37,24 @@ func (p *VBoxBoxPostProcessor) Configure(raw interface{}) error {
 	return nil
 }
 
-func (p *VBoxBoxPostProcessor) PostProcess(ui packer.Ui, artifact packer.Artifact) (packer.Artifact, error) {
+func (p *VBoxBoxPostProcessor) PostProcess(ui packer.Ui, artifact packer.Artifact) (packer.Artifact, bool, error) {
 	var err error
 	tplData := &VBoxVagrantfileTemplate{}
 	tplData.BaseMacAddress, err = p.findBaseMacAddress(artifact)
 	if err != nil {
-		return nil, err
+		return nil, false, err
 	}
 
 	// Compile the output path
 	outputPath, err := ProcessOutputPath(p.config.OutputPath, "virtualbox", artifact)
 	if err != nil {
-		return nil, err
+		return nil, false, err
 	}
 
 	// Create a temporary directory for us to build the contents of the box in
 	dir, err := ioutil.TempDir("", "packer")
 	if err != nil {
-		return nil, err
+		return nil, false, err
 	}
 	defer os.RemoveAll(dir)
 
@@ -63,25 +63,25 @@ func (p *VBoxBoxPostProcessor) PostProcess(ui packer.Ui, artifact packer.Artifac
 		ui.Message(fmt.Sprintf("Copying: %s", path))
 		src, err := os.Open(path)
 		if err != nil {
-			return nil, err
+			return nil, false, err
 		}
 		defer src.Close()
 
 		dst, err := os.Create(filepath.Join(dir, filepath.Base(path)))
 		if err != nil {
-			return nil, err
+			return nil, false, err
 		}
 		defer dst.Close()
 
 		if _, err := io.Copy(dst, src); err != nil {
-			return nil, err
+			return nil, false, err
 		}
 	}
 
 	// Create the Vagrantfile from the template
 	vf, err := os.Create(filepath.Join(dir, "Vagrantfile"))
 	if err != nil {
-		return nil, err
+		return nil, false, err
 	}
 	defer vf.Close()
 
@@ -89,13 +89,13 @@ func (p *VBoxBoxPostProcessor) PostProcess(ui packer.Ui, artifact packer.Artifac
 	if p.config.VagrantfileTemplate != "" {
 		f, err := os.Open(p.config.VagrantfileTemplate)
 		if err != nil {
-			return nil, err
+			return nil, false, err
 		}
 		defer f.Close()
 
 		contents, err := ioutil.ReadAll(f)
 		if err != nil {
-			return nil, err
+			return nil, false, err
 		}
 
 		vagrantfileContents = string(contents)
@@ -108,22 +108,22 @@ func (p *VBoxBoxPostProcessor) PostProcess(ui packer.Ui, artifact packer.Artifac
 	// Create the metadata
 	metadata := map[string]string{"provider": "virtualbox"}
 	if err := WriteMetadata(dir, metadata); err != nil {
-		return nil, err
+		return nil, false, err
 	}
 
 	// Rename the OVF file to box.ovf, as required by Vagrant
 	ui.Message("Renaming the OVF to box.ovf...")
 	if err := p.renameOVF(dir); err != nil {
-		return nil, err
+		return nil, false, err
 	}
 
 	// Compress the directory to the given output path
 	ui.Message(fmt.Sprintf("Compressing box..."))
 	if err := DirToBox(outputPath, dir); err != nil {
-		return nil, err
+		return nil, false, err
 	}
 
-	return NewArtifact("virtualbox", outputPath), nil
+	return NewArtifact("virtualbox", outputPath), false, nil
 }
 
 func (p *VBoxBoxPostProcessor) findBaseMacAddress(a packer.Artifact) (string, error) {

post-processor/vagrant/vmware.go

@@ -29,17 +29,17 @@ func (p *VMwareBoxPostProcessor) Configure(raw interface{}) error {
 	return nil
 }
 
-func (p *VMwareBoxPostProcessor) PostProcess(ui packer.Ui, artifact packer.Artifact) (packer.Artifact, error) {
+func (p *VMwareBoxPostProcessor) PostProcess(ui packer.Ui, artifact packer.Artifact) (packer.Artifact, bool, error) {
 	// Compile the output path
 	outputPath, err := ProcessOutputPath(p.config.OutputPath, "vmware", artifact)
 	if err != nil {
-		return nil, err
+		return nil, false, err
 	}
 
 	// Create a temporary directory for us to build the contents of the box in
 	dir, err := ioutil.TempDir("", "packer")
 	if err != nil {
-		return nil, err
+		return nil, false, err
 	}
 	defer os.RemoveAll(dir)
 
@@ -48,37 +48,37 @@ func (p *VMwareBoxPostProcessor) PostProcess(ui packer.Ui, artifact packer.Artif
 		ui.Message(fmt.Sprintf("Copying: %s", path))
 		src, err := os.Open(path)
 		if err != nil {
-			return nil, err
+			return nil, false, err
 		}
 		defer src.Close()
 
 		dst, err := os.Create(filepath.Join(dir, filepath.Base(path)))
 		if err != nil {
-			return nil, err
+			return nil, false, err
 		}
 		defer dst.Close()
 
 		if _, err := io.Copy(dst, src); err != nil {
-			return nil, err
+			return nil, false, err
 		}
 	}
 
 	if p.config.VagrantfileTemplate != "" {
 		f, err := os.Open(p.config.VagrantfileTemplate)
 		if err != nil {
-			return nil, err
+			return nil, false, err
 		}
 		defer f.Close()
 
 		contents, err := ioutil.ReadAll(f)
 		if err != nil {
-			return nil, err
+			return nil, false, err
 		}
 
 		// Create the Vagrantfile from the template
 		vf, err := os.Create(filepath.Join(dir, "Vagrantfile"))
 		if err != nil {
-			return nil, err
+			return nil, false, err
 		}
 		defer vf.Close()
 
@@ -90,14 +90,14 @@ func (p *VMwareBoxPostProcessor) PostProcess(ui packer.Ui, artifact packer.Artif
 	// Create the metadata
 	metadata := map[string]string{"provider": "vmware_desktop"}
 	if err := WriteMetadata(dir, metadata); err != nil {
-		return nil, err
+		return nil, false, err
 	}
 
 	// Compress the directory to the given output path
 	ui.Message(fmt.Sprintf("Compressing box..."))
 	if err := DirToBox(outputPath, dir); err != nil {
-		return nil, err
+		return nil, false, err
 	}
 
-	return NewArtifact("vmware", outputPath), nil
+	return NewArtifact("vmware", outputPath), false, nil
 }

scripts/build.sh

@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 set -e
 
 NO_COLOR="\x1b[0m"
@@ -15,12 +15,12 @@ DIR="$( cd -P "$( dirname "$SOURCE" )/.." && pwd )"
 cd $DIR
 
 # Compile the main Packer app
-echo "${OK_COLOR}--> Compiling Packer${NO_COLOR}"
+echo -e "${OK_COLOR}--> Compiling Packer${NO_COLOR}"
 go build -v -o bin/packer .
 
 # Go over each plugin and build it
 for PLUGIN in $(find ./plugin -mindepth 1 -maxdepth 1 -type d); do
     PLUGIN_NAME=$(basename ${PLUGIN})
-    echo "${OK_COLOR}--> Compiling Plugin: ${PLUGIN_NAME}${NO_COLOR}"
+    echo -e "${OK_COLOR}--> Compiling Plugin: ${PLUGIN_NAME}${NO_COLOR}"
     go build -v -o bin/packer-${PLUGIN_NAME} ${PLUGIN}
 done

website/config.rb

@@ -82,7 +82,7 @@ helpers do
   end
 
   def download_url(file)
-    "http://dl.bintray.com/mitchellh/packer/#{file}?direct"
+    "https://dl.bintray.com/mitchellh/packer/#{file}?direct"
   end
 
   def latest_version

website/source/docs/builders/virtualbox.html.markdown

@@ -66,6 +66,9 @@ Optional:
   five seconds and one minute 30 seconds, respectively. If this isn't specified,
   the default is 10 seconds.
 
+* `disk_size` (int) - The size, in megabytes, of the hard disk to create
+  for the VM. By default, this is 40000 (40 GB).
+
 * `guest_additions_path` (string) - The path on the guest virtual machine
   where the VirtualBox guest additions ISO will be uploaded. By default this
   is "VBoxGuestAdditions.iso" which should upload into the login directory
@@ -97,8 +100,9 @@ Optional:
 * `output_directory` (string) - This is the path to the directory where the
   resulting virtual machine will be created. This may be relative or absolute.
   If relative, the path is relative to the working directory when `packer`
-  is executed. By default this is "virtualbox". This directory must not exist
-  or be empty prior to running the builder.
+  is executed. This directory must not exist or be empty prior to running the builder.
+  By default this is "output-BUILDNAME" where "BUILDNAME" is the name
+  of the build.
 
 * `shutdown_command` (string) - The command to use to gracefully shut down
   the machine once all the provisioning is done. By default this is an empty
@@ -142,7 +146,8 @@ Optional:
   the home directory.
 
 * `vm_name` (string) - This is the name of the VMX file for the new virtual
-  machine, without the file extension. By default this is "packer".
+  machine, without the file extension. By default this is "packer-BUILDNAME",
+  where "BUILDNAME" is the name of the build.
 
 ## Boot Command
 

website/source/docs/builders/vmware.html.markdown

@@ -95,8 +95,9 @@ Optional:
 * `output_directory` (string) - This is the path to the directory where the
   resulting virtual machine will be created. This may be relative or absolute.
   If relative, the path is relative to the working directory when `packer`
-  is executed. By default this is "vmware". This directory must not exist
-  or be empty prior to running the builder.
+  is executed. This directory must not exist or be empty prior to running the builder.
+  By default this is "output-BUILDNAME" where "BUILDNAME" is the name
+  of the build.
 
 * `shutdown_command` (string) - The command to use to gracefully shut down
   the machine once all the provisioning is done. By default this is an empty
@@ -117,11 +118,23 @@ Optional:
   available. By default this is "20m", or 20 minutes. Note that this should
   be quite long since the timer begins as soon as virtual machine is booted.
 
+* `tools_upload_flavor` (string) - The flavor of the VMware Tools ISO to
+  upload into the VM. Valid values are "darwin", "linux", and "windows".
+  By default, this is empty, which means VMware tools won't be uploaded.
+
+* `tools_upload_path` (string) - The path in the VM to upload the VMware
+  tools. This only takes effect if `tools_upload_flavor` is non-empty.
+  This is a [configuration template](/docs/templates/configuration-templates.html)
+  that has a single valid variable: `Flavor`, which will be the value of
+  `tools_upload_flavor`. By default the upload path is set to
+  `{{.Flavor}}.iso`.
+
 * `vm_name` (string) - This is the name of the VMX file for the new virtual
-  machine, without the file extension. By default this is "packer".
+  machine, without the file extension. By default this is "packer-BUILDNAME",
+  where "BUILDNAME" is the name of the build.
 
 * `vmdk_name` (string) - The filename of the virtual disk that'll be created,
-  without the extension. This defaults to "packer".
+  without the extension. This is a This defaults to "packer".
 
 * `vmx_data` (object, string keys and string values) - Arbitrary key/values
   to enter into the virtual machine VMX file. This is for advanced users

website/source/docs/extend/post-processor.html.markdown

@@ -38,7 +38,7 @@ what each method should do.
 <pre class="prettyprint">
 type PostProcessor interface {
 	Configure(interface{}) error
-	PostProcess(Ui, Artifact) (Artifact, error)
+	PostProcess(Ui, Artifact) (a Artifact, keep bool, err error)
 }
 </pre>
 
@@ -79,3 +79,15 @@ a "compress" post-processor that is responsible for compressing files,
 the transformation would be taking the `Files()` from the original artifact,
 compressing them, and creating a new artifact with a single file: the
 compressed archive.
+
+The result signature of this method is `(Artifact, bool, error)`. Each
+return value is explained below:
+
+* `Artifact` - The newly created artifact if no errors occurred.
+* `bool` - If true, the input artifact will forcefully be kept. By default,
+  Packer typically deletes all input artifacts, since the user doesn't generally
+  want intermediary artifacts. However, some post-processors depend on the
+  previous artifact existing. If this is `true`, it forces packer to keep the
+  artifact around.
+* `error` - Non-nil if there was an error in any way. If this is the case,
+  the other two return values are ignored.

website/source/docs/installation.html.markdown

@@ -47,6 +47,6 @@ Available commands are:
 
 If you get an error that `packer` could not be found, then your PATH
 environmental variable was not setup properly. Please go back and ensure
-that yoru PATH variable contains the directory which has Packer installed.
+that your PATH variable contains the directory which has Packer installed.
 
 Otherwise, Packer is installed and you're ready to go!

website/source/docs/templates/veewee-to-packer.html.markdown

@@ -22,7 +22,7 @@ $ gem install veewee-to-packer
 ...
 ```
 
-Once installed, usage is easy! Just point call `veewee-to-packer` pointed
+Once installed, usage is easy! Just point `veewee-to-packer`
 at the `definition.rb` file of any template. The converter will output
 any warnings or messages about the conversion. The example below converts
 a CentOS template:

website/source/downloads.html.erb

@@ -17,7 +17,7 @@ page_title: "Downloads"
 			Below are all available downloads for the latest version of Packer
 			(<%= latest_version %>). Please download the proper package for your
 			operating system and architecture. You can find SHA256 checksums
-			for packages <a href="http://dl.bintray.com/mitchellh/packer/<%= latest_version %>_SHA256SUMS?direct">here</a>.
+			for packages <a href="https://dl.bintray.com/mitchellh/packer/<%= latest_version %>_SHA256SUMS?direct">here</a>.
 			</p>
 		</div>
 	</div>