diff --git a/.travis.yml b/.travis.yml index 74970c5..145d5af 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,8 +1,8 @@ language: go go: - - "1.10.x" - "1.11.x" - "1.12.x" + - "1.13.x" - "tip" env: diff --git a/Makefile b/Makefile index 36f8515..e92f8c5 100644 --- a/Makefile +++ b/Makefile @@ -9,52 +9,30 @@ VERSION = $(shell go run tools/build-version.go) HASH = $(shell git rev-parse --short HEAD) DATE = $(shell go run tools/build-date.go) GOMINORVERSION = $(shell go version | cut -d ' ' -f 3 | cut -d '.' -f 2) -GOMODULESUPPORT = $(shell echo $(GOMINORVERSION)\<11 | bc) - GOBIN ?= $($GOPATH)/bin -# Builds hargo after checking dependencies -build: deps - go build -ldflags "-s -w -X main.Version=$(VERSION) -X main.CommitHash=$(HASH) -X 'main.CompileDate=$(DATE)'" -o hargo ./cmd/hargo - -# Builds hargo after checking dependencies -build-all: build - -# Builds hargo without checking for dependencies -build-quick: +# Builds hargo +build: go build -ldflags "-s -w -X main.Version=$(VERSION) -X main.CommitHash=$(HASH) -X 'main.CompileDate=$(DATE)'" -o hargo ./cmd/hargo # Same as 'build' but installs to $GOBIN afterward -install: deps +install: go install -ldflags "-s -w -X main.Version=$(VERSION) -X main.CommitHash=$(HASH) -X 'main.CompileDate=$(DATE)'" ./cmd/hargo -# Same as 'build-all' but installs to $GOBIN afterward -install-all: install - -# Same as 'build-quick' but installs to $GOBIN afterward -install-quick: - go install -ldflags "-s -w -X main.Version=$(VERSION) -X main.CommitHash=$(HASH) -X 'main.CompileDate=$(DATE)'" ./cmd/hargo - -# Checks for dependencies -deps: -ifeq ($(GOMODULESUPPORT),1) - @echo Go minor version: $(GOMINORVERSION) does not support modules, using Glide - glide install -endif - update: git pull - glide install + go install test: - glide install + go install go test ./cmd/hargo/main clean: rm -f hargo docker: - docker build --rm -t ${IMAGE} --build-arg VERSION="${VERSION}" \ + docker build --rm -t ${IMAGE} \ + --build-arg VERSION="${VERSION}" \ --build-arg BUILD_DATE="${BUILD_DATE}" \ --build-arg DATE="${DATE}" \ --build-arg HASH="${HASH}" \ @@ -62,4 +40,4 @@ docker: --build-arg VCS_URL="${VCS_URL}" \ --build-arg VCS_REF="${VCS_REF}" \ --build-arg NAME="${NAME}" \ - --build-arg VENDOR="${VENDOR}" . \ No newline at end of file + --build-arg VENDOR="${VENDOR}" . diff --git a/README.md b/README.md index 0bc3240..53ee9c7 100644 --- a/README.md +++ b/README.md @@ -15,7 +15,7 @@ USAGE: hargo [arguments] <.har file> VERSION: - 0.1.2-dev.16 (28c9ef4) + 0.1.2-dev.57 (da53069) AUTHOR: Mark A. Richman diff --git a/cmd/hargo/hargo.go b/cmd/hargo/hargo.go index fbf6a46..0ba6787 100644 --- a/cmd/hargo/hargo.go +++ b/cmd/hargo/hargo.go @@ -9,7 +9,7 @@ import ( "github.com/mrichman/hargo" log "github.com/sirupsen/logrus" - "gopkg.in/urfave/cli.v1" + "github.com/urfave/cli" ) var ( diff --git a/glide.lock b/glide.lock deleted file mode 100644 index 69fe84f..0000000 --- a/glide.lock +++ /dev/null @@ -1,43 +0,0 @@ -hash: 56dc4b2922466bf4ba4bf2c816be45f509da24827cb413d5665feb25bd86d3ce -updated: 2018-09-20T16:05:57.622947-07:00 -imports: -- name: github.com/blang/semver - version: 2ee87856327ba09384cabd113bc6b5d174e9ec0f -- name: github.com/davecgh/go-spew - version: 8991bc29aa16c548c550c7ff78260e27b9ab7c73 - subpackages: - - spew -- name: github.com/influxdata/influxdb - version: 389de31c961831de0a9f4172173337d4a6193909 - subpackages: - - client/v2 - - models - - pkg/escape -- name: github.com/mrichman/hargo - version: 79c306bb2a43e1fe61ad38bb07ba86787b8892e6 -- name: github.com/Sirupsen/logrus - version: 3e01752db0189b9157070a0e1668a620f9a85da2 -- name: golang.org/x/crypto - version: 0e37d006457bf46f9e6692014ba72ef82c33022c - subpackages: - - ssh/terminal -- name: golang.org/x/net - version: 92b859f39abd2d91a854c9f9c4621b2f5054a92d - subpackages: - - http/httpguts - - idna -- name: golang.org/x/sys - version: d8e400bc7db4870d786864138af681469693d18c - subpackages: - - unix - - windows -- name: golang.org/x/text - version: f21a4dfb5e38f5895301dc265a8def02365cc3d0 - subpackages: - - secure/bidirule - - transform - - unicode/bidi - - unicode/norm -- name: gopkg.in/urfave/cli.v1 - version: cfb38830724cc34fedffe9a2a29fb54fa9169cd1 -testImports: [] diff --git a/glide.yaml b/glide.yaml deleted file mode 100644 index 23056a5..0000000 --- a/glide.yaml +++ /dev/null @@ -1,21 +0,0 @@ -package: . -import: -- package: github.com/Sirupsen/logrus - version: ^1.0.6 -- package: github.com/blang/semver - version: ^3.5.1 -- package: github.com/davecgh/go-spew - version: ^1.1.0 - subpackages: - - spew -- package: github.com/influxdata/influxdb - version: ^1.6.0 - subpackages: - - client/v2 -- package: github.com/mrichman/hargo - version: ^0.1.1 -- package: golang.org/x/net - subpackages: - - http/httpguts -- package: gopkg.in/urfave/cli.v1 - version: ^1.20.0 diff --git a/go.mod b/go.mod index 730ea61..548a297 100644 --- a/go.mod +++ b/go.mod @@ -1,13 +1,13 @@ module github.com/mrichman/hargo +go 1.13 + require ( github.com/blang/semver v3.5.1+incompatible // indirect - github.com/influxdata/influxdb1-client v0.0.0-20190402204710-8ff2fc3824fc - github.com/sirupsen/logrus v1.3.0 - golang.org/x/crypto v0.0.0-20180910181607-0e37d006457b // indirect - golang.org/x/net v0.0.0-20190110200230-915654e7eabc - golang.org/x/text v0.3.0 // indirect - gopkg.in/urfave/cli.v1 v1.20.0 + github.com/influxdata/influxdb1-client v0.0.0-20190809212627-fc22c7df067e + github.com/sirupsen/logrus v1.4.2 + github.com/urfave/cli v1.21.0 + golang.org/x/net v0.0.0-20190827160401-ba9fcec4b297 ) go 1.13 diff --git a/go.sum b/go.sum index 756f5c8..ba0554b 100644 --- a/go.sum +++ b/go.sum @@ -1,26 +1,27 @@ +github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= github.com/blang/semver v3.5.1+incompatible h1:cQNTCjp13qL8KC3Nbxr/y2Bqb63oX6wdnnjpJbkM4JQ= github.com/blang/semver v3.5.1+incompatible/go.mod h1:kRBLl5iJ+tD4TcOOxsy/0fnwebNt5EWlYSAyrTnjyyk= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/influxdata/influxdb1-client v0.0.0-20190402204710-8ff2fc3824fc h1:KpMgaYJRieDkHZJWY3LMafvtqS/U8xX6+lUN+OKpl/Y= -github.com/influxdata/influxdb1-client v0.0.0-20190402204710-8ff2fc3824fc/go.mod h1:qj24IKcXYK6Iy9ceXlo3Tc+vtHo9lIhSX5JddghvEPo= -github.com/konsorten/go-windows-terminal-sequences v1.0.1 h1:mweAR1A6xJ3oS2pRaGiHgQ4OO8tzTaLawm8vnODuwDk= +github.com/influxdata/influxdb1-client v0.0.0-20190809212627-fc22c7df067e h1:txQltCyjXAqVVSZDArPEhUTg35hKwVIuXwtQo7eAMNQ= +github.com/influxdata/influxdb1-client v0.0.0-20190809212627-fc22c7df067e/go.mod h1:qj24IKcXYK6Iy9ceXlo3Tc+vtHo9lIhSX5JddghvEPo= github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= -github.com/sirupsen/logrus v1.3.0 h1:hI/7Q+DtNZ2kINb6qt/lS+IyXnHQe9e90POfeewL/ME= -github.com/sirupsen/logrus v1.3.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo= +github.com/sirupsen/logrus v1.4.2 h1:SPIRibHv4MatM3XXNO2BJeFLZwZ2LvZgfQ5+UNI2im4= +github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE= github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/testify v1.2.2 h1:bSDNvY7ZPG5RlJ8otE/7V6gMiyenm9RtJ7IUVIAoJ1w= github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= -golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= -golang.org/x/crypto v0.0.0-20180910181607-0e37d006457b h1:2b9XGzhjiYsYPnKXoEfL7klWZQIt8IfyRCz62gCqqlQ= -golang.org/x/crypto v0.0.0-20180910181607-0e37d006457b/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= -golang.org/x/net v0.0.0-20190110200230-915654e7eabc h1:Yx9JGxI1SBhVLFjpAkWMaO1TF+xyqtHLjZpvQboJGiM= -golang.org/x/net v0.0.0-20190110200230-915654e7eabc/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= -golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33 h1:I6FyU15t786LL7oL/hn43zqTuEGr4PN7F4XJ1p4E3Y8= -golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +github.com/urfave/cli v1.21.0 h1:wYSSj06510qPIzGSua9ZqsncMmWE3Zr55KBERygyrxE= +github.com/urfave/cli v1.21.0/go.mod h1:lxDj6qX9Q6lWQxIrbrT0nwecwUtRnhVZAJjJZrVUZZQ= +golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= +golang.org/x/net v0.0.0-20190827160401-ba9fcec4b297 h1:k7pJ2yAPLPgbskkFdhRCsA77k2fySZ1zf2zCjvQCiIM= +golang.org/x/net v0.0.0-20190827160401-ba9fcec4b297/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20190422165155-953cdadca894 h1:Cz4ceDQGXuKRnVBDTS23GTn/pU5OE2C0WrNTOYK1Uuc= +golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/text v0.3.0 h1:g61tztE5qeGQ89tm6NTjjM9VPIm088od1l6aSorWRWg= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= -gopkg.in/urfave/cli.v1 v1.20.0 h1:NdAVW6RYxDif9DhDHaAortIu956m2c0v+09AZBPTbE0= -gopkg.in/urfave/cli.v1 v1.20.0/go.mod h1:vuBzUtMdQeixQj8LVd+/98pzhxNGQoyuPBlsXHOQNO0= +gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=