Merge fc8479f into 587af0f

Gopkg.toml

@@ -0,0 +1,106 @@
+# Gopkg.toml example
+#
+# Refer to https://github.com/golang/dep/blob/master/docs/Gopkg.toml.md
+# for detailed Gopkg.toml documentation.
+#
+# required = ["github.com/user/thing/cmd/thing"]
+# ignored = ["github.com/user/project/pkgX", "bitbucket.org/user/project/pkgA/pkgY"]
+#
+# [[constraint]]
+#   name = "github.com/user/project"
+#   version = "1.0.0"
+#
+# [[constraint]]
+#   name = "github.com/user/project2"
+#   branch = "dev"
+#   source = "github.com/myfork/project2"
+#
+# [[override]]
+#  name = "github.com/x/y"
+#  version = "2.4.0"
+
+ignored = ["golang.org/x/sys/unix"]
+
+[[constraint]]
+  name = "github.com/asaskevich/govalidator"
+  version = "5.0.0"
+
+[[constraint]]
+  name = "github.com/awnumar/memguard"
+  version = "0.13.2"
+
+[[constraint]]
+  name = "github.com/aws/aws-sdk-go"
+  version = "1.5.13"
+
+[[constraint]]
+  name = "github.com/blang/semver"
+  version = "3.3.0"
+
+[[constraint]]
+  name = "github.com/boltdb/bolt"
+  version = "1.3.0"
+
+[[constraint]]
+  branch = "master"
+  name = "github.com/chzyer/readline"
+
+[[constraint]]
+  branch = "master"
+  name = "github.com/dchest/blake2b"
+
+[[constraint]]
+  branch = "master"
+  name = "github.com/facebookgo/httpdown"
+
+[[constraint]]
+  name = "github.com/go-ini/ini"
+  version = "1.21.1"
+
+[[constraint]]
+  name = "github.com/go-zoo/bone"
+  version = "1.2.0"
+
+[[constraint]]
+  branch = "master"
+  name = "github.com/google/shlex"
+
+[[constraint]]
+  branch = "master"
+  name = "github.com/keybase/go-triplesec"
+
+[[constraint]]
+  name = "github.com/manifoldco/ansiwrap"
+  version = "1.0.0"
+
+[[constraint]]
+  name = "github.com/manifoldco/go-base32"
+  version = "1.0.0"
+
+[[constraint]]
+  name = "github.com/manifoldco/go-base64"
+  version = "1.0.0"
+
+[[constraint]]
+  name = "github.com/natefinch/lumberjack"
+  version = "2.0.0"
+
+[[constraint]]
+  branch = "v2"
+  name = "github.com/natefinch/npipe"
+
+[[constraint]]
+  name = "github.com/onsi/gomega"
+  version = "1.1.0"
+
+[[constraint]]
+  name = "github.com/satori/go.uuid"
+  version = "1.1.0"
+
+[[constraint]]
+  name = "github.com/urfave/cli"
+  version = "1.19.1"
+
+[[constraint]]
+  name = "gopkg.in/oleiade/reflections.v1"
+  version = "1.0.0"

Makefile

@@ -33,13 +33,13 @@ ci: binary $(LINTERS) cmdlint test
 
 BOOTSTRAP=\
 	github.com/jteeuwen/go-bindata/... \
-	github.com/alecthomas/gometalinter
+	github.com/alecthomas/gometalinter \
+	github.com/golang/dep
 
 $(BOOTSTRAP):
 	go get -u $@
 bootstrap: $(BOOTSTRAP)
 	gometalinter --install
-	glide -v || curl http://glide.sh/get | sh
 
 .PHONY: bootstrap $(BOOTSTRAP)
 
@@ -77,8 +77,8 @@ data/zz_generated_bindata.go: data/ca_bundle.pem data/public_key.json data/aws_i
 primitive/zz_generated_primitive.go envelope/zz_generated_envelope.go: $(TOOLS)/primitive-boilerplate primitive/primitive.go
 	$^
 
-vendor: glide.lock
-	glide install
+vendor: Gopkg.lock
+	dep ensure
 
 PRIMITIVE_BOILERPLATE=tools/primitive-boilerplate
 $(TOOLS)/primitive-boilerplate: $(wildcard $(PRIMITIVE_BOILERPLATE)/*.go) $(wildcard $(PRIMITIVE_BOILERPLATE)/*.tmpl)
@@ -103,13 +103,13 @@ clean:
 #################################################
 
 test: generated vendor
-	@CGO_ENABLED=0 go test -run=. -bench=. -short $$(glide nv)
+	@CGO_ENABLED=0 go test -run=. -bench=. -short $$(go list ./... | grep -v ./vendor)
 
 METALINT=gometalinter --tests --disable-all --vendor --deadline=5m -s data \
 	 . --enable
 
 $(LINTERS):
-	gometalinter --tests --disable-all --vendor --deadline=5m -s data $$(glide nv) --enable $@
+	gometalinter --tests --disable-all --vendor --deadline=5m -s data $$(go list ./... | grep -v ./vendor) --enable $@
 
 $(TOOLS)/cmdlint: $(wildcard tools/cmdlint/*.go) $(wildcard cmd/*.go)
 	$(GO_BUILD) -o $@ ./tools/cmdlint