Merge pull request #24 from Clever/ux-nits

UX Nits

VERSION

@@ -1 +1 @@
-0.0.9
+0.0.10

cmd/plan.go

@@ -6,9 +6,11 @@ import (
 	"log"
 	"os"
 	"path/filepath"
+	"strings"
 
 	"github.com/Clever/microplane/clone"
 	"github.com/Clever/microplane/initialize"
+	"github.com/Clever/microplane/merge"
 	"github.com/Clever/microplane/plan"
 	"github.com/spf13/cobra"
 )
@@ -62,7 +64,7 @@ var planCmd = &cobra.Command{
 
 		err = parallelize(repos, planOneRepo)
 		if err != nil {
-			log.Fatal(err)
+			log.Fatal("# errors = ", strings.Count(err.Error(), " | ")+1)
 		}
 	},
 }
@@ -77,6 +79,16 @@ func planOneRepo(r initialize.Repo, ctx context.Context) error {
 		return nil
 	}
 
+	// Exit early if already merged
+	var mergeOutput struct {
+		merge.Output
+		Error string
+	}
+	if loadJSON(outputPath(r.Name, "merge"), &mergeOutput) == nil && mergeOutput.Success {
+		log.Printf("%s/%s - already merged", r.Owner, r.Name)
+		return nil
+	}
+
 	// Prepare workdir for current step's output
 	planOutputPath := outputPath(r.Name, "plan")
 	planWorkDir := filepath.Dir(planOutputPath)

cmd/push.go

@@ -7,6 +7,7 @@ import (
 	"path/filepath"
 
 	"github.com/Clever/microplane/initialize"
+	"github.com/Clever/microplane/merge"
 	"github.com/Clever/microplane/plan"
 	"github.com/Clever/microplane/push"
 	"github.com/spf13/cobra"
@@ -51,6 +52,16 @@ var pushCmd = &cobra.Command{
 func pushOneRepo(r initialize.Repo, ctx context.Context) error {
 	log.Printf("pushing: %s/%s", r.Owner, r.Name)
 
+	// Exit early if already merged
+	var mergeOutput struct {
+		merge.Output
+		Error string
+	}
+	if loadJSON(outputPath(r.Name, "merge"), &mergeOutput) == nil && mergeOutput.Success {
+		log.Printf("%s/%s - already merged", r.Owner, r.Name)
+		return nil
+	}
+
 	// Get previous step's output
 	var planOutput plan.Output
 	if loadJSON(outputPath(r.Name, "plan"), &planOutput) != nil || !planOutput.Success {

cmd/status.go

@@ -47,6 +47,7 @@ var statusCmd = &cobra.Command{
 			if !valid {
 				log.Fatalf("%s not a targeted repo name (valid target repos are: %s)", singleRepo, strings.Join(validRepoNames, ", "))
 			}
+			isSingleRepo = true
 		}
 
 		repos := []string{}
@@ -120,6 +121,9 @@ func getRepoStatus(repo string) (status, details string) {
 	if err == nil {
 		details = fmt.Sprintf("%d file(s) modified", len(diff.Files))
 	}
+	if isSingleRepo {
+		fmt.Println(planOutput.GitDiff)
+	}
 
 	var pushOutput struct {
 		push.Output

golang.mk

@@ -1,7 +1,7 @@
 # This is the default Clever Golang Makefile.
 # It is stored in the dev-handbook repo, github.com/Clever/dev-handbook
 # Please do not alter this file directly.
-GOLANG_MK_VERSION := 0.2.0
+GOLANG_MK_VERSION := 0.3.2
 
 SHELL := /bin/bash
 SYSTEM := $(shell uname -a | cut -d" " -f1 | tr '[:upper:]' '[:lower:]')
@@ -18,7 +18,7 @@ define golang-version-check
 _ := $(if  \
 		$(shell  \
 			expr >/dev/null  \
-				`go version | cut -d" " -f3 | cut -c3- | cut -d. -f2`  \
+				`go version | cut -d" " -f3 | cut -c3- | cut -d. -f2 | sed -E 's/beta[0-9]+//'`  \
 				\>= `echo $(1) | cut -d. -f2`  \
 				\&  \
 				`go version | cut -d" " -f3 | cut -c3- | cut -d. -f1`  \
@@ -52,9 +52,16 @@ golang-dep-vendor-deps: bin/dep
 # golang-godep-vendor is a target for saving dependencies with the dep tool
 # to the vendor/ directory. All nested vendor/ directories are deleted via
 # the prune command.
+# In CI, -vendor-only is used to avoid updating the lock file.
+ifndef CI
 define golang-dep-vendor
-bin/dep ensure
+bin/dep ensure -v
 endef
+else
+define golang-dep-vendor
+bin/dep ensure -v -vendor-only
+endef
+endif
 
 # Golint is a tool for linting Golang code for common errors.
 GOLINT := $(GOPATH)/bin/golint
@@ -147,6 +154,19 @@ $(call golang-vet,$(1))
 $(call golang-test-strict,$(1))
 endef
 
+# golang-build: builds a golang binary. ensures CGO build is done during CI. This is needed to make a binary that works with a Docker alpine image.
+# arg1: pkg path
+# arg2: executable name
+define golang-build
+@echo "BUILDING..."
+@if [ -z "$$CI" ]; then \
+	go build -o bin/$(2) $(1); \
+else \
+	echo "-> Building CGO binary"; \
+	CGO_ENABLED=0 go build -installsuffix cgo -o bin/$(2) $(1); \
+fi;
+endef
+
 # golang-update-makefile downloads latest version of golang.mk
 golang-update-makefile:
 	@wget https://raw.githubusercontent.com/Clever/dev-handbook/master/make/golang.mk -O /tmp/golang.mk 2>/dev/null