replace glide with dep

theparanoids · Nov 25, 2018 · c6ac127 · c6ac127
1 parent acb0858
commit c6ac127
Show file tree

Hide file tree

Showing 11 changed files with 742 additions and 368 deletions.
diff --git a/cmd/yfuzz-cli/Gopkg.lock b/cmd/yfuzz-cli/Gopkg.lock
diff --git a/cmd/yfuzz-cli/Gopkg.toml b/cmd/yfuzz-cli/Gopkg.toml
@@ -0,0 +1,20 @@
+ignored = [
+  "github.com/yahoo/yfuzz/pkg/schema",
+  "github.com/yahoo/yfuzz/pkg/version",
+]
+
+[[constraint]]
+  name = "github.com/fatih/color"
+  version = "1.7.0"
+
+[[constraint]]
+  name = "github.com/spf13/viper"
+  version = "1.0.2"
+
+[[constraint]]
+  name = "gopkg.in/urfave/cli.v1"
+  version = "1.20.0"
+
+[prune]
+  go-tests = true
+  unused-packages = true
diff --git a/cmd/yfuzz-cli/README.md b/cmd/yfuzz-cli/README.md
@@ -16,7 +16,7 @@ A simple command-line utility for [yFuzz](https://github.com/yahoo/yfuzz).
   - [Settings](#settings)
 
 ## Prerequisites: 
-To build the CLI, you will need [Go](https://golang.org/), [Glide](https://glide.sh/), and [Make](https://www.gnu.org/software/make/).
+To build the CLI, you will need [Go](https://golang.org/), [Dep](https://golang.github.io/dep/), and [Make](https://www.gnu.org/software/make/).
 
 ## Install
 

diff --git a/cmd/yfuzz-cli/glide.lock b/cmd/yfuzz-cli/glide.lock
diff --git a/cmd/yfuzz-cli/glide.yaml b/cmd/yfuzz-cli/glide.yaml
diff --git a/scripts/go.mk b/scripts/go.mk
@@ -9,14 +9,15 @@
 
 TARGET ?= $(shell basename `pwd`)
 YFUZZ_BUILD_VERSION ?= $(shell git describe --tags --abbrev=0)_local
+HAS_DEP := $(shell command -v dep;)
 
 # Run go build or go install with the appropriate flags
 define _build
 	go $(1) -ldflags "-s -w -X github.com/yahoo/yfuzz/pkg/version.Version=${YFUZZ_BUILD_VERSION} \
 													-X github.com/yahoo/yfuzz/pkg/version.Timestamp=$(shell date +'%Y/%m/%d_%H:%M:%S')"
 endef
 
-all: deps lint test build
+all: deps dep-check lint test build
 
 clean:
 	@echo Cleaning binaries, vendor for ${TARGET}.
@@ -26,15 +27,22 @@ clean:
 
 deps:
 	@echo Installing dependencies for ${TARGET}.
+ifndef HAS_DEP
+	curl https://raw.githubusercontent.com/golang/dep/master/install.sh | sh
+endif
 ifeq (${verbose},true)
-	glide install
+	dep ensure -v
 else
-	glide -q install
+	dep ensure
 endif
 ifndef TRAVIS
 	go get -u github.com/golangci/golangci-lint/cmd/golangci-lint
 endif
 
+dep-check:
+	@echo Running dep check to verify consistency across Gopkg.toml, Gopkg.lock, and vendor.
+	dep check
+
 lint:
 ifdef TRAVIS
 	@echo Skipping lint in Travis, linting is done by https://golangci.com/
@@ -59,4 +67,4 @@ install:
 	@echo Installing ${TARGET} ${YFUZZ_BUILD_VERSION}
 	$(call _build,install)
 
-.PHONY: clean deps lint test build install
+.PHONY: clean deps dep-check lint test build install