From 751c52157d8840ef1ebfeb65917fb9680ef51f24 Mon Sep 17 00:00:00 2001 From: Mark Bates Date: Thu, 13 Jun 2019 17:51:46 -0400 Subject: [PATCH] version bump: v0.1.5 --- LICENSE | 21 +++++++++++++++++---- Makefile | 33 +++++++++++++++++++++++---------- SHOULDERS.md | 2 ++ go.mod | 5 ++++- go.sum | 2 ++ version.go | 2 +- 6 files changed, 49 insertions(+), 16 deletions(-) diff --git a/LICENSE b/LICENSE index 123ddc0..649efd4 100644 --- a/LICENSE +++ b/LICENSE @@ -1,8 +1,21 @@ The MIT License (MIT) -Copyright (c) 2018 Mark Bates -Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: +Copyright (c) 2019 Mark Bates -The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. diff --git a/Makefile b/Makefile index fca203f..0ac539f 100644 --- a/Makefile +++ b/Makefile @@ -1,7 +1,7 @@ TAGS ?= "" -GO_BIN ?= go +GO_BIN ?= "go" -install: +install: $(GO_BIN) install -tags ${TAGS} -v . make tidy @@ -13,36 +13,49 @@ else endif deps: - $(GO_BIN) get github.com/gobuffalo/release $(GO_BIN) get -tags ${TAGS} -t ./... make tidy -build: +build: $(GO_BIN) build -v . make tidy -test: +test: $(GO_BIN) test -cover -tags ${TAGS} ./... make tidy -ci-deps: +ci-deps: $(GO_BIN) get -tags ${TAGS} -t ./... -ci-test: +ci-test: $(GO_BIN) test -tags ${TAGS} -race ./... +lint: + go get github.com/golangci/golangci-lint/cmd/golangci-lint + golangci-lint run --enable-all + make tidy + update: +ifeq ($(GO111MODULE),on) + rm go.* + $(GO_BIN) mod init + $(GO_BIN) mod tidy +else $(GO_BIN) get -u -tags ${TAGS} - make tidy +endif make test make install make tidy -release-test: +release-test: $(GO_BIN) test -tags ${TAGS} -race ./... make tidy release: + $(GO_BIN) get github.com/gobuffalo/release make tidy - release -y -f --skip-packr version.go + release -y -f version.go --skip-packr make tidy + + + diff --git a/SHOULDERS.md b/SHOULDERS.md index a73b414..8c359f1 100644 --- a/SHOULDERS.md +++ b/SHOULDERS.md @@ -5,4 +5,6 @@ github.com/gobuffalo/flect does not try to reinvent the wheel! Instead, it uses Thank you to the following **GIANTS**: +* [github.com/davecgh/go-spew](https://godoc.org/github.com/davecgh/go-spew) + * [github.com/stretchr/testify](https://godoc.org/github.com/stretchr/testify) diff --git a/go.mod b/go.mod index f70304d..cd02d07 100644 --- a/go.mod +++ b/go.mod @@ -2,4 +2,7 @@ module github.com/gobuffalo/flect go 1.12 -require github.com/stretchr/testify v1.3.0 +require ( + github.com/davecgh/go-spew v1.1.1 // indirect + github.com/stretchr/testify v1.3.0 +) diff --git a/go.sum b/go.sum index 4347755..4f76e62 100644 --- a/go.sum +++ b/go.sum @@ -1,5 +1,7 @@ github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= +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/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= diff --git a/version.go b/version.go index f7c9e4c..e060983 100644 --- a/version.go +++ b/version.go @@ -1,4 +1,4 @@ package flect //Version holds Flect version number -const Version = "v0.1.4" +const Version = "v0.1.5"