Fixing coverage report to aggregate results from all packages.

Author: RichardKnop

Makefile

@@ -1,4 +1,6 @@
-DEPS=go list -f '{{range .TestImports}}{{.}} {{end}}' ./...
+.PHONY: update-deps install-deps fmt lint golint test test-with-coverage
+# TODO: When Go 1.9 is released vendor folder should be ignored automatically
+PACKAGES=`go list ./... | grep -v vendor | grep -v mocks`
 
 update-deps:
 	rm -rf Godeps
@@ -9,22 +11,30 @@ update-deps:
 install-deps:
 	go get github.com/tools/godep
 	godep restore
-	$(DEPS) | xargs -n1 go get -d
 
 fmt:
-	bash -c 'go list ./... | grep -v vendor | xargs -n1 go fmt'
+	for pkg in ${PACKAGES}; do \
+		go fmt $$pkg; \
+	done;
 
 lint:
-	bash -c 'gometalinter --disable-all -E vet -E gofmt -E misspell -E ineffassign -E goimports -E deadcode --tests --vendor ./...'
+	gometalinter --disable-all -E vet -E gofmt -E misspell -E ineffassign -E goimports -E deadcode --tests --vendor ./...
 
 golint:
-	# TODO: When Go 1.9 is released vendor folder should be ignored automatically
-	bash -c 'go list ./... | grep -v vendor | grep -v mocks | xargs -n1 golint'
+	for pkg in ${PACKAGES}; do \
+		golint $$pkg; \
+	done;
 
 test:
-	# TODO: When Go 1.9 is released vendor folder should be ignored automatically
-	bash -c 'go list ./... | grep -v vendor | xargs -n1 go test -timeout=10s'
+	for pkg in ${PACKAGES}; do \
+		go test $$pkg; \
+	done;
 
 test-with-coverage:
-	# TODO: When Go 1.9 is released vendor folder should be ignored automatically
-	bash -c 'go list ./... | grep -v vendor | xargs -n1 go test -timeout=10s -coverprofile=coverage.txt -covermode=set'
+	echo "" > coverage.out
+	echo "mode: set" > coverage-all.out
+	for pkg in ${PACKAGES}; do \
+		go test -coverprofile=coverage.out -covermode=set $$pkg; \
+		tail -n +2 coverage.out >> coverage-all.out; \
+	done;
+	#go tool cover -html=coverage-all.out