issue #360 wrong version compare of requirements (#361)

Open-CMSIS-Pack · Oct 23, 2024 · 45e8b39 · 45e8b39
1 parent 68f1a10
commit 45e8b39
Show file tree

Hide file tree

Showing 6 changed files with 95 additions and 8 deletions.
diff --git a/cmd/installer/pack.go b/cmd/installer/pack.go
@@ -604,11 +604,7 @@ func (p *PackType) loadDependencies() error {
 		// Need to convert the spec <package/requirements/packages> "version" to the one internally used
 		if version != "latest" {
 			if len(strings.Split(version, ":")) >= 1 {
-				if string(version[len(version)-1]) == "_" {
-					pack.versionModifier = utils.GreaterVersion
-				} else {
-					pack.versionModifier = utils.RangeVersion
-				}
+				pack.versionModifier = utils.RangeVersion
 			} else {
 				pack.versionModifier = utils.ExactVersion
 			}

diff --git a/cmd/installer/root.go b/cmd/installer/root.go
@@ -1274,7 +1274,9 @@ func (p *PacksInstallationType) PackIsInstalled(pack *PackType, noLocal bool) bo
 	}
 
 	if pack.versionModifier == utils.RangeVersion {
+		log.Debugf("Checking for installed packs %s", pack.Version)
 		for _, version := range installedVersions {
+			log.Debugf("- checking against: %s", version)
 			if utils.SemverCompareRange(version, pack.Version) == 0 {
 				return true
 			}

diff --git a/cmd/utils/semver.go b/cmd/utils/semver.go
@@ -27,7 +27,9 @@ func stripLeadingZeros(version string) string {
 // SemverCompare extends `semver.Compare` to work with leading zeros
 func SemverCompare(version1, version2 string) int {
 	version1 = "v" + stripLeadingZeros(version1)
+	version1, _, _ = strings.Cut(version1, ":")
 	version2 = "v" + stripLeadingZeros(version2)
+	version2, _, _ = strings.Cut(version2, ":")
 	return semver.Compare(version1, version2)
 }
 

diff --git a/cmd/utils/semver_test.go b/cmd/utils/semver_test.go
@@ -46,6 +46,13 @@ func TestSemverCompare(t *testing.T) {
 		assert.True(utils.SemverCompare(version1, version3) < 0)
 		assert.True(utils.SemverCompare(version2, version3) < 0)
 	})
+	t.Run("test comparing two versions with range suffix", func(t *testing.T) {
+		version1 := "1.2.3"
+		version2 := "1.2.4:2.3.4"
+		assert.True(utils.SemverCompare(version1, version2) < 0)
+		assert.True(utils.SemverCompare(version2, version1) > 0)
+	})
+
 }
 
 func TestSemverMajor(t *testing.T) {
@@ -58,6 +65,18 @@ func TestSemverMajor(t *testing.T) {
 		assert.Equal("1", utils.SemverMajor("1.02.03"))
 	})
 }
+
+func TestSemverMajorMinor(t *testing.T) {
+	assert := assert.New(t)
+
+	t.Run("test major minor version", func(t *testing.T) {
+		assert.Equal("1.2", utils.SemverMajorMinor("1.2.3"))
+		assert.Equal("1.2", utils.SemverMajorMinor("01.2.3"))
+		assert.Equal("1.2", utils.SemverMajorMinor("01.02.03"))
+		assert.Equal("1.2", utils.SemverMajorMinor("1.02.03"))
+	})
+}
+
 func TestSemverStripMeta(t *testing.T) {
 	assert := assert.New(t)
 

diff --git a/cmd/xml/pdsc.go b/cmd/xml/pdsc.go
@@ -148,7 +148,7 @@ func (p *PdscXML) Dependencies() [][]string {
 	if p.RequirementsTag.Packages == nil {
 		return nil
 	}
-	for i, pack := range p.RequirementsTag.Packages {
+	for _, pack := range p.RequirementsTag.Packages {
 		for _, pk := range pack.Packages {
 			// empty -> install the latest
 			if pk.Version == "" {
@@ -160,8 +160,9 @@ func (p *PdscXML) Dependencies() [][]string {
 					pk.Version = pk.Version + ":_"
 				}
 			}
-			dependencies = append(dependencies, []string{pk.Name, pk.Vendor, pk.Version})
-			log.Debugf("found %v dependency", dependencies[i])
+			dependency := []string{pk.Name, pk.Vendor, pk.Version}
+			log.Debugf("found %v dependency", dependency)
+			dependencies = append(dependencies, dependency)
 		}
 	}
 	return dependencies

diff --git a/cmd/xml/pdsc_test.go b/cmd/xml/pdsc_test.go
@@ -146,4 +146,71 @@ func TestPdscXML(t *testing.T) {
 		assert.Equal(expectedURL, pdscXML.PackURL(""))
 		assert.Equal(expectedURL, pdscXML.PackURL(version))
 	})
+
+	t.Run("test Dependencies1", func(t *testing.T) {
+		var name = "TheName"
+		var vendor = "TheVendor"
+		var version = "0.0.1"
+		pdscXML := xml.PdscXML{}
+		pack := xml.PackageTag{
+			Vendor:  vendor,
+			Name:    name,
+			Version: version,
+		}
+		packs := xml.PackagesTag{}
+		packs.Packages = append(packs.Packages, pack)
+		pdscXML.RequirementsTag.Packages = append(pdscXML.RequirementsTag.Packages, packs)
+
+		expectedDeps := [][]string{}
+		expectedDep := []string{name, vendor, version + ":_"}
+		expectedDeps = append(expectedDeps, expectedDep)
+		assert.Equal(expectedDeps, pdscXML.Dependencies())
+	})
+
+	t.Run("test Dependencies2", func(t *testing.T) {
+		var name = "TheName"
+		var vendor = "TheVendor"
+		var version = "0.0.1:0.0.2"
+		pdscXML := xml.PdscXML{}
+		pack := xml.PackageTag{
+			Vendor:  vendor,
+			Name:    name,
+			Version: version,
+		}
+		packs := xml.PackagesTag{}
+		packs.Packages = append(packs.Packages, pack)
+		pdscXML.RequirementsTag.Packages = append(pdscXML.RequirementsTag.Packages, packs)
+
+		expectedDeps := [][]string{}
+		expectedDep := []string{name, vendor, version}
+		expectedDeps = append(expectedDeps, expectedDep)
+		assert.Equal(expectedDeps, pdscXML.Dependencies())
+	})
+
+	t.Run("test Dependencies3", func(t *testing.T) {
+		var name = "TheName"
+		var vendor = "TheVendor"
+		var version = ""
+		pdscXML := xml.PdscXML{}
+		pack := xml.PackageTag{
+			Vendor:  vendor,
+			Name:    name,
+			Version: version,
+		}
+		packs := xml.PackagesTag{}
+		packs.Packages = append(packs.Packages, pack)
+		pdscXML.RequirementsTag.Packages = append(pdscXML.RequirementsTag.Packages, packs)
+
+		expectedDeps := [][]string{}
+		expectedDep := []string{name, vendor, "latest"}
+		expectedDeps = append(expectedDeps, expectedDep)
+		assert.Equal(expectedDeps, pdscXML.Dependencies())
+	})
+
+	t.Run("test Dependencies4", func(t *testing.T) {
+		pdscXML := xml.PdscXML{}
+
+		pdscXML.RequirementsTag.Packages = nil
+		assert.Nil(pdscXML.Dependencies())
+	})
 }