Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Hotfix 1 #188

Merged
merged 4 commits into from
Jul 14, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
language: go

go:
- "1.12.x"
- "1.13.x"
- "1.14.x"
- "tip"
Expand Down
3 changes: 2 additions & 1 deletion harness/app.go
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion harness/build.go
Original file line number Diff line number Diff line change
Expand Up @@ -458,7 +458,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
Expand Down
2 changes: 1 addition & 1 deletion model/version.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
21 changes: 11 additions & 10 deletions parser2/source_processor.go
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ import (
"go/ast"
"go/token"
"go/scanner"

)

type (
Expand Down Expand Up @@ -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
}
Expand All @@ -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()
Expand Down Expand Up @@ -173,14 +173,15 @@ 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")

// Ignore packages that end with _test
// 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)
}
}
Expand All @@ -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)
}
Expand All @@ -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)
for filename,astFile := range pkg.Files {
p.Syntax = append(p.Syntax,astFile)
p.GoFiles = append(p.GoFiles,filename)
s.log.Info("Found package", "pkg.Name", pkg.Name, "p.Name", p.PkgPath)
for filename, astFile := range pkg.Files {
p.Syntax = append(p.Syntax, astFile)
p.GoFiles = append(p.GoFiles, filename)
}
}
s.packageList = append(s.packageList, p)
Expand Down
2 changes: 1 addition & 1 deletion revel/run.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
}