#13 support HOME alias "~"

grammarly · Sep 19, 2015 · b0cfdf8 · b0cfdf8
1 parent 3c4048e
commit b0cfdf8
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 0 deletions.
diff --git a/src/rocker/template/vars.go b/src/rocker/template/vars.go
@@ -124,6 +124,9 @@ func ParseKvPairs(pairs []string) (vars Vars) {
 }
 
 func loadFileContent(f string) (string, error) {
+	if f == "~" || strings.HasPrefix(f, "~/") {
+		f = strings.Replace(f, "~", os.Getenv("HOME"), 1)
+	}
 	if !filepath.IsAbs(f) {
 		wd, err := os.Getwd()
 		if err != nil {

diff --git a/src/rocker/template/vars_test.go b/src/rocker/template/vars_test.go
@@ -20,6 +20,7 @@ import (
 	"encoding/json"
 	"fmt"
 	"os"
+	"path"
 	"testing"
 
 	"github.com/stretchr/testify/assert"
@@ -215,4 +216,14 @@ func TestVarsFileContent(t *testing.T) {
 	}
 
 	assert.Equal(t, "@testdata/content.txt", result3["FOO"])
+
+	// Test HOME
+	os.Setenv("HOME", path.Join(wd, "testdata"))
+
+	result4, err := VarsFromStrings([]string{"FOO=@~/content.txt"})
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	assert.Equal(t, "hello\n", result4["FOO"])
 }