Fixes an issue where processRequirements was overriding special versions (#1417)

* Fixes an issue where `processRequirements` was overriding special versions

* removes unused

* Fix test

Author: jmgomez

src/nimblepkg/nimblesat.nim

@@ -662,6 +662,13 @@ proc getMinimalFromPreferred(pv: PkgTuple,  getMinimalPackage: GetPackageMinimal
       return @[pp]
   getMinimalPackage(pv, options)
 
+proc hasSpecialVersion(versions: Table[string, PackageVersions], pkgName: string): bool =
+  if pkgName in versions:
+    for pkg in versions[pkgName].versions:
+      if pkg.version.isSpecial:
+        return true
+  return false
+
 proc processRequirements(versions: var Table[string, PackageVersions], pv: PkgTuple, visited: var HashSet[PkgTuple], getMinimalPackage: GetPackageMinimal, preferredPackages: seq[PackageMinimalInfo] = newSeq[PackageMinimalInfo](), options: Options) =
   if pv in visited:
     return
@@ -683,6 +690,10 @@ proc processRequirements(versions: var Table[string, PackageVersions], pv: PkgTu
         else:
           versions[pv.name] = PackageVersions(pkgName: pv.name, versions: @[pkgMin])
       else:
+        # Don't add regular versions if a special version already exists
+        if hasSpecialVersion(versions, pv.name):
+          continue
+          
         if not versions.hasKey(pv.name):
           versions[pv.name] = PackageVersions(pkgName: pv.name, versions: @[pkgMin])
         else:

tests/gitversions/gitversions.nimble

@@ -11,3 +11,4 @@ bin           = @["gitversions"]
 # Dependencies
 
 requires "nim"
+requires "json_rpc"

tests/trequireflag.nim

@@ -58,20 +58,40 @@ suite "requires flag":
         let isVersion = req.contains("==")
         # echo "Trying require: ", req
         let no_test = if isVersion: "-d:no_test" else: ""
-        let (output, exitCode) = execNimble("run", require, no_test)
-        let pkgDir = getPackageDir(pkgsDir, "json_serialization-0.2.9")
+        let (_, exitCode) = execNimble("run", require, no_test)
+        
         check exitCode == QuitSuccess
 
         let (_, exitCodeTest) = execNimble("test", require, no_test)
         check exitCodeTest == QuitSuccess
 
-        let nimbleTestDontDeleteFile =  pkgDir / "json_serialization" / "nimbletest.nim"
+        var pkgDir = ""
+        if isVersion:
+          pkgDir = getPackageDir(pkgsDir, "json_serialization")
+        else:
+          # Special version - find the directory with nimbletest.nim
+          for kind, dir in walkDir(pkgsDir):
+            if kind == pcDir and dir.splitPath.tail.startsWith("json_serialization"):
+              let testFile = dir / "json_serialization" / "nimbletest.nim"
+              if fileExists(testFile):
+                pkgDir = dir
+                break
+          # If no directory with nimbletest.nim found, fall back to standard function
+          if pkgDir == "":
+            pkgDir = getPackageDir(pkgsDir, "json_serialization")
+        
+        check pkgDir != ""
+
+        let nimbleTestDontDeleteFile = pkgDir / "json_serialization" / "nimbletest.nim"
         # echo "Nimble test dont delete file: ", nimbleTestDontDeleteFile
         if isVersion:
-          check output.processOutput.inLines("Success:  json_serialization installed successfully.")
+          # Regular version should NOT have the nimbletest.nim file
           check not fileExists(nimbleTestDontDeleteFile)
         else:
-          check output.processOutput.inLines("Success:  json_serialization installed successfully.")
+          # Special version should have the nimbletest.nim file
           check fileExists(nimbleTestDontDeleteFile)
-        cleanDir(pkgDir) #Resets the package dir for each require
+        # Clean up all json_serialization directories
+        for kind, dir in walkDir(pkgsDir):
+          if kind == pcDir and dir.splitPath.tail.startsWith("json_serialization"):
+            removeDir(dir)