summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--config.go113
-rw-r--r--config_test.go53
-rw-r--r--gomplate.go84
-rw-r--r--gomplate_test.go26
-rw-r--r--template.go11
-rw-r--r--template_test.go2
6 files changed, 173 insertions, 116 deletions
diff --git a/config.go b/config.go
new file mode 100644
index 00000000..26f48ee7
--- /dev/null
+++ b/config.go
@@ -0,0 +1,113 @@
+package gomplate
+
+import (
+ "os"
+ "strconv"
+ "strings"
+)
+
+// Config - values necessary for rendering templates with gomplate.
+// Mainly for use by the CLI
+type Config struct {
+ Input string
+ InputFiles []string
+ InputDir string
+ ExcludeGlob []string
+ OutputFiles []string
+ OutputDir string
+ OutMode string
+
+ DataSources []string
+ DataSourceHeaders []string
+ Contexts []string
+
+ LDelim string
+ RDelim string
+
+ Templates []string
+}
+
+// defaults - sets any unset fields to their default value (if applicable)
+func (o *Config) defaults() *Config {
+ if o.OutputDir == "" {
+ o.OutputDir = "."
+ }
+ if o.InputFiles == nil {
+ o.InputFiles = []string{"-"}
+ }
+ if o.OutputFiles == nil {
+ o.OutputFiles = []string{"-"}
+ }
+ if o.LDelim == "" {
+ o.LDelim = "{{"
+ }
+ if o.RDelim == "" {
+ o.RDelim = "}}"
+ }
+ return o
+}
+
+// parse an os.FileMode out of the string, and let us know if it's an override or not...
+func (o *Config) getMode() (os.FileMode, bool, error) {
+ modeOverride := o.OutMode != ""
+ m, err := strconv.ParseUint("0"+o.OutMode, 8, 32)
+ if err != nil {
+ return 0, false, err
+ }
+ mode := os.FileMode(m)
+ if mode == 0 && o.Input != "" {
+ mode = 0644
+ }
+ return mode, modeOverride, nil
+}
+
+// nolint: gocyclo
+func (o *Config) String() string {
+ o.defaults()
+
+ c := "input: "
+ if o.Input != "" {
+ c += "<arg>"
+ } else if o.InputDir != "" {
+ c += o.InputDir
+ } else {
+ c += strings.Join(o.InputFiles, ", ")
+ }
+
+ if len(o.ExcludeGlob) > 0 {
+ c += "\nexclude: " + strings.Join(o.ExcludeGlob, ", ")
+ }
+
+ c += "\noutput: "
+ if o.InputDir != "" && o.OutputDir != "." {
+ c += o.OutputDir
+ } else {
+ c += strings.Join(o.OutputFiles, ", ")
+ }
+
+ if o.OutMode != "" {
+ c += "\nchmod: " + o.OutMode
+ }
+
+ if len(o.DataSources) > 0 {
+ c += "\ndatasources: " + strings.Join(o.DataSources, ", ")
+ }
+ if len(o.DataSourceHeaders) > 0 {
+ c += "\ndatasourceheaders: " + strings.Join(o.DataSourceHeaders, ", ")
+ }
+ if len(o.Contexts) > 0 {
+ c += "\ncontexts: " + strings.Join(o.Contexts, ", ")
+ }
+
+ if o.LDelim != "{{" {
+ c += "\nleft_delim: " + o.LDelim
+ }
+ if o.RDelim != "}}" {
+ c += "\nright_delim: " + o.RDelim
+ }
+
+ if len(o.Templates) > 0 {
+ c += "\ntemplates: " + strings.Join(o.Templates, ", ")
+ }
+ return c
+}
diff --git a/config_test.go b/config_test.go
new file mode 100644
index 00000000..d916e7e9
--- /dev/null
+++ b/config_test.go
@@ -0,0 +1,53 @@
+package gomplate
+
+import (
+ "os"
+ "testing"
+
+ "github.com/stretchr/testify/assert"
+)
+
+func TestConfigString(t *testing.T) {
+ c := &Config{}
+
+ expected := `input: -
+output: -`
+ assert.Equal(t, expected, c.String())
+
+ c = &Config{
+ LDelim: "{{",
+ RDelim: "}}",
+ Input: "{{ foo }}",
+ OutputFiles: []string{"-"},
+ Templates: []string{"foo=foo.t", "bar=bar.t"},
+ }
+ expected = `input: <arg>
+output: -
+templates: foo=foo.t, bar=bar.t`
+
+ assert.Equal(t, expected, c.String())
+}
+
+func TestGetMode(t *testing.T) {
+ c := &Config{}
+ m, o, err := c.getMode()
+ assert.NoError(t, err)
+ assert.Equal(t, os.FileMode(0), m)
+ assert.False(t, o)
+
+ c = &Config{OutMode: "755"}
+ m, o, err = c.getMode()
+ assert.NoError(t, err)
+ assert.Equal(t, os.FileMode(0755), m)
+ assert.True(t, o)
+
+ c = &Config{OutMode: "0755"}
+ m, o, err = c.getMode()
+ assert.NoError(t, err)
+ assert.Equal(t, os.FileMode(0755), m)
+ assert.True(t, o)
+
+ c = &Config{OutMode: "foo"}
+ _, _, err = c.getMode()
+ assert.Error(t, err)
+}
diff --git a/gomplate.go b/gomplate.go
index da0ba097..0e08f0ce 100644
--- a/gomplate.go
+++ b/gomplate.go
@@ -4,7 +4,6 @@ import (
"io"
"os"
"path"
- "strconv"
"strings"
"text/template"
"time"
@@ -13,87 +12,6 @@ import (
"github.com/spf13/afero"
)
-// Config - values necessary for rendering templates with gomplate.
-// Mainly for use by the CLI
-type Config struct {
- Input string
- InputFiles []string
- InputDir string
- ExcludeGlob []string
- OutputFiles []string
- OutputDir string
- OutMode string
-
- DataSources []string
- DataSourceHeaders []string
- Contexts []string
-
- LDelim string
- RDelim string
-
- Templates []string
-}
-
-// parse an os.FileMode out of the string, and let us know if it's an override or not...
-func (o *Config) getMode() (os.FileMode, bool, error) {
- modeOverride := o.OutMode != ""
- m, err := strconv.ParseUint("0"+o.OutMode, 8, 32)
- if err != nil {
- return 0, false, err
- }
- mode := os.FileMode(m)
- return mode, modeOverride, nil
-}
-
-// nolint: gocyclo
-func (o *Config) String() string {
- c := "input: "
- if o.Input != "" {
- c += "<arg>"
- } else if o.InputDir != "" {
- c += o.InputDir
- } else if len(o.InputFiles) > 0 {
- c += strings.Join(o.InputFiles, ", ")
- }
-
- if len(o.ExcludeGlob) > 0 {
- c += "\nexclude: " + strings.Join(o.ExcludeGlob, ", ")
- }
-
- c += "\noutput: "
- if o.InputDir != "" && o.OutputDir != "." {
- c += o.OutputDir
- } else if len(o.OutputFiles) > 0 {
- c += strings.Join(o.OutputFiles, ", ")
- }
-
- if o.OutMode != "" {
- c += "\nchmod: " + o.OutMode
- }
-
- if len(o.DataSources) > 0 {
- c += "\ndatasources: " + strings.Join(o.DataSources, ", ")
- }
- if len(o.DataSourceHeaders) > 0 {
- c += "\ndatasourceheaders: " + strings.Join(o.DataSourceHeaders, ", ")
- }
- if len(o.Contexts) > 0 {
- c += "\ncontexts: " + strings.Join(o.Contexts, ", ")
- }
-
- if o.LDelim != "{{" {
- c += "\nleft_delim: " + o.LDelim
- }
- if o.RDelim != "}}" {
- c += "\nright_delim: " + o.RDelim
- }
-
- if len(o.Templates) > 0 {
- c += "\ntemplates: " + strings.Join(o.Templates, ", ")
- }
- return c
-}
-
// gomplate -
type gomplate struct {
funcMap template.FuncMap
@@ -186,6 +104,8 @@ func parseTemplateArg(templateArg string, ta templateAliases) error {
func RunTemplates(o *Config) error {
Metrics = newMetrics()
defer runCleanupHooks()
+ // make sure config is sane
+ o.defaults()
ds := append(o.DataSources, o.Contexts...)
d, err := data.NewData(ds, o.DataSourceHeaders)
if err != nil {
diff --git a/gomplate_test.go b/gomplate_test.go
index 3121aa55..5bb7c69d 100644
--- a/gomplate_test.go
+++ b/gomplate_test.go
@@ -165,7 +165,7 @@ func TestRunTemplates(t *testing.T) {
defer func() { Stdout = os.Stdout }()
buf := &bytes.Buffer{}
Stdout = &nopWCloser{buf}
- config := &Config{Input: "foo"}
+ config := &Config{Input: "foo", OutputFiles: []string{"-"}}
err := RunTemplates(config)
assert.NoError(t, err)
assert.Equal(t, "foo", buf.String())
@@ -174,30 +174,6 @@ func TestRunTemplates(t *testing.T) {
assert.Equal(t, 0, Metrics.Errors)
}
-func TestConfigString(t *testing.T) {
- c := &Config{}
-
- expected := `input:
-output:
-left_delim:
-right_delim: `
-
- assert.Equal(t, expected, c.String())
-
- c = &Config{
- LDelim: "{{",
- RDelim: "}}",
- Input: "{{ foo }}",
- OutputFiles: []string{"-"},
- Templates: []string{"foo=foo.t", "bar=bar.t"},
- }
- expected = `input: <arg>
-output: -
-templates: foo=foo.t, bar=bar.t`
-
- assert.Equal(t, expected, c.String())
-}
-
func TestParseTemplateArg(t *testing.T) {
fs = afero.NewMemMapFs()
afero.WriteFile(fs, "foo.t", []byte("hi"), 0600)
diff --git a/template.go b/template.go
index 5a723ab6..7697cef2 100644
--- a/template.go
+++ b/template.go
@@ -97,6 +97,7 @@ func (t *tplate) addTarget() (err error) {
// gatherTemplates - gather and prepare input template(s) and output file(s) for rendering
// nolint: gocyclo
func gatherTemplates(o *Config) (templates []*tplate, err error) {
+ o.defaults()
mode, modeOverride, err := o.getMode()
if err != nil {
return nil, err
@@ -104,19 +105,13 @@ func gatherTemplates(o *Config) (templates []*tplate, err error) {
// the arg-provided input string gets a special name
if o.Input != "" {
- if mode == 0 {
- mode = 0644
- }
templates = []*tplate{{
name: "<arg>",
contents: o.Input,
mode: mode,
modeOverride: modeOverride,
+ targetPath: o.OutputFiles[0],
}}
-
- if len(o.OutputFiles) == 1 {
- templates[0].targetPath = o.OutputFiles[0]
- }
}
// input dirs presume output dirs are set too
@@ -125,7 +120,7 @@ func gatherTemplates(o *Config) (templates []*tplate, err error) {
if err != nil {
return nil, err
}
- } else if len(o.InputFiles) > 0 && o.Input == "" {
+ } else if o.Input == "" {
templates = make([]*tplate, len(o.InputFiles))
for i := range o.InputFiles {
templates[i], err = fileToTemplates(o.InputFiles[i], o.OutputFiles[i], mode, modeOverride)
diff --git a/template_test.go b/template_test.go
index 10fbc417..123eb58a 100644
--- a/template_test.go
+++ b/template_test.go
@@ -94,7 +94,7 @@ func TestGatherTemplates(t *testing.T) {
templates, err := gatherTemplates(&Config{})
assert.NoError(t, err)
- assert.Len(t, templates, 0)
+ assert.Len(t, templates, 1)
templates, err = gatherTemplates(&Config{
Input: "foo",
generated by cgit v1.2.3 (git 2.25.1) at 2026-02-12 10:25:36 +0000