Merge pull request #299 from hairyhenderson/export-template-stdout

Exporting the writer used when templates are sent to Stdout

gomplate_test.go

@@ -2,6 +2,7 @@ package gomplate
 
 import (
 	"bytes"
+	"io"
 	"net/http/httptest"
 	"os"
 	"testing"
@@ -15,6 +16,15 @@ import (
 	"github.com/stretchr/testify/assert"
 )
 
+// like ioutil.NopCloser(), except for io.WriteClosers...
+type nopWCloser struct {
+	io.Writer
+}
+
+func (n *nopWCloser) Close() error {
+	return nil
+}
+
 func testTemplate(g *gomplate, tmpl string) string {
 	var out bytes.Buffer
 	err := g.runTemplate(&tplate{name: "testtemplate", contents: tmpl, target: &out})
@@ -148,3 +158,13 @@ func TestCustomDelim(t *testing.T) {
 	}
 	assert.Equal(t, "hi", testTemplate(g, `[print "hi"]`))
 }
+
+func TestRunTemplates(t *testing.T) {
+	defer func() { Stdout = os.Stdout }()
+	buf := &bytes.Buffer{}
+	Stdout = &nopWCloser{buf}
+	config := &Config{Input: "foo"}
+	err := RunTemplates(config)
+	assert.NoError(t, err)
+	assert.Equal(t, "foo", buf.String())
+}

template.go

@@ -13,9 +13,11 @@ import (
 
 // for overriding in tests
 var stdin io.ReadCloser = os.Stdin
-var stdout io.WriteCloser = os.Stdout
 var fs = afero.NewOsFs()
 
+// Stdout allows overriding the writer to use when templates are written to stdout ("-").
+var Stdout io.WriteCloser = os.Stdout
+
 // tplate - models a gomplate template file...
 type tplate struct {
 	name     string
@@ -151,7 +153,7 @@ func inList(list []string, entry string) bool {
 
 func openOutFile(filename string) (out io.WriteCloser, err error) {
 	if filename == "-" {
-		return stdout, nil
+		return Stdout, nil
 	}
 	return fs.OpenFile(filename, os.O_RDWR|os.O_CREATE|os.O_TRUNC, 0644)
 }

template_test.go

@@ -4,7 +4,6 @@ package gomplate
 
 import (
 	"bytes"
-	"io"
 	"io/ioutil"
 	"os"
 	"testing"
@@ -14,14 +13,6 @@ import (
 	"github.com/stretchr/testify/assert"
 )
 
-// like ioutil.NopCloser(), except for io.WriteClosers...
-type nopWCloser struct {
-	io.Writer
-}
-
-func (n *nopWCloser) Close() error {
-	return nil
-}
 func TestReadInput(t *testing.T) {
 	origfs := fs
 	defer func() { fs = origfs }()
@@ -60,12 +51,12 @@ func TestOpenOutFile(t *testing.T) {
 	assert.NoError(t, err)
 	assert.Equal(t, os.FileMode(0644), i.Mode())
 
-	defer func() { stdout = os.Stdout }()
-	stdout = &nopWCloser{&bytes.Buffer{}}
+	defer func() { Stdout = os.Stdout }()
+	Stdout = &nopWCloser{&bytes.Buffer{}}
 
 	f, err := openOutFile("-")
 	assert.NoError(t, err)
-	assert.Equal(t, stdout, f)
+	assert.Equal(t, Stdout, f)
 }
 
 func TestInList(t *testing.T) {
@@ -163,7 +154,7 @@ func TestGatherTemplates(t *testing.T) {
 	assert.NoError(t, err)
 	assert.Len(t, templates, 1)
 	assert.Equal(t, "foo", templates[0].contents)
-	assert.Equal(t, stdout, templates[0].target)
+	assert.Equal(t, Stdout, templates[0].target)
 
 	templates, err = gatherTemplates(&Config{
 		InputFiles:  []string{"foo"},
@@ -172,7 +163,7 @@ func TestGatherTemplates(t *testing.T) {
 	assert.NoError(t, err)
 	assert.Len(t, templates, 1)
 	assert.Equal(t, "bar", templates[0].contents)
-	assert.NotEqual(t, stdout, templates[0].target)
+	assert.NotEqual(t, Stdout, templates[0].target)
 
 	templates, err = gatherTemplates(&Config{
 		InputDir:  "in",