From 8ffbc2efe7effbc39881f6c1f8ad0a94ee648cb4 Mon Sep 17 00:00:00 2001
From: Mitchell Hashimoto <mitchell.hashimoto@gmail.com>
Date: Wed, 8 May 2013 17:28:05 -0700
Subject: [PATCH] packer: Start pulling out the global config stuff

---
 command/build/command.go      |  2 +-
 config.go                     | 47 +++++++++++++++++++++++++++++++++++
 packer.go                     | 24 +++---------------
 packer/environment.go         |  2 ++
 plugin/command-build/Makefile |  2 +-
 5 files changed, 54 insertions(+), 23 deletions(-)
 create mode 100644 config.go

diff --git a/command/build/command.go b/command/build/command.go
index 0d3a73cac..664ab553d 100644
--- a/command/build/command.go
+++ b/command/build/command.go
@@ -49,5 +49,5 @@ func (Command) Run(env packer.Environment, args []string) int {
 }
 
 func (Command) Synopsis() string {
-	return "build image(s) from tempate"
+	return "build image(s) from template"
 }
diff --git a/config.go b/config.go
new file mode 100644
index 000000000..b2378fd3a
--- /dev/null
+++ b/config.go
@@ -0,0 +1,47 @@
+package main
+
+import (
+	"fmt"
+	"github.com/mitchellh/packer/packer"
+	"github.com/mitchellh/packer/packer/plugin"
+	"log"
+	"os/exec"
+)
+
+type config struct {
+	builds map[string]string
+	commands map[string]string
+}
+
+func defaultConfig() (result *config) {
+	commands := []string{"build"}
+
+	result = new(config)
+	result.builds = make(map[string]string)
+	result.commands = make(map[string]string)
+
+	for _, name := range commands {
+		result.commands[name] = fmt.Sprintf("packer-command-%s", name)
+	}
+
+	return
+}
+
+func (c *config) Commands() (result []string) {
+	result = make([]string, 0, len(c.commands))
+	for name, _ := range c.commands {
+		result = append(result, name)
+	}
+	return
+}
+
+func (c *config) LoadCommand(name string) (packer.Command, error) {
+	log.Printf("Loading command: %s\n", name)
+	commandBin, ok := c.commands[name]
+	if !ok {
+		log.Printf("Command not found: %s\n", name)
+		return nil, nil
+	}
+
+	return plugin.Command(exec.Command(commandBin))
+}
diff --git a/packer.go b/packer.go
index c4faaf9ae..b48f108d8 100644
--- a/packer.go
+++ b/packer.go
@@ -8,7 +8,6 @@ import (
 	"io/ioutil"
 	"log"
 	"os"
-	"os/exec"
 )
 
 func main() {
@@ -22,27 +21,10 @@ func main() {
 
 	defer plugin.CleanupClients()
 
-	commands := map[string]string {
-		"build": "packer-build",
-	}
-
-	commandKeys := make([]string, 0, len(commands))
-	for k, _ := range commands {
-		commandKeys = append(commandKeys, k)
-	}
-
+	config := defaultConfig()
 	envConfig := packer.DefaultEnvironmentConfig()
-	envConfig.Commands = commandKeys
-	envConfig.CommandFunc = func(n string) (packer.Command, error) {
-		log.Printf("Loading command: %s\n", n)
-		commandBin, ok := commands[n]
-		if !ok {
-			log.Printf("Command not found: %s\n", n)
-			return nil, nil
-		}
-
-		return plugin.Command(exec.Command(commandBin))
-	}
+	envConfig.Commands = config.Commands()
+	envConfig.CommandFunc = config.LoadCommand
 
 	env, err := packer.NewEnvironment(envConfig)
 	if err != nil {
diff --git a/packer/environment.go b/packer/environment.go
index 7838602da..4d7855dcd 100644
--- a/packer/environment.go
+++ b/packer/environment.go
@@ -153,6 +153,8 @@ func (e *coreEnvironment) printHelp() {
 		command, err := e.commandFunc(key)
 		if err != nil {
 			synopsis = fmt.Sprintf("Error loading command: %s", err.Error())
+		} else if command == nil {
+			continue
 		} else {
 			synopsis = command.Synopsis()
 		}
diff --git a/plugin/command-build/Makefile b/plugin/command-build/Makefile
index 8e93cf031..11b21c774 100644
--- a/plugin/command-build/Makefile
+++ b/plugin/command-build/Makefile
@@ -1,6 +1,6 @@
 plugin:
 	go get -d -v ./...
-	go build -v -o $(ROOTDIR)/bin/packer-build
+	go build -v -o $(ROOTDIR)/bin/packer-command-build
 
 format:
 	go fmt ./...