diff --git a/README.md b/README.md index 3afc87d54..52ff6bc87 100644 --- a/README.md +++ b/README.md @@ -65,9 +65,9 @@ ______ | |_/ / ___ ___ | ___ \ / _ \ / _ \ | |_/ /| __/| __/ -\____/ \___| \___| v2.0.3 +\____/ \___| \___| v2.0.4 -├── Beego : 2.0.3 +├── Beego : 2.0.4 ├── GoVersion : go1.14.1 ├── GOOS : darwin ├── GOARCH : amd64 @@ -90,8 +90,8 @@ $ bee version -o json "GOPATH": "/home/beeuser/.go", "GOROOT": "/usr/local/Cellar/go/1.14.1/libexec", "Compiler": "gc", - "BeeVersion": "2.0.3", - "BeegoVersion": "2.0.3", + "BeeVersion": "2.0.4", + "BeegoVersion": "2.0.4", "Published": "2020-09-13" } ``` diff --git a/cmd/commands/version/banner.go b/cmd/commands/version/banner.go index 69954e8e2..b41ebf783 100644 --- a/cmd/commands/version/banner.go +++ b/cmd/commands/version/banner.go @@ -15,15 +15,15 @@ import ( // RuntimeInfo holds information about the current runtime. type RuntimeInfo struct { - GoVersion string - GOOS string - GOARCH string - NumCPU int - GOPATH string - GOROOT string - Compiler string - BeeVersion string - Published string + GoVersion string + GOOS string + GOARCH string + NumCPU int + GOPATH string + GOROOT string + Compiler string + BeeVersion string + Published string } // InitBanner loads the banner and prints it to output @@ -52,7 +52,7 @@ func show(out io.Writer, content string) { } err = t.Execute(out, RuntimeInfo{ - GetGoVersion(), + runtime.Version(), runtime.GOOS, runtime.GOARCH, runtime.NumCPU(), diff --git a/cmd/commands/version/version.go b/cmd/commands/version/version.go index b57511e36..fd8d68afc 100644 --- a/cmd/commands/version/version.go +++ b/cmd/commands/version/version.go @@ -1,23 +1,18 @@ package version import ( - "bufio" "bytes" "encoding/json" "flag" "fmt" "gopkg.in/yaml.v2" - "io" "os" - path "path/filepath" - "regexp" "runtime" "github.com/beego/bee/v2/cmd/commands" "github.com/beego/bee/v2/config" beeLogger "github.com/beego/bee/v2/logger" "github.com/beego/bee/v2/logger/colors" - "github.com/beego/bee/v2/utils" ) const verboseVersionBanner string = `%s%s______ @@ -27,7 +22,6 @@ const verboseVersionBanner string = `%s%s______ | |_/ /| __/| __/ \____/ \___| \___| v{{ .BeeVersion }}%s %s%s -├── Beego : {{ .BeegoVersion }} ├── GoVersion : {{ .GoVersion }} ├── GOOS : {{ .GOOS }} ├── GOARCH : {{ .GOARCH }} @@ -72,15 +66,14 @@ func versionCmd(cmd *commands.Command, args []string) int { if outputFormat != "" { runtimeInfo := RuntimeInfo{ - GetGoVersion(), - runtime.GOOS, - runtime.GOARCH, - runtime.NumCPU(), - os.Getenv("GOPATH"), - runtime.GOROOT(), - runtime.Compiler, - version, - GetBeegoVersion(), + GoVersion: runtime.Version(), + GOOS: runtime.GOOS, + GOARCH: runtime.GOARCH, + NumCPU: runtime.NumCPU(), + GOPATH: os.Getenv("GOPATH"), + GOROOT: runtime.GOROOT(), + Compiler: runtime.Compiler, + BeeVersion: version, } switch outputFormat { case "json": @@ -115,53 +108,3 @@ func ShowShortVersionBanner() { output := colors.NewColorWriter(os.Stdout) InitBanner(output, bytes.NewBufferString(colors.MagentaBold(shortVersionBanner))) } - -func GetBeegoVersion() string { - re, err := regexp.Compile(`VERSION = "([0-9.]+)"`) - if err != nil { - return "" - } - wgopath := utils.GetGOPATHs() - if len(wgopath) == 0 { - beeLogger.Log.Error("GOPATH environment is empty,may be you use `go module`") - return "" - } - for _, wg := range wgopath { - wg, _ = path.EvalSymlinks(path.Join(wg, "src", "github.com", "astaxie", "beego")) - filename := path.Join(wg, "beego.go") - _, err := os.Stat(filename) - if err != nil { - if os.IsNotExist(err) { - continue - } - beeLogger.Log.Error("Error while getting stats of 'beego.go'") - } - fd, err := os.Open(filename) - if err != nil { - beeLogger.Log.Error("Error while reading 'beego.go'") - continue - } - reader := bufio.NewReader(fd) - for { - byteLine, _, er := reader.ReadLine() - if er != nil && er != io.EOF { - return "" - } - if er == io.EOF { - break - } - line := string(byteLine) - s := re.FindStringSubmatch(line) - if len(s) >= 2 { - return s[1] - } - } - - } - return "Beego is not installed. Please do consider installing it first: https://github.com/beego/beego/v2. " + - "If you are using go mod, and you don't install the beego under $GOPATH/src/github.com/astaxie, just ignore this." -} - -func GetGoVersion() string { - return runtime.Version() -} diff --git a/config/conf.go b/config/conf.go index d570213bc..71ea3027f 100644 --- a/config/conf.go +++ b/config/conf.go @@ -27,7 +27,7 @@ import ( const confVer = 0 const ( - Version = "2.0.2" + Version = "2.0.4" GitRemotePath = "github.com/beego/bee/v2" ) diff --git a/go.mod b/go.mod index e3270f43f..29fd5cb7b 100644 --- a/go.mod +++ b/go.mod @@ -3,7 +3,7 @@ module github.com/beego/bee/v2 go 1.18 require ( - github.com/beego/beego/v2 v2.0.3 + github.com/beego/beego/v2 v2.0.4 github.com/davecgh/go-spew v1.1.1 github.com/flosch/pongo2 v0.0.0-20200529170236-5abacdfa4915 github.com/fsnotify/fsnotify v1.4.9 diff --git a/go.sum b/go.sum index 40042e693..ef3bc30e9 100644 --- a/go.sum +++ b/go.sum @@ -43,8 +43,8 @@ github.com/alecthomas/units v0.0.0-20190924025748-f65c72e2690d/go.mod h1:rBZYJk5 github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e/go.mod h1:3U/XgcO3hCbHZ8TKRvWD2dDTCfh9M9ya+I9JpbB7O8o= github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da/go.mod h1:Q73ZrmVTwzkszR9V5SSuryQ31EELlFMUz1kKyl939pY= github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8= -github.com/beego/beego/v2 v2.0.3 h1:vLrjDsn3JcxvIUqduDs4i0BdWuu5v7YN2FRKQcTWIDI= -github.com/beego/beego/v2 v2.0.3/go.mod h1:svcOCy6uDaGYHwcO3nppzKwFigeXm8WHkZfgnvemYNM= +github.com/beego/beego/v2 v2.0.4 h1:1NjpVkcqYVdKE06VJTQUVzsgZqFcaj0MqjHna57bWsA= +github.com/beego/beego/v2 v2.0.4/go.mod h1:21YTlo+jRYqrM/dLC0knzmo9C25x0pqddoKqy8kxev8= github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q= github.com/beorn7/perks v1.0.0/go.mod h1:KWe93zE9D1o94FZ5RNwFwVgaQK1VOXiVxmqh+CedLV8= github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM=