Migrate from glide to dep (#410)

aelsabbahy · Dec 27, 2018 · d41ac7e5ef5e9c7bc74004a10e12cbc544ec1700 · d41ac7e
1 parent cdcd29f
commit d41ac7e5ef5e9c7bc74004a10e12cbc544ec1700
Unified Split

Showing with 240 additions and 86 deletions.

+1 −4 .travis.yml

+152 −0 Gopkg.lock

+57 −0 Gopkg.toml

+2 −2 Makefile

+6 −0 README.md

+0 −56 glide.lock

+0 −24 glide.yaml

+22 −0 novendor.sh
diff --git a/.travis.yml b/.travis.yml
@@ -10,11 +10,8 @@ services:
 - docker
 before_install:
-  
- curl -L https://github.com/Masterminds/glide/releases/download/0.10.2/glide-0.10.2-linux-amd64.zip
-  
-  > glide.zip
-  
- unzip glide.zip
-  
- export PATH="$PATH:$PWD/linux-amd64"
 - go get -u github.com/golang/lint/golint
+  
+- DEP_RELEASE_TAG=0.5.0 curl https://raw.githubusercontent.com/golang/dep/master/install.sh | sh
 script:
 - make deps
diff --git a/Gopkg.lock b/Gopkg.lock
diff --git a/Gopkg.toml b/Gopkg.toml
@@ -0,0 +1,57 @@
+  
+[prune]
+  
+  go-tests = true
+  
+  unused-packages = true
+  
+
+  
+[[constraint]]
+  
+  name = "github.com/achanda/go-sysctl"
+  
+  revision = "6be7678c45d2052640e72060e4f5db6165b1ecab"
+  
+
+  
+[[constraint]]
+  
+    name = "github.com/aelsabbahy/GOnetstat"
+  
+    revision = "edf89f784e0876818dc19f7744a16742a0a66f16"
+  
+
+  
+[[constraint]]
+  
+    name = "github.com/cheekybits/genny"
+  
+    revision = "e8e29e67948b15c64e60d6617182c18cf7eead7f"
+  
+    #subpackage: generic
+  
+
+  
+[[constraint]]
+  
+    name = "github.com/docker/docker"
+  
+    revision = "383a2f046b16c9f79d2fb800844e6550cc784871"
+  
+    #subpackage: pkg/mount
+  
+
+  
+[[constraint]]
+  
+    name = "github.com/fatih/color"
+  
+    revision = "bf82308e8c8546dc2b945157173eb8a959ae9505"
+  
+
+  
+[[constraint]]
+  
+    name = "github.com/miekg/dns"
+  
+    revision = "58f52c57ce9df13460ac68200cef30a008b9c468"
+  
+
+  
+[[constraint]]
+  
+    name = "github.com/aelsabbahy/go-ps"
+  
+    revision = "443386855ca1f4d28d990ae9e46e9bc1533de994"
+  
+
+  
+[[constraint]]
+  
+    name = "github.com/oleiade/reflections"
+  
+    revision = "0e86b3c98b2ff33e30c85cfe97d9a63d439fe7eb"
+  
+
+  
+[[constraint]]
+  
+    name = "github.com/onsi/gomega"
+  
+    revision = "ff4bc6b6f9f5affa66635cd04d31d2a7ee21ffd6"
+  
+
+  
+[[constraint]]
+  
+    name ="github.com/opencontainers/runc"
+  
+    revision = "8779fa57eb4a810a7360187dfa5e168a76cf5d21"
+  
+
+  
+[[constraint]]
+  
+    name = "github.com/patrickmn/go-cache"
+  
+    revision = "1881a9bccb818787f68c52bfba648c6cf34c34fa"
+  
+
+  
+[[constraint]]
+  
+    name = "github.com/urfave/cli"
+  
+    revision = "d86a009f5e13f83df65d0d6cee9a2e3f1445f0da"
+  
+
+  
+[[constraint]]
+  
+    name = "gopkg.in/yaml.v2"
+  
+    revision = "a5b47d31c556af34a302ce5d659e6fea44d90de0"
diff --git a/Makefile b/Makefile
@@ -1,7 +1,7 @@
 export GO15VENDOREXPERIMENT=1
 exe = github.com/aelsabbahy/goss/cmd/goss
-  
-pkgs = $(shell glide novendor)
+  
+pkgs = $(shell ./novendor.sh)
 cmd = goss
 TRAVIS_TAG ?= "0.0.0"
 GO_FILES = $(shell find . \( -path ./vendor -o -name '_test.go' \) -prune -o -name '*.go' -print)
@@ -93,7 +93,7 @@ test-all: lint test test-int
 deps:
 	$(info INFO: Starting build $@)
-  
-	glide install
+  
+	dep ensure
 gen:
 	$(info INFO: Starting build $@)
diff --git a/README.md b/README.md
@@ -56,6 +56,12 @@ curl -L https://raw.githubusercontent.com/aelsabbahy/goss/_VERSION_/extras/dgoss
 chmod +rx /usr/local/bin/dgoss
 ```
+  
+### Build it yourself
+  
+
+  
+```bash
+  
+make build
+  
+```
+  
+
 ## Full Documentation
 Documentation is available here: https://github.com/aelsabbahy/goss/blob/master/docs/manual.md
diff --git a/glide.lock b/glide.lock
diff --git a/glide.yaml b/glide.yaml
diff --git a/novendor.sh b/novendor.sh
@@ -0,0 +1,22 @@
+  
+#!/usr/bin/env bash
+  
+set -euo pipefail
+  
+
+  
+# Bash replacement for glide novendor command
+  
+# Returns all directories which include go files
+  
+
+  
+DIRS=$(ls -ld */ . | awk {'print $9'} | grep -v vendor)
+  
+
+  
+for DIR in ${DIRS}; do
+  
+    GOFILES=$(git ls-files ${DIR} | grep ".*\.go$") || true
+  
+
+  
+    if [[ ${DIR} == "."  ]]; then
+  
+        echo "."
+  
+        continue
+  
+    fi
+  
+
+  
+    if [[ ${GOFILES} != "" ]]; then
+  
+        echo "./"${DIR}"..."
+  
+    fi
+  
+done
+  
+
+  
+exit 0