Vendor all dependencies

Uses godep to vendor dependencies. Godeps is not necessary during build,
golang's new vendor support is used instead.

Author: grobie

.travis.yml

@@ -2,16 +2,18 @@ sudo: false
 
 language: go
 go:
-  - 1.5.2
-  - tip
+- 1.5.3
+- tip
+
+env:
+- GO15VENDOREXPERIMENT=1
 
 install:
-  - go get -d
-  - go get golang.org/x/tools/cmd/vet
+- go get golang.org/x/tools/cmd/vet
 
 script:
-  - '! gofmt -l **/*.go | read nothing'
-  - go vet
-  - go test -v ./...
-  - go build
-  - ./end-to-end-test.sh
+- "! gofmt -l $(find . -path ./vendor -prune -o -name '*.go' -print) | read nothing"
+- go vet
+- go test -v $(go list ./... | grep -v /vendor/)
+- go build
+- ./end-to-end-test.sh

Makefile.COMMON

@@ -45,21 +45,32 @@ GOOS   ?= $(shell uname | tr A-Z a-z)
 GOARCH ?= $(subst x86_64,amd64,$(patsubst i%86,386,$(shell uname -m)))
 
 GO_VERSION ?= 1.5.3
-GOURL      ?= https://golang.org/dl
-GOPKG      ?= go$(GO_VERSION).$(GOOS)-$(GOARCH).tar.gz
-GOPATH     := $(CURDIR)/.build/gopath
 
 # Check for the correct version of go in the path. If we find it, use it.
 # Otherwise, prepare to build go locally.
 ifeq ($(shell command -v "go" >/dev/null && go version | sed -e 's/^[^0-9.]*\([0-9.]*\).*/\1/'), $(GO_VERSION))
 	GOCC   ?= $(shell command -v "go")
 	GOFMT  ?= $(shell command -v "gofmt")
-	GO     ?= GOPATH=$(GOPATH) $(GOCC)
+	GO     ?= $(GOCC)
 else
+	GOURL  ?= https://golang.org/dl
+	GOPKG  ?= go$(GO_VERSION).$(GOOS)-$(GOARCH).tar.gz
 	GOROOT ?= $(CURDIR)/.build/go$(GO_VERSION)
 	GOCC   ?= $(GOROOT)/bin/go
 	GOFMT  ?= $(GOROOT)/bin/gofmt
-	GO     ?= GOROOT=$(GOROOT) GOPATH=$(GOPATH) $(GOCC)
+	GO     ?= GOROOT=$(GOROOT) $(GOCC)
+endif
+
+# Use vendored dependencies if available. Otherwise try to download them.
+ifneq (,$(wildcard vendor))
+	DEPENDENCIES := $(shell find vendor/ -type f -iname '*.go')
+	GO           := GO15VENDOREXPERIMENT=1 $(GO)
+else
+	GOPATH       := $(CURDIR)/.build/gopath
+	ROOTPKG      ?= github.com/prometheus/$(TARGET)
+	SELFLINK     ?= $(GOPATH)/src/$(ROOTPKG)
+	DEPENDENCIES := dependencies-stamp
+	GO           := GOPATH=$(GOPATH) $(GO)
 endif
 
 # Never honor GOBIN, should it be set at all.
@@ -68,32 +79,10 @@ unexport GOBIN
 SUFFIX   ?= $(GOOS)-$(GOARCH)
 BINARY   ?= $(TARGET)
 ARCHIVE  ?= $(TARGET)-$(VERSION).$(SUFFIX).tar.gz
-ROOTPKG  ?= github.com/prometheus/$(TARGET)
-SELFLINK ?= $(GOPATH)/src/$(ROOTPKG)
 
 default: $(BINARY)
 
-$(GOCC):
-	@echo Go version $(GO_VERSION) required but not found in PATH.
-	@echo About to download and install go$(GO_VERSION) to $(GOROOT)
-	@echo Abort now if you want to manually install it system-wide instead.
-	@echo
-	@sleep 5
-	mkdir -p .build
-	# The archive contains a single directory called 'go/'.
-	curl -L $(GOURL)/$(GOPKG) | tar -C .build -xzf -
-	rm -rf $(GOROOT)
-	mv .build/go $(GOROOT)
-
-$(SELFLINK):
-	mkdir -p $(dir $@)
-	ln -s $(CURDIR) $@
-
-dependencies-stamp: $(GOCC) $(SRC) | $(SELFLINK)
-	$(GO) get -d
-	touch $@
-
-$(BINARY): $(GOCC) $(SRC) dependencies-stamp Makefile Makefile.COMMON
+$(BINARY): $(GOCC) $(SRC) $(DEPENDENCIES) Makefile Makefile.COMMON
 	$(GO) build $(GOFLAGS) -o $@
 
 .PHONY: archive
@@ -108,13 +97,36 @@ tag:
 	git push --tags
 
 .PHONY: test
-test: $(GOCC) dependencies-stamp
-	$(GO) test ./...
+test: $(GOCC) $(DEPENDENCIES)
+	$(GO) test $$($(GO) list ./... | grep -v /vendor/)
 
 .PHONY: format
 format: $(GOCC)
-	find . -iname '*.go' | egrep -v "^\./\.build|./generated|\./Godeps|\.(l|y)\.go" | xargs -n1 $(GOFMT) -w -s=true
+	find . -iname '*.go' | egrep -v "^\./\.build|./generated|\./vendor|\.(l|y)\.go" | xargs -n1 $(GOFMT) -w -s=true
 
 .PHONY: clean
 clean:
 	rm -rf $(BINARY) $(ARCHIVE) .build *-stamp
+
+
+
+$(GOCC):
+	@echo Go version $(GO_VERSION) required but not found in PATH.
+	@echo About to download and install go$(GO_VERSION) to $(GOROOT)
+	@echo Abort now if you want to manually install it system-wide instead.
+	@echo
+	@sleep 5
+	mkdir -p .build
+	# The archive contains a single directory called 'go/'.
+	curl -L $(GOURL)/$(GOPKG) | tar -C .build -xzf -
+	rm -rf $(GOROOT)
+	mv .build/go $(GOROOT)
+
+$(SELFLINK):
+	mkdir -p $(dir $@)
+	ln -s $(CURDIR) $@
+
+# Download dependencies if project doesn't vendor them.
+dependencies-stamp: $(GOCC) $(SRC) | $(SELFLINK)
+	$(GO) get -d
+	touch $@