Merge pull request #2 from github/go-getify

Make `git-sizer` installable using `go get`

Author: mhagger

src/Gopkg.lock renamed to Gopkg.lock

@@ -6,43 +6,43 @@ export GOPATH
 GO := $(CURDIR)/script/go
 GOFMT := $(CURDIR)/script/gofmt
 
-BIN := bin
-
 GOFLAGS := \
 	--tags "static" \
 	-ldflags "-X main.BuildVersion=$(shell git rev-parse HEAD) -X main.BuildDescribe=$(shell git describe --tags --always --dirty)"
-GO_CMDS := $(BIN)/git-sizer
-GO_PKGS := $(shell cd .gopath/src && find github.com/github/git-sizer/ -type f -name '*.go' | xargs -n1 dirname | grep -v '^github.com/github/git-sizer/vendor/' | sort -u)
-GO_SRCS := $(shell find src -type f -name '*.go')
 
-.PHONY: all
-all: $(GO_CMDS)
+GO_SRCS := $(shell cd $(GOPATH)/src/$(PACKAGE) && $(GO) list -f '{{$$ip := .ImportPath}}{{range .GoFiles}}{{printf ".gopath/src/%s/%s\n" $$ip .}}{{end}}{{range .CgoFiles}}{{printf ".gopath/src/%s/%s\n" $$ip .}}{{end}}{{range .TestGoFiles}}{{printf ".gopath/src/%s/%s\n" $$ip .}}{{end}}{{range .XTestGoFiles}}{{printf ".gopath/src/%s/%s\n" $$ip .}}{{end}}' ./...)
 
-$(BIN)/%: $(GO_SRCS) | $(BIN)
-	$(GO) build $(GOFLAGS) -o $@ $(PACKAGE)/$*
+.PHONY: all
+all: bin/git-sizer
 
-$(BIN):
-	mkdir -p $(BIN)
+.PHONY: bin/git-sizer
+bin/git-sizer:
+	mkdir -p bin
+	$(GO) build $(GOFLAGS) -o $@ $(PACKAGE)
 
 .PHONY: test
-test: $(GO_CMDS) gotest
+test: bin/git-sizer gotest
 
 .PHONY: gotest
 gotest:
-	$(GO) test -timeout 60s $(GOFLAGS) $(GO_PKGS)
+	$(GO) test -timeout 60s $(GOFLAGS) ./...
 
 .PHONY: gofmt
 gofmt:
-	find src test -name "*.go" -print0 | xargs -0 $(GOFMT) -l -w | sed -e 's/^/Fixing /'
+	$(GOFMT) -l -w $(GO_SRCS) | sed -e 's/^/Fixing /'
 
 .PHONY: goimports
 goimports:
-	find src -name "*.go" -print0 | xargs -0 goimports -l -w -e
+	goimports -l -w -e $(GO_SRCS)
 
 .PHONY: govet
 govet:
-	$(GO) vet $(GO_PKGS)
+	$(GO) vet ./...
 
 .PHONY: clean
 clean:
 	rm -rf bin
+
+.PHONY: srcs
+srcs:
+	@printf "%s\n" $(GO_SRCS)

src/Gopkg.toml renamed to Gopkg.toml

@@ -7,8 +7,7 @@ import (
 
 // Smoke test that the program runs.
 func TestExec(t *testing.T) {
-	command := exec.Command("bin/git-sizer", ".")
-	command.Dir = "../.."
+	command := exec.Command("bin/git-sizer")
 	output, err := command.CombinedOutput()
 	if err != nil {
 		t.Errorf("command failed (%s); output: %#v", err, string(output))

Makefile

@@ -15,4 +15,4 @@ fi
 BASE="$GOPATH/src/github.com/github/git-sizer"
 rm -f "$BASE"
 mkdir -p $(dirname "$BASE")
-ln -s "$(pwd)/src" "$BASE"
+ln -s "$(pwd)" "$BASE"