Merge pull request #306 from vania-pooh/master

Migrated to dep (fixes #305)

.travis.yml

@@ -13,11 +13,11 @@ script:
   - gox -os "linux darwin windows" -arch "amd64" -osarch="windows/386" -output "dist/{{.Dir}}_{{.OS}}_{{.Arch}}" -ldflags "-X main.buildStamp=`date -u '+%Y-%m-%d_%I:%M:%S%p'` -X main.gitRevision=`git describe --tags || git rev-parse HEAD`"
 
 before_install:
-  - go get -u github.com/kardianos/govendor
+  - go get -u github.com/golang/dep/cmd/dep
 
 install: 
   - go get -u github.com/mitchellh/gox # cross compile
-  - govendor sync
+  - dep ensure
 
 deploy:
   - provider: releases

Gopkg.toml

@@ -0,0 +1,29 @@
+# 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/aandryashin/matchers"
+
+[[constraint]]
+  name = "github.com/docker/go-units"
+  version = "0.3.2"

docs/contributing.adoc

@@ -6,17 +6,17 @@ To build Selenoid:
 
 . Setup `$GOPATH` https://github.com/golang/go/wiki/GOPATH[properly]
 
-. Install https://github.com/kardianos/govendor[govendor]
-
-    $ go get -u github.com/kardianos/govendor
-
 . Get Selenoid source:
 
     $ go get -d github.com/aerokube/selenoid
 
+. Go to project directory:
+
+    $ cd $GOPATH/src/github.com/aerokube/selenoid 
+
 . Checkout dependencies
 
-    $ cd $GOPATH/src/github.com/aerokube/selenoid && govendor sync
+    $ go get -u github.com/golang/dep/cmd/dep && dep ensure
 
 . Build source: