Closes #13

The problem was due to improperly handling files on the command line.
Splitting the file-references from the two types of arguments makes it easier to manage.
Also fixes a bug with a prior push that was checking lowercase when it should check original case.

Author: nicerobot

main.go

@@ -36,6 +36,8 @@ type Settings struct {
 	Config      map[string]interface{}
 	//
 	Arguments []string
+	//
+	Templates []string
 	// Add the environment map to the variables.
 	Environment string
 	//
@@ -59,6 +61,7 @@ var settings = Settings{
 	Config:      map[string]interface{}{},
 	ConfigFiles: []string{},
 	Arguments:   []string{},
+	Templates:   []string{},
 }
 
 //
@@ -128,21 +131,7 @@ func main() {
 
 		settings.Arguments = append(settings.Arguments, ctx.Args()...)
 
-		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 {
+		if len(settings.Templates) == 0 && !settings.Stdin {
 			// Try default the template name
 			folderName, err := os.Getwd()
 			if err != nil {
@@ -152,23 +141,32 @@ func main() {
 				folderName = filepath.Base(folderName)
 			}
 
-			for _, ext := range []string{".tmpl", ""} {
-				for _, try := range []string{"yaml", "json", "html", "txt", "xml", ""} {
-					name := fmt.Sprintf("%s.%s%s", folderName, try, ext)
-					if _, err := os.Stat(name); err == nil {
-						if settings.Verbose {
-							log.Printf("using template: %+v", name)
+			name := func() string {
+				for _, base := range []string{folderName, "renderizer"} {
+					for _, ext := range []string{".tmpl", ""} {
+						for _, try := range []string{"yaml", "json", "html", "txt", "xml", ""} {
+							name := fmt.Sprintf("%s.%s%s", base, try, ext)
+							if _, err := os.Stat(name); err == nil {
+								if settings.Verbose {
+									log.Printf("using template: %+v", name)
+								}
+								return name
+							}
 						}
-						mainTemplate = name
 					}
 				}
+				return ""
+			}()
+			if name != "" {
+				settings.Templates = append(settings.Templates, name)
 			}
 		}
 
-		if noTemplate {
-			settings.Arguments = append(settings.Arguments, mainTemplate)
+		if len(settings.Templates) == 0 {
+			return cli.NewExitError("missing template name", 1)
 		}
-		mainName = strings.Split(strings.TrimLeft(filepath.Base(mainTemplate), "."), ".")[0]
+
+		mainName := strings.Split(strings.TrimLeft(filepath.Base(settings.Templates[0]), "."), ".")[0]
 
 		switch settings.MissingKey {
 		case "zero", "error", "default", "invalid":
@@ -248,13 +246,22 @@ func main() {
 					continue
 				}
 			} else if strings.HasPrefix(larg, "-") {
-				switch larg[1:] {
+				switch arg[1:] {
 				case "C":
+				case "S":
+					if !strings.Contains(arg, "=") {
+						next = true
+					}
+					fallthrough
 				default:
 					args = append(args, arg)
 					continue
 				}
+			} else {
+				settings.Templates = append(settings.Templates, arg)
+				continue
 			}
+
 			settings.Arguments = append(settings.Arguments, arg)
 		}
 	}

renderizer.go

@@ -20,15 +20,13 @@ import (
 func renderizer(_ *cli.Context) error {
 
 	globalContext := map[string]interface{}{}
-	args := []string{}
 
 	// Iterate the remaining arguments for variable overrides and file names.
 
 	for a, arg := range settings.Arguments {
 		if len(arg) == 0 {
 			continue
 		} else if arg[0] != '-' {
-			args = append(args, arg)
 			continue
 		}
 
@@ -85,8 +83,8 @@ func renderizer(_ *cli.Context) error {
 	globalContext = retyper(globalContext, retypeSingleElementSlice)
 
 	// If there's no files, read from stdin.
-	files := args
-	if len(args) == 0 {
+	files := settings.Templates
+	if len(files) == 0 {
 		if settings.Stdin && settings.Verbose {
 			log.Println("source: stdin")
 		}
@@ -96,7 +94,7 @@ func renderizer(_ *cli.Context) error {
 	// Copy any loaded keys into the globalContext unless they already exist, i.e. they were provided on the command line.
 	mergo.Merge(&globalContext, settings.Config)
 
-	if settings.Environment != "" || len(args) == 0 {
+	if settings.Environment != "" || len(files) == 0 {
 		v := make(map[string]string)
 		for _, item := range os.Environ() {
 			splits := strings.Split(item, "=")

test/issue-0013.sh

@@ -0,0 +1,6 @@
+#!/bin/sh
+
+parameters=(
+	# issue 13
+	"-S=issue-0013.yaml"
+)

test/issue-0013.yaml

@@ -0,0 +1,5 @@
+OSLIST:
+- UBUNTU: '16.04'
+  OSID: 'ubu1604'
+- UBUNTU: '18.04'
+  OSID: 'ubu1804'

test/issue-0013.yaml.tmpl

@@ -0,0 +1,3 @@
+{{ range .OSLIST }}
+echo "{{ .UBUNTU }} aka {{ .OSID }}"
+{{ end }}