From fb2c28e58a562d847d24c97abbdabbf5aef8de24 Mon Sep 17 00:00:00 2001
From: Eli Bendersky <eliben@gmail.com>
Date: Mon, 1 Jul 2019 06:44:09 -0700
Subject: [PATCH 1/2] When testing on Travis, verify that tools/build was run

This is done by routing the generation of HTML into a temporary directory,
and checking its diff agains the existing public/ when running tests.

Fixes #237
---
 .travis.yml       |  1 +
 tools/build       | 26 ++++++++++++++++++++++++--
 tools/generate    |  2 +-
 tools/generate.go | 11 ++++++++++-
 4 files changed, 36 insertions(+), 4 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 54d1654..25b9ffc 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -16,3 +16,4 @@ script:
 
 env:
   - VERBOSE=1
+  - TESTING=1
diff --git a/tools/build b/tools/build
index f06beae..4f66902 100755
--- a/tools/build
+++ b/tools/build
@@ -15,5 +15,27 @@ tools/format
 verbose && echo "Measuring line lengths..."
 tools/measure
 
-verbose && echo "Generating HTML..."
-tools/generate
+# SITE_DIR is the final location where we want generated content to be
+SITE_DIR="public"
+
+# GENERATE_DIR is where the content will be generated initially
+GENERATE_DIR="$(mktemp -d)"
+
+function cleanup() {
+  rm -rf "$GENERATE_DIR"
+}
+trap cleanup EXIT
+
+verbose && echo "Generating HTML to $GENERATE_DIR..."
+tools/generate $GENERATE_DIR
+
+# In TESTING mode, make sure that the generated content is identical to
+# what's already in SITE_DIR. If a difference is found, this script exits
+# with an error.
+if [[ ! -z "$TESTING" ]]; then
+	echo "Comparing $GENERATE_DIR with $SITE_DIR..."
+	diff -r "$GENERATE_DIR" "$SITE_DIR"
+fi
+
+verbose && echo "Copying $GENERATE_DIR to $SITE_DIR"
+cp -rf "${GENERATE_DIR}/." "$SITE_DIR"
diff --git a/tools/generate b/tools/generate
index 83ed0e7..af897e5 100755
--- a/tools/generate
+++ b/tools/generate
@@ -1,3 +1,3 @@
 #!/bin/bash
 
-exec go run tools/generate.go
+exec go run tools/generate.go $@
diff --git a/tools/generate.go b/tools/generate.go
index 97d8ab5..a332128 100644
--- a/tools/generate.go
+++ b/tools/generate.go
@@ -15,8 +15,12 @@ import (
 	"github.com/russross/blackfriday"
 )
 
-var cacheDir = "/tmp/gobyexample-cache"
+// siteDir is the target directory into which the HTML gets generated. Its
+// default is set here but can be changed by an argument passed into the
+// program.
 var siteDir = "./public"
+
+var cacheDir = "/tmp/gobyexample-cache"
 var pygmentizeBin = "./vendor/pygments/pygmentize"
 
 func verbose() bool {
@@ -301,6 +305,11 @@ func renderExamples(examples []*Example) {
 }
 
 func main() {
+	if len(os.Args) > 1 {
+		siteDir = os.Args[1]
+	}
+	ensureDir(siteDir)
+
 	copyFile("templates/site.css", siteDir+"/site.css")
 	copyFile("templates/favicon.ico", siteDir+"/favicon.ico")
 	copyFile("templates/404.html", siteDir+"/404.html")

From fe1443c7ed2d1ea56bf19ee45a28ffd8d9952ae4 Mon Sep 17 00:00:00 2001
From: Eli Bendersky <eliben@gmail.com>
Date: Mon, 1 Jul 2019 06:51:20 -0700
Subject: [PATCH 2/2] Combine testing environments on travis

---
 .travis.yml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 25b9ffc..96a94a1 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -15,5 +15,4 @@ script:
   - tools/build
 
 env:
-  - VERBOSE=1
-  - TESTING=1
+  - VERBOSE=1 TESTING=1