From c1aee244452d2bedd95bace5e01b5942565c8b26 Mon Sep 17 00:00:00 2001 From: "notzippy@gmail.com" Date: Sun, 26 Apr 2020 09:57:35 -0700 Subject: [PATCH] Corrected version detection, so that equal versions match --- model/version.go | 4 +++- revel/version.go | 4 ++-- utils/file.go | 2 +- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/model/version.go b/model/version.go index 60ee3b0..bc52654 100644 --- a/model/version.go +++ b/model/version.go @@ -21,6 +21,7 @@ type Version struct { var frameworkCompatibleRangeList = [][]string{ {"0.0.0", "0.20.0"}, // minimum Revel version to use with this version of the tool {"0.19.99", "0.30.0"}, // Compatible with Framework V 0.19.99 - 0.30.0 + {"1.0.0", "1.1.0"}, // Compatible with Framework V 1.0 - 1.1 } // Parses a version like v1.2.3a or 1.2 @@ -70,6 +71,7 @@ func (v *Version) CompatibleFramework(c *CommandConfig) error { if !v.Newer(start) || v.Newer(end) { continue } + // Framework is older then 0.20, turn on historic mode if i == 0 { c.HistoricMode = true @@ -109,7 +111,7 @@ func (v *Version) Newer(o *Version) bool { if v.Maintenance != o.Maintenance { return v.Maintenance > o.Maintenance } - return false + return true } // Convert the version to a string diff --git a/revel/version.go b/revel/version.go index af0a43e..3de97fb 100644 --- a/revel/version.go +++ b/revel/version.go @@ -239,8 +239,8 @@ func (v *VersionCommand) updateLocalVersions() { utils.Logger.Warn("Unable to extract version information from Revel library", "path",pathMap[model.RevelImportPath], "error",err) return } - utils.Logger.Info("Fullpath to revel", "dir", pathMap[model.RevelModulesImportPath]) - v.revelVersion, err = v.versionFromFilepath(pathMap[model.RevelModulesImportPath]) + utils.Logger.Info("Fullpath to revel modules", "dir", pathMap[model.RevelImportPath]) + v.revelVersion, err = v.versionFromFilepath(pathMap[model.RevelImportPath]) if err != nil { utils.Logger.Warn("Unable to extract version information from Revel", "error,err") } diff --git a/utils/file.go b/utils/file.go index b48f9ff..d661beb 100644 --- a/utils/file.go +++ b/utils/file.go @@ -352,7 +352,7 @@ func findSrcPaths(appPath string, packagesList []string) (sourcePathsmap map[str sourcePathsmap = map[string]string{} pkgs, err := packages.Load(config, packagesList...) - Logger.Info("Loaded packegs ", "len results", len(pkgs), "error",err,"basedir",appPath) + Logger.Info("Loaded packages ", "len results", len(pkgs), "error",err,"basedir",appPath) for _, packageName := range packagesList { found := false log:= Logger.New("seeking",packageName)