Merge pull request #17 from mtchavez/f-golang-dep

Use dep for dependencies

Author: mtchavez

.gitignore

@@ -17,3 +17,6 @@
 *.gob
 *.txt
 *.log
+
+# Dependencies
+vendor

Gopkg.lock

@@ -0,0 +1,34 @@
+
+# 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"
+
+
+[[constraint]]
+  branch = "master"
+  name = "github.com/DataDog/mmh3"
+
+[[constraint]]
+  branch = "master"
+  name = "github.com/dgryski/go-farm"
+
+[[constraint]]
+  name = "github.com/stretchr/testify"
+  version = "1.1.4"

Gopkg.toml

@@ -2,14 +2,13 @@ ROOT := $(CURDIR)
 GOPKGS = \
 		golang.org/x/tools/cmd/cover \
 		github.com/golang/lint/golint \
-		github.com/tools/godep
+		github.com/golang/dep/cmd/dep
 
 default: test
 
 deps:
 	@go get -u -v $(GOPKGS)
-	@go get -u -v -t ./...
-	@if [ `which godep` ] && [ -f ./Godeps/Godeps.json ]; then godep restore; fi
+	@dep ensure
 
 lint:
 	@echo "[Lint] running golint"
@@ -23,6 +22,6 @@ ci: deps vet lint test
 
 test:
 	@echo "[Test] running tests"
-	@if [ "$CI" ]; then goveralls -service=travis-ci; else go test -v -cover; fi
+	@if [ "$(CI)" ]; then goveralls -service=travis-ci; else go test -v -cover; fi
 
 .PHONY: default golint test vet deps