Restructure (#10)

* Restructure packages to use internal folder

* Fix missing template panic

* Update travis settings

.travis.yml

@@ -3,10 +3,11 @@ dist: trusty
 go:
   - 1.9.x
   - 1.10.x
+  - 1.11.x
 os:
   - linux
 env:
-  - DEP_VERSION="0.4.1"
+  - DEP_VERSION="0.5.0"
 go_import_path: github.com/openpixel/rise
 before_install:
   # Download the binary to bin folder in $GOPATH

cmd/rise.go

@@ -4,7 +4,6 @@ import (
 	"fmt"
 	"log"
 
-	"github.com/openpixel/rise/runner"
 	"github.com/spf13/cobra"
 )
 
@@ -18,6 +17,7 @@ func init() {
 	RootCmd.PersistentFlags().StringVarP(&inputs, "input", "i", "", "The file to perform interpolation on")
 	RootCmd.PersistentFlags().StringVarP(&outputs, "output", "o", "", "The file to output")
 	RootCmd.PersistentFlags().StringSliceVarP(&configFiles, "config", "c", []string{}, "The files that define the configuration to use for interpolation")
+
 	RootCmd.AddCommand(versionCmd)
 }
 
@@ -30,7 +30,7 @@ var RootCmd = &cobra.Command{
 		if inputs == "" {
 			log.Fatal("Must have an input")
 		}
-		err := runner.Run(&inputs, &outputs, &configFiles)
+		err := Run(inputs, outputs, configFiles)
 		if err != nil {
 			log.Fatal(err)
 		}

cmd/runner.go

@@ -0,0 +1,48 @@
+package cmd
+
+import (
+	"io"
+	"io/ioutil"
+	"os"
+
+	"github.com/openpixel/rise/internal/config"
+	"github.com/openpixel/rise/internal/template"
+)
+
+// Run accepts an input, output and config files and performs interpolation.
+// If the output is empty, it writes to stdout
+func Run(inputFile, outputFile string, configFiles []string) error {
+	contents, err := ioutil.ReadFile(inputFile)
+	if err != nil {
+		return err
+	}
+
+	configResult, err := config.LoadConfigFiles(configFiles)
+	if err != nil {
+		return err
+	}
+
+	t, err := template.NewTemplate(configResult)
+	if err != nil {
+		return err
+	}
+
+	result, err := t.Render(string(contents))
+	if err != nil {
+		return err
+	}
+
+	if outputFile != "" {
+		err = ioutil.WriteFile(outputFile, []byte(result.Value.(string)), 0644)
+		if err != nil {
+			return err
+		}
+	} else {
+		_, err = io.WriteString(os.Stdout, result.Value.(string))
+		if err != nil {
+			return err
+		}
+	}
+
+	return nil
+}

examples/input.yaml

@@ -1,6 +1,6 @@
 ---
-${i}:
+${var.i}:
   - ${join(", ", list("Foo", "Bar"))}
-  - ${i}
+  - ${var.i}
   - ${upper("foobar")}
-  - ${length(h)}
+  - ${length(var.h)}

template/template.go → internal/template/template.go

@@ -5,8 +5,8 @@ import (
 
 	"github.com/hashicorp/hil"
 	"github.com/hashicorp/hil/ast"
-	"github.com/openpixel/rise/config"
-	"github.com/openpixel/rise/interpolation"
+	"github.com/openpixel/rise/internal/config"
+	"github.com/openpixel/rise/internal/interpolation"
 )
 
 // Template is a container for holding onto the ast Variables
@@ -92,8 +92,6 @@ func (vf visitorFn) fn(n ast.Node) ast.Node {
 		if va, ok := vn.Key.(*ast.VariableAccess); ok {
 			vn.Key = vf.processVariable(va)
 		}
-	default:
-		return n
 	}
 	return n
 }
@@ -107,15 +105,20 @@ func (vf visitorFn) processVariable(va *ast.VariableAccess) ast.Node {
 			vf.resultErr = err
 			return va
 		}
-		resultN = vf.fn(resultN)
-		return resultN
+		if resultN != va {
+			resultN = vf.fn(resultN)
+			return resultN
+		}
 	}
 
 	return va
 }
 
 func (vf visitorFn) processTemplateNode(original ast.Node, name string) (replacement ast.Node, err error) {
-	template := vf.templates[name]
+	template, ok := vf.templates[name]
+	if !ok {
+		return original, nil
+	}
 
 	switch template.Type {
 	case ast.TypeString:

template/template_test.go → internal/template/template_test.go

@@ -4,7 +4,7 @@ import (
 	"testing"
 
 	"github.com/hashicorp/hil/ast"
-	"github.com/openpixel/rise/config"
+	"github.com/openpixel/rise/internal/config"
 )
 
 func TestTemplate_Render(t *testing.T) {