Merge pull request #77 from justenwalker/godeps

Add support for godep

.gitignore

@@ -27,6 +27,8 @@ _testmain.go
 build/
 release/
 cover/
+/vendor/
+/Godeps/_workspace/
 examples/**/opt/containerbuddy/containerbuddy
 *.tar.gz
 .godeps

.travis.yml

@@ -11,14 +11,18 @@ services:
 ## Need docker-compose 1.5.x for Variable Interpolation
 env:
   DOCKER_COMPOSE_VERSION: 1.5.2
+  GO15VENDOREXPERIMENT: 1
 
 before_install:
   - sudo rm /usr/local/bin/docker-compose
   - curl -L https://github.com/docker/compose/releases/download/${DOCKER_COMPOSE_VERSION}/docker-compose-`uname -s`-`uname -m` > docker-compose
   - chmod +x docker-compose
   - sudo mv docker-compose /usr/local/bin
 
+install:
+  - make vendor
+
 script:
-  - make clean lint build
+  - make lint build
   - make test
   - make integration

Dockerfile

@@ -1,6 +1,8 @@
 FROM golang
 
-RUN go get -u github.com/golang/lint/golint
+RUN  go get github.com/golang/lint/golint \
+  && go get github.com/tools/godep
 
 ENV CGO_ENABLED 0
+ENV GO15VENDOREXPERIMENT 1
 ENTRYPOINT ["make"]

Makefile.docker

@@ -5,35 +5,31 @@ SHELL := /bin/bash
 .SHELLFLAGS = -o pipefail -euc
 .DEFAULT_GOAL := build
 
-.PHONY: all build check test cover
+.PHONY: all build check test cover update-deps vendor
 
-CONSUL_REF := 158eabdd6f2408067c1d7656fa10e49434f96480
-ETCD_REF := release-2.2
-
-ROOT := /go
-CDWD := cd ${ROOT}/src/containerbuddy
+PACKAGE := github.com/joyent/containerbuddy
+SRC  := /go/src/${PACKAGE}
+CDWD := cd ${SRC}
+NO_VENDOR:= $(shell cd ${SRC} && go list ./... | grep -v /vendor/)
+GO15VENDOREXPERIMENT := 1
+export GO15VENDOREXPERIMENT
 
 all: build cover
 
-build: /go/src/github.com
-	${CDWD} && go build -a -o /build/containerbuddy -ldflags "$(LDFLAGS)"
-	chmod 755 /build/containerbuddy
+vendor:
+	${CDWD} && godep restore
 
-/go/src/github.com:
-	mkdir -p "${ROOT}/src/github.com/hashicorp"
-	git clone https://github.com/hashicorp/consul.git ${ROOT}/src/github.com/hashicorp/consul
-	cd ${ROOT}/src/github.com/hashicorp/consul && git checkout ${CONSUL_REF}
-	mkdir -p "${ROOT}/src/github.com/coreos"
-	git clone https://github.com/coreos/etcd.git ${ROOT}/src/github.com/coreos/etcd
-	cd ${ROOT}/src/github.com/coreos/etcd && git checkout ${ETCD_REF}
+build: vendor
+	${CDWD} && go build -a -o /build/containerbuddy -ldflags "$(LDFLAGS)" ./
+	chmod 755 /build/containerbuddy
 
 lint:
-	${CDWD} && go vet
-	${CDWD} && go fmt
-	golint ${ROOT}/src/containerbuddy
+	${CDWD} && go vet ${NO_VENDOR}
+	${CDWD} && go fmt ${NO_VENDOR}
+	golint ${SRC}
 
-test: /go/src/github.com
-	${CDWD} && go test -v -coverprofile=/cover/coverage.out
+test:
+	${CDWD} && go test -v -coverprofile=/cover/coverage.out ./containerbuddy
 
 cover: test
 	go tool cover -html=/cover/coverage.out -o /cover/coverage.html

src/containerbuddy/config.go → containerbuddy/config.go

@@ -1,4 +1,4 @@
-package main
+package containerbuddy
 
 import (
 	"bufio"

src/containerbuddy/config_test.go → containerbuddy/config_test.go

@@ -1,4 +1,4 @@
-package main
+package containerbuddy
 
 import (
 	"encoding/json"

src/containerbuddy/consul.go → containerbuddy/consul.go

@@ -1,4 +1,4 @@
-package main
+package containerbuddy
 
 import (
 	"fmt"

src/containerbuddy/consul_test.go → containerbuddy/consul_test.go

@@ -1,4 +1,4 @@
-package main
+package containerbuddy
 
 import (
 	"testing"

src/containerbuddy/discovery.go → containerbuddy/discovery.go

@@ -1,4 +1,4 @@
-package main
+package containerbuddy
 
 // DiscoveryService is an interface
 // which all service discovery backends must implement

src/containerbuddy/etcd.go → containerbuddy/etcd.go

@@ -1,4 +1,4 @@
-package main
+package containerbuddy
 
 import (
 	"fmt"
@@ -8,8 +8,8 @@ import (
 
 	"encoding/json"
 
-	"github.com/coreos/etcd/Godeps/_workspace/src/golang.org/x/net/context"
 	"github.com/coreos/etcd/client"
+	"golang.org/x/net/context"
 )
 
 // Etcd is a service discovery backend for CoreOS etcd

src/containerbuddy/etcd_test.go → containerbuddy/etcd_test.go

@@ -1,4 +1,4 @@
-package main
+package containerbuddy
 
 import (
 	"testing"

src/containerbuddy/ips.go → containerbuddy/ips.go

@@ -1,4 +1,4 @@
-package main
+package containerbuddy
 
 import (
 	"bytes"

src/containerbuddy/ips_test.go → containerbuddy/ips_test.go

@@ -1,4 +1,4 @@
-package main
+package containerbuddy
 
 import (
 	"encoding/json"

src/containerbuddy/main.go → containerbuddy/main.go

@@ -1,4 +1,4 @@
-package main
+package containerbuddy
 
 import (
 	"flag"
@@ -10,7 +10,8 @@ import (
 	"time"
 )
 
-func main() {
+// Main executes the containerbuddy CLI
+func Main() {
 	// make sure we use only a single CPU so as not to cause
 	// contention on the main application
 	runtime.GOMAXPROCS(1)

src/containerbuddy/main_test.go → containerbuddy/main_test.go

@@ -1,4 +1,4 @@
-package main
+package containerbuddy
 
 import (
 	"testing"

src/containerbuddy/signals.go → containerbuddy/signals.go

@@ -1,4 +1,4 @@
-package main
+package containerbuddy
 
 import (
 	"log"

src/containerbuddy/signals_test.go → containerbuddy/signals_test.go

@@ -1,4 +1,4 @@
-package main
+package containerbuddy
 
 import (
 	"flag"

src/containerbuddy/template.go → containerbuddy/template.go

@@ -1,4 +1,4 @@
-package main
+package containerbuddy
 
 import (
 	"bytes"

src/containerbuddy/template_test.go → containerbuddy/template_test.go

@@ -1,4 +1,4 @@
-package main
+package containerbuddy
 
 import (
 	"reflect"

main.go

@@ -0,0 +1,7 @@
+package main
+
+import "github.com/joyent/containerbuddy/containerbuddy"
+
+func main() {
+	containerbuddy.Main()
+}

makefile

@@ -6,18 +6,22 @@ SHELL := /bin/bash
 .PHONY: clean test integration consul etcd run-consul run-etcd example example-consul example-etcd ship dockerfile docker cover lint
 
 VERSION ?= dev-build-not-for-release
-LDFLAGS := '-X main.GitHash=$(shell git rev-parse --short HEAD) -X main.Version=${VERSION}'
+LDFLAGS := '-X containerbuddy.GitHash=$(shell git rev-parse --short HEAD) -X containerbuddy.Version=${VERSION}'
 
 ROOT := $(shell pwd)
+PACKAGE := github.com/joyent/containerbuddy
+GO15VENDOREXPERIMENT := 1
+export GO15VENDOREXPERIMENT
 
 COMPOSE_PREFIX_ETCD := exetcd
 COMPOSE_PREFIX_CONSUL := exconsul
 
+
 DOCKERMAKE := docker run --rm \
 	--link containerbuddy_consul:consul \
 	--link containerbuddy_etcd:etcd \
-	-v ${ROOT}/src/containerbuddy:/go/src/containerbuddy \
-	-v ${ROOT}/.godeps:/go/src \
+	-v ${ROOT}/vendor:/go/src \
+	-v ${ROOT}:/go/src/${PACKAGE} \
 	-v ${ROOT}/build:/build \
 	-v ${ROOT}/cover:/cover \
 	-v ${ROOT}/examples:/root/examples:ro \
@@ -26,7 +30,7 @@ DOCKERMAKE := docker run --rm \
 	containerbuddy_build
 
 clean:
-	rm -rf build release cover .godeps
+	rm -rf build release cover vendor
 	docker rmi -f containerbuddy_build > /dev/null 2>&1 || true
 	docker rm -f containerbuddy_consul > /dev/null 2>&1 || true
 	docker rm -f containerbuddy_etcd > /dev/null 2>&1 || true
@@ -46,6 +50,9 @@ docker: build/containerbuddy_build consul etcd
 build: docker
 	${DOCKERMAKE} build
 
+vendor: docker
+	${DOCKERMAKE} vendor
+
 # ----------------------------------------------
 # develop and test