Embed web view templates to the binary

.gitignore

@@ -3,10 +3,10 @@
 *.prof
 *.pyc
 
-config.json
-fabfile.py
-
 /mistry
 /mistryd
 
+cmd/mistryd/statik
+config.json
+fabfile.py
 vendor/

Makefile

@@ -10,13 +10,13 @@ install: fmt test
 
 build: mistryd mistry
 
-mistryd:
+mistryd: generate
 	$(BUILDCMD) -o $(SERVER) cmd/mistryd/*.go
 
 mistry:
 	$(BUILDCMD) -o $(CLIENT) cmd/mistry/*.go
 
-test: mistry
+test: generate mistry
 	$(TESTCMD) --filesystem plain
 
 testall: test
@@ -34,3 +34,6 @@ fmt:
 
 clean:
 	go clean ./...
+
+generate:
+	go generate ./...

cmd/mistryd/Gopkg.toml

@@ -33,3 +33,7 @@
 [[constraint]]
   name = "github.com/urfave/cli"
   version = "1.20.0"
+
+[[constraint]]
+  name = "github.com/rakyll/statik"
+  version = "0.1.1"

cmd/mistryd/server.go

@@ -1,3 +1,4 @@
+//go:generate statik -src=./public -f
 package main
 
 import (
@@ -17,8 +18,8 @@ import (
 
 	"sync"
 
-	"github.com/alecthomas/template"
-
+	"github.com/rakyll/statik/fs"
+	_ "github.com/skroutz/mistry/cmd/mistryd/statik"
 	"github.com/skroutz/mistry/pkg/broker"
 	"github.com/skroutz/mistry/pkg/tailer"
 	"github.com/skroutz/mistry/pkg/types"
@@ -41,12 +42,16 @@ type Server struct {
 	// matches a job id.
 	// The stored map type is [string]bool.
 	tq *sync.Map
+
+	fs http.FileSystem
 }
 
 // NewServer accepts a non-nil configuration and an optional logger, and
 // returns a new Server.
 // If logger is nil, server logs are disabled.
 func NewServer(cfg *Config, logger *log.Logger) (*Server, error) {
+	var err error
+
 	if cfg == nil {
 		return nil, errors.New("config cannot be nil")
 	}
@@ -57,7 +62,13 @@ func NewServer(cfg *Config, logger *log.Logger) (*Server, error) {
 
 	s := new(Server)
 	mux := http.NewServeMux()
-	mux.Handle("/", http.StripPrefix("/", http.FileServer(http.Dir("public"))))
+
+	s.fs, err = fs.New()
+	if err != nil {
+		logger.Fatal(err)
+	}
+
+	mux.Handle("/", http.StripPrefix("/", http.FileServer(s.fs)))
 	mux.HandleFunc("/jobs", s.HandleNewJob)
 	mux.HandleFunc("/index/", s.HandleIndex)
 	mux.HandleFunc("/job/", s.HandleShowJob)
@@ -326,13 +337,28 @@ func (s *Server) HandleShowJob(w http.ResponseWriter, r *http.Request) {
 		}
 	}
 
-	t, err := template.ParseFiles("./public/templates/show.html")
+	f, err := s.fs.Open("/templates/show.html")
+	if err != nil {
+		s.Log.Print(err)
+		w.WriteHeader(http.StatusInternalServerError)
+		return
+	}
+
+	tmplBody, err := ioutil.ReadAll(f)
+	if err != nil {
+		s.Log.Print(err)
+		w.WriteHeader(http.StatusInternalServerError)
+		return
+	}
+
+	tmpl := template.New("jobshow")
+	tmpl, err = tmpl.Parse(string(tmplBody))
 	if err != nil {
 		s.Log.Print(err)
 		w.WriteHeader(http.StatusBadRequest)
 		return
 	}
-	t.Execute(w, ji)
+	tmpl.Execute(w, ji)
 }
 
 // HandleServerPush handles the server push logic.