rails: prefer Gemfile over .ruby-version (#4119)

rails: prefer gemfile to `.ruby-version`
superfly · Dec 17, 2024 · 339cefc · 339cefc
1 parent 82a8738
commit 339cefc
Showing 1 changed file with 8 additions and 8 deletions.
diff --git a/scanner/rails.go b/scanner/rails.go
@@ -84,22 +84,22 @@ func configureRails(sourceDir string, config *ScannerConfig) (*SourceInfo, error
 
 	var rubyVersion string
 
-	// add ruby version from .ruby-version file
-	versionFile, err := os.ReadFile(".ruby-version")
+	// add ruby version from Gemfile
+	gemfile, err := os.ReadFile("Gemfile")
 	if err == nil {
-		re := regexp.MustCompile(`ruby-(\d+\.\d+\.\d+)`)
-		matches := re.FindStringSubmatch(string(versionFile))
+		re := regexp.MustCompile(`(?m)^ruby\s+["'](\d+\.\d+\.\d+)["']`)
+		matches := re.FindStringSubmatch(string(gemfile))
 		if len(matches) >= 2 {
 			rubyVersion = matches[1]
 		}
 	}
 
 	if rubyVersion == "" {
-		// add ruby version from Gemfile
-		gemfile, err := os.ReadFile("Gemfile")
+		// add ruby version from .ruby-version file
+		versionFile, err := os.ReadFile(".ruby-version")
 		if err == nil {
-			re := regexp.MustCompile(`(?m)^ruby\s+["'](\d+\.\d+\.\d+)["']`)
-			matches := re.FindStringSubmatch(string(gemfile))
+			re := regexp.MustCompile(`ruby-(\d+\.\d+\.\d+)`)
+			matches := re.FindStringSubmatch(string(versionFile))
 			if len(matches) >= 2 {
 				rubyVersion = matches[1]
 			}