Merge pull request #167 from carolynvs/dep-migration

Migrate from glide to dep

.gitignore

@@ -1,5 +1,3 @@
-/vendor
-
 # Compiled Object files, Static and Dynamic libs (Shared Objects)
 *.o
 *.a
@@ -28,6 +26,7 @@ _testmain.go
 
 # Temporary files
 .tmp
+.DS_Store
 
 # Downloads
 bin

.travis.yml

@@ -1,11 +1,12 @@
 language: go
 go:
 - 1.7
+- 1.8
+- tip
 go_import_path: github.com/howtowhale/dvm
 git:
   depth: 9999999
-install:
-- make get-deps
+sudo: false # Run in a container
 script:
 - make test
 - make cross-build
@@ -20,4 +21,3 @@ deploy:
   on:
     repo: howtowhale/dvm
     tags: true
-

Gopkg.toml

@@ -0,0 +1,58 @@
+
+# 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]]
+  name = "github.com/Masterminds/semver"
+  version = "1.2.2"
+
+[[constraint]]
+  name = "github.com/codegangsta/cli"
+  version = "=1.19.1"
+
+[[constraint]]
+  name = "github.com/docker/docker"
+  version = "1.13.1"
+
+[[constraint]]
+  name = "github.com/fatih/color"
+  version = "=1.5.0"
+
+[[constraint]]
+  name = "github.com/google/go-github"
+  revision = "1c08387e4c91df86627d0853f155a4efc8cb8a2d"
+
+[[constraint]]
+  branch = "master"
+  name = "github.com/pivotal-golang/archiver"
+
+[[constraint]]
+  name = "github.com/ryanuber/go-glob"
+  version = "=0.1.0"
+
+[[constraint]]
+  name = "github.com/stretchr/testify"
+  version = "1.1.4"
+
+[[constraint]]
+  branch = "master"
+  name = "golang.org/x/oauth2"

Makefile

@@ -18,11 +18,7 @@ BINDIR = bin/dvm/$(VERSION)
 GOFILES = dvm-helper/*.go
 GOFILES_NOVENDOR = $(shell go list ./... | grep -v /vendor/)
 
-default: get-deps local
-
-get-deps:
-	go get github.com/Masterminds/glide
-	glide install
+default: local
 
 validate:
 	go fmt $(GOFILES_NOVENDOR)