Merge pull request #187 from Laur1nMartins/master

Fixed parsing of user defined linker flags

.travis.yml

@@ -1,7 +1,6 @@
 language: go
 
 go:
-  - "1.12.x"
   - "1.13.x"
   - "1.14.x"
   - "tip"

harness/app.go

@@ -93,7 +93,8 @@ func (cmd AppCmd) Start(c *model.CommandConfig) error {
 }
 
 // Run the app server inline.  Never returns.
-func (cmd AppCmd) Run() {
+func (cmd AppCmd) Run(c *model.CommandConfig) {
+	utils.CmdInit(cmd.Cmd, !c.Vendored, c.AppPath)
 	utils.Logger.Info("Exec app:", "path", cmd.Path, "args", cmd.Args)
 	if err := cmd.Cmd.Run(); err != nil {
 		utils.Logger.Fatal("Error running:", "error", err)

harness/build.go

@@ -160,16 +160,15 @@ func Build(c *model.CommandConfig, paths *model.RevelContainer) (_ *App, err err
 			if !contains(c.BuildFlags, "build") {
 				flags = []string{"build"}
 			}
-			flags = append(flags, c.BuildFlags...)
 			if !contains(flags, "-ldflags") {
 				ldflags := "-ldflags= " + versionLinkerFlags
-				// Add in build flags
+				// Add user defined build flags
 				for i := range c.BuildFlags {
-					ldflags += "-X '" + c.BuildFlags[i] + "'"
+					ldflags += " -X '" + c.BuildFlags[i] + "'"
 				}
 				flags = append(flags, ldflags)
 			}
-			if !contains(flags, "-tags") {
+			if !contains(flags, "-tags") && buildTags != "" {
 				flags = append(flags, "-tags", buildTags)
 			}
 			if !contains(flags, "-o") {
@@ -177,9 +176,6 @@ func Build(c *model.CommandConfig, paths *model.RevelContainer) (_ *App, err err
 			}
 		}
 
-		// Add in build flags
-		flags = append(flags, c.BuildFlags...)
-
 		// Note: It's not applicable for filepath.* usage
 		flags = append(flags, path.Join(paths.ImportPath, "app", "tmp"))
 
@@ -458,7 +454,7 @@ func newCompileError(paths *model.RevelContainer, output []byte) *utils.SourceEr
 	return compileError
 }
 
-// RevelMainTemplate template for app/tmp/main.go
+// RevelMainTemplate template for app/tmp/run/run.go
 const RevelRunTemplate = `// GENERATED CODE - DO NOT EDIT
 // This file is the run file for Revel.
 // It registers all the controllers and provides details for the Revel server engine to

model/version.go

@@ -21,7 +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
+	{"1.0.0", "1.9.0"}, // Compatible with Framework V 1.0 - 1.9
 }
 
 // Parses a version like v1.2.3a or 1.2

parser2/source_info_processor.go

@@ -62,7 +62,7 @@ func (s *SourceInfoProcessor) processPackage(p *packages.Package) (sourceInfo *m
 					funcDecl.Name.IsExported() && // be public
 					funcDecl.Type.Results != nil && len(funcDecl.Type.Results.List) == 1 {
 					// return one result
-					if m, receiver := s.getControllerFunc(funcDecl, p); m != nil {
+					if m, receiver := s.getControllerFunc(funcDecl, p, localImportMap); m != nil {
 						methodMap[receiver] = append(methodMap[receiver], m)
 						log.Info("Added method map to ", "receiver", receiver, "method", m.Name)
 					}
@@ -191,7 +191,7 @@ func (s *SourceInfoProcessor)  getValidationParameter(funcDecl *ast.FuncDecl) *a
 	}
 	return nil
 }
-func (s *SourceInfoProcessor) getControllerFunc(funcDecl *ast.FuncDecl, p *packages.Package) (method *model.MethodSpec, recvTypeName string) {
+func (s *SourceInfoProcessor) getControllerFunc(funcDecl *ast.FuncDecl, p *packages.Package, localImportMap map[string]string) (method *model.MethodSpec, recvTypeName string) {
 	selExpr, ok := funcDecl.Type.Results.List[0].Type.(*ast.SelectorExpr)
 	if !ok {
 		return
@@ -220,8 +220,11 @@ func (s *SourceInfoProcessor) getControllerFunc(funcDecl *ast.FuncDecl, p *packa
 				importPath = p.PkgPath
 			} else if typeExpr.PkgName != "" {
 				var ok bool
-				if importPath, ok = s.sourceProcessor.importMap[typeExpr.PkgName]; !ok {
+				if importPath, ok = localImportMap[typeExpr.PkgName]; !ok {
-					utils.Logger.Fatalf("Failed to find import for arg of type: %s , %s", typeExpr.PkgName, typeExpr.TypeName(""))
+					if importPath, ok = s.sourceProcessor.importMap[typeExpr.PkgName]; !ok {
+						utils.Logger.Error("Unable to find import", "importMap", s.sourceProcessor.importMap, "localimport", localImportMap)
+						utils.Logger.Fatalf("Failed to find import for arg of type: %s , %s", typeExpr.PkgName, typeExpr.TypeName(""))
+					}
 				}
 			}
 			method.Args = append(method.Args, &model.MethodArg{

parser2/source_processor.go

@@ -12,7 +12,6 @@ import (
 	"go/ast"
 	"go/token"
 	"go/scanner"
-
 )
 
 type (
@@ -111,9 +110,8 @@ func (s *SourceProcessor) addPackages() (err error) {
 	s.packageList, err = packages.Load(config, allPackages...)
 	s.log.Info("Loaded modules ", "len results", len(s.packageList), "error", err)
 
-
 	// Now process the files in the aap source folder	s.revelContainer.ImportPath + "/...",
-	err = utils.Walk(s.revelContainer.AppPath, s.processPath)
+	err = utils.Walk(s.revelContainer.BasePath, s.processPath)
 	s.log.Info("Loaded apps and modules ", "len results", len(s.packageList), "error", err)
 	return
 }
@@ -136,8 +134,10 @@ func (s *SourceProcessor) processPath(path string, info os.FileInfo, err error)
 	pkgImportPath := s.revelContainer.ImportPath
 	appPath := s.revelContainer.BasePath
 	if appPath != path {
-		pkgImportPath = s.revelContainer.ImportPath + "/" + filepath.ToSlash(path[len(appPath)+1:])
+		pkgImportPath = s.revelContainer.ImportPath + "/" + filepath.ToSlash(path[len(appPath) + 1:])
 	}
+	s.log.Info("Processing source package folder", "package", pkgImportPath, "path", path)
+
 	// Parse files within the path.
 	var pkgMap map[string]*ast.Package
 	fset := token.NewFileSet()
@@ -173,6 +173,7 @@ func (s *SourceProcessor) processPath(path string, info os.FileInfo, err error)
 		ast.Print(nil, err)
 		s.log.Fatal("Failed to parse dir", "error", err)
 	}
+
 	// Skip "main" packages.
 	delete(pkgMap, "main")
 
@@ -180,7 +181,7 @@ func (s *SourceProcessor) processPath(path string, info os.FileInfo, err error)
 	// These cannot be included in source code that is not generated specifically as a test
 	for i := range pkgMap {
 		if len(i) > 6 {
-			if string(i[len(i)-5:]) == "_test" {
+			if string(i[len(i) - 5:]) == "_test" {
 				delete(pkgMap, i)
 			}
 		}
@@ -194,7 +195,7 @@ func (s *SourceProcessor) processPath(path string, info os.FileInfo, err error)
 	// There should be only one package in this directory.
 	if len(pkgMap) > 1 {
 		for i := range pkgMap {
-			println("Found package ", i)
+			println("Found duplicate packages in single directory ", i)
 		}
 		utils.Logger.Fatal("Most unexpected! Multiple packages in a single directory:", "packages", pkgMap)
 	}
@@ -205,10 +206,10 @@ func (s *SourceProcessor) processPath(path string, info os.FileInfo, err error)
 	p.Fset = fset
 	for _, pkg := range pkgMap {
 		p.Name = pkg.Name
-		s.log.Info("Found package","pkg.Name", pkg.Name,"p.Name", p.PkgPath)
+		s.log.Info("Found package", "pkg.Name", pkg.Name, "p.Name", p.PkgPath)
-		for filename,astFile := range pkg.Files {
+		for filename, astFile := range pkg.Files {
-			p.Syntax = append(p.Syntax,astFile)
+			p.Syntax = append(p.Syntax, astFile)
-			p.GoFiles = append(p.GoFiles,filename)
+			p.GoFiles = append(p.GoFiles, filename)
 		}
 	}
 	s.packageList = append(s.packageList, p)

revel/build_test.go

@@ -1,19 +1,20 @@
 package main_test
 
 import (
-	"github.com/revel/cmd/model"
-	"github.com/revel/cmd/revel"
-	"github.com/revel/cmd/utils"
-	"github.com/stretchr/testify/assert"
 	"os"
 	"path/filepath"
 	"testing"
+
+	"github.com/revel/cmd/model"
+	main "github.com/revel/cmd/revel"
+	"github.com/revel/cmd/utils"
+	"github.com/stretchr/testify/assert"
 )
 
 // test the commands
 func TestBuild(t *testing.T) {
 	a := assert.New(t)
-	gopath := setup("revel-test-build",  a)
+	gopath := setup("revel-test-build", a)
 
 	t.Run("Build", func(t *testing.T) {
 		a := assert.New(t)
@@ -26,6 +27,21 @@ func TestBuild(t *testing.T) {
 		a.True(utils.Exists(filepath.Join(gopath, "build-test", "target")))
 	})
 
+	t.Run("Build-withFlags", func(t *testing.T) {
+		a := assert.New(t)
+		c := newApp("build-test-WithFlags", model.NEW, nil, a)
+		c.BuildFlags = []string{
+			"build-test-WithFlags/app.AppVersion=SomeValue",
+			"build-test-WithFlags/app.SomeOtherValue=SomeValue",
+		}
+		main.Commands[model.NEW].RunWith(c)
+		c.Index = model.BUILD
+		c.Build.TargetPath = filepath.Join(gopath, "build-test", "target")
+		c.Build.ImportPath = c.ImportPath
+		a.Nil(main.Commands[model.BUILD].RunWith(c), "Failed to run build-test-withFlags")
+		a.True(utils.Exists(filepath.Join(gopath, "build-test", "target")))
+	})
+
 	if !t.Failed() {
 		if err := os.RemoveAll(gopath); err != nil {
 			a.Fail("Failed to remove test path")

revel/run.go

@@ -162,6 +162,6 @@ func runApp(c *model.CommandConfig) (err error) {
 	if c.HistoricMode {
 		runMode = revel_path.RunMode
 	}
-	app.Cmd(runMode).Run()
+	app.Cmd(runMode).Run(c)
 	return
 }