From 273ee2cfdcc372bf872b8088f809d9886e78f6b9 Mon Sep 17 00:00:00 2001
From: Jud White <github@judsonwhite.com>
Date: Sun, 29 Oct 2017 06:59:55 -0500
Subject: [PATCH] dep; update travis, dist, test, coverage

---
 .travis.yml |  6 ++---
 Godeps      | 11 ---------
 Gopkg.lock  | 70 +++++++++++++++++++++++++++++++++++++++++++++++++++++
 Gopkg.toml  | 70 +++++++++++++++++++++++++++++++++++++++++++++++++++++
 coverage.sh |  2 +-
 dist.sh     |  5 +---
 test.sh     |  4 +--
 7 files changed, 147 insertions(+), 21 deletions(-)
 delete mode 100644 Godeps
 create mode 100644 Gopkg.lock
 create mode 100644 Gopkg.toml

diff --git a/.travis.yml b/.travis.yml
index 73d85a1ec..7b698d8bf 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -10,9 +10,9 @@ sudo: false
 before_install:
   - go get github.com/mattn/goveralls
 script:
-  - curl -s https://raw.githubusercontent.com/pote/gpm/v1.4.0/bin/gpm > gpm
-  - chmod +x gpm
-  - ./gpm install
+  - wget -O dep https://github.com/golang/dep/releases/download/v0.3.2/dep-linux-amd64
+  - chmod +x dep
+  - ./dep ensure
   - ./test.sh
   - ./coverage.sh --coveralls
 notifications:
diff --git a/Godeps b/Godeps
deleted file mode 100644
index 3dd9deba2..000000000
--- a/Godeps
+++ /dev/null
@@ -1,11 +0,0 @@
-github.com/BurntSushi/toml              2dff11163ee667d51dcc066660925a92ce138deb
-github.com/bitly/go-hostpool            58b95b10d6ca26723a7f46017b348653b825a8d6
-github.com/nsqio/go-nsq                 a53d495e81424aaf7a7665a9d32a97715c40e953
-github.com/bmizerany/perks/quantile     6cb9d9d729303ee2628580d9aec5db968da3a607
-github.com/mreiferson/go-options        77551d20752b54535462404ad9d877ebdb26e53d
-github.com/golang/snappy                d9eb7a3d35ec988b8585d4a0068e462c27d28380
-github.com/bitly/timer_metrics          afad1794bb13e2a094720aeb27c088aa64564895
-github.com/blang/semver                 9bf7bff48b0388cb75991e58c6df7d13e982f1f2
-github.com/julienschmidt/httprouter     6aacfd5ab513e34f7e64ea9627ab9670371b34e7
-github.com/judwhite/go-svc/svc          63c12402f579f0bdf022653c821a1aa5d7544f01
-github.com/nsqio/go-diskqueue           0681a1afee1245efa503b7543989fc26d8f268bc
diff --git a/Gopkg.lock b/Gopkg.lock
new file mode 100644
index 000000000..925b8aad7
--- /dev/null
+++ b/Gopkg.lock
@@ -0,0 +1,70 @@
+# This file is autogenerated, do not edit; changes may be undone by the next 'dep ensure'.
+
+
+[[projects]]
+  name = "github.com/BurntSushi/toml"
+  packages = ["."]
+  revision = "2dff11163ee667d51dcc066660925a92ce138deb"
+
+[[projects]]
+  name = "github.com/bitly/go-hostpool"
+  packages = ["."]
+  revision = "a3a6125de9329587178a9792dc8f4bc98e620d2d"
+
+[[projects]]
+  name = "github.com/bitly/timer_metrics"
+  packages = ["."]
+  revision = "afad1794bb13e2a094720aeb27c088aa64564895"
+
+[[projects]]
+  name = "github.com/blang/semver"
+  packages = ["."]
+  revision = "9bf7bff48b0388cb75991e58c6df7d13e982f1f2"
+
+[[projects]]
+  name = "github.com/bmizerany/perks"
+  packages = ["quantile"]
+  revision = "6cb9d9d729303ee2628580d9aec5db968da3a607"
+
+[[projects]]
+  name = "github.com/golang/snappy"
+  packages = ["."]
+  revision = "d9eb7a3d35ec988b8585d4a0068e462c27d28380"
+
+[[projects]]
+  name = "github.com/judwhite/go-svc"
+  packages = ["svc"]
+  revision = "63c12402f579f0bdf022653c821a1aa5d7544f01"
+
+[[projects]]
+  name = "github.com/julienschmidt/httprouter"
+  packages = ["."]
+  revision = "6aacfd5ab513e34f7e64ea9627ab9670371b34e7"
+
+[[projects]]
+  name = "github.com/mreiferson/go-options"
+  packages = ["."]
+  revision = "77551d20752b54535462404ad9d877ebdb26e53d"
+
+[[projects]]
+  name = "github.com/nsqio/go-diskqueue"
+  packages = ["."]
+  revision = "0681a1afee1245efa503b7543989fc26d8f268bc"
+
+[[projects]]
+  name = "github.com/nsqio/go-nsq"
+  packages = ["."]
+  revision = "a53d495e81424aaf7a7665a9d32a97715c40e953"
+
+[[projects]]
+  branch = "master"
+  name = "golang.org/x/sys"
+  packages = ["unix","windows","windows/svc"]
+  revision = "661970f62f5897bc0cd5fdca7e087ba8a98a8fa1"
+
+[solve-meta]
+  analyzer-name = "dep"
+  analyzer-version = 1
+  inputs-digest = "532ea1365ba72d95b44f494d7a4c77046f7786c7c1a706faadf3c5202da0b47e"
+  solver-name = "gps-cdcl"
+  solver-version = 1
diff --git a/Gopkg.toml b/Gopkg.toml
new file mode 100644
index 000000000..20b77efa6
--- /dev/null
+++ b/Gopkg.toml
@@ -0,0 +1,70 @@
+
+# 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/BurntSushi/toml"
+  revision = "2dff11163ee667d51dcc066660925a92ce138deb"
+
+[[constraint]]
+  name = "github.com/bitly/go-hostpool"
+  revision = "a3a6125de9329587178a9792dc8f4bc98e620d2d"
+
+[[constraint]]
+  name = "github.com/bitly/timer_metrics"
+  revision = "afad1794bb13e2a094720aeb27c088aa64564895"
+
+[[constraint]]
+  name = "github.com/blang/semver"
+  revision = "9bf7bff48b0388cb75991e58c6df7d13e982f1f2"
+
+[[constraint]]
+  name = "github.com/bmizerany/perks"
+  revision = "6cb9d9d729303ee2628580d9aec5db968da3a607"
+
+[[constraint]]
+  name = "github.com/golang/snappy"
+  revision = "d9eb7a3d35ec988b8585d4a0068e462c27d28380"
+
+[[constraint]]
+  name = "github.com/judwhite/go-svc"
+  revision = "63c12402f579f0bdf022653c821a1aa5d7544f01"
+
+[[constraint]]
+  name = "github.com/julienschmidt/httprouter"
+  revision = "6aacfd5ab513e34f7e64ea9627ab9670371b34e7"
+
+[[constraint]]
+  name = "github.com/mreiferson/go-options"
+  revision = "77551d20752b54535462404ad9d877ebdb26e53d"
+
+[[constraint]]
+  name = "github.com/nsqio/go-diskqueue"
+  revision = "0681a1afee1245efa503b7543989fc26d8f268bc"
+
+[[constraint]]
+  name = "github.com/nsqio/go-nsq"
+  revision = "a53d495e81424aaf7a7665a9d32a97715c40e953"
+
+[[constraint]]
+  name = "golang.org/x/sys"
+  branch = "master"
diff --git a/coverage.sh b/coverage.sh
index 377e847c3..06879e610 100755
--- a/coverage.sh
+++ b/coverage.sh
@@ -45,7 +45,7 @@ push_to_coveralls() {
                                -ignore="nsqadmin/bindata.go" || true
 }
 
-generate_cover_data $(go list ./...)
+generate_cover_data $(go list ./... | grep -v /vendor/)
 show_csv_report
 
 case "$1" in
diff --git a/dist.sh b/dist.sh
index fa2664bec..b979891fa 100755
--- a/dist.sh
+++ b/dist.sh
@@ -18,10 +18,7 @@ set -e
 DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
 rm -rf   $DIR/dist/docker
 mkdir -p $DIR/dist/docker
-rm -rf   $DIR/.godeps
-mkdir -p $DIR/.godeps
-export GOPATH=$DIR/.godeps:$GOPATH
-GOPATH=$DIR/.godeps gpm install
+dep ensure
 
 GOFLAGS='-ldflags="-s -w"'
 arch=$(go env GOARCH)
diff --git a/test.sh b/test.sh
index 7b2d8bfa2..35bc22cd9 100755
--- a/test.sh
+++ b/test.sh
@@ -1,8 +1,8 @@
 #!/bin/bash
 set -e
 
-GOMAXPROCS=1 go test -timeout 90s ./...
-GOMAXPROCS=4 go test -timeout 90s -race ./...
+GOMAXPROCS=1 go test -timeout 90s $(go list ./... | grep -v /vendor/)
+GOMAXPROCS=4 go test -timeout 90s -race $(go list ./... | grep -v /vendor/)
 
 # no tests, but a build is something
 for dir in apps/*/ bench/*/; do