improve display #40

tofuutils · Feb 2, 2024 · 68102ea · 68102ea
1 parent e12928f
commit 68102ea
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 6 deletions.
diff --git a/versionmanager/manager.go b/versionmanager/manager.go
@@ -158,16 +158,24 @@ func (m VersionManager) Reset() error {
 }
 
 // (made lazy method : not always useful and allows flag override for root path).
-func (m VersionManager) Resolve(defaultVersion string) string {
+func (m VersionManager) Resolve(defaultStrategy string) string {
 	if forcedVersion := os.Getenv(m.VersionEnvName); forcedVersion != "" {
+		if m.conf.Verbose {
+			fmt.Println("Resolved version from", m.VersionEnvName, ":", forcedVersion) //nolint
+		}
+
 		return forcedVersion
 	}
 
 	if version := flatparser.RetrieveVersion(m.VersionFileNames, m.conf); version != "" {
 		return version
 	}
 
-	return defaultVersion
+	if m.conf.Verbose {
+		fmt.Println("No", m.FolderName, "version found in flat files, fallback to", defaultStrategy, "strategy") //nolint
+	}
+
+	return defaultStrategy
 }
 
 // (made lazy method : not always useful and allows flag override for root path).

diff --git a/versionmanager/semantic/parser/flat/flatparser.go b/versionmanager/semantic/parser/flat/flatparser.go
@@ -33,7 +33,12 @@ func RetrieveVersion(versionFileNames []string, conf *config.Config) string {
 	for _, fileName := range versionFileNames {
 		data, err := os.ReadFile(fileName)
 		if err == nil {
-			return string(bytes.TrimSpace(data))
+			resolvedVersion := string(bytes.TrimSpace(data))
+			if conf.Verbose && resolvedVersion != "" {
+				fmt.Println("Resolved version from", fileName, ":", resolvedVersion) //nolint
+			}
+
+			return resolvedVersion
 		}
 		if conf.Verbose {
 			fmt.Println(msgFlatErr, err) //nolint
@@ -73,9 +78,15 @@ func RetrieveVersion(versionFileNames []string, conf *config.Config) string {
 
 func retrieveVersionFromDir(versionFileNames []string, dirPath string, verbose bool) string {
 	for _, fileName := range versionFileNames {
-		data, err := os.ReadFile(filepath.Join(dirPath, fileName))
+		filePath := filepath.Join(dirPath, fileName)
+		data, err := os.ReadFile(filePath)
 		if err == nil {
-			return string(bytes.TrimSpace(data))
+			resolvedVersion := string(bytes.TrimSpace(data))
+			if verbose && resolvedVersion != "" {
+				fmt.Println("Resolved version from", filePath, ":", resolvedVersion) //nolint
+			}
+
+			return resolvedVersion
 		}
 		if verbose {
 			fmt.Println(msgFlatErr, err) //nolint

diff --git a/versionmanager/semantic/semantic.go b/versionmanager/semantic/semantic.go
@@ -90,7 +90,7 @@ func ParsePredicate(behaviourOrConstraint string, displayName string, predicateR
 		}
 
 		if conf.Verbose {
-			fmt.Println("No", displayName, "version requirement found in files, fallback to latest-stable") //nolint
+			fmt.Println("No", displayName, "version requirement found in files, fallback to latest-stable strategy") //nolint
 		}
 
 		return StableVersion, true, nil // erase min-required case