Bump gotty-client with godep support

Author: moul

Godeps/Godeps.json

@@ -1,12 +1,14 @@
 # Go parameters
-GOCMD ?=	go
-GOBUILD ?=	$(GOCMD) build
-GOCLEAN ?=	$(GOCMD) clean
-GOINSTALL ?=	$(GOCMD) install
-GOTEST ?=	$(GOCMD) test
+GOENV ?=	GO15VENDOREXPERIMENT=1
+GO ?=		$(GOENV) go
+GODEP ?=	$(GOENV) godep
+GOBUILD ?=	$(GO) build
+GOCLEAN ?=	$(GO) clean
+GOINSTALL ?=	$(GO) install
+GOTEST ?=	$(GO) test
 GOFMT ?=	gofmt -w
+GODIR ?=	github.com/scaleway/scaleway-cli
 GOCOVER ?=	$(GOTEST) -covermode=count -v
-
 FPM_VERSION ?=	$(shell ./dist/scw-Darwin-i386 --version | sed 's/.*v\([0-9.]*\),.*/\1/g')
 FPM_DOCKER ?=	\
 	-it --rm \
@@ -23,32 +25,34 @@ FPM_ARGS ?=	\
 	-m "Scaleway <[email protected]>"
 
 
-NAME = scw
-SRC = cmd/scw
-PACKAGES = pkg/api pkg/commands pkg/utils pkg/cli pkg/sshcommand pkg/config pkg/scwversion pkg/pricing
-VERSION = $(shell cat .goxc.json | grep "PackageVersion" | egrep -o "([0-9]{1,}\.)+[0-9]{1,}")
-REV = $(shell git rev-parse HEAD || git ls-remote https://github.com/scaleway/scaleway-cli  | grep -F $(VERSION) | head -n1 | awk '{print $$1}' || echo "nogit")
-TAG = $(shell git describe --tags --always || echo $(VERSION) || echo "nogit")
+NAME =		scw
+
+SOURCES :=	$(shell find . -type f -name "*.go")
+COMMANDS :=	$(shell go list ./... | grep -v /vendor/ | grep /cmd/)
+PACKAGES :=	$(shell go list ./... | grep -v /vendor/ | grep -v /cmd/)
+VERSION =	$(shell cat .goxc.json | grep "PackageVersion" | egrep -o "([0-9]{1,}\.)+[0-9]{1,}")
+REV =		$(shell git rev-parse HEAD || git ls-remote https://github.com/scaleway/scaleway-cli  | grep -F $(VERSION) | head -n1 | awk '{print $$1}' || echo "nogit")
+TAG =		$(shell git describe --tags --always || echo $(VERSION) || echo "nogit")
 LDFLAGS = "-X github.com/scaleway/scaleway-cli/pkg/scwversion.GITCOMMIT=$(REV) \
            -X github.com/scaleway/scaleway-cli/pkg/scwversion.VERSION=$(TAG)"
-BUILDER = scaleway-cli-builder
-ALL_GO_FILES = $(shell find . -type f -name "*.go")
+BUILDER =	scaleway-cli-builder
+ALL_GO_FILES =	$(shell find . -type f -name "*.go")
 
 # Check go version
-GOVERSIONMAJOR = $(shell go version | grep -o '[1-9].[0-9]' | cut -d '.' -f1)
-GOVERSIONMINOR = $(shell go version | grep -o '[1-9].[0-9]' | cut -d '.' -f2)
+GOVERSIONMAJOR = $(shell $(GO) version | grep -o '[1-9].[0-9]' | cut -d '.' -f1)
+GOVERSIONMINOR = $(shell $(GO) version | grep -o '[1-9].[0-9]' | cut -d '.' -f2)
 VERSION_GE_1_5 = $(shell [ $(GOVERSIONMAJOR) -gt 1 -o $(GOVERSIONMINOR) -ge 5 ] && echo true)
 ifneq ($(VERSION_GE_1_5),true)
 	$(error Bad go version, please install a version greater than or equal to 1.5)
 endif
 
-BUILD_LIST = $(foreach int, $(SRC), $(int)_build)
-CLEAN_LIST = $(foreach int, $(SRC) $(PACKAGES), $(int)_clean)
-INSTALL_LIST = $(foreach int, $(SRC), $(int)_install)
-IREF_LIST = $(foreach int, $(SRC) $(PACKAGES), $(int)_iref)
-TEST_LIST = $(foreach int, $(SRC) $(PACKAGES), $(int)_test)
-FMT_LIST = $(foreach int, $(SRC) $(PACKAGES), $(int)_fmt)
-COVERPROFILE_LIST = $(foreach int, $(PACKAGES), $(int)/profile.out)
+BUILD_LIST =		$(foreach int, $(COMMANDS), $(int)_build)
+CLEAN_LIST =		$(foreach int, $(COMMANDS) $(PACKAGES), $(int)_clean)
+INSTALL_LIST =		$(foreach int, $(COMMANDS), $(int)_install)
+IREF_LIST =		$(foreach int, $(COMMANDS) $(PACKAGES), $(int)_iref)
+TEST_LIST =		$(foreach int, $(COMMANDS) $(PACKAGES), $(int)_test)
+FMT_LIST =		$(foreach int, $(COMMANDS) $(PACKAGES), $(int)_fmt)
+COVERPROFILE_LIST =	$(foreach int, $(PACKAGES), $(int)/profile.out)
 
 
 .PHONY: $(CLEAN_LIST) $(TEST_LIST) $(FMT_LIST) $(INSTALL_LIST) $(BUILD_LIST) $(IREF_LIST)
@@ -68,18 +72,18 @@ fmt: $(FMT_LIST)
 
 
 $(BUILD_LIST): %_build: %_fmt %_iref
-	$(GOBUILD) -ldflags $(LDFLAGS) -o $(NAME) ./$*
-	go tool vet -all=true $(PACKAGES) $(SRC)
+	$(GOBUILD) -ldflags $(LDFLAGS) -o $(NAME) $(subst $(GODIR),./,$*)
+	$(GO) tool vet -all=true $(PACKAGES) $(COMMANDS)
 $(CLEAN_LIST): %_clean:
-	$(GOCLEAN) ./$*
+	$(GOCLEAN) $(subst $(GODIR),./,$*)
 $(INSTALL_LIST): %_install:
-	$(GOINSTALL) ./$*
+	$(GOINSTALL) $(subst $(GODIR),./,$*)
 $(IREF_LIST): %_iref:
-	$(GOTEST) -ldflags $(LDFLAGS) -i ./$*
+	$(GOTEST) -ldflags $(LDFLAGS) -i $(subst $(GODIR),./,$*)
 $(TEST_LIST): %_test:
-	$(GOTEST) -ldflags $(LDFLAGS) -v ./$*
+	$(GOTEST) -ldflags $(LDFLAGS) -v $(subst $(GODIR),./,$*)
 $(FMT_LIST): %_fmt:
-	$(GOFMT) ./$*
+	$(GOFMT) $(subst $(GODIR),./,$*)
 
 
 
@@ -130,18 +134,22 @@ packages:
 #publish_packages:
 #	docker run -v $(PWD)/dist moul/dput ppa:moul/scw dist/scw_$(FPM_VERSION)_arm.changes
 
+
+.PHONY: golint
 golint:
-	@go get github.com/golang/lint/golint
-	@for dir in $(shell go list ./... | grep -v /vendor/); do golint $$dir; done
+	@$(GO) get github.com/golang/lint/golint
+	@for dir in $(shell $(GO) list ./... | grep -v /vendor/); do golint $$dir; done
 
 
+.PHONY: gocyclo
 gocyclo:
 	go get github.com/fzipp/gocyclo
 	gocyclo -over 15 $(shell find . -name "*.go" -not -name "*test.go" | grep -v /vendor/)
 
 
-party:
-	party -c -d=vendor
+.PHONY: godep-save
+godep-save:
+	$(GODEP) save $(PACKAGES) $(COMMANDS)
 
 
 .PHONY: convey

Makefile

@@ -11,8 +11,8 @@ package main
 import (
 	"os"
 
-	"github.com/scaleway/scaleway-cli/pkg/cli"
 	"github.com/Sirupsen/logrus"
+	"github.com/scaleway/scaleway-cli/pkg/cli"
 )
 
 func main() {