From f384e579179c0f1c3ceae1a1ce27cada0ddbd9c9 Mon Sep 17 00:00:00 2001 From: Dawid Dziurla Date: Sat, 13 Jul 2019 12:39:50 +0200 Subject: [PATCH] mod: tidy and vendor --- go.mod | 1 - go.sum | 6 - .../github.com/tcnksm/go-gitconfig/.gitignore | 1 - .../tcnksm/go-gitconfig/CHANGELOG.md | 64 ---------- vendor/github.com/tcnksm/go-gitconfig/LICENSE | 22 ---- .../github.com/tcnksm/go-gitconfig/README.md | 84 ------------- .../tcnksm/go-gitconfig/gitconfig.go | 113 ------------------ .../tcnksm/go-gitconfig/wercker.yml | 20 ---- vendor/modules.txt | 2 - 9 files changed, 313 deletions(-) delete mode 100644 vendor/github.com/tcnksm/go-gitconfig/.gitignore delete mode 100644 vendor/github.com/tcnksm/go-gitconfig/CHANGELOG.md delete mode 100644 vendor/github.com/tcnksm/go-gitconfig/LICENSE delete mode 100644 vendor/github.com/tcnksm/go-gitconfig/README.md delete mode 100644 vendor/github.com/tcnksm/go-gitconfig/gitconfig.go delete mode 100644 vendor/github.com/tcnksm/go-gitconfig/wercker.yml diff --git a/go.mod b/go.mod index a9e838ee..2ae23dcf 100644 --- a/go.mod +++ b/go.mod @@ -37,7 +37,6 @@ require ( github.com/sirupsen/logrus v1.3.0 github.com/spkg/bom v0.0.0-20160624110644-59b7046e48ad github.com/stretchr/testify v1.2.2 - github.com/tcnksm/go-gitconfig v0.1.2 golang.org/x/time v0.0.0-20190308202827-9d24e82272b4 // indirect golang.org/x/xerrors v0.0.0-20190513163551-3ee3066db522 google.golang.org/grpc v1.22.0 // indirect diff --git a/go.sum b/go.sum index eefe6aa8..69dbc2fb 100644 --- a/go.sum +++ b/go.sum @@ -44,10 +44,6 @@ github.com/integrii/flaggy v0.0.0-20190517180110-07ea7eb77404 h1:oRzqLvY7HzDWD9k github.com/integrii/flaggy v0.0.0-20190517180110-07ea7eb77404/go.mod h1:tnTxHeTJbah0gQ6/K0RW0J7fMUBk9MCF5blhm43LNpI= github.com/jesseduffield/asciigraph v0.0.0-20190605104717-6d88e39309ee h1:7Zi/OQlGbMz4MT2V1+prN/gv1C64NDyVb/MbJnS0ZfA= github.com/jesseduffield/asciigraph v0.0.0-20190605104717-6d88e39309ee/go.mod h1:Z9UKHveKXXgyo8ME7R8yxh/BUTFOK+FgfWKlhy8oOAg= -github.com/jesseduffield/gocui v0.3.1-0.20190703115836-08c34c9081b3 h1:F9a1FHBFAEa1Jqrd1+vc1UhwVCQH8yywV1qSNadO81U= -github.com/jesseduffield/gocui v0.3.1-0.20190703115836-08c34c9081b3/go.mod h1:2RtZznzYKt8RLRwvFiSkXjU0Ei8WwHdubgnlaYH47dw= -github.com/jesseduffield/gocui v0.3.1-0.20190705132128-68f2ad6e3532 h1:PBs+XBBrhHBIfEm9uw0EcxG4hsFkUslwrjcgEOF6cfI= -github.com/jesseduffield/gocui v0.3.1-0.20190705132128-68f2ad6e3532/go.mod h1:2RtZznzYKt8RLRwvFiSkXjU0Ei8WwHdubgnlaYH47dw= github.com/jesseduffield/gocui v0.3.1-0.20190706002342-e625df489460 h1:ZE/5AVVJV5j7cVFvnQ/YsogDiUh544Qoh4ib/iVyKf8= github.com/jesseduffield/gocui v0.3.1-0.20190706002342-e625df489460/go.mod h1:2RtZznzYKt8RLRwvFiSkXjU0Ei8WwHdubgnlaYH47dw= github.com/jesseduffield/roll v0.0.0-20190629104057-695be2e62b00 h1:+JaOkfBNYQYlGD7dgru8mCwYNEc5tRRI8mThlVANhSM= @@ -96,8 +92,6 @@ github.com/spkg/bom v0.0.0-20160624110644-59b7046e48ad/go.mod h1:qLr4V1qq6nMqFKk 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= -github.com/tcnksm/go-gitconfig v0.1.2 h1:iiDhRitByXAEyjgBqsKi9QU4o2TNtv9kPP3RgPgXBPw= -github.com/tcnksm/go-gitconfig v0.1.2/go.mod h1:/8EhP4H7oJZdIPyT+/UIsG87kTzrzM4UsLGSItWYCpE= golang.org/x/crypto v0.0.0-20180904163835-0709b304e793 h1:u+LnwYTOOW7Ukr/fppxEb1Nwz0AtPflrblfvUudpo+I= golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2 h1:VklqNMn3ovrHsnt90PveolxSbWFaJdECFbxSq0Mqo2M= diff --git a/vendor/github.com/tcnksm/go-gitconfig/.gitignore b/vendor/github.com/tcnksm/go-gitconfig/.gitignore deleted file mode 100644 index 9ed3b07c..00000000 --- a/vendor/github.com/tcnksm/go-gitconfig/.gitignore +++ /dev/null @@ -1 +0,0 @@ -*.test diff --git a/vendor/github.com/tcnksm/go-gitconfig/CHANGELOG.md b/vendor/github.com/tcnksm/go-gitconfig/CHANGELOG.md deleted file mode 100644 index cb2fff5c..00000000 --- a/vendor/github.com/tcnksm/go-gitconfig/CHANGELOG.md +++ /dev/null @@ -1,64 +0,0 @@ -## 0.1.2 (2015-03-28) - -Add new functions - -### Added - -- `GithubUser()` extracts `github.user` ([**dstokes**](https://github.com/dstokes)), [#5](https://github.com/tcnksm/go-gitconfig/pull/5/commits) - -### Deprecated - -- Nothing - -### Removed - -- Nothing - -### Fixed - -- Nothing - - -## 0.1.1 (2014-10-28) - -Add new functions - -### Added - -- `GithubToken()` extracts `github.token` ([**@sona-tar**](https://github.com/sona-tar), [#3](https://github.com/tcnksm/go-gitconfig/pull/3)) -- `Entire()` try to extract value from entire git config. It's able to extract values from included config ([**@sona-tar**](https://github.com/sona-tar), [#3](https://github.com/tcnksm/go-gitconfig/pull/3)) - -### Deprecated - -- Nothing - -### Removed - -- Nothing - -### Fixed - -- Nothing - - -## 0.1.0 (2014-09-08) - -Initial release - -### Added - -- Fundamental features - -### Deprecated - -- Nothing - -### Removed - -- Nothing - -### Fixed - -- Nothing - - diff --git a/vendor/github.com/tcnksm/go-gitconfig/LICENSE b/vendor/github.com/tcnksm/go-gitconfig/LICENSE deleted file mode 100644 index 3457f256..00000000 --- a/vendor/github.com/tcnksm/go-gitconfig/LICENSE +++ /dev/null @@ -1,22 +0,0 @@ -Copyright (c) 2014 tcnksm - -MIT License - -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 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. \ No newline at end of file diff --git a/vendor/github.com/tcnksm/go-gitconfig/README.md b/vendor/github.com/tcnksm/go-gitconfig/README.md deleted file mode 100644 index 70f1e72e..00000000 --- a/vendor/github.com/tcnksm/go-gitconfig/README.md +++ /dev/null @@ -1,84 +0,0 @@ -go-gitconfig -==== - -[![GitHub release](http://img.shields.io/github/release/tcnksm/go-gitconfig.svg?style=flat-square)][release] -[![Wercker](http://img.shields.io/wercker/ci/544ee33aea87f6374f001483.svg?style=flat-square)][wercker] -[![Coveralls](http://img.shields.io/coveralls/tcnksm/go-gitconfig.svg?style=flat-square)][coveralls] -[![MIT License](http://img.shields.io/badge/license-MIT-blue.svg?style=flat-square)][license] -[![Go Documentation](http://img.shields.io/badge/go-documentation-blue.svg?style=flat-square)][godocs] - -[release]: https://github.com/tcnksm/go-gitconfig/releases -[wercker]: https://app.wercker.com/project/bykey/89c5a6e50a0daceec971ff5ce210164a -[coveralls]: https://coveralls.io/r/tcnksm/go-gitconfig -[license]: https://github.com/tcnksm/go-gitconfig/blob/master/LICENSE -[godocs]: http://godoc.org/github.com/tcnksm/go-gitconfig - - -`go-gitconfig` is a pacakge to use `gitconfig` values in Golang. - -Sometimes you want to extract username or its email address **implicitly** in your tool. -Now most of developer use `git`, so we can use its configuration variables. `go-gitconfig` is for that. - -`go-gitconfig` is very small, so it may not be included what you want to use. -If you want to use more git specific variable, check [Other](##VS). - -## Usage - -If you want to use git user name defined in `~/.gitconfig`: - -```go -username, err := gitconfig.Username() -``` - -Or git user email defined in `~/.gitconfig`: - -```go -email, err := gitconfig.Email() -``` - -Or, if you want to extract origin url of current project (from `.git/config`): - -```go -url, err := gitconfig.OriginURL() -``` - -You can also extract value by key: - -```go -editor, err := gitconfig.Global("core.editor") -``` - -```go -remote, err := gitconfig.Local("branch.master.remote") -``` - -See more details in document at [https://godoc.org/github.com/tcnksm/go-gitconfig](https://godoc.org/github.com/tcnksm/go-gitconfig). - -## Install - -To install, use `go get`: - -```bash -$ go get -d github.com/tcnksm/go-gitconfig -``` - -## VS. - -- [speedata/gogit](https://github.com/speedata/gogit) -- [libgit2/git2go](https://github.com/libgit2/git2go) - -These packages have many features to use git from golang. `go-gitconfig` is very simple alternative and focus to extract information from gitconfig. `go-gitconfig` is used in [tcnksm/ghr](https://github.com/tcnksm/ghr). - -## Contribution - -1. Fork ([https://github.com/tcnksm/go-gitconfig/fork](https://github.com/tcnksm/go-gitconfig/fork)) -1. Create a feature branch -1. Commit your changes -1. Rebase your local changes against the master branch -1. Run test suite with the `go test ./...` command and confirm that it passes -1. Run `gofmt -s` -1. Create new Pull Request - -## Author - -[tcnksm](https://github.com/tcnksm) diff --git a/vendor/github.com/tcnksm/go-gitconfig/gitconfig.go b/vendor/github.com/tcnksm/go-gitconfig/gitconfig.go deleted file mode 100644 index 46c6a10f..00000000 --- a/vendor/github.com/tcnksm/go-gitconfig/gitconfig.go +++ /dev/null @@ -1,113 +0,0 @@ -// Package gitconfig enables you to use `~/.gitconfig` values in Golang. -// -// For a full guide visit http://github.com/tcnksm/go-gitconfig -// -// package main -// -// import ( -// "github.com/tcnksm/go-gitconfig" -// "fmt" -// ) -// -// func main() { -// user, err := gitconfig.Global("user.name") -// if err == nil { -// fmt.Println(user) -// } -// } -// -package gitconfig - -import ( - "bytes" - "fmt" - "io/ioutil" - "os/exec" - "regexp" - "strings" - "syscall" -) - -// Entire extracts configuration value from `$HOME/.gitconfig` file , -// `$GIT_CONFIG`, /etc/gitconfig or include.path files. -func Entire(key string) (string, error) { - return execGitConfig(key) -} - -// Global extracts configuration value from `$HOME/.gitconfig` file or `$GIT_CONFIG`. -func Global(key string) (string, error) { - return execGitConfig("--global", key) -} - -// Local extracts configuration value from current project repository. -func Local(key string) (string, error) { - return execGitConfig("--local", key) -} - -// GithubUser extracts github.user name from `Entire gitconfig` -// This is same as Entire("github.user") -func GithubUser() (string, error) { - return Entire("github.user") -} - -// Username extracts git user name from `Entire gitconfig`. -// This is same as Entire("user.name") -func Username() (string, error) { - return Entire("user.name") -} - -// Email extracts git user email from `$HOME/.gitconfig` file or `$GIT_CONFIG`. -// This is same as Global("user.email") -func Email() (string, error) { - return Entire("user.email") -} - -// OriginURL extract remote origin url from current project repository. -// This is same as Local("remote.origin.url") -func OriginURL() (string, error) { - return Local("remote.origin.url") -} - -// Repository extract repository name of current project repository. -func Repository() (string, error) { - url, err := OriginURL() - if err != nil { - return "", err - } - - repo := retrieveRepoName(url) - return repo, nil -} - -// Github extracts github token from `Entire gitconfig`. -// This is same as Entire("github.token") -func GithubToken() (string, error) { - return Entire("github.token") -} - -func execGitConfig(args ...string) (string, error) { - gitArgs := append([]string{"config", "--get", "--null"}, args...) - var stdout bytes.Buffer - cmd := exec.Command("git", gitArgs...) - cmd.Stdout = &stdout - cmd.Stderr = ioutil.Discard - - err := cmd.Run() - if exitError, ok := err.(*exec.ExitError); ok { - if waitStatus, ok := exitError.Sys().(syscall.WaitStatus); ok { - if waitStatus.ExitStatus() == 1 { - return "", fmt.Errorf("the key `%s` is not found", args[len(args)-1]) - } - } - return "", err - } - - return strings.TrimRight(stdout.String(), "\000"), nil -} - -var RepoNameRegexp = regexp.MustCompile(`.+/([^/]+)(\.git)?$`) - -func retrieveRepoName(url string) string { - matched := RepoNameRegexp.FindStringSubmatch(url) - return strings.TrimSuffix(matched[1], ".git") -} diff --git a/vendor/github.com/tcnksm/go-gitconfig/wercker.yml b/vendor/github.com/tcnksm/go-gitconfig/wercker.yml deleted file mode 100644 index d5950686..00000000 --- a/vendor/github.com/tcnksm/go-gitconfig/wercker.yml +++ /dev/null @@ -1,20 +0,0 @@ -box: tcnksm/gox -build: - steps: - - setup-go-workspace - - script: - name: install latest git - code: | - sudo add-apt-repository -y ppa:git-core/ppa - sudo apt-get -y update - sudo apt-get -y install git - - script: - name: git version - code: | - git version - - script: - name: go get - code: | - go get -t ./... - - tcnksm/goveralls: - token: $COVERALLS_REPO_TOKEN \ No newline at end of file diff --git a/vendor/modules.txt b/vendor/modules.txt index aa27420d..d8eda052 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -85,8 +85,6 @@ github.com/sirupsen/logrus github.com/spkg/bom # github.com/stretchr/testify v1.2.2 github.com/stretchr/testify/assert -# github.com/tcnksm/go-gitconfig v0.1.2 -github.com/tcnksm/go-gitconfig # golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2 golang.org/x/crypto/ssh/terminal # golang.org/x/net v0.0.0-20190311183353-d8887717615a