Merge 5e6ecc0 into c6987e4

.travis.yml

@@ -2,12 +2,7 @@ language: go
 
 
 go:
-#- 1.3
-- 1.4
-- 1.5
-- 1.6
-- 1.7
-- 1.8
+- 1.11
 - tip
 
 
@@ -27,7 +22,7 @@ before_install:
 
 
 script:
-- go build -v ./cmd/...
-- go test -v ./
-- go test -covermode=count -coverprofile=profile.out .
+- GO111MODULE=on go install ./cmd/...
+- GO111MODULE=on go test -v ./
+- GO111MODULE=on go test -covermode=count -coverprofile=profile.out .
 - goveralls -covermode=count -service=travis-ci -v -coverprofile=profile.out

Makefile

@@ -1,13 +1,9 @@
 # Project-specific variables
 BINARIES ?=	anonuuid
-CONVEY_PORT ?=	9042
-
-
-# Common variables
 SOURCES :=	$(shell find . -name "*.go")
 COMMANDS :=	$(shell go list ./... | grep -v /vendor/ | grep /cmd/)
 PACKAGES :=	$(shell go list ./... | grep -v /vendor/ | grep -v /cmd/)
-GOENV ?=	GO15VENDOREXPERIMENT=1
+GOENV ?=	GO111MODULE=on
 GO ?=		$(GOENV) go
 USER ?=		$(shell whoami)
 
@@ -20,7 +16,7 @@ build:	$(BINARIES)
 
 
 $(BINARIES):	$(SOURCES)
-	$(GO) build -o $@ ./cmd/$@
+	$(GO) install ./cmd/...
 
 
 .PHONY: test
@@ -38,30 +34,10 @@ clean:
 re:	clean all
 
 
-.PHONY: convey
-convey:
-	$(GO) get github.com/smartystreets/goconvey
-	goconvey -cover -port=$(CONVEY_PORT) -workDir="$(realpath .)" -depth=1
-
-
 .PHONY:	cover
 cover:	profile.out
 
 
 profile.out:	$(SOURCES)
 	rm -f $@
 	$(GO) test -covermode=count -coverpkg=. -coverprofile=$@ .
-
-
-.PHONY: docker-build
-docker-build:
-	go get github.com/laher/goxc
-	rm -rf contrib/docker/linux_386
-	for binary in $(BINARIES); do                                             \
-	  goxc -bc="linux,386" -d . -pv contrib/docker -n $$binary xc;            \
-	  mv contrib/docker/linux_386/$$binary contrib/docker/entrypoint;         \
-	  docker build -t $(USER)/$$binary contrib/docker;                        \
-	  docker run -it --rm $(USER)/$$binary || true;                           \
-	  docker inspect --type=image --format="{{ .Id }}" moul/$$binary || true; \
-	  echo "Now you can run 'docker push $(USER)/$$binary'";                  \
-	done

go.mod

@@ -0,0 +1,11 @@
+module github.com/moul/anonuuid
+
+require (
+	github.com/codegangsta/cli v1.20.0
+	github.com/debber/debber-v0.3 v0.0.0-20160226200915-cf10fd052975 // indirect
+	github.com/jtolds/gls v0.0.0-20150401064343-9a4a02dbe491
+	github.com/laher/argo v0.0.0-20140722103944-11d91c83cc0f // indirect
+	github.com/laher/goxc v0.18.1 // indirect
+	github.com/smartystreets/assertions v0.0.0-20151002022720-01fedaa993c0
+	github.com/smartystreets/goconvey v0.0.0-20151121044913-5bb9e117a1a4
+)

go.sum

@@ -0,0 +1,14 @@
+github.com/codegangsta/cli v1.20.0 h1:iX1FXEgwzd5+XN6wk5cVHOGQj6Q3Dcp20lUeS4lHNTw=
+github.com/codegangsta/cli v1.20.0/go.mod h1:/qJNoX69yVSKu5o4jLyXAENLRyk1uhi7zkbQ3slBdOA=
+github.com/debber/debber-v0.3 v0.0.0-20160226200915-cf10fd052975 h1:WnS6xbOw6xZABYTIpTZ4NAjrXh0iQFO8XJhvXNMY/9I=
+github.com/debber/debber-v0.3 v0.0.0-20160226200915-cf10fd052975/go.mod h1:TCVRstzD4Q5cPZofOCFtaeBwCr5WXJdG3hxzFmYYnZ0=
+github.com/jtolds/gls v0.0.0-20150401064343-9a4a02dbe491 h1:JcCGiVd7BXlt3M0Av9IfvfrCevgGhzVO7+TpNw9o1dk=
+github.com/jtolds/gls v0.0.0-20150401064343-9a4a02dbe491/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU=
+github.com/laher/argo v0.0.0-20140722103944-11d91c83cc0f h1:fQ8JwxJN77cxE0foUmSHkKQebcxyd6vAfWCv7Bs5r34=
+github.com/laher/argo v0.0.0-20140722103944-11d91c83cc0f/go.mod h1:Ymqfd31XvifvQ001Ty97DbYjQoeJPnb1WVkFhGeNYA4=
+github.com/laher/goxc v0.18.1 h1:b5KJsjerACeEBsFWBveVzdUjc5wetTA5IQhOSjFJx50=
+github.com/laher/goxc v0.18.1/go.mod h1:NdnX1aggrtsAowOUacIAYkuGKn2Md8Ej2DpoPUUqofs=
+github.com/smartystreets/assertions v0.0.0-20151002022720-01fedaa993c0 h1:hSbw2NkV0MiQhuWqBnBXOaYgylyaFFWsi9ar8UPzqmw=
+github.com/smartystreets/assertions v0.0.0-20151002022720-01fedaa993c0/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc=
+github.com/smartystreets/goconvey v0.0.0-20151121044913-5bb9e117a1a4 h1:ia7jD8VXZYYsDseTVrOGvhePpiVElJOrBo1JNJpB+SM=
+github.com/smartystreets/goconvey v0.0.0-20151121044913-5bb9e117a1a4/go.mod h1:XDJAKZRPZ1CvBcN2aX5YOUTYGHki24fSF0Iv48Ibg0s=