totole/revel-cmd
1
0
Fork 0
mirror of https://github.com/kevin-DL/revel-cmd.git synced 2026-01-22 15:05:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Corrected version detection, so that equal versions match

Browse Source
This commit is contained in:
notzippy@gmail.com
2020-04-26 09:57:35 -07:00
parent f2b54f5a69
commit c1aee24445
3 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
model/version.go
View File

@@ -21,6 +21,7 @@ type Version struct {
var frameworkCompatibleRangeList = [][]string{ var frameworkCompatibleRangeList = [][]string{
{"0.0.0", "0.20.0"}, // minimum Revel version to use with this version of the tool {"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 {"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 // 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) { if !v.Newer(start) || v.Newer(end) {
continue continue
} }
// Framework is older then 0.20, turn on historic mode // Framework is older then 0.20, turn on historic mode
if i == 0 { if i == 0 {
c.HistoricMode = true c.HistoricMode = true
@@ -109,7 +111,7 @@ func (v *Version) Newer(o *Version) bool {
if v.Maintenance != o.Maintenance { if v.Maintenance != o.Maintenance {
return v.Maintenance > o.Maintenance return v.Maintenance > o.Maintenance
} }
return false return true
} }
// Convert the version to a string // Convert the version to a string

4
revel/version.go
View File

@@ -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) utils.Logger.Warn("Unable to extract version information from Revel library", "path",pathMap[model.RevelImportPath], "error",err)
return return
} }
utils.Logger.Info("Fullpath to revel", "dir", pathMap[model.RevelModulesImportPath]) utils.Logger.Info("Fullpath to revel modules", "dir", pathMap[model.RevelImportPath])
v.revelVersion, err = v.versionFromFilepath(pathMap[model.RevelModulesImportPath]) v.revelVersion, err = v.versionFromFilepath(pathMap[model.RevelImportPath])
if err != nil { if err != nil {
utils.Logger.Warn("Unable to extract version information from Revel", "error,err") utils.Logger.Warn("Unable to extract version information from Revel", "error,err")
} }

2
utils/file.go
View File

@@ -352,7 +352,7 @@ func findSrcPaths(appPath string, packagesList []string) (sourcePathsmap map[str
sourcePathsmap = map[string]string{} sourcePathsmap = map[string]string{}
pkgs, err := packages.Load(config, packagesList...) 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 { for _, packageName := range packagesList {
found := false found := false
log:= Logger.New("seeking",packageName) log:= Logger.New("seeking",packageName)