update version constraints

Author: ImSingee

cmd/kitty/main.go

@@ -10,11 +10,10 @@ import (
 
 	"github.com/ImSingee/go-ex/ee"
 	"github.com/ImSingee/go-ex/pp"
-	"github.com/ImSingee/semver"
 	"github.com/spf13/cobra"
-	"github.com/ysmood/gson"
 
 	"github.com/ImSingee/kitty/internal/config"
+	"github.com/ImSingee/kitty/internal/config/kittyversion"
 	"github.com/ImSingee/kitty/internal/ext/format"
 	lintstaged "github.com/ImSingee/kitty/internal/ext/lint-staged"
 	"github.com/ImSingee/kitty/internal/hooks"
@@ -148,61 +147,22 @@ func mayUseAnotherKitty() error {
 		}
 	}
 
-	requiredVersion := parseRequiredKittyVersion(c)
+	requiredVersion := kittyversion.ParseRequired(c)
 	if requiredVersion == "" {
 		return nil // no required version
 	}
 
-	// TODO auto download new kitty version
-	if requiredVersion[0] == '=' {
-		sv, err := semver.NewVersion(requiredVersion[1:])
-		if err != nil {
-			return ee.Wrapf(err, "invalid kitty required version %s", requiredVersion)
-		}
-
-		if !sv.Equal(version.Semver()) {
-			pp.Println("Please use kitty ", requiredVersion[1:], "to run this command")
-			pp.Println("Visit https://github.com/ImSingee/kitty/releases/tag/v" + requiredVersion[1:] + " to download")
-			return ee.Phantom
-		}
-	} else {
-		sv, err := semver.NewVersion(strings.TrimPrefix(requiredVersion, ">"))
-		if err != nil {
-			return ee.Wrapf(err, "invalid kitty required version %s", requiredVersion)
-		}
-
-		if version.LessThan(sv) {
-			pp.Println("Please use kitty ", requiredVersion, "or later to run this command")
-			pp.Println("Visit https://github.com/ImSingee/kitty/releases to download")
-			return ee.Phantom
-		}
-	}
-
-	return nil
-}
-
-func parseRequiredKittyVersion(c map[string]gson.JSON) string {
-	if c == nil {
-		return ""
+	ok, err := kittyversion.CurrentSatisfies(requiredVersion)
+	if err != nil {
+		return ee.Wrapf(err, "invalid kitty required version %s", requiredVersion)
 	}
-
-	kitty, kittyExists := c["kitty"]
-	if !kittyExists {
-		return ""
+	if !ok {
+		pp.Println("Please use kitty version matching constraint", requiredVersion, "to run this command")
+		pp.Println("Visit https://github.com/ImSingee/kitty/releases to download")
+		return ee.Phantom
 	}
 
-	switch kittyVal := kitty.Val().(type) {
-	case string:
-		return kittyVal
-	case map[string]any:
-		if v, ok := kittyVal["version"].(string); ok {
-			return v
-		}
-
-		return ""
-	default:
-		return "" // unknown kitty config type
-	}
+	return nil
 }
 
 func runExtension(name string, args []string) error {

go.mod

@@ -1,11 +1,11 @@
 module github.com/ImSingee/kitty
 
-go 1.20
+go 1.21
 
 require (
 	github.com/ImSingee/go-ex v0.4.43
-	github.com/ImSingee/semver v0.1.0
 	github.com/ImSingee/tt v1.0.4
+	github.com/Masterminds/semver/v3 v3.4.0
 	github.com/alessio/shellescape v1.4.2
 	github.com/charmbracelet/bubbletea v0.24.2
 	github.com/go-git/go-git/v5 v5.9.0

go.sum

@@ -1,9 +1,9 @@
 github.com/ImSingee/go-ex v0.4.43 h1:+w8AGSPOkcBuzuRkAYisjHsR5+d9eMiRZrLTEnfohFw=
 github.com/ImSingee/go-ex v0.4.43/go.mod h1:CNc3Fqk9GkQfm/1x53vGnQ0BEHH+52siqBJFkVwdy8U=
-github.com/ImSingee/semver v0.1.0 h1:h0l6RYP2KK3PKQlvd4TDsvHWThwcjGHm47GtTk9hMR8=
-github.com/ImSingee/semver v0.1.0/go.mod h1:oFE1h7iyQ3+khH/BqhWtr03FMSKeWIApAhIrWF/bf+E=
 github.com/ImSingee/tt v1.0.4 h1:avDmypiAGmTEaRVJ1hweLzggyKRVfuUfLsGrebTrAyQ=
 github.com/ImSingee/tt v1.0.4/go.mod h1:7O7v+cIBruYWGFObw85DDjH0gNLquen1cJqMR3GOgxw=
+github.com/Masterminds/semver/v3 v3.4.0 h1:Zog+i5UMtVoCU8oKka5P7i9q9HgrJeGzI9SA1Xbatp0=
+github.com/Masterminds/semver/v3 v3.4.0/go.mod h1:4V+yj/TJE1HU9XfppCwVMZq3I84lprf4nC11bSS5beM=
 github.com/acomagu/bufpipe v1.0.4 h1:e3H4WUzM3npvo5uv95QuJM3cQspFNtFBzvJ2oNjKIDQ=
 github.com/acomagu/bufpipe v1.0.4/go.mod h1:mxdxdup/WdsKVreO5GpW4+M/1CE2sMG4jeGJ2sYmHc4=
 github.com/alessio/shellescape v1.4.2 h1:MHPfaU+ddJ0/bYWpgIeUnQUqKrlJ1S7BfEYPM4uEoM0=
@@ -34,7 +34,9 @@ github.com/inconshreveable/mousetrap v1.1.0/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLf
 github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 h1:BQSFePA1RWJOlocH6Fxy8MmwDt+yVQYULKfN0RoTN8A=
 github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99/go.mod h1:1lJo3i6rXxKeerYnT8Nvf0QmHCRC1n8sfWVwXF2Frvo=
 github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE=
+github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk=
 github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
+github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
 github.com/lucasb-eyer/go-colorful v1.2.0 h1:1nnpGOrhyZZuNyfu1QjKiUICQ74+3FNCN69Aj6K7nkY=
 github.com/lucasb-eyer/go-colorful v1.2.0/go.mod h1:R4dSotOR9KMtayYi1e77YzuveK+i7ruzyGqttikkLy0=
 github.com/matryer/is v1.2.0 h1:92UTHpy8CDwaJ08GqLDzhhuixiBUUD1p3AU6PHddz4A=
@@ -63,6 +65,7 @@ github.com/rivo/uniseg v0.2.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJ
 github.com/rivo/uniseg v0.4.4 h1:8TfxU8dW6PdqD27gjM8MVNuicgxIjxpm4K7x4jp8sis=
 github.com/rivo/uniseg v0.4.4/go.mod h1:FN3SvrM+Zdj16jyLfmOkMNblXMcoc8DfTHruCPUcx88=
 github.com/rogpeppe/go-internal v1.11.0 h1:cWPaGQEPrBb5/AsnsZesgZZ9yb1OQ+GOISoDNXVBh4M=
+github.com/rogpeppe/go-internal v1.11.0/go.mod h1:ddIwULY96R17DhadqLgMfk9H9tvdUzkipdSkR5nkCZA=
 github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
 github.com/spf13/cobra v1.7.0 h1:hyqWnYt1ZQShIddO5kBpj3vu05/++x6tJ6dg8EC572I=
 github.com/spf13/cobra v1.7.0/go.mod h1:uLxZILRyS/50WlhOIKD7W6V5bgeIt+4sICxh6uRMrb0=
@@ -86,6 +89,7 @@ golang.org/x/text v0.13.0 h1:ablQoSUd0tRdKxZewP80B+BaqeKJuVhuRxj/dkrun3k=
 golang.org/x/text v0.13.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=
+gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q=
 gopkg.in/warnings.v0 v0.1.2 h1:wFXVbFY8DY5/xOe1ECiWdKCzZlxgshcYVNkBHstARME=
 gopkg.in/warnings.v0 v0.1.2/go.mod h1:jksf8JmL6Qr/oQM2OXTHunEvvTAsrWBLb6OOjuVWRNI=
 gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=

internal/config/kittyversion/constraint.go

@@ -0,0 +1,54 @@
+package kittyversion
+
+import (
+	semver "github.com/Masterminds/semver/v3"
+	"github.com/ysmood/gson"
+
+	"github.com/ImSingee/kitty/internal/version"
+)
+
+func ParseRequired(c map[string]gson.JSON) string {
+	if c == nil {
+		return ""
+	}
+
+	kitty, kittyExists := c["kitty"]
+	if !kittyExists {
+		return ""
+	}
+
+	switch kittyVal := kitty.Val().(type) {
+	case string:
+		return kittyVal
+	case map[string]any:
+		if v, ok := kittyVal["version"].(string); ok {
+			return v
+		}
+
+		return ""
+	default:
+		return ""
+	}
+}
+
+func CurrentSatisfies(requiredVersion string) (bool, error) {
+	return Satisfies(version.Version(), requiredVersion)
+}
+
+func Satisfies(currentVersion string, requiredVersion string) (bool, error) {
+	if currentVersion == version.DevVersion {
+		return true, nil
+	}
+
+	constraints, err := semver.NewConstraint(requiredVersion)
+	if err != nil {
+		return false, err
+	}
+
+	sv, err := semver.NewVersion(currentVersion)
+	if err != nil {
+		return false, err
+	}
+
+	return constraints.Check(sv), nil
+}

internal/config/kittyversion/constraint_test.go

@@ -0,0 +1,65 @@
+package kittyversion
+
+import (
+	"testing"
+
+	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
+	"github.com/ysmood/gson"
+)
+
+func TestParseRequired(t *testing.T) {
+	t.Run("reads string shorthand", func(t *testing.T) {
+		config := map[string]gson.JSON{
+			"kitty": gson.New("0.2.2"),
+		}
+
+		assert.Equal(t, "0.2.2", ParseRequired(config))
+	})
+
+	t.Run("reads version from object", func(t *testing.T) {
+		config := map[string]gson.JSON{
+			"kitty": gson.New(map[string]any{
+				"version": ">=0.2.2",
+			}),
+		}
+
+		assert.Equal(t, ">=0.2.2", ParseRequired(config))
+	})
+
+	t.Run("ignores unsupported shapes", func(t *testing.T) {
+		config := map[string]gson.JSON{
+			"kitty": gson.New([]any{"0.2.2"}),
+		}
+
+		assert.Equal(t, "", ParseRequired(config))
+	})
+}
+
+func TestSatisfies(t *testing.T) {
+	t.Run("plain version follows semver constraint semantics", func(t *testing.T) {
+		ok, err := Satisfies("0.2.2", "0.2.2")
+		require.NoError(t, err)
+		assert.True(t, ok)
+
+		ok, err = Satisfies("0.2.2", "0.2.3")
+		require.NoError(t, err)
+		assert.False(t, ok)
+	})
+
+	t.Run("greater than is strict", func(t *testing.T) {
+		ok, err := Satisfies("0.2.2", ">0.2.2")
+		require.NoError(t, err)
+		assert.False(t, ok)
+
+		ok, err = Satisfies("0.2.3", ">0.2.2")
+		require.NoError(t, err)
+		assert.True(t, ok)
+	})
+
+	t.Run("dev supports everything", func(t *testing.T) {
+		ok, err := Satisfies("DEV", ">=999.0.0")
+		require.NoError(t, err)
+		assert.True(t, ok)
+	})
+}

internal/extension-registry/installer/impl/goinstaller/installer.go

@@ -9,7 +9,7 @@ import (
 
 	"github.com/ImSingee/go-ex/ee"
 	"github.com/ImSingee/go-ex/pp"
-	"github.com/ImSingee/semver"
+	semver "github.com/Masterminds/semver/v3"
 
 	"github.com/ImSingee/kitty/internal/extension-registry/installer"
 	eroptions "github.com/ImSingee/kitty/internal/extension-registry/options"

internal/extension-registry/installer/tmpl/tmpl.go

@@ -6,7 +6,7 @@ import (
 	"text/template"
 
 	"github.com/ImSingee/go-ex/ee"
-	"github.com/ImSingee/semver"
+	semver "github.com/Masterminds/semver/v3"
 
 	"github.com/ImSingee/kitty/internal/extension-registry/installer"
 )

internal/version/version.go

@@ -3,7 +3,7 @@ package version
 import (
 	"fmt"
 
-	"github.com/ImSingee/semver"
+	semver "github.com/Masterminds/semver/v3"
 )
 
 var (
@@ -29,7 +29,7 @@ func Semver() *semver.Version {
 	if err == nil {
 		return v
 	} else {
-		return semver.NewVersionByParts(0, 0, 0)
+		return semver.MustParse("0.0.0")
 	}
 }