Skip to content
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 12 additions & 2 deletions cmd/installer/root.go
Original file line number Diff line number Diff line change
Expand Up @@ -153,8 +153,18 @@ func AddPack(packPath string, checkEula, extractEula, forceReinstall, noRequirem
log.Debugf("Moved pack to temporary path \"%s\"", backupPackPath)
dropPreInstalled = true
} else {
log.Errorf("Pack \"%s@%s\" is already installed here: \"%s\", use the --force-reinstall (-F) flag to force installation",
packPath, pack.targetVersion, filepath.Join(Installation.PackRoot, pack.Vendor, pack.Name, pack.GetVersionNoMeta()))
if pack.versionModifier == utils.AnyVersion {
if len(pack.installedVersions) > 1 {
log.Infof("Pack \"%s\" is already installed here: \"%s\", versions: %s",
packPath, filepath.Join(Installation.PackRoot, pack.Vendor, pack.Name), utils.VersionList(pack.installedVersions))
} else {
log.Infof("Pack \"%s\" is already installed here: \"%s\"",
packPath, filepath.Join(Installation.PackRoot, pack.Vendor, pack.Name, pack.installedVersions[0]))
}
} else {
log.Errorf("Pack \"%s@%s\" is already installed here: \"%s\", use the --force-reinstall (-F) flag to force installation",
packPath, pack.targetVersion, filepath.Join(Installation.PackRoot, pack.Vendor, pack.Name, pack.GetVersionNoMeta()))
}
return nil
}
}
Expand Down
17 changes: 17 additions & 0 deletions cmd/utils/semver.go
Original file line number Diff line number Diff line change
Expand Up @@ -76,3 +76,20 @@ func SemverStripMeta(version string) string {
}
return version
}

// VersionList takes a slice of version strings, strips any semantic version metadata
// from each version using SemverStripMeta, and returns a single comma-separated string
// of the processed versions. Empty strings in the input slice are ignored.
// If the input slice is empty, it returns an empty string.
func VersionList(versions []string) (versionList string) {
for _, version := range versions {
ver := SemverStripMeta(version)
if ver != "" {
if versionList != "" {
versionList += ", "
}
versionList += ver
}
}
return
}
68 changes: 52 additions & 16 deletions cmd/utils/semver_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,27 @@ func TestSemverCompare(t *testing.T) {

}

func TestSemverCompareRange(t *testing.T) {
assert := assert.New(t)

t.Run("test version range compare", func(t *testing.T) {
assert.True(utils.SemverCompareRange("1.2.3", "1.2.3") == 0)
assert.True(utils.SemverCompareRange("1.2.3", "1.2.3:") == 0)
assert.True(utils.SemverCompareRange("1.2.3", "1.2.3:_") == 0)
assert.True(utils.SemverCompareRange("1.2.3", ":1.2.3") == 0)
assert.True(utils.SemverCompareRange("1.2.3", "1.2.3:1.2.3") == 0)
assert.True(utils.SemverCompareRange("1.2.3", "1.2.0:1.2.3") == 0)
assert.True(utils.SemverCompareRange("1.2.3", "1.2.3:1.2.4") == 0)
assert.True(utils.SemverCompareRange("1.2.3", "1.2.0:1.2.4") == 0)
assert.True(utils.SemverCompareRange("1.2.3", "1.2.0") == 0)
assert.True(utils.SemverCompareRange("1.2.3", ":1.2.4") == 0)
assert.True(utils.SemverCompareRange("1.2.3", "1.2.4") < 0)
assert.True(utils.SemverCompareRange("1.2.3", ":1.2.0") > 0)
assert.True(utils.SemverCompareRange("1.2.3", "1.2.4:1.2.5") < 0)
assert.True(utils.SemverCompareRange("1.2.3", "1.2.0:1.2.1") > 0)
})
}

func TestSemverMajor(t *testing.T) {
assert := assert.New(t)

Expand Down Expand Up @@ -99,23 +120,38 @@ func TestSemverStripMeta(t *testing.T) {
})
}

func TestSemverCompareRange(t *testing.T) {
func TestVersionList(t *testing.T) {
assert := assert.New(t)

t.Run("test version range compare", func(t *testing.T) {
assert.True(utils.SemverCompareRange("1.2.3", "1.2.3") == 0)
assert.True(utils.SemverCompareRange("1.2.3", "1.2.3:") == 0)
assert.True(utils.SemverCompareRange("1.2.3", "1.2.3:_") == 0)
assert.True(utils.SemverCompareRange("1.2.3", ":1.2.3") == 0)
assert.True(utils.SemverCompareRange("1.2.3", "1.2.3:1.2.3") == 0)
assert.True(utils.SemverCompareRange("1.2.3", "1.2.0:1.2.3") == 0)
assert.True(utils.SemverCompareRange("1.2.3", "1.2.3:1.2.4") == 0)
assert.True(utils.SemverCompareRange("1.2.3", "1.2.0:1.2.4") == 0)
assert.True(utils.SemverCompareRange("1.2.3", "1.2.0") == 0)
assert.True(utils.SemverCompareRange("1.2.3", ":1.2.4") == 0)
assert.True(utils.SemverCompareRange("1.2.3", "1.2.4") < 0)
assert.True(utils.SemverCompareRange("1.2.3", ":1.2.0") > 0)
assert.True(utils.SemverCompareRange("1.2.3", "1.2.4:1.2.5") < 0)
assert.True(utils.SemverCompareRange("1.2.3", "1.2.0:1.2.1") > 0)
t.Run("empty slice", func(t *testing.T) {
assert.Equal("", utils.VersionList([]string{}))
})

t.Run("single version, no meta", func(t *testing.T) {
assert.Equal("1.2.3", utils.VersionList([]string{"1.2.3"}))
})

t.Run("single version, with meta", func(t *testing.T) {
assert.Equal("1.2.3", utils.VersionList([]string{"1.2.3+meta"}))
})

t.Run("multiple versions, no meta", func(t *testing.T) {
assert.Equal("1.2.3, 2.3.4, 3.4.5", utils.VersionList([]string{"1.2.3", "2.3.4", "3.4.5"}))
})

t.Run("multiple versions, some with meta", func(t *testing.T) {
assert.Equal("1.2.3, 2.3.4, 3.4.5", utils.VersionList([]string{"1.2.3+meta", "2.3.4", "3.4.5+build"}))
})

t.Run("multiple versions, all with meta", func(t *testing.T) {
assert.Equal("1.2.3, 2.3.4, 3.4.5", utils.VersionList([]string{"1.2.3+meta", "2.3.4+build", "3.4.5+test"}))
})

t.Run("versions with empty string", func(t *testing.T) {
assert.Equal("1.2.3", utils.VersionList([]string{"", "1.2.3"}))
})

t.Run("versions with empty strings in between", func(t *testing.T) {
assert.Equal("1.2.3, 2.3.4, 3.4.5", utils.VersionList([]string{"1.2.3", "", "2.3.4", "", "3.4.5"}))
})
}
Loading