From a2af38f03e8472aabce75959da8baa3c1f93c361 Mon Sep 17 00:00:00 2001 From: Jakob Schrettenbrunner Date: Tue, 27 Jun 2017 12:43:55 +0200 Subject: [PATCH] replace dep with glide --- .gitignore | 3 + .travis.yml | 4 +- Gopkg.lock | 170 ---------------------------------------------------- Gopkg.toml | 83 ------------------------- glide.lock | 87 +++++++++++++++++++++++++++ glide.yaml | 16 +++++ 6 files changed, 108 insertions(+), 255 deletions(-) delete mode 100644 Gopkg.lock delete mode 100644 Gopkg.toml create mode 100644 glide.lock create mode 100644 glide.yaml diff --git a/.gitignore b/.gitignore index 9f03281..5d83817 100644 --- a/.gitignore +++ b/.gitignore @@ -28,5 +28,8 @@ # Builds by gox /build +# Go Coverage tool +/coverage.out + # Keep all gitkeep files (This needs to stay at the bottom) !.gitkeep diff --git a/.travis.yml b/.travis.yml index fe4d58e..ee5afdd 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,11 +5,11 @@ go: - master install: -- go get github.com/golang/dep/cmd/dep +- curl https://glide.sh/get | sh - go get github.com/mitchellh/gox - go get github.com/haya14busa/goverage - go get github.com/schrej/godacov -- dep ensure +- glide install script: - gox -output "build/{{.Dir}}_{{.OS}}_{{.Arch}}" diff --git a/Gopkg.lock b/Gopkg.lock deleted file mode 100644 index 1a4fb51..0000000 --- a/Gopkg.lock +++ /dev/null @@ -1,170 +0,0 @@ -# This file is autogenerated, do not edit; changes may be undone by the next 'dep ensure'. - - -[[projects]] - name = "bitbucket.org/tebeka/strftime" - packages = ["."] - revision = "af5e0ef38369dfb5819b56d27d593142841e4600" - version = "0.1.2" - -[[projects]] - name = "github.com/davecgh/go-spew" - packages = ["spew"] - revision = "346938d642f2ec3594ed81d874461961cd0faa76" - version = "v1.1.0" - -[[projects]] - name = "github.com/fsnotify/fsnotify" - packages = ["."] - revision = "629574ca2a5df945712d3079857300b5e4da0236" - version = "v1.4.2" - -[[projects]] - name = "github.com/gin-gonic/gin" - packages = [".","binding","render"] - revision = "e2212d40c62a98b388a5eb48ecbdcf88534688ba" - version = "v1.1.4" - -[[projects]] - branch = "master" - name = "github.com/golang/protobuf" - packages = ["proto"] - revision = "6a1fa9404c0aebf36c879bc50152edcc953910d2" - -[[projects]] - branch = "master" - name = "github.com/hashicorp/hcl" - packages = [".","hcl/ast","hcl/parser","hcl/scanner","hcl/strconv","hcl/token","json/parser","json/scanner","json/token"] - revision = "392dba7d905ed5d04a5794ba89f558b27e2ba1ca" - -[[projects]] - name = "github.com/lestrrat/go-file-rotatelogs" - packages = ["."] - revision = "ab335c655133cea61d8164853c1ed0e97d6c77cb" - version = "v2.0.0" - -[[projects]] - name = "github.com/magiconair/properties" - packages = ["."] - revision = "f917359f079a3759162704eaa8caeec3d01d9f91" - version = "v1.7.2" - -[[projects]] - branch = "master" - name = "github.com/manucorporat/sse" - packages = ["."] - revision = "ee05b128a739a0fb76c7ebd3ae4810c1de808d6d" - -[[projects]] - name = "github.com/mattn/go-isatty" - packages = ["."] - revision = "fc9e8d8ef48496124e79ae0df75490096eccf6fe" - version = "v0.0.2" - -[[projects]] - branch = "master" - name = "github.com/mitchellh/mapstructure" - packages = ["."] - revision = "d0303fe809921458f417bcf828397a65db30a7e4" - -[[projects]] - name = "github.com/pelletier/go-buffruneio" - packages = ["."] - revision = "c37440a7cf42ac63b919c752ca73a85067e05992" - version = "v0.2.0" - -[[projects]] - name = "github.com/pelletier/go-toml" - packages = ["."] - revision = "5ccdfb18c776b740aecaf085c4d9a2779199c279" - version = "v1.0.0" - -[[projects]] - name = "github.com/pmezard/go-difflib" - packages = ["difflib"] - revision = "792786c7400a136282c1664665ae0a8db921c6c2" - version = "v1.0.0" - -[[projects]] - name = "github.com/rifflock/lfshook" - packages = ["."] - revision = "6844c808343cb8fa357d7f141b1b990e05d24e41" - version = "1.7" - -[[projects]] - name = "github.com/sirupsen/logrus" - packages = ["."] - revision = "202f25545ea4cf9b191ff7f846df5d87c9382c2b" - version = "v1.0.0" - -[[projects]] - branch = "master" - name = "github.com/spf13/afero" - packages = [".","mem"] - revision = "9be650865eab0c12963d8753212f4f9c66cdcf12" - -[[projects]] - name = "github.com/spf13/cast" - packages = ["."] - revision = "acbeb36b902d72a7a4c18e8f3241075e7ab763e4" - version = "v1.1.0" - -[[projects]] - branch = "master" - name = "github.com/spf13/jwalterweatherman" - packages = ["."] - revision = "0efa5202c04663c757d84f90f5219c1250baf94f" - -[[projects]] - branch = "master" - name = "github.com/spf13/pflag" - packages = ["."] - revision = "e57e3eeb33f795204c1ca35f56c44f83227c6e66" - -[[projects]] - name = "github.com/spf13/viper" - packages = ["."] - revision = "c1de95864d73a5465492829d7cb2dd422b19ac96" - -[[projects]] - name = "github.com/stretchr/testify" - packages = ["assert"] - revision = "69483b4bd14f5845b5a1e55bca19e954e827f1d0" - version = "v1.1.4" - -[[projects]] - branch = "master" - name = "golang.org/x/net" - packages = ["context"] - revision = "5f8847ae0d0e90b6a9dc8148e7ad616874625171" - -[[projects]] - branch = "master" - name = "golang.org/x/sys" - packages = ["unix"] - revision = "f7928cfef4d09d1b080aa2b6fd3ca9ba1567c733" - -[[projects]] - branch = "master" - name = "golang.org/x/text" - packages = ["internal/gen","internal/triegen","internal/ucd","transform","unicode/cldr","unicode/norm"] - revision = "4e9ab9ee170f2a39bd66c92b3e0a47ff47a4bc77" - -[[projects]] - name = "gopkg.in/go-playground/validator.v8" - packages = ["."] - revision = "5f57d2222ad794d0dffb07e664ea05e2ee07d60c" - version = "v8.18.1" - -[[projects]] - branch = "v2" - name = "gopkg.in/yaml.v2" - packages = ["."] - revision = "cd8b52f8269e0feb286dfeef29f8fe4d5b397e0b" - -[solve-meta] - analyzer-name = "dep" - analyzer-version = 1 - inputs-digest = "5cc19aac7d1db7309258f14e9817b2516dd29886fd60072ac1b55c9ad86259ce" - solver-name = "gps-cdcl" - solver-version = 1 diff --git a/Gopkg.toml b/Gopkg.toml deleted file mode 100644 index c260389..0000000 --- a/Gopkg.toml +++ /dev/null @@ -1,83 +0,0 @@ - -## Gopkg.toml example (these lines may be deleted) - -## "required" lists a set of packages (not projects) that must be included in -## Gopkg.lock. This list is merged with the set of packages imported by the current -## project. Use it when your project needs a package it doesn't explicitly import - -## including "main" packages. -# required = ["github.com/user/thing/cmd/thing"] - -## "ignored" lists a set of packages (not projects) that are ignored when -## dep statically analyzes source code. Ignored packages can be in this project, -## or in a dependency. -# ignored = ["github.com/user/project/badpkg"] - -## Dependencies define constraints on dependent projects. They are respected by -## dep whether coming from the Gopkg.toml of the current project or a dependency. -# [[dependencies]] -## Required: the root import path of the project being constrained. -# name = "github.com/user/project" -# -## Recommended: the version constraint to enforce for the project. -## Only one of "branch", "version" or "revision" can be specified. -# version = "1.0.0" -# branch = "master" -# revision = "abc123" -# -## Optional: an alternate location (URL or import path) for the project's source. -# source = "https://github.com/myfork/package.git" - -## Overrides have the same structure as [[dependencies]], but supercede all -## [[dependencies]] declarations from all projects. Only the current project's -## [[overrides]] are applied. -## -## Overrides are a sledgehammer. Use them only as a last resort. -# [[overrides]] -## Required: the root import path of the project being constrained. -# name = "github.com/user/project" -# -## Optional: specifying a version constraint override will cause all other -## constraints on this project to be ignored; only the overriden constraint -## need be satisfied. -## Again, only one of "branch", "version" or "revision" can be specified. -# version = "1.0.0" -# branch = "master" -# revision = "abc123" -# -## Optional: specifying an alternate source location as an override will -## enforce that the alternate location is used for that project, regardless of -## what source location any dependent projects specify. -# source = "https://github.com/myfork/package.git" - - -[[constraint]] - branch = "master" - name = "github.com/prometheus/common" - -[[constraint]] - branch = "master" - name = "golang.org/x/sys" - -[[constraint]] - version = "v2.0.0" - name = "github.com/lestrrat/go-file-rotatelogs" - -[[constraint]] - version = "v1.0.0" - name = "github.com/sirupsen/logrus" - -[[constraint]] - version = "1.6" - name = "github.com/rifflock/lfshook" - -[[constraint]] - revision = "c1de95864d73a5465492829d7cb2dd422b19ac96" - name = "github.com/spf13/viper" - -[[constraint]] - version = "1.1.4" - name = "github.com/stretchr/testify" - -[[constraint]] - version = "v1.1.4" - name = "github.com/gin-gonic/gin" diff --git a/glide.lock b/glide.lock new file mode 100644 index 0000000..91cbd07 --- /dev/null +++ b/glide.lock @@ -0,0 +1,87 @@ +hash: 4954000649d7a74d198904957adae4d4a88f6710c254f87930fbf6457b07eddb +updated: 2017-06-27T12:42:33.899081413+02:00 +imports: +- name: bitbucket.org/tebeka/strftime + version: 2194253a23c090a4d5953b152a3c63fb5da4f5a4 +- name: github.com/fsnotify/fsnotify + version: 4da3e2cfbabc9f751898f250b49f2439785783a1 +- name: github.com/gin-gonic/gin + version: e2212d40c62a98b388a5eb48ecbdcf88534688ba + subpackages: + - binding + - render +- name: github.com/golang/protobuf + version: 2402d76f3d41f928c7902a765dfc872356dd3aad + subpackages: + - proto +- name: github.com/hashicorp/hcl + version: 392dba7d905ed5d04a5794ba89f558b27e2ba1ca + subpackages: + - hcl/ast + - hcl/parser + - hcl/scanner + - hcl/strconv + - hcl/token + - json/parser + - json/scanner + - json/token +- name: github.com/lestrrat/go-file-rotatelogs + version: ab335c655133cea61d8164853c1ed0e97d6c77cb +- name: github.com/magiconair/properties + version: 51463bfca2576e06c62a8504b5c0f06d61312647 +- name: github.com/manucorporat/sse + version: ee05b128a739a0fb76c7ebd3ae4810c1de808d6d +- name: github.com/mattn/go-isatty + version: fc9e8d8ef48496124e79ae0df75490096eccf6fe +- name: github.com/mitchellh/mapstructure + version: d0303fe809921458f417bcf828397a65db30a7e4 +- name: github.com/pelletier/go-buffruneio + version: c37440a7cf42ac63b919c752ca73a85067e05992 +- name: github.com/pelletier/go-toml + version: 4a000a21a414d139727f616a8bb97f847b1b310b +- name: github.com/rifflock/lfshook + version: 6844c808343cb8fa357d7f141b1b990e05d24e41 +- name: github.com/sirupsen/logrus + version: 202f25545ea4cf9b191ff7f846df5d87c9382c2b +- name: github.com/spf13/afero + version: 9be650865eab0c12963d8753212f4f9c66cdcf12 + subpackages: + - mem +- name: github.com/spf13/cast + version: acbeb36b902d72a7a4c18e8f3241075e7ab763e4 +- name: github.com/spf13/jwalterweatherman + version: 0efa5202c04663c757d84f90f5219c1250baf94f +- name: github.com/spf13/pflag + version: e57e3eeb33f795204c1ca35f56c44f83227c6e66 +- name: github.com/spf13/viper + version: c1de95864d73a5465492829d7cb2dd422b19ac96 +- name: golang.org/x/net + version: f315505cf3349909cdf013ea56690da34e96a451 + subpackages: + - context +- name: golang.org/x/sys + version: f7928cfef4d09d1b080aa2b6fd3ca9ba1567c733 + subpackages: + - unix +- name: golang.org/x/text + version: 5a2c30c33799f1e813f7f3259000d594a5ed493a + subpackages: + - transform + - unicode/norm +- name: gopkg.in/go-playground/validator.v8 + version: c193cecd124b5cc722d7ee5538e945bdb3348435 +- name: gopkg.in/yaml.v2 + version: cd8b52f8269e0feb286dfeef29f8fe4d5b397e0b +testImports: +- name: github.com/davecgh/go-spew + version: 5215b55f46b2b919f50a1df0eaa5886afe4e3b3d + subpackages: + - spew +- name: github.com/pmezard/go-difflib + version: 792786c7400a136282c1664665ae0a8db921c6c2 + subpackages: + - difflib +- name: github.com/stretchr/testify + version: 69483b4bd14f5845b5a1e55bca19e954e827f1d0 + subpackages: + - assert diff --git a/glide.yaml b/glide.yaml new file mode 100644 index 0000000..f928bf3 --- /dev/null +++ b/glide.yaml @@ -0,0 +1,16 @@ +package: github.com/schrej/wings +import: +- package: github.com/gin-gonic/gin + version: ~1.1.4 +- package: github.com/lestrrat/go-file-rotatelogs + version: ~2.0.0 +- package: github.com/rifflock/lfshook + version: ~1.7.0 +- package: github.com/sirupsen/logrus + version: ~1.0.0 +- package: github.com/spf13/viper +testImport: +- package: github.com/stretchr/testify + version: ~1.1.4 + subpackages: + - assert