- Update to current funcmap

- Fixes some bugs with parameters and defaults
- Update README.md
- Improved verbose output

Author: nicerobot

README.md

@@ -20,31 +20,31 @@ And read from the environment:
 
 ## Examples
 
-Render the `pod.yaml` using values from `examples/pod/.renderizer.yaml`:
+Render the `pod.yaml.tmpl` using values from `examples/pod/.renderizer.yaml`:
 
     renderizer --settings=examples/pod/.pod.yaml examples/pod/pod.yaml.tmpl
 
 Or set `RENDERIZER` in the environment:
 
     RENDERIZER=examples/.pod.yaml renderizer examples/pod/pod.yaml.tmpl
 
-Alternatively, it'll try `.renderizer.yaml` in the current directory.
+Alternatively, it'll try `.pod.yaml` in the current directory.
 
-    (cd examples/pod; renderizer pod.yaml)
+    (cd examples/pod; renderizer)
 
-Next, override the `deployment` value to render the "dev" `pod.yaml` (after `cd examples/pod`):
+Next, override the `deployment` value to render the "dev" `pod.yaml.tmpl` (after `cd examples/pod`):
 
-    renderizer --deployment=dev --name='spaced out' pod.yaml
+    renderizer --deployment=dev --name='spaced out'
 
 For more examples, see the [`examples`](examples) folder.
 
 # Configuration
 
 ### Settings
 
-Settings can be loaded from a yaml:
+Settings can be loaded from any YAMLs:
 
-    renderizer --settings=.renderizer.yaml --name=value --top=first template-file
+    renderizer --settings=.settings1.yaml --settings=.settings2.yaml --name=value template-file
 
 ### Capitalization `-C`
 

examples/Makefile

@@ -0,0 +1,16 @@
+EXAMPLES = $(patsubst %/,%,$(sort $(dir $(wildcard */*.tmpl))))
+
+.PHONY : $(EXAMPLES)
+.PHONY : run
+.PHONY : help
+.DEFAULT_GOAL := run
+
+run: $(EXAMPLES) ## Run all the examples
+
+$(EXAMPLES):
+	cd $@; renderizer
+
+help: ## This help.
+	@echo EXAMPLES=$(EXAMPLES)
+	@echo Targets:
+	@awk 'BEGIN {FS = ":.*?## "} / [#][#] / {printf "\033[36m%-30s\033[0m %s\n", $$1, $$2}' $(MAKEFILE_LIST)

examples/functions/functions.txt.tmpl

@@ -50,9 +50,15 @@ line {{next}} mod               = 12345 % 10 = {{mod 10 12345}}
 line {{next}} rand              = {{rand}}
 line {{next}} lower             = {{lower "LOWER"}}
 line {{next}} upper             = {{upper "upper"}}
-line {{next}} title             = {{title "this is a title"}}
-line {{next}} title             = {{title "THIS IS A TITLE"}}
-line {{next}} initcap           = {{initcap "this is a title"}}
+line {{next}} title             = {{title "this is a title from lowercase"}}
+line {{next}} title             = {{title "THIS IS A TITLE FROM UPPERCASE"}}
+line {{next}} initcap           = {{initcap "this is initcap from lowercase"}}
+line {{next}} initcap           = {{initcap "THIS IS INITCAP FROM UPPERCASE"}}
+line {{next}} cleanser          = {{cleanser "[^works]" "abcdefghijklmnopqrstuvwxyz"}}
+line {{next}} cleanse           = [{{cleanse " abcdefghijklmnopqrstuvwxyz ABCDEFGHIJKLMNOPQRSTUVWXYZ "}}]
+line {{next}} cleanse           = {{cleanse "WOR1234567890KS"}}
+line {{next}} cleanse           = {{cleanse "WOR!@#$%^&*()KS"}}
+line {{next}} cleanse           = {{cleanse "WOR`~-=_+[]{};':\",.<>/?KS"}}
 line {{next}} cleanse           = {{cleanse "zaq!xsw@cde#vfr$bgt%nhy^mju&,ki*.lo(/;p)"}}
 line {{next}} now               = {{now}}
 line {{next}} pausing 1s        = {{pause 1000}}

examples/pod/pod.yaml.tmpl

@@ -4,15 +4,15 @@
 apiVersion: v1
 kind: Pod
 metadata:
-  name: {{replace .Name " " "_" -1 | cleanse | lower}}
+  name: {{replace .Name " " "_" -1 | identifier | lower}}
   namespace: {{.App}}-{{.Deployment}}
   labels:
     app: &app_name {{.App}}
 spec:
   containers: {{$p := .}}{{range $i, $c := .Containers}}
-    - name: &name_{{index $i}} {{.Name}}
+    - name: &name_{{$i}} {{.Name}}
       image: {{$p.Repo}}/{{$p.App}}-{{.Name}}
       ports:
-        - name: *name_{{index $i}}
+        - name: *name_{{$i}}
           containerPort: {{inc $p.BasePort $i}}
           protocol: TCP{{end}}

go.mod

@@ -1,7 +1,7 @@
 module github.com/gomatic/renderizer
 
 require (
-	github.com/gomatic/funcmap v0.0.0-20170407194050-9ab29796c307
+	github.com/gomatic/funcmap v0.0.0-20180916232612-d0d9de88be48
 	github.com/imdario/mergo v0.3.6
 	github.com/kardianos/osext v0.0.0-20170510131534-ae77be60afb1
 	github.com/pkg/errors v0.8.0

go.sum

@@ -1,5 +1,5 @@
-github.com/gomatic/funcmap v0.0.0-20170407194050-9ab29796c307 h1:vdV1B6lc0iOnze2OvoHREif4bzaYTY5WHo1+HhBD2io=
-github.com/gomatic/funcmap v0.0.0-20170407194050-9ab29796c307/go.mod h1:tgYMANYRbfiPtGpM0in6m2dnRENPq5Oj0f+eJkTBT1E=
+github.com/gomatic/funcmap v0.0.0-20180916232612-d0d9de88be48 h1:7zBC8mBAIu2aDXiF47LfBYzm60L0l8smmaiFEKGVUVw=
+github.com/gomatic/funcmap v0.0.0-20180916232612-d0d9de88be48/go.mod h1:tgYMANYRbfiPtGpM0in6m2dnRENPq5Oj0f+eJkTBT1E=
 github.com/imdario/mergo v0.3.6 h1:xTNEAn+kxVO7dTZGu0CegyqKZmoWFI0rF8UxjlB2d28=
 github.com/imdario/mergo v0.3.6/go.mod h1:2EnlNZ0deacrJVfApfmtdGgDfMuh/nq6Ok1EcJh5FfA=
 github.com/kardianos/osext v0.0.0-20170510131534-ae77be60afb1 h1:PJPDf8OUfOK1bb/NeTKd4f1QXZItOX389VN3B6qC8ro=

main.go

@@ -8,6 +8,7 @@ import (
 	"path/filepath"
 	"strings"
 
+	"github.com/imdario/mergo"
 	"github.com/kardianos/osext"
 	"github.com/urfave/cli"
 	"gopkg.in/yaml.v2"
@@ -126,7 +127,22 @@ func main() {
 		settings.Stdin = settings.Stdin || (fi.Mode()&os.ModeCharDevice) == 0
 
 		settings.Arguments = append(settings.Arguments, ctx.Args()...)
-		if len(settings.Arguments) == 0 && !settings.Stdin {
+
+		mainName, mainTemplate, noTemplate := "", "", true
+		if largs := len(settings.Arguments); largs > 0 {
+			i, found := largs-1, -1
+			for ; i > 0; i-- {
+				if !strings.HasPrefix(settings.Arguments[i], "--") {
+					found = i
+				}
+			}
+			if found >= 0 {
+				noTemplate = false
+				mainTemplate = settings.Arguments[found]
+			}
+		}
+
+		if mainTemplate == "" && !settings.Stdin {
 			// Try default the template name
 			folderName, err := os.Getwd()
 			if err != nil {
@@ -143,12 +159,16 @@ func main() {
 						if settings.Verbose {
 							log.Printf("using template: %+v", name)
 						}
-						settings.Arguments = []string{name}
+						mainTemplate = name
 					}
 				}
 			}
+		}
 
+		if noTemplate {
+			settings.Arguments = append(settings.Arguments, mainTemplate)
 		}
+		mainName = strings.Split(strings.TrimLeft(filepath.Base(mainTemplate), "."), ".")[0]
 
 		switch settings.MissingKey {
 		case "zero", "error", "default", "invalid":
@@ -158,12 +178,8 @@ func main() {
 		}
 
 		if len(configs) == 0 {
-			name := "renderizer"
-			if len(settings.Arguments) >= 1 {
-				name = strings.Split(strings.TrimLeft(filepath.Base(settings.Arguments[0]), "."), ".")[0]
-			}
 			settings.Defaulted = true
-			settings.ConfigFiles = []string{"." + name + ".yaml"}
+			settings.ConfigFiles = []string{"." + mainName + ".yaml"}
 		} else {
 			settings.ConfigFiles = configs
 		}
@@ -175,18 +191,28 @@ func main() {
 					return err
 				}
 			} else {
-				yaml.Unmarshal(in, &settings.Config)
+				loaded := map[string]interface{}{}
+				err := yaml.Unmarshal(in, &loaded)
+				if err != nil {
+					return err
+				}
 				if settings.Verbose || settings.Defaulted {
 					log.Printf("using settings: %+v", settings.ConfigFiles)
 				}
+				loaded = retyper(loaded)
+				if settings.Debugging {
+					log.Printf("loaded: %s = %#v", config, loaded)
+				} else if settings.Verbose {
+					log.Printf("loaded: %s = %+v", config, loaded)
+				}
+				mergo.Merge(&settings.Config, loaded)
 			}
-			if settings.Debugging {
-				log.Printf("--settings:%#v", settings)
-				log.Printf("loaded: %#v", settings.Config)
-			} else if settings.Verbose {
-				log.Printf("--settings:%+v", settings)
-				log.Printf("loaded: %+v", settings.Config)
-			}
+		}
+
+		if settings.Debugging {
+			log.Printf("--settings:%#v", settings)
+		} else if settings.Verbose {
+			log.Printf("--settings:%+v", settings)
 		}
 
 		return nil
@@ -203,6 +229,7 @@ func main() {
 				next = false
 				continue
 			}
+			// TODO convert all '--name value' parameters to --name=value
 			if strings.HasPrefix(larg, "--") {
 				flag := larg
 				parts := strings.SplitN(larg, "=", 2)

renderizer.go

@@ -13,6 +13,7 @@ import (
 	"github.com/gomatic/funcmap"
 	"github.com/imdario/mergo"
 	"github.com/urfave/cli"
+	"gopkg.in/yaml.v2"
 )
 
 //
@@ -62,58 +63,38 @@ func renderizer(_ *cli.Context) error {
 
 		var currentValue interface{}
 		if len(nameValuePair) == 1 { // i.e. a boolean
-			leaf[last] = []interface{}{true}
+			currentValue = []interface{}{true}
 		} else {
-			leaf[last] = []interface{}{typer(nameValuePair[1])}
+			currentValue = []interface{}{typer(nameValuePair[1])}
 		}
+		leaf[last] = currentValue
 
 		if settings.Debugging {
 			log.Printf("index:%d name:%s value:%+v", a, currentName, currentValue)
 		}
 
-		// log.Printf("currentContext: %[1]T %#[1]v", currentContext)
+		if settings.Debugging {
+			log.Printf("currentContext: %[1]T %#[1]v", currentContext)
+		}
 		mergo.Merge(&globalContext, currentContext, mergo.WithAppendSlice)
-		// log.Printf("globalContext: %[1]T %#[1]v", globalContext)
+		if settings.Debugging {
+			log.Printf("globalContext: %[1]T %#[1]v", globalContext)
+		}
 	}
 
-	retyper(globalContext)
-
-	// Dump the settings
-
-	if settings.Debugging {
-		log.Printf("globalContext: %#v", globalContext)
-	} else if settings.Verbose {
-		log.Printf("globalContext: %+v", globalContext)
-	}
+	globalContext = retyper(globalContext, retypeSingleElementSlice)
 
 	// If there's no files, read from stdin.
 	files := args
 	if len(args) == 0 {
-		stat, _ := os.Stdin.Stat()
-		isTTY := (stat.Mode() & os.ModeCharDevice) != 0
-		if isTTY {
+		if settings.Stdin {
 			log.Println("source: stdin")
 		}
 		files = []string{""}
 	}
 
 	// Copy any loaded keys into the globalContext unless they already exist, i.e. they were provided on the command line.
-	for n, v := range settings.Config {
-		if _, exists := globalContext[n]; !exists {
-			switch x := v.(type) {
-			case int8:
-				globalContext[n] = int64(x)
-			case int16:
-				globalContext[n] = int64(x)
-			case int32:
-				globalContext[n] = int64(x)
-			case int:
-				globalContext[n] = int64(x)
-			default:
-				globalContext[n] = v
-			}
-		}
-	}
+	mergo.Merge(&globalContext, settings.Config)
 
 	if settings.Environment != "" || len(args) == 0 {
 		v := make(map[string]string)
@@ -129,7 +110,11 @@ func renderizer(_ *cli.Context) error {
 	if settings.Debugging {
 		log.Printf("globalContext: %#v", globalContext)
 	} else if settings.Verbose {
-		log.Printf("globalContext: %+v", globalContext)
+		if o, err := yaml.Marshal(globalContext); err != nil {
+			log.Printf("globalContext: %+v", globalContext)
+		} else {
+			log.Printf("globalContext:\n%s", o)
+		}
 	}
 
 	// Execute each template