Merge pull request #28 from gondor/master

switch all CLI output to Go Template

commands/config.go

@@ -8,13 +8,30 @@ import (
 	"github.com/ContainX/depcon/utils"
 	"github.com/spf13/cobra"
 	"io"
+	"text/template"
 )
 
+const (
+	T_CONFIG_ENV = `
+{{ "NAME" }}	{{ "TYPE" }}	{{ "ENDPOINT" }}	{{ "AUTH" }}	{{ "DEFAULT" }}
+{{ range . }}{{ .Name }}	{{ .EnvType }}	{{ .HostURL }}	{{ .Auth | boolToYesNo }}	{{ .Default | defaultEnvToStr }}
+{{end}}`
+)
+
+
 type ConfigEnvironments struct {
 	DefaultEnv string
 	Envs       map[string]*cliconfig.ConfigEnvironment
 }
 
+type EnvironmentSummary struct {
+	Name string
+	EnvType string
+	HostURL string
+	Auth	bool
+	Default bool
+}
+
 var ValidOutputs []string = []string{"json", "yaml", "column"}
 var ErrInvalidOutputFormat = errors.New("Invalid Output specified. Must be 'json','yaml' or 'column'")
 var ErrInvalidRootOption = errors.New("Invalid chroot option specified. Must be 'true' or 'false'")
@@ -66,7 +83,9 @@ var configListCmd = &cobra.Command{
 	Use:   "list",
 	Short: "List current environments",
 	Run: func(cmd *cobra.Command, args []string) {
-		cli.Output(&ConfigEnvironments{DefaultEnv: configFile.DefaultEnv, Envs: configFile.Environments}, nil)
+		ce := &ConfigEnvironments{DefaultEnv: configFile.DefaultEnv, Envs: configFile.Environments}
+		template := templateFor(T_CONFIG_ENV, ce.toEnvironmentMap())
+		cli.Output(template, nil)
 	},
 }
 
@@ -149,17 +168,53 @@ func init() {
 	configCmd.AddCommand(configEnvCmd, configOutputCmd, configRootServiceCmd)
 }
 
-func (e ConfigEnvironments) ToColumns(output io.Writer) error {
-	w := cli.NewTabWriter(output)
-	fmt.Fprintln(w, "\nNAME\tTYPE\tURI\tAUTH\tDEFAULT")
+type ConfigTemplate struct {
+	cli.FormatData
+}
+
+func templateFor(template string, data interface{}) ConfigTemplate {
+	return ConfigTemplate{cli.FormatData{ Template: template, Data: data, Funcs: buildFuncMap() }}
+}
+
+func (d ConfigTemplate) ToColumns(output io.Writer) error {
+	return d.FormatData.ToColumns(output)
+}
+
+func (d ConfigTemplate) Data() cli.FormatData {
+	return d.FormatData
+}
+
+func (e ConfigEnvironments) toEnvironmentMap() []*EnvironmentSummary {
+
+	arr := []*EnvironmentSummary{}
+
 	for k, v := range e.Envs {
 		var sc cliconfig.ServiceConfig
 		switch v.EnvironmentType() {
 		case cliconfig.TypeMarathon:
 			sc = *v.Marathon
 		}
-		fmt.Fprintf(w, "%s\t%s\t%s\t%v\t%v\n", k, v.EnvironmentType(), sc.HostUrl, sc.Username != "", k == e.DefaultEnv)
+		arr = append(arr, &EnvironmentSummary{
+			Name: k,
+			EnvType: v.EnvironmentType(),
+			HostURL: sc.HostUrl,
+			Auth: sc.Username != "",
+			Default: k == e.DefaultEnv,
+		})
 	}
-	cli.FlushWriter(w)
-	return nil
+	return arr
 }
+
+func buildFuncMap() template.FuncMap {
+	funcMap := template.FuncMap{
+		"defaultEnvToStr":     defaultEnvToStr,
+	}
+	return funcMap
+}
+
+func defaultEnvToStr(b bool) string {
+	if b {
+		return "true"
+	}
+	return "-"
+}

commands/format.go

@@ -53,7 +53,7 @@ func PrintFormat(formatter cli.Formatter) {
 
 func printEncodedType(formatter cli.Formatter, encoder encoding.EncoderType) {
 	e, _ := encoding.NewEncoder(encoder)
-	str, _ := e.MarshalIndent(formatter)
+	str, _ := e.MarshalIndent(formatter.Data().Data)
 	fmt.Println(str)
 }
 
@@ -63,3 +63,4 @@ func printColumn(formatter cli.Formatter) {
 		log.Error("Error: %s", err.Error())
 	}
 }
+

commands/marathon/app_bg_cmds.go

@@ -53,8 +53,7 @@ func deployBlueGreenCmd(cmd *cobra.Command, args []string) {
 		cli.Output(nil, err)
 		os.Exit(1)
 	}
-	cli.Output(Application{a}, err)
-
+	cli.Output(templateFor(T_APPLICATIONS, a), err)
 }
 
 func bgc(c *cobra.Command) bluegreen.BlueGreen {

commands/marathon/app_cmds.go

@@ -55,7 +55,7 @@ var appListCmd = &cobra.Command{
 	Short: "List all applications",
 	Run: func(cmd *cobra.Command, args []string) {
 		v, e := client(cmd).ListApplications()
-		cli.Output(Applications{v}, e)
+		cli.Output(templateFor(T_APPLICATIONS, v), e)
 	},
 }
 
@@ -68,7 +68,7 @@ var appGetCmd = &cobra.Command{
 			return
 		}
 		v, e := client(cmd).GetApplication(args[0])
-		cli.Output(Application{v}, e)
+		cli.Output(templateFor(T_APPLICATION, v), e)
 	},
 }
 
@@ -81,7 +81,7 @@ var appVersionsCmd = &cobra.Command{
 			return
 		}
 		v, e := client(cmd).ListVersions(args[0])
-		cli.Output(Versions{v}, e)
+		cli.Output(templateFor(T_VERSIONS, v), e)
 	},
 }
 
@@ -175,7 +175,7 @@ func createApp(cmd *cobra.Command, args []string) {
 		}
 		os.Exit(1)
 	}
-	cli.Output(Application{result}, e)
+	cli.Output(templateFor(T_APPLICATIONS, result), e)
 }
 
 func parseParamsFile(filename string) (map[string]string, error) {
@@ -208,7 +208,7 @@ func restartApp(cmd *cobra.Command, args []string) {
 	force, _ := cmd.Flags().GetBool(FORCE_FLAG)
 
 	v, e := client(cmd).RestartApplication(args[0], force)
-	cli.Output(DeploymentId{v}, e)
+	cli.Output(templateFor(T_DEPLOYMENT_ID, v), e)
 	waitForDeploymentIfFlagged(cmd, v.DeploymentID)
 }
 
@@ -218,7 +218,7 @@ func destroyApp(cmd *cobra.Command, args []string) {
 	}
 
 	v, e := client(cmd).DestroyApplication(args[0])
-	cli.Output(DeploymentId{v}, e)
+	cli.Output(templateFor(T_DEPLOYMENT_ID, v), e)
 	waitForDeploymentIfFlagged(cmd, v.DeploymentID)
 }
 
@@ -233,7 +233,7 @@ func scaleApp(cmd *cobra.Command, args []string) {
 		os.Exit(1)
 	}
 	v, e := client(cmd).ScaleApplication(args[0], instances)
-	cli.Output(DeploymentId{v}, e)
+	cli.Output(templateFor(T_DEPLOYMENT_ID, v), e)
 	waitForDeploymentIfFlagged(cmd, v.DeploymentID)
 }
 
@@ -251,7 +251,7 @@ func updateAppCPU(cmd *cobra.Command, args []string) {
 	}
 	update := marathon.NewApplication(args[0]).CPU(cpu)
 	v, e := client(cmd).UpdateApplication(update, wait)
-	cli.Output(Application{v}, e)
+	cli.Output(templateFor(T_APPLICATIONS, v), e)
 }
 
 func updateAppMemory(cmd *cobra.Command, args []string) {
@@ -268,7 +268,7 @@ func updateAppMemory(cmd *cobra.Command, args []string) {
 	}
 	update := marathon.NewApplication(args[0]).Memory(mem)
 	v, e := client(cmd).UpdateApplication(update, wait)
-	cli.Output(Application{v}, e)
+	cli.Output(templateFor(T_APPLICATIONS, v), e)
 }
 
 func rollbackAppVersion(cmd *cobra.Command, args []string) {
@@ -289,7 +289,7 @@ func rollbackAppVersion(cmd *cobra.Command, args []string) {
 	}
 	update := marathon.NewApplication(args[0]).RollbackVersion(version)
 	v, e := client(cmd).UpdateApplication(update, wait)
-	cli.Output(Application{v}, e)
+	cli.Output(templateFor(T_APPLICATIONS, v), e)
 }
 
 func convertFile(cmd *cobra.Command, args []string) {

commands/marathon/app_log_cmds.go

@@ -14,8 +14,7 @@ import (
 const (
 	STDERR_FLAG = "stderr"
 	FOLLOW_FLAG = "follow"
-	POLL_FLAG = "poll"
-
+	POLL_FLAG   = "poll"
 )
 
 var logCmd = &cobra.Command{