From 75142be0b0844f0f9bdb569c261fa1b49d530ecf Mon Sep 17 00:00:00 2001
From: Carlo Strub <cs@carlostrub.ch>
Date: Wed, 7 Feb 2018 22:17:04 +0100
Subject: [PATCH] replace glide by dep (fixes #10)

---
 Gopkg.lock | 200 +++++++++++++++++++++++++++++++++++++++++++++++++++++
 Gopkg.toml |  70 +++++++++++++++++++
 Makefile   |   4 +-
 glide.lock | 111 -----------------------------
 glide.yaml |  21 ------
 5 files changed, 272 insertions(+), 134 deletions(-)
 create mode 100644 Gopkg.lock
 create mode 100644 Gopkg.toml
 delete mode 100644 glide.lock
 delete mode 100644 glide.yaml

diff --git a/Gopkg.lock b/Gopkg.lock
new file mode 100644
index 0000000..d8d31fe
--- /dev/null
+++ b/Gopkg.lock
@@ -0,0 +1,200 @@
+# This file is autogenerated, do not edit; changes may be undone by the next 'dep ensure'.
+
+
+[[projects]]
+  name = "github.com/boltdb/bolt"
+  packages = ["."]
+  revision = "2f1ce7a837dcb8da3ec595b1dac9d0632f0f99e8"
+  version = "v1.3.1"
+
+[[projects]]
+  branch = "master"
+  name = "github.com/carlostrub/maildir"
+  packages = ["."]
+  revision = "eed2685d688901996e5e040115a236404498af3e"
+
+[[projects]]
+  name = "github.com/fsnotify/fsnotify"
+  packages = ["."]
+  revision = "c2828203cd70a50dcccfb2761f8b1f8ceef9a8e9"
+  version = "v1.4.7"
+
+[[projects]]
+  branch = "master"
+  name = "github.com/gonum/blas"
+  packages = [
+    ".",
+    "blas64",
+    "native",
+    "native/internal/math32"
+  ]
+  revision = "e7c5890b24cf6f3bb173f76e1bd71e80e887e3f9"
+
+[[projects]]
+  branch = "master"
+  name = "github.com/gonum/floats"
+  packages = ["."]
+  revision = "7de1f4ea7ab57890bfd427af68c7994cd67975d4"
+
+[[projects]]
+  branch = "master"
+  name = "github.com/gonum/internal"
+  packages = [
+    "asm/f32",
+    "asm/f64"
+  ]
+  revision = "fda53f8d25717c07e2dac25758075a182bd74235"
+
+[[projects]]
+  branch = "master"
+  name = "github.com/gonum/lapack"
+  packages = [
+    ".",
+    "lapack64",
+    "native"
+  ]
+  revision = "f0b8b25edeceafb3a2752941c7bf0cda962df112"
+
+[[projects]]
+  branch = "master"
+  name = "github.com/gonum/matrix"
+  packages = [
+    ".",
+    "mat64"
+  ]
+  revision = "a41cc49d4c29f7451775f4379a5cc6ec6239dfab"
+
+[[projects]]
+  branch = "master"
+  name = "github.com/gonum/stat"
+  packages = ["."]
+  revision = "ec9c8a1062f4be6c6ad671f0f5dba12d4a76826d"
+
+[[projects]]
+  name = "github.com/kennygrant/sanitize"
+  packages = ["."]
+  revision = "2e6820834a1f36c626bf19a253b7d3cc060e9b8b"
+  version = "v1.2.3"
+
+[[projects]]
+  name = "github.com/onsi/ginkgo"
+  packages = [
+    ".",
+    "config",
+    "internal/codelocation",
+    "internal/containernode",
+    "internal/failer",
+    "internal/leafnodes",
+    "internal/remote",
+    "internal/spec",
+    "internal/spec_iterator",
+    "internal/specrunner",
+    "internal/suite",
+    "internal/testingtproxy",
+    "internal/writer",
+    "reporters",
+    "reporters/stenographer",
+    "reporters/stenographer/support/go-colorable",
+    "reporters/stenographer/support/go-isatty",
+    "types"
+  ]
+  revision = "9eda700730cba42af70d53180f9dcce9266bc2bc"
+  version = "v1.4.0"
+
+[[projects]]
+  name = "github.com/onsi/gomega"
+  packages = [
+    ".",
+    "format",
+    "internal/assertion",
+    "internal/asyncassertion",
+    "internal/oraclematcher",
+    "internal/testingtsupport",
+    "matchers",
+    "matchers/support/goraph/bipartitegraph",
+    "matchers/support/goraph/edge",
+    "matchers/support/goraph/node",
+    "matchers/support/goraph/util",
+    "types"
+  ]
+  revision = "003f63b7f4cff3fc95357005358af2de0f5fe152"
+  version = "v1.3.0"
+
+[[projects]]
+  name = "github.com/retailnext/hllpp"
+  packages = ["."]
+  revision = "9fdfea05b3e55bebe7beb22d16c7db15d46cd518"
+  version = "v1.0.0"
+
+[[projects]]
+  name = "github.com/sirupsen/logrus"
+  packages = ["."]
+  revision = "d682213848ed68c0a260ca37d6dd5ace8423f5ba"
+  version = "v1.0.4"
+
+[[projects]]
+  name = "github.com/urfave/cli"
+  packages = ["."]
+  revision = "cfb38830724cc34fedffe9a2a29fb54fa9169cd1"
+  version = "v1.20.0"
+
+[[projects]]
+  name = "golang.org/x/crypto"
+  packages = ["ssh/terminal"]
+  revision = "1875d0a70c90e57f11972aefd42276df65e895b9"
+
+[[projects]]
+  branch = "master"
+  name = "golang.org/x/net"
+  packages = [
+    "html",
+    "html/atom",
+    "html/charset"
+  ]
+  revision = "2fb46b16b8dda405028c50f7c7f0f9dd1fa6bfb1"
+
+[[projects]]
+  branch = "master"
+  name = "golang.org/x/sys"
+  packages = [
+    "unix",
+    "windows"
+  ]
+  revision = "37707fdb30a5b38865cfb95e5aab41707daec7fd"
+
+[[projects]]
+  branch = "master"
+  name = "golang.org/x/text"
+  packages = [
+    "encoding",
+    "encoding/charmap",
+    "encoding/htmlindex",
+    "encoding/internal",
+    "encoding/internal/identifier",
+    "encoding/japanese",
+    "encoding/korean",
+    "encoding/simplifiedchinese",
+    "encoding/traditionalchinese",
+    "encoding/unicode",
+    "internal/gen",
+    "internal/tag",
+    "internal/utf8internal",
+    "language",
+    "runes",
+    "transform",
+    "unicode/cldr"
+  ]
+  revision = "e19ae1496984b1c655b8044a65c0300a3c878dd3"
+
+[[projects]]
+  branch = "v2"
+  name = "gopkg.in/yaml.v2"
+  packages = ["."]
+  revision = "d670f9405373e636a5a2765eea47fac0c9bc91a4"
+
+[solve-meta]
+  analyzer-name = "dep"
+  analyzer-version = 1
+  inputs-digest = "86a8a299a11ece0852179c1eba4b5ab6b368b4d733421aaca8bf31875ee1a646"
+  solver-name = "gps-cdcl"
+  solver-version = 1
diff --git a/Gopkg.toml b/Gopkg.toml
new file mode 100644
index 0000000..6d7ff37
--- /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"
+#
+# [prune]
+#   non-go = false
+#   go-tests = true
+#   unused-packages = true
+
+
+[[constraint]]
+  name = "github.com/boltdb/bolt"
+  version = "1.3.1"
+
+[[constraint]]
+  branch = "master"
+  name = "github.com/carlostrub/maildir"
+
+[[constraint]]
+  name = "github.com/fsnotify/fsnotify"
+  version = "1.4.7"
+
+[[constraint]]
+  branch = "master"
+  name = "github.com/gonum/stat"
+
+[[constraint]]
+  name = "github.com/kennygrant/sanitize"
+  version = "1.2.3"
+
+[[constraint]]
+  name = "github.com/onsi/ginkgo"
+  version = "1.4.0"
+
+[[constraint]]
+  name = "github.com/onsi/gomega"
+  version = "1.3.0"
+
+[[constraint]]
+  name = "github.com/retailnext/hllpp"
+  version = "1.0.0"
+
+[[constraint]]
+  name = "github.com/sirupsen/logrus"
+  version = "1.0.4"
+
+[[constraint]]
+  name = "github.com/urfave/cli"
+  version = "1.20.0"
+
+[prune]
+  go-tests = true
+  unused-packages = true
diff --git a/Makefile b/Makefile
index ada8593..17a018f 100644
--- a/Makefile
+++ b/Makefile
@@ -18,8 +18,8 @@ verify-version:
 	fi
 
 build: verify-version
-	${SISYPHUS_GO_EXECUTABLE} get -u github.com/Masterminds/glide
-	glide install
+	${SISYPHUS_GO_EXECUTABLE} get -u github.com/golang/dep/cmd/dep
+	dep ensure
 	${SISYPHUS_GO_EXECUTABLE} build -o sisyphus/sisyphus -ldflags "-X main.version=${VERSION}" sisyphus/sisyphus.go
 
 install: build
diff --git a/glide.lock b/glide.lock
deleted file mode 100644
index b84f29e..0000000
--- a/glide.lock
+++ /dev/null
@@ -1,111 +0,0 @@
-hash: 14460d143bbeaabad675e23bb0773e78aa41b7a955b3d36453c57b8a14045b9e
-updated: 2018-02-02T23:04:42.946381535+01:00
-imports:
-- name: github.com/boltdb/bolt
-  version: 2f1ce7a837dcb8da3ec595b1dac9d0632f0f99e8
-- name: github.com/carlostrub/maildir
-  version: eed2685d688901996e5e040115a236404498af3e
-- name: github.com/fsnotify/fsnotify
-  version: c2828203cd70a50dcccfb2761f8b1f8ceef9a8e9
-- name: github.com/gonum/blas
-  version: e7c5890b24cf6f3bb173f76e1bd71e80e887e3f9
-  subpackages:
-  - blas64
-  - native
-  - native/internal/math32
-- name: github.com/gonum/floats
-  version: 7de1f4ea7ab57890bfd427af68c7994cd67975d4
-- name: github.com/gonum/internal
-  version: fda53f8d25717c07e2dac25758075a182bd74235
-  subpackages:
-  - asm/f32
-  - asm/f64
-- name: github.com/gonum/lapack
-  version: f0b8b25edeceafb3a2752941c7bf0cda962df112
-  subpackages:
-  - lapack64
-  - native
-- name: github.com/gonum/matrix
-  version: a41cc49d4c29f7451775f4379a5cc6ec6239dfab
-  subpackages:
-  - mat64
-- name: github.com/gonum/stat
-  version: ec9c8a1062f4be6c6ad671f0f5dba12d4a76826d
-- name: github.com/kennygrant/sanitize
-  version: 2e6820834a1f36c626bf19a253b7d3cc060e9b8b
-- name: github.com/retailnext/hllpp
-  version: 9fdfea05b3e55bebe7beb22d16c7db15d46cd518
-- name: github.com/sirupsen/logrus
-  version: d682213848ed68c0a260ca37d6dd5ace8423f5ba
-- name: github.com/urfave/cli
-  version: cfb38830724cc34fedffe9a2a29fb54fa9169cd1
-- name: golang.org/x/crypto
-  version: 1875d0a70c90e57f11972aefd42276df65e895b9
-  subpackages:
-  - ssh/terminal
-- name: golang.org/x/net
-  version: 2fb46b16b8dda405028c50f7c7f0f9dd1fa6bfb1
-  subpackages:
-  - html
-  - html/atom
-  - html/charset
-- name: golang.org/x/sys
-  version: 37707fdb30a5b38865cfb95e5aab41707daec7fd
-  subpackages:
-  - unix
-  - windows
-testImports:
-- name: github.com/onsi/ginkgo
-  version: 9eda700730cba42af70d53180f9dcce9266bc2bc
-  subpackages:
-  - config
-  - internal/codelocation
-  - internal/containernode
-  - internal/failer
-  - internal/leafnodes
-  - internal/remote
-  - internal/spec
-  - internal/spec_iterator
-  - internal/specrunner
-  - internal/suite
-  - internal/testingtproxy
-  - internal/writer
-  - reporters
-  - reporters/stenographer
-  - reporters/stenographer/support/go-colorable
-  - reporters/stenographer/support/go-isatty
-  - types
-- name: github.com/onsi/gomega
-  version: 003f63b7f4cff3fc95357005358af2de0f5fe152
-  subpackages:
-  - format
-  - internal/assertion
-  - internal/asyncassertion
-  - internal/oraclematcher
-  - internal/testingtsupport
-  - matchers
-  - matchers/support/goraph/bipartitegraph
-  - matchers/support/goraph/edge
-  - matchers/support/goraph/node
-  - matchers/support/goraph/util
-  - types
-- name: golang.org/x/text
-  version: e19ae1496984b1c655b8044a65c0300a3c878dd3
-  subpackages:
-  - encoding
-  - encoding/charmap
-  - encoding/htmlindex
-  - encoding/internal
-  - encoding/internal/identifier
-  - encoding/japanese
-  - encoding/korean
-  - encoding/simplifiedchinese
-  - encoding/traditionalchinese
-  - encoding/unicode
-  - internal/tag
-  - internal/utf8internal
-  - language
-  - runes
-  - transform
-- name: gopkg.in/yaml.v2
-  version: d670f9405373e636a5a2765eea47fac0c9bc91a4
diff --git a/glide.yaml b/glide.yaml
deleted file mode 100644
index d64432c..0000000
--- a/glide.yaml
+++ /dev/null
@@ -1,21 +0,0 @@
-package: github.com/carlostrub/sisyphus
-import:
-- package: github.com/boltdb/bolt
-  version: ^1.3.1
-- package: github.com/carlostrub/maildir
-- package: github.com/fsnotify/fsnotify
-  version: ^1.4.7
-- package: github.com/gonum/stat
-- package: github.com/kennygrant/sanitize
-  version: ^1.2.3
-- package: github.com/retailnext/hllpp
-  version: ^1.0.0
-- package: github.com/sirupsen/logrus
-  version: ^1.0.4
-- package: github.com/urfave/cli
-  version: ^1.20.0
-testImport:
-- package: github.com/onsi/ginkgo
-  version: ^1.4.0
-- package: github.com/onsi/gomega
-  version: ^1.3.0