Merge pull request #4341 from mboersma/go-cli-to-client

Move go cli to client/

Author: mboersma

.gitignore

@@ -24,10 +24,8 @@ logs/
 # local binaries, installers, and artifacts
 builder/rootfs/usr/bin
 cache/image/bin/
-client/dist/
-client/makeself/
-client-go/deis
-client-go/deis.exe
+client/deis
+client/deis.exe
 contrib/azure/azure-user-data
 contrib/bumpver/bumpver
 deisctl/deisctl

Makefile

@@ -12,7 +12,7 @@ GO_PACKAGES_REPO_PATH = $(addprefix $(repo_path)/,$(GO_PACKAGES))
 
 COMPONENTS=builder cache controller database logger logspout publisher registry router $(STORE_IF_STATEFUL)
 START_ORDER=publisher $(STORE_IF_STATEFUL) logger logspout database cache registry controller builder router
-CLIENTS=client client-go deisctl
+CLIENTS=client deisctl
 
 all: build run
 

client-go/LICENSE

@@ -1,4 +1,4 @@
-Copyright 2013, 2014 Engine Yard, Inc.
+Copyright 2015 Engine Yard, Inc.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.

client-go/Makefile

@@ -1,38 +1,40 @@
+include ../includes.mk
 
-build: setup-venv
-	venv/bin/pip install --disable-pip-version-check -r requirements.txt git+https://github.com/pyinstaller/pyinstaller@32bbb954b355937ccfe377afbe56979db79a7b30
-	venv/bin/pyinstaller deis.spec
-	chmod +x dist/deis
+# the filepath to this repository, relative to $GOPATH/src
+repo_path = github.com/deis/deis/client
+
+GO_FILES = $(wildcard *.go)
+GO_PACKAGES = parser cmd controller/api controller/client $(wildcard controller/models/*) $(wildcard pkg/*)
+GO_PACKAGES_REPO_PATH = $(addprefix $(repo_path)/,$(GO_PACKAGES))
+
+COMPONENT = $(notdir $(repo_path))
+IMAGE =  $(IMAGE_PREFIX)/$(COMPONENT):$(BUILD_TAG)
+
+build:
+	CGO_ENABLED=0 godep go build -a -installsuffix cgo -ldflags '-s' -o deis .
+	@$(call check-static-binary,deis)
 
-# Install deis client locally through pip.
 install:
-	pip install .
-
-# Remove the installed copy of the deis client through pip.
-uninstall:
-	pip uninstall -y deis
-
-# Clean up after setup.py droppings.
-clean:
-	rm -rf build/ dist/ *.egg-info
-
-installer: build
-	@if [ ! -d makeself ]; then git clone -b single-binary https://github.com/deis/makeself.git; fi
-	PATH=./makeself:$$PATH BINARY=deis makeself.sh --bzip2 --current --nox11 dist \
-		dist/deis-cli-`grep '__version__\ =\ ' deis.py | cut -d' ' -f3 | tr -d \'`-`go env GOOS`-`go env GOARCH`.run \
-		"Deis CLI" "echo \
-		&& echo 'deis is in the current directory. Please' \
-		&& echo 'move deis to a directory in your search PATH.' \
-		&& echo \
-		&& echo 'See http://docs.deis.io/ for documentation.' \
-		&& echo"
-
-setup-venv:
-	@if [ ! -d venv ]; then virtualenv venv; fi
-
-test-style: setup-venv
-	venv/bin/pip install --disable-pip-version-check -q flake8==2.4.1
-	venv/bin/flake8
+	godep go install -v .
+
+setup-root-gotools:
+	sudo GOPATH=/tmp/tmpGOPATH go get -u -v golang.org/x/tools/cmd/cover
+	sudo GOPATH=/tmp/tmpGOPATH go get -u -v golang.org/x/tools/cmd/vet
+	sudo rm -rf /tmp/tmpGOPATH
+
+setup-gotools:
+	go get -u github.com/golang/lint/golint
+	go get -u golang.org/x/tools/cmd/cover
+	go get -u golang.org/x/tools/cmd/vet
+
+test: test-style test-unit
+
+test-style:
+# display output, then check
+	$(GOFMT) $(GO_PACKAGES) $(GO_FILES)
+	@$(GOFMT) $(GO_PACKAGES) $(GO_FILES) | read; if [ $$? == 0 ]; then echo "gofmt check failed."; exit 1; fi
+	$(GOVET) $(repo_path) $(GO_PACKAGES_REPO_PATH)
+	$(GOLINT) ./...
 
 test-unit:
-	@echo no unit tests
+	$(GOTEST) ./...