Trying to collect common code and then add better diagnostics

Author: mtiller

docker/gopath/src/xogeny/pubbook/Makefile

@@ -1,5 +1,6 @@
 image:
-	tar zcf - . | docker build -t xogeny/book-hook -
+	-rm -rf _cache
+	tar zcf - . | docker build -t mtiller/book-hook -
 
-push:
+push: image
 	docker push mtiller/book-hook

docker/gopath/src/xogeny/pubbook/pubbook.go

@@ -12,6 +12,34 @@ type Builder struct {
 	Debug bool
 }
 
+func git(args...string) error {
+	log.Printf("Running %v...", args);
+
+	cmd := exec.Command("git", args...)
+	err := cmd.Run()
+	if err != nil {
+		log.Printf("Error: %s", err.Error());
+		return err;
+	} else {
+		log.Printf("...successful");
+	}
+	return nil;
+}
+
+func make(dir string, targets...string) error {
+	cmd := exec.Command("make", targets...);
+	cmd.Dir = path.Join(dir, "text");
+	log.Printf("Running initial make: %v...", targets);
+	err := cmd.Run()
+	if err != nil {
+		log.Printf("Error running initial make '%v': %s", targets, err.Error());
+		return err;
+	} else {
+		log.Printf("...successful");
+	}
+	return nil;
+}
+
 func (b Builder) Push(msg hs.HubMessage) {
 	url := "git@github.com:xogeny/ModelicaBook.git"
 	ref := "origin/master"
@@ -22,83 +50,34 @@ func (b Builder) Push(msg hs.HubMessage) {
 	dir := path.Join("_cache", user);
 
 	diri, err := os.Stat(dir);
-	/*
-	if (err!=nil) {
-		log.Printf("Error getting file information: %s", err.Error());
-		return;
-	}
-    */
-
-	var cmd *exec.Cmd;
-	var exists bool;
 
-	exists = err==nil && diri.IsDir();
+	exists := err==nil && diri.IsDir();
 
 	// TODO: Have a query parameter to clear cache
 
 	if (exists) {
-		log.Printf("Repository already exists, fetching latest updates...");
-		/* Clone repo locally */
-		cmd = exec.Command("git", "fetch", "origin")
-		err := cmd.Run()
-		if err != nil {
-			log.Printf("Error fetching updates: %s", err.Error());
-			return;
-		} else {
-			log.Printf("...successful");
-		}
+		err = git("fetch", "origin");
+		if (err!=nil) { return; }
 	} else {
-		log.Printf("Cloning repository: %s...", url);
-		/* Clone repo locally */
-		cmd = exec.Command("git", "clone", url, dir)
-		err := cmd.Run()
-		if err != nil {
-			log.Printf("Error cloning repository at '%s' to directory %s: %s",
-				url, dir, err.Error());
-			return;
-		} else {
-			log.Printf("...successful");
-		}
+		err = git("clone", url, dir);
+		if (err!=nil) { return; }
 	}
 
-	log.Printf("Checking out: %s...", ref);
 	/* Repo checkout correct ref */
-	cmd = exec.Command("git", "checkout", ref)
-	err = cmd.Run()
-	if err != nil {
-		log.Printf("Error checking out '%s': %s", ref, err.Error());
-		return;
-	} else {
-		log.Printf("...successful");
-	}
+	err = git("checkout", ref)
+	if err != nil { return; }
 
 	bucket := fmt.Sprintf("S3BUCKET=dev.book.xogeny.com/%s", user);
 	if (!exists) {
 		// If it didn't already exist, we need to run some make targets
 		/* Run make */
-		cmd = exec.Command("make", "specs", "results");
-		cmd.Dir = path.Join(dir, "text");
-		log.Printf("Running initial make: %v...", cmd);
-		err = cmd.Run()
-		if err != nil {
-			log.Printf("Error running initial make '%v': %s", cmd, err.Error());
-			return;
-		} else {
-			log.Printf("...successful");
-		}
+		make(dir, "specs", "results");
+		if (err!=nil) { return; }
 	}
 
 	/* Run make */
-	cmd = exec.Command("make", target1, target2, bucket);
-	cmd.Dir = path.Join(dir, "text");
-	log.Printf("Running build make: %v...", cmd);
-	err = cmd.Run()
-	if err != nil {
-		log.Printf("Error running build make '%v': %s", cmd, err.Error());
-		return;
-	} else {
-		log.Printf("...successful");
-	}
+	make(dir, target1, target2, bucket);
+	if err != nil {	return; }
 
 	log.Printf("Make ran!");
 }