Add configuration

Author: marcomilon

internal/gstatic/defs.go

@@ -7,3 +7,9 @@ type VarReader interface {
 	GetVarsForTpl(r io.Reader) (map[interface{}]interface{}, error)
 	GetDsExtension() string
 }
+
+// Config the structs holds config settings
+type Config struct {
+	Layout string
+	Base   string
+}

internal/gstatic/generator.go

@@ -8,6 +8,7 @@ import (
 
 // Generator is the main struct. It use a VarReader to extract variables from a data source
 type Generator struct {
+	Config    Config
 	VarReader VarReader
 }
 
@@ -27,7 +28,7 @@ func (g Generator) Generate(srcFolder string, targetFolder string) error {
 func (g Generator) resolver(srcFolder string, targetFolder string) filepath.WalkFunc {
 
 	var useLayout bool = false
-	var layout string = srcFolder + string(os.PathSeparator) + "layout" + string(os.PathSeparator) + "layout.html"
+	var layout string = srcFolder + string(os.PathSeparator) + g.Config.Layout
 
 	if _, err := os.Stat(layout); err == nil {
 		useLayout = true
@@ -106,7 +107,7 @@ func (g Generator) parseFileWithLayout(path, targetFilename, layout string) erro
 	defer f.Close()
 
 	tmpl, err := template.ParseFiles(layout, path)
-	err = tmpl.ExecuteTemplate(f, "base", m)
+	err = tmpl.ExecuteTemplate(f, g.Config.Base, m)
 	if err != nil {
 		return err
 	}

internal/gstatic/generator_test.go

@@ -23,7 +23,15 @@ func TestBasicGenerator(t *testing.T) {
 
 	ds := datasource.Yaml{}
 
-	yamlGen := gstatic.Generator{ds}
+	config := gstatic.Config{
+		"layout/layout.html",
+		"base",
+	}
+
+	yamlGen := gstatic.Generator{
+		config,
+		ds,
+	}
 
 	err := yamlGen.Generate(srcFolderBasic, targetFolder)
 	if err != nil {
@@ -61,7 +69,15 @@ func TestCompositionGenerator(t *testing.T) {
 
 	ds := datasource.Yaml{}
 
-	yamlGen := gstatic.Generator{ds}
+	config := gstatic.Config{
+		"layout/layout.html",
+		"base",
+	}
+
+	yamlGen := gstatic.Generator{
+		config,
+		ds,
+	}
 
 	err := yamlGen.Generate(srcFolderComposition, targetFolder)
 	if err != nil {
@@ -88,7 +104,15 @@ func TestStaticGenerator(t *testing.T) {
 
 	ds := datasource.Yaml{}
 
-	yamlGen := gstatic.Generator{ds}
+	config := gstatic.Config{
+		"layout/layout.html",
+		"base",
+	}
+
+	yamlGen := gstatic.Generator{
+		config,
+		ds,
+	}
 
 	err := yamlGen.Generate(srcFolderStatic, targetFolder)
 	if err != nil {

main.go

@@ -1,6 +1,7 @@
 package main
 
 import (
+	"flag"
 	"fmt"
 	"os"
 
@@ -10,6 +11,16 @@ import (
 
 func main() {
 
+	layoutPtr := flag.String("layout", "layout/layout.html", "Path to the layout")
+	basePtr := flag.String("base", "base", "Name of the main template")
+
+	flag.Parse()
+
+	config := gstatic.Config{
+		Layout: *layoutPtr,
+		Base:   *basePtr,
+	}
+
 	if len(os.Args) < 3 {
 		usage()
 	}
@@ -21,16 +32,23 @@ func main() {
 
 	ds := datasource.Yaml{}
 
-	yamlGen := gstatic.Generator{VarReader: ds}
+	yamlGen := gstatic.Generator{
+		Config:    config,
+		VarReader: ds,
+	}
 
 	err := yamlGen.Generate(srcFolder, targetFolder)
 	if err != nil {
 		fmt.Fprintf(os.Stderr, "Something went wrong: %v\n", err.Error())
+		os.Exit(1)
 	}
 
 }
 
 func usage() {
+
 	fmt.Println("Usage: gstatic <sourceFolder> <targetFolder>")
-	os.Exit(0)
+	fmt.Println("Use -h for help")
+	os.Exit(1)
+
 }