Re-resolving tree after bumping the vcs version for a bug.
diff --git a/glide.lock b/glide.lock index 2221b61..1bbde7a 100644 --- a/glide.lock +++ b/glide.lock
@@ -1,12 +1,12 @@ -hash: 20903781daabd592231b6616959bc03a5c9d6cbda87a0a566463d3ba1fcaf02b -updated: 2016-03-22T12:48:16.057789318-04:00 +hash: 83c7c3c86a8d50d46ac2731938195e348f2445e6106325a4f90976563c946bd8 +updated: 2016-03-23T21:38:59.47773549-04:00 imports: - name: github.com/codegangsta/cli - version: aca5b047ed14d17224157c3434ea93bf6cdaadee + version: 9fec0fad02befc9209347cc6d620e68e1b45f74d - name: github.com/Masterminds/semver version: 808ed7761c233af2de3f9729a041d68c62527f3a - name: github.com/Masterminds/vcs - version: 37d65fe88a747ab1ac3af3cf5035f62b9f4bee1c + version: b22ee1673cdd03ef47bb0b422736a7f17ff0648c - name: gopkg.in/yaml.v2 version: a83829b6f1293c91addabc89d0571c246397bbf4 devImports: []
diff --git a/glide.yaml b/glide.yaml index 9e95a35..a8eb79a 100644 --- a/glide.yaml +++ b/glide.yaml
@@ -11,7 +11,7 @@ import: - package: gopkg.in/yaml.v2 - package: github.com/Masterminds/vcs - version: ^1.5.0 + version: ^1.5.1 - package: github.com/codegangsta/cli - package: github.com/Masterminds/semver version: ^1.0.0
diff --git a/vendor/github.com/Masterminds/vcs/CHANGELOG.md b/vendor/github.com/Masterminds/vcs/CHANGELOG.md index 87c23cd..96af5ec 100644 --- a/vendor/github.com/Masterminds/vcs/CHANGELOG.md +++ b/vendor/github.com/Masterminds/vcs/CHANGELOG.md
@@ -1,3 +1,7 @@ +# 1.5.1 (2016-03-23) + +- Fixing bug parsing some Git commit dates. + # 1.5.0 (2016-03-22) - Add Travis CI testing for Go 1.6.
diff --git a/vendor/github.com/Masterminds/vcs/git.go b/vendor/github.com/Masterminds/vcs/git.go index a27bfc7..636ddc7 100644 --- a/vendor/github.com/Masterminds/vcs/git.go +++ b/vendor/github.com/Masterminds/vcs/git.go
@@ -214,7 +214,7 @@ return nil, err } - t, err := time.Parse(time.RFC1123Z, cis.Date) + t, err := time.Parse("Mon, _2 Jan 2006 15:04:05 -0700", cis.Date) if err != nil { return nil, err }
diff --git a/vendor/github.com/codegangsta/cli/README.md b/vendor/github.com/codegangsta/cli/README.md index 364c964..bb769fe 100644 --- a/vendor/github.com/codegangsta/cli/README.md +++ b/vendor/github.com/codegangsta/cli/README.md
@@ -1,6 +1,7 @@ [](http://gocover.io/github.com/codegangsta/cli) [](https://travis-ci.org/codegangsta/cli) [](https://godoc.org/github.com/codegangsta/cli) +[](https://codebeat.co/projects/github-com-codegangsta-cli) # cli.go
diff --git a/vendor/github.com/codegangsta/cli/altsrc/yaml_command_test.go b/vendor/github.com/codegangsta/cli/altsrc/yaml_command_test.go index c7ccbf7..275bc64 100644 --- a/vendor/github.com/codegangsta/cli/altsrc/yaml_command_test.go +++ b/vendor/github.com/codegangsta/cli/altsrc/yaml_command_test.go
@@ -1,7 +1,7 @@ // Disabling building of yaml support in cases where golang is 1.0 or 1.1 // as the encoding library is not implemented or supported. -// +build !go1,!go1.1 +// +build go1.2 package altsrc
diff --git a/vendor/github.com/codegangsta/cli/altsrc/yaml_file_loader.go b/vendor/github.com/codegangsta/cli/altsrc/yaml_file_loader.go index 1251aeb..4fb0965 100644 --- a/vendor/github.com/codegangsta/cli/altsrc/yaml_file_loader.go +++ b/vendor/github.com/codegangsta/cli/altsrc/yaml_file_loader.go
@@ -1,7 +1,7 @@ // Disabling building of yaml support in cases where golang is 1.0 or 1.1 // as the encoding library is not implemented or supported. -// +build !go1,!go1.1 +// +build go1.2 package altsrc @@ -23,19 +23,19 @@ // NewYamlSourceFromFile creates a new Yaml InputSourceContext from a filepath. func NewYamlSourceFromFile(file string) (InputSourceContext, error) { - ymlLoader := &yamlSourceLoader{FilePath: file} + ysc := &yamlSourceContext{FilePath: file} var results map[string]interface{} - err := readCommandYaml(ysl.FilePath, &results) + err := readCommandYaml(ysc.FilePath, &results) if err != nil { - return fmt.Errorf("Unable to load Yaml file '%s': inner error: \n'%v'", filePath, err.Error()) + return nil, fmt.Errorf("Unable to load Yaml file '%s': inner error: \n'%v'", ysc.FilePath, err.Error()) } return &MapInputSource{valueMap: results}, nil } // NewYamlSourceFromFlagFunc creates a new Yaml InputSourceContext from a provided flag name and source context. -func NewYamlSourceFromFlagFunc(flagFileName string) func(InputSourceContext, error) { - return func(context cli.Context) { +func NewYamlSourceFromFlagFunc(flagFileName string) func(context *cli.Context) (InputSourceContext, error) { + return func(context *cli.Context) (InputSourceContext, error) { filePath := context.String(flagFileName) return NewYamlSourceFromFile(filePath) }
diff --git a/vendor/github.com/codegangsta/cli/app.go b/vendor/github.com/codegangsta/cli/app.go index 1ea3fd0..6632ec0 100644 --- a/vendor/github.com/codegangsta/cli/app.go +++ b/vendor/github.com/codegangsta/cli/app.go
@@ -32,7 +32,7 @@ EnableBashCompletion bool // Boolean to hide built-in help command HideHelp bool - // Boolean to hide built-in version flag + // Boolean to hide built-in version flag and the VERSION section of help HideVersion bool // An action to execute when the bash-completion flag is set BashComplete func(context *Context)
diff --git a/vendor/github.com/codegangsta/cli/help.go b/vendor/github.com/codegangsta/cli/help.go index 15916f8..d3a12a2 100644 --- a/vendor/github.com/codegangsta/cli/help.go +++ b/vendor/github.com/codegangsta/cli/help.go
@@ -16,10 +16,10 @@ USAGE: {{if .UsageText}}{{.UsageText}}{{else}}{{.HelpName}} {{if .Flags}}[global options]{{end}}{{if .Commands}} command [command options]{{end}} {{if .ArgsUsage}}{{.ArgsUsage}}{{else}}[arguments...]{{end}}{{end}} - {{if .Version}} + {{if .Version}}{{if not .HideVersion}} VERSION: {{.Version}} - {{end}}{{if len .Authors}} + {{end}}{{end}}{{if len .Authors}} AUTHOR(S): {{range .Authors}}{{ . }}{{end}} {{end}}{{if .Commands}}
diff --git a/vendor/github.com/codegangsta/cli/help_test.go b/vendor/github.com/codegangsta/cli/help_test.go index 350e263..0821f48 100644 --- a/vendor/github.com/codegangsta/cli/help_test.go +++ b/vendor/github.com/codegangsta/cli/help_test.go
@@ -35,6 +35,22 @@ } } +func Test_ShowAppHelp_HideVersion(t *testing.T) { + output := new(bytes.Buffer) + app := NewApp() + app.Writer = output + + app.HideVersion = true + + c := NewContext(app, nil, nil) + + ShowAppHelp(c) + + if bytes.Index(output.Bytes(), []byte("VERSION:")) != -1 { + t.Errorf("expected\n%snot to include %s", output.String(), "VERSION:") + } +} + func Test_Help_Custom_Flags(t *testing.T) { oldFlag := HelpFlag defer func() {