Improvement and golint taken care for version

jeevatkm · jeevatkm · commit 5d9e48e451a5 · 2016-05-31T22:59:35.000-07:00
diff --git a/i18n.go b/i18n.go
@@ -107,7 +107,7 @@ func loadMessages(path string) {
 	// Read in messages from the modules. Load the module messges first,
 	// so that it can be override in parent application
 	for _, module := range Modules {
-		TRACE.Println("Importing messages from ", filepath.Join(module.Path, messageFilesDirectory))
+		TRACE.Println("Importing messages from module:", module.ImportPath)
 		if err := Walk(filepath.Join(module.Path, messageFilesDirectory), loadMessageFile); err != nil &&
 			!os.IsNotExist(err) {
 			ERROR.Println("Error reading messages files from module:", err)
diff --git a/revel.go b/revel.go
@@ -215,7 +215,7 @@ func Init(mode, importPath, srcPath string) {
 	loadModules()
 
 	Initialized = true
-	INFO.Printf("Initialized Revel v%s (%s) for %s", VERSION, BUILD_DATE, MINIMUM_GO)
+	INFO.Printf("Initialized Revel v%s (%s) for %s", Version, BuildDate, MinimumGoVersion)
 }
 
 // Create a logger using log.* directives in app.conf plus the current settings
diff --git a/util.go b/util.go
@@ -212,7 +212,7 @@ func ClientIP(r *http.Request) string {
 // Walk method extends filepath.Walk to also follow symlinks.
 // Always returns the path of the file or directory.
 func Walk(root string, walkFn filepath.WalkFunc) error {
-	return fsWalk(root, root, root, walkFn)
+	return fsWalk(root, root, walkFn)
 }
 
 // createDir method creates nested directories if not exists
@@ -229,19 +229,19 @@ func createDir(path string) error {
 	return nil
 }
 
-func fsWalk(path string, dirName string, linkDirName string, walkFn filepath.WalkFunc) error {
+func fsWalk(fname string, linkName string, walkFn filepath.WalkFunc) error {
 	fsWalkFunc := func(path string, info os.FileInfo, err error) error {
 		if err != nil {
 			return err
 		}
 
 		var name string
-		name, err = filepath.Rel(dirName, path)
+		name, err = filepath.Rel(fname, path)
 		if err != nil {
 			return err
 		}
 
-		path = filepath.Join(linkDirName, name)
+		path = filepath.Join(linkName, name)
 
 		if err == nil && info.Mode()&os.ModeSymlink == os.ModeSymlink {
 			var symlinkPath string
@@ -257,14 +257,14 @@ func fsWalk(path string, dirName string, linkDirName string, walkFn filepath.Wal
 			}
 
 			if info.IsDir() {
-				return fsWalk(symlinkPath, symlinkPath, path, walkFn)
+				return fsWalk(symlinkPath, path, walkFn)
 			}
 		}
 
 		return walkFn(path, info, err)
 	}
 
-	return filepath.Walk(path, fsWalkFunc)
+	return filepath.Walk(fname, fsWalkFunc)
 }
 
 func init() {
diff --git a/version.go b/version.go
@@ -2,9 +2,11 @@ package revel
 
 const (
 	// Current Revel version
-	VERSION = "0.13.0-dev"
+	Version = "0.13.0-dev"
+
 	// Latest commit date
-	BUILD_DATE = "TBD"
+	BuildDate = "TBD"
+
 	// Minimum required Go version
-	MINIMUM_GO = ">= go1.4"
+	MinimumGoVersion = ">= go1.4"
 )

Original file line number	Diff line number	Diff line change
`@@ -215,7 +215,7 @@ func Init(mode, importPath, srcPath string) {`
`215`	`215`	`loadModules()`
`216`	`216`
`217`	`217`	`Initialized = true`
`218`		`- INFO.Printf("Initialized Revel v%s (%s) for %s", VERSION, BUILD_DATE, MINIMUM_GO)`
	`218`	`+ INFO.Printf("Initialized Revel v%s (%s) for %s", Version, BuildDate, MinimumGoVersion)`
`219`	`219`	`}`
`220`	`220`
`221`	`221`	`// Create a logger using log.* directives in app.conf plus the current settings`
Original file line number	Diff line number	Diff line change
`@@ -212,7 +212,7 @@ func ClientIP(r *http.Request) string {`
`212`	`212`	`// Walk method extends filepath.Walk to also follow symlinks.`
`213`	`213`	`// Always returns the path of the file or directory.`
`214`	`214`	`func Walk(root string, walkFn filepath.WalkFunc) error {`
`215`		`- return fsWalk(root, root, root, walkFn)`
	`215`	`+ return fsWalk(root, root, walkFn)`
`216`	`216`	`}`
`217`	`217`
`218`	`218`	`// createDir method creates nested directories if not exists`
`@@ -229,19 +229,19 @@ func createDir(path string) error {`
`229`	`229`	`return nil`
`230`	`230`	`}`
`231`	`231`
`232`		`-func fsWalk(path string, dirName string, linkDirName string, walkFn filepath.WalkFunc) error {`
	`232`	`+func fsWalk(fname string, linkName string, walkFn filepath.WalkFunc) error {`
`233`	`233`	`fsWalkFunc := func(path string, info os.FileInfo, err error) error {`
`234`	`234`	`if err != nil {`
`235`	`235`	`return err`
`236`	`236`	`}`
`237`	`237`
`238`	`238`	`var name string`
`239`		`- name, err = filepath.Rel(dirName, path)`
	`239`	`+ name, err = filepath.Rel(fname, path)`
`240`	`240`	`if err != nil {`
`241`	`241`	`return err`
`242`	`242`	`}`
`243`	`243`
`244`		`- path = filepath.Join(linkDirName, name)`
	`244`	`+ path = filepath.Join(linkName, name)`
`245`	`245`
`246`	`246`	`if err == nil && info.Mode()&os.ModeSymlink == os.ModeSymlink {`
`247`	`247`	`var symlinkPath string`
`@@ -257,14 +257,14 @@ func fsWalk(path string, dirName string, linkDirName string, walkFn filepath.Wal`
`257`	`257`	`}`
`258`	`258`
`259`	`259`	`if info.IsDir() {`
`260`		`- return fsWalk(symlinkPath, symlinkPath, path, walkFn)`
	`260`	`+ return fsWalk(symlinkPath, path, walkFn)`
`261`	`261`	`}`
`262`	`262`	`}`
`263`	`263`
`264`	`264`	`return walkFn(path, info, err)`
`265`	`265`	`}`
`266`	`266`
`267`		`- return filepath.Walk(path, fsWalkFunc)`
	`267`	`+ return filepath.Walk(fname, fsWalkFunc)`
`268`	`268`	`}`
`269`	`269`
`270`	`270`	`func init() {`