diff --git a/.gitignore b/.gitignore index 1a99957c..328cee44 100644 --- a/.gitignore +++ b/.gitignore @@ -7,6 +7,12 @@ _obj _test .vscode +AGENTS.md +.claude +.agents +.claude +.copilot +.pi *.cgo1.go *.cgo2.c diff --git a/.golangci.yml b/.golangci.yml index 7649ba2f..7c8fafac 100644 --- a/.golangci.yml +++ b/.golangci.yml @@ -12,6 +12,7 @@ linters: - gochecknoinits - gocritic - goprintffuncname + - modernize - gosec - govet - ineffassign @@ -93,7 +94,7 @@ formatters: settings: goimports: local-prefixes: - - github.com/Jguer/yay/v12 + - github.com/Jguer/yay/v13 exclusions: generated: lax paths: diff --git a/clean.go b/clean.go index a8d1a871..8b2c0210 100644 --- a/clean.go +++ b/clean.go @@ -9,11 +9,11 @@ import ( mapset "github.com/deckarep/golang-set/v2" "github.com/leonelquinteros/gotext" - "github.com/Jguer/yay/v12/pkg/db" - "github.com/Jguer/yay/v12/pkg/runtime" - "github.com/Jguer/yay/v12/pkg/settings" - "github.com/Jguer/yay/v12/pkg/settings/exe" - "github.com/Jguer/yay/v12/pkg/settings/parser" + "github.com/Jguer/yay/v13/pkg/db" + "github.com/Jguer/yay/v13/pkg/runtime" + "github.com/Jguer/yay/v13/pkg/settings" + "github.com/Jguer/yay/v13/pkg/settings/exe" + "github.com/Jguer/yay/v13/pkg/settings/parser" ) // CleanDependencies removes all dangling dependencies in system. diff --git a/clean_test.go b/clean_test.go index 66d460f5..4e444257 100644 --- a/clean_test.go +++ b/clean_test.go @@ -1,5 +1,4 @@ //go:build !integration -// +build !integration package main @@ -17,11 +16,11 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/Jguer/yay/v12/pkg/db/mock" - "github.com/Jguer/yay/v12/pkg/runtime" - "github.com/Jguer/yay/v12/pkg/settings" - "github.com/Jguer/yay/v12/pkg/settings/exe" - "github.com/Jguer/yay/v12/pkg/settings/parser" + "github.com/Jguer/yay/v13/pkg/db/mock" + "github.com/Jguer/yay/v13/pkg/runtime" + "github.com/Jguer/yay/v13/pkg/settings" + "github.com/Jguer/yay/v13/pkg/settings/exe" + "github.com/Jguer/yay/v13/pkg/settings/parser" ) func TestCleanHanging(t *testing.T) { diff --git a/cmd.go b/cmd.go index 1f5db4b1..c1f5d6b7 100644 --- a/cmd.go +++ b/cmd.go @@ -5,24 +5,25 @@ import ( "errors" "fmt" "net/http" + "slices" "strings" alpm "github.com/Jguer/dyalpm" "github.com/leonelquinteros/gotext" - "github.com/Jguer/yay/v12/pkg/completion" - "github.com/Jguer/yay/v12/pkg/db" - "github.com/Jguer/yay/v12/pkg/download" - "github.com/Jguer/yay/v12/pkg/intrange" - "github.com/Jguer/yay/v12/pkg/news" - "github.com/Jguer/yay/v12/pkg/query" - "github.com/Jguer/yay/v12/pkg/runtime" - "github.com/Jguer/yay/v12/pkg/settings" - "github.com/Jguer/yay/v12/pkg/settings/exe" - "github.com/Jguer/yay/v12/pkg/settings/parser" - "github.com/Jguer/yay/v12/pkg/text" - "github.com/Jguer/yay/v12/pkg/upgrade" - "github.com/Jguer/yay/v12/pkg/vcs" + "github.com/Jguer/yay/v13/pkg/completion" + "github.com/Jguer/yay/v13/pkg/db" + "github.com/Jguer/yay/v13/pkg/download" + "github.com/Jguer/yay/v13/pkg/intrange" + "github.com/Jguer/yay/v13/pkg/news" + "github.com/Jguer/yay/v13/pkg/query" + "github.com/Jguer/yay/v13/pkg/runtime" + "github.com/Jguer/yay/v13/pkg/settings" + "github.com/Jguer/yay/v13/pkg/settings/exe" + "github.com/Jguer/yay/v13/pkg/settings/parser" + "github.com/Jguer/yay/v13/pkg/text" + "github.com/Jguer/yay/v13/pkg/upgrade" + "github.com/Jguer/yay/v13/pkg/vcs" ) func usage(logger *text.Logger) { @@ -412,8 +413,8 @@ func syncList(ctx context.Context, run *runtime.Runtime, ) error { aur := false - for i := len(cmdArgs.Targets) - 1; i >= 0; i-- { - if cmdArgs.Targets[i] == "aur" && run.Cfg.Mode.AtLeastAUR() { + for i, v := range slices.Backward(cmdArgs.Targets) { + if v == "aur" && run.Cfg.Mode.AtLeastAUR() { cmdArgs.Targets = append(cmdArgs.Targets[:i], cmdArgs.Targets[i+1:]...) aur = true } diff --git a/cmd_test.go b/cmd_test.go index 65f62d49..04903203 100644 --- a/cmd_test.go +++ b/cmd_test.go @@ -1,5 +1,4 @@ //go:build !integration -// +build !integration package main @@ -16,15 +15,15 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/Jguer/yay/v12/pkg/db/mock" - mockaur "github.com/Jguer/yay/v12/pkg/dep/mock" - "github.com/Jguer/yay/v12/pkg/query" - "github.com/Jguer/yay/v12/pkg/runtime" - "github.com/Jguer/yay/v12/pkg/settings" - "github.com/Jguer/yay/v12/pkg/settings/exe" - "github.com/Jguer/yay/v12/pkg/settings/parser" - "github.com/Jguer/yay/v12/pkg/text" - "github.com/Jguer/yay/v12/pkg/vcs" + "github.com/Jguer/yay/v13/pkg/db/mock" + mockaur "github.com/Jguer/yay/v13/pkg/dep/mock" + "github.com/Jguer/yay/v13/pkg/query" + "github.com/Jguer/yay/v13/pkg/runtime" + "github.com/Jguer/yay/v13/pkg/settings" + "github.com/Jguer/yay/v13/pkg/settings/exe" + "github.com/Jguer/yay/v13/pkg/settings/parser" + "github.com/Jguer/yay/v13/pkg/text" + "github.com/Jguer/yay/v13/pkg/vcs" ) func TestYogurtMenuAURDB(t *testing.T) { diff --git a/get.go b/get.go index b2c6b22a..39d32210 100644 --- a/get.go +++ b/get.go @@ -10,10 +10,10 @@ import ( "github.com/Jguer/aur" "github.com/leonelquinteros/gotext" - "github.com/Jguer/yay/v12/pkg/download" - "github.com/Jguer/yay/v12/pkg/runtime" - "github.com/Jguer/yay/v12/pkg/settings/parser" - "github.com/Jguer/yay/v12/pkg/text" + "github.com/Jguer/yay/v13/pkg/download" + "github.com/Jguer/yay/v13/pkg/runtime" + "github.com/Jguer/yay/v13/pkg/settings/parser" + "github.com/Jguer/yay/v13/pkg/text" ) // yay -Gp. diff --git a/get_ops_test.go b/get_ops_test.go index c2004111..8a1ceb2d 100644 --- a/get_ops_test.go +++ b/get_ops_test.go @@ -1,5 +1,4 @@ //go:build !integration -// +build !integration package main @@ -14,10 +13,10 @@ import ( "github.com/stretchr/testify/require" gock "gopkg.in/h2non/gock.v1" - "github.com/Jguer/yay/v12/pkg/db" - mockaur "github.com/Jguer/yay/v12/pkg/dep/mock" - "github.com/Jguer/yay/v12/pkg/settings/parser" - "github.com/Jguer/yay/v12/pkg/text" + "github.com/Jguer/yay/v13/pkg/db" + mockaur "github.com/Jguer/yay/v13/pkg/dep/mock" + "github.com/Jguer/yay/v13/pkg/settings/parser" + "github.com/Jguer/yay/v13/pkg/text" ) func TestPrintPkgbuilds(t *testing.T) { @@ -43,7 +42,6 @@ func TestPrintPkgbuilds(t *testing.T) { } for _, tc := range tests { - tc := tc t.Run(tc.name, func(t *testing.T) { defer gock.Off() gock.New("https://aur.archlinux.org"). diff --git a/go.mod b/go.mod index 0ce54cec..eb55772f 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module github.com/Jguer/yay/v12 +module github.com/Jguer/yay/v13 require ( github.com/Jguer/aur v1.3.0 diff --git a/local_install.go b/local_install.go index 6a40b067..f9fd927a 100644 --- a/local_install.go +++ b/local_install.go @@ -10,13 +10,13 @@ import ( "path/filepath" "strings" - "github.com/Jguer/yay/v12/pkg/db" - "github.com/Jguer/yay/v12/pkg/dep" - "github.com/Jguer/yay/v12/pkg/runtime" - "github.com/Jguer/yay/v12/pkg/settings" - "github.com/Jguer/yay/v12/pkg/settings/exe" - "github.com/Jguer/yay/v12/pkg/settings/parser" - "github.com/Jguer/yay/v12/pkg/sync" + "github.com/Jguer/yay/v13/pkg/db" + "github.com/Jguer/yay/v13/pkg/dep" + "github.com/Jguer/yay/v13/pkg/runtime" + "github.com/Jguer/yay/v13/pkg/settings" + "github.com/Jguer/yay/v13/pkg/settings/exe" + "github.com/Jguer/yay/v13/pkg/settings/parser" + "github.com/Jguer/yay/v13/pkg/sync" gosrc "github.com/Morganamilo/go-srcinfo" "github.com/leonelquinteros/gotext" diff --git a/local_install_test.go b/local_install_test.go index d7e66da1..d9f4a206 100644 --- a/local_install_test.go +++ b/local_install_test.go @@ -1,5 +1,4 @@ //go:build !integration -// +build !integration package main @@ -19,14 +18,14 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/Jguer/yay/v12/pkg/db/mock" - mockaur "github.com/Jguer/yay/v12/pkg/dep/mock" - "github.com/Jguer/yay/v12/pkg/runtime" - "github.com/Jguer/yay/v12/pkg/settings" - "github.com/Jguer/yay/v12/pkg/settings/exe" - "github.com/Jguer/yay/v12/pkg/settings/parser" - "github.com/Jguer/yay/v12/pkg/text" - "github.com/Jguer/yay/v12/pkg/vcs" + "github.com/Jguer/yay/v13/pkg/db/mock" + mockaur "github.com/Jguer/yay/v13/pkg/dep/mock" + "github.com/Jguer/yay/v13/pkg/runtime" + "github.com/Jguer/yay/v13/pkg/settings" + "github.com/Jguer/yay/v13/pkg/settings/exe" + "github.com/Jguer/yay/v13/pkg/settings/parser" + "github.com/Jguer/yay/v13/pkg/text" + "github.com/Jguer/yay/v13/pkg/vcs" ) func newTestLogger() *text.Logger { diff --git a/main.go b/main.go index 072a015d..d888f59e 100644 --- a/main.go +++ b/main.go @@ -11,16 +11,16 @@ import ( "github.com/leonelquinteros/gotext" - "github.com/Jguer/yay/v12/pkg/db/ialpm" - "github.com/Jguer/yay/v12/pkg/runtime" - "github.com/Jguer/yay/v12/pkg/settings" - "github.com/Jguer/yay/v12/pkg/settings/lua" - "github.com/Jguer/yay/v12/pkg/settings/parser" - "github.com/Jguer/yay/v12/pkg/text" + "github.com/Jguer/yay/v13/pkg/db/ialpm" + "github.com/Jguer/yay/v13/pkg/runtime" + "github.com/Jguer/yay/v13/pkg/settings" + "github.com/Jguer/yay/v13/pkg/settings/lua" + "github.com/Jguer/yay/v13/pkg/settings/parser" + "github.com/Jguer/yay/v13/pkg/text" ) var ( - yayVersion = "12.6.0" // To be set by compiler. + yayVersion = "13.0.0" // To be set by compiler. localePath = "/usr/share/locale" // To be set by compiler. ) diff --git a/pkg/cmd/graph/main.go b/pkg/cmd/graph/main.go index 486fe410..df636113 100644 --- a/pkg/cmd/graph/main.go +++ b/pkg/cmd/graph/main.go @@ -7,12 +7,12 @@ import ( "os" "path/filepath" - "github.com/Jguer/yay/v12/pkg/db/ialpm" - "github.com/Jguer/yay/v12/pkg/dep" - "github.com/Jguer/yay/v12/pkg/runtime" - "github.com/Jguer/yay/v12/pkg/settings" - "github.com/Jguer/yay/v12/pkg/settings/parser" - "github.com/Jguer/yay/v12/pkg/text" + "github.com/Jguer/yay/v13/pkg/db/ialpm" + "github.com/Jguer/yay/v13/pkg/dep" + "github.com/Jguer/yay/v13/pkg/runtime" + "github.com/Jguer/yay/v13/pkg/settings" + "github.com/Jguer/yay/v13/pkg/settings/parser" + "github.com/Jguer/yay/v13/pkg/text" "github.com/Jguer/aur/metadata" "github.com/leonelquinteros/gotext" diff --git a/pkg/cmd/graph/main_test.go b/pkg/cmd/graph/main_test.go index 3965c2f4..8d3ff98f 100644 --- a/pkg/cmd/graph/main_test.go +++ b/pkg/cmd/graph/main_test.go @@ -1,5 +1,4 @@ //go:build !integration -// +build !integration package main @@ -14,11 +13,11 @@ import ( "github.com/Jguer/aur" "github.com/stretchr/testify/require" - "github.com/Jguer/yay/v12/pkg/db" - "github.com/Jguer/yay/v12/pkg/db/mock" - "github.com/Jguer/yay/v12/pkg/dep" - mockaur "github.com/Jguer/yay/v12/pkg/dep/mock" - "github.com/Jguer/yay/v12/pkg/text" + "github.com/Jguer/yay/v13/pkg/db" + "github.com/Jguer/yay/v13/pkg/db/mock" + "github.com/Jguer/yay/v13/pkg/dep" + mockaur "github.com/Jguer/yay/v13/pkg/dep/mock" + "github.com/Jguer/yay/v13/pkg/text" ) func TestGraphPackageRequiresSingleTarget(t *testing.T) { diff --git a/pkg/completion/completion.go b/pkg/completion/completion.go index 2c5d6ecc..79098150 100644 --- a/pkg/completion/completion.go +++ b/pkg/completion/completion.go @@ -8,9 +8,9 @@ import ( "strings" "time" - "github.com/Jguer/yay/v12/pkg/db" - "github.com/Jguer/yay/v12/pkg/download" - "github.com/Jguer/yay/v12/pkg/text" + "github.com/Jguer/yay/v13/pkg/db" + "github.com/Jguer/yay/v13/pkg/download" + "github.com/Jguer/yay/v13/pkg/text" ) // NeedsUpdate checks if the completion cache needs to be regenerated. diff --git a/pkg/completion/completion_test.go b/pkg/completion/completion_test.go index 9f284d27..5c23b83d 100644 --- a/pkg/completion/completion_test.go +++ b/pkg/completion/completion_test.go @@ -1,5 +1,4 @@ //go:build !integration -// +build !integration package completion @@ -15,8 +14,8 @@ import ( "testing" "time" - "github.com/Jguer/yay/v12/pkg/db" - "github.com/Jguer/yay/v12/pkg/db/mock" + "github.com/Jguer/yay/v13/pkg/db" + "github.com/Jguer/yay/v13/pkg/db/mock" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/pkg/db/executor.go b/pkg/db/executor.go index a9f7f69a..793f8188 100644 --- a/pkg/db/executor.go +++ b/pkg/db/executor.go @@ -5,7 +5,7 @@ import ( alpm "github.com/Jguer/dyalpm" - "github.com/Jguer/yay/v12/pkg/text" + "github.com/Jguer/yay/v13/pkg/text" ) type ( diff --git a/pkg/db/ialpm/alpm.go b/pkg/db/ialpm/alpm.go index 7b0bd7be..0bf8d900 100644 --- a/pkg/db/ialpm/alpm.go +++ b/pkg/db/ialpm/alpm.go @@ -11,9 +11,9 @@ import ( pacmanconf "github.com/Morganamilo/go-pacmanconf" "github.com/leonelquinteros/gotext" - "github.com/Jguer/yay/v12/pkg/db" - "github.com/Jguer/yay/v12/pkg/settings" - "github.com/Jguer/yay/v12/pkg/text" + "github.com/Jguer/yay/v13/pkg/db" + "github.com/Jguer/yay/v13/pkg/settings" + "github.com/Jguer/yay/v13/pkg/text" ) type AlpmExecutor struct { diff --git a/pkg/db/ialpm/alpm_test.go b/pkg/db/ialpm/alpm_test.go index 3f301bd3..beee8c35 100644 --- a/pkg/db/ialpm/alpm_test.go +++ b/pkg/db/ialpm/alpm_test.go @@ -1,5 +1,4 @@ //go:build !integration -// +build !integration package ialpm @@ -12,7 +11,7 @@ import ( "github.com/Morganamilo/go-pacmanconf" "github.com/stretchr/testify/assert" - "github.com/Jguer/yay/v12/pkg/text" + "github.com/Jguer/yay/v13/pkg/text" ) func TestAlpmExecutor(t *testing.T) { diff --git a/pkg/db/ialpm/high_level.go b/pkg/db/ialpm/high_level.go index 3f9b4cba..cbbb6b05 100644 --- a/pkg/db/ialpm/high_level.go +++ b/pkg/db/ialpm/high_level.go @@ -3,7 +3,7 @@ package ialpm import ( alpm "github.com/Jguer/dyalpm" - "github.com/Jguer/yay/v12/pkg/text" + "github.com/Jguer/yay/v13/pkg/text" ) // GetPackageNamesBySource returns package names with and without correspondence in SyncDBS respectively. diff --git a/pkg/db/mock/executor.go b/pkg/db/mock/executor.go index c4bd7e45..63943704 100644 --- a/pkg/db/mock/executor.go +++ b/pkg/db/mock/executor.go @@ -3,8 +3,8 @@ package mock import ( "time" - "github.com/Jguer/yay/v12/pkg/db" - "github.com/Jguer/yay/v12/pkg/text" + "github.com/Jguer/yay/v13/pkg/db" + "github.com/Jguer/yay/v13/pkg/text" alpm "github.com/Jguer/dyalpm" ) diff --git a/pkg/dep/dep.go b/pkg/dep/dep.go index 683567f5..a109324f 100644 --- a/pkg/dep/dep.go +++ b/pkg/dep/dep.go @@ -3,8 +3,8 @@ package dep import ( "strings" - "github.com/Jguer/yay/v12/pkg/db" - aur "github.com/Jguer/yay/v12/pkg/query" + "github.com/Jguer/yay/v13/pkg/db" + aur "github.com/Jguer/yay/v13/pkg/query" ) func splitDep(dep string) (pkg, mod, ver string) { diff --git a/pkg/dep/dep_graph.go b/pkg/dep/dep_graph.go index e4e540f8..93747414 100644 --- a/pkg/dep/dep_graph.go +++ b/pkg/dep/dep_graph.go @@ -14,11 +14,11 @@ import ( mapset "github.com/deckarep/golang-set/v2" "github.com/leonelquinteros/gotext" - "github.com/Jguer/yay/v12/pkg/db" - "github.com/Jguer/yay/v12/pkg/dep/topo" - "github.com/Jguer/yay/v12/pkg/intrange" - aur "github.com/Jguer/yay/v12/pkg/query" - "github.com/Jguer/yay/v12/pkg/text" + "github.com/Jguer/yay/v13/pkg/db" + "github.com/Jguer/yay/v13/pkg/dep/topo" + "github.com/Jguer/yay/v13/pkg/intrange" + aur "github.com/Jguer/yay/v13/pkg/query" + "github.com/Jguer/yay/v13/pkg/text" ) type InstallInfo struct { @@ -763,18 +763,19 @@ func (g *Grapher) provideMenu(dep string, options []aur.Pkg) *aur.Pkg { return &options[0] } - str := text.Bold(gotext.Get("There are %[1]d providers available for %[2]s:", size, dep)) - str += "\n" + var str strings.Builder + str.WriteString(text.Bold(gotext.Get("There are %[1]d providers available for %[2]s:", size, dep))) + str.WriteString("\n") size = 1 - str += g.logger.SprintOperationInfo(gotext.Get("Repository AUR"), "\n ") + str.WriteString(g.logger.SprintOperationInfo(gotext.Get("Repository AUR"), "\n ")) for i := range options { - str += fmt.Sprintf("%d) %s ", size, options[i].Name) + str.WriteString(fmt.Sprintf("%d) %s ", size, options[i].Name)) size++ } - g.logger.OperationInfoln(str) + g.logger.OperationInfoln(str.String()) for { g.logger.Println(gotext.Get("\nEnter a number (default=1): ")) diff --git a/pkg/dep/dep_graph_bench_test.go b/pkg/dep/dep_graph_bench_test.go index 41d41890..5a8dd989 100644 --- a/pkg/dep/dep_graph_bench_test.go +++ b/pkg/dep/dep_graph_bench_test.go @@ -1,5 +1,4 @@ //go:build !integration -// +build !integration package dep @@ -13,10 +12,10 @@ import ( alpm "github.com/Jguer/dyalpm" "github.com/stretchr/testify/require" - "github.com/Jguer/yay/v12/pkg/db/mock" - mockaur "github.com/Jguer/yay/v12/pkg/dep/mock" - aur "github.com/Jguer/yay/v12/pkg/query" - "github.com/Jguer/yay/v12/pkg/text" + "github.com/Jguer/yay/v13/pkg/db/mock" + mockaur "github.com/Jguer/yay/v13/pkg/dep/mock" + aur "github.com/Jguer/yay/v13/pkg/query" + "github.com/Jguer/yay/v13/pkg/text" ) // benchCase represents a single benchmark scenario with expected results for validation. @@ -323,27 +322,27 @@ func BenchmarkGraphFromTargets_GstreamerGit(b *testing.B) { name: "SingleTarget", targets: []string{"gst-plugins-good-git"}, expectedLayers: []map[string]*InstallInfo{ - {"gst-plugins-good-git": {Source: AUR, Reason: Explicit, Version: "1.24.0.r37-1", AURBase: ptrString("gstreamer-git")}}, - {"gst-plugins-base-libs-git": {Source: AUR, Reason: Dep, Version: "1.24.0.r37-1", AURBase: ptrString("gstreamer-git")}}, - {"gstreamer-git": {Source: AUR, Reason: Dep, Version: "1.24.0.r37-1", AURBase: ptrString("gstreamer-git")}}, + {"gst-plugins-good-git": {Source: AUR, Reason: Explicit, Version: "1.24.0.r37-1", AURBase: new("gstreamer-git")}}, + {"gst-plugins-base-libs-git": {Source: AUR, Reason: Dep, Version: "1.24.0.r37-1", AURBase: new("gstreamer-git")}}, + {"gstreamer-git": {Source: AUR, Reason: Dep, Version: "1.24.0.r37-1", AURBase: new("gstreamer-git")}}, }, }, { name: "TwoTargets", targets: []string{"gstreamer-git", "gst-plugins-good-git"}, expectedLayers: []map[string]*InstallInfo{ - {"gst-plugins-good-git": {Source: AUR, Reason: Explicit, Version: "1.24.0.r37-1", AURBase: ptrString("gstreamer-git")}}, - {"gst-plugins-base-libs-git": {Source: AUR, Reason: Dep, Version: "1.24.0.r37-1", AURBase: ptrString("gstreamer-git")}}, - {"gstreamer-git": {Source: AUR, Reason: Explicit, Version: "1.24.0.r37-1", AURBase: ptrString("gstreamer-git")}}, + {"gst-plugins-good-git": {Source: AUR, Reason: Explicit, Version: "1.24.0.r37-1", AURBase: new("gstreamer-git")}}, + {"gst-plugins-base-libs-git": {Source: AUR, Reason: Dep, Version: "1.24.0.r37-1", AURBase: new("gstreamer-git")}}, + {"gstreamer-git": {Source: AUR, Reason: Explicit, Version: "1.24.0.r37-1", AURBase: new("gstreamer-git")}}, }, }, { name: "AllThreeExplicit", targets: []string{"gstreamer-git", "gst-plugins-base-libs-git", "gst-plugins-good-git"}, expectedLayers: []map[string]*InstallInfo{ - {"gst-plugins-good-git": {Source: AUR, Reason: Explicit, Version: "1.24.0.r37-1", AURBase: ptrString("gstreamer-git")}}, - {"gst-plugins-base-libs-git": {Source: AUR, Reason: Explicit, Version: "1.24.0.r37-1", AURBase: ptrString("gstreamer-git")}}, - {"gstreamer-git": {Source: AUR, Reason: Explicit, Version: "1.24.0.r37-1", AURBase: ptrString("gstreamer-git")}}, + {"gst-plugins-good-git": {Source: AUR, Reason: Explicit, Version: "1.24.0.r37-1", AURBase: new("gstreamer-git")}}, + {"gst-plugins-base-libs-git": {Source: AUR, Reason: Explicit, Version: "1.24.0.r37-1", AURBase: new("gstreamer-git")}}, + {"gstreamer-git": {Source: AUR, Reason: Explicit, Version: "1.24.0.r37-1", AURBase: new("gstreamer-git")}}, }, }, } @@ -379,8 +378,8 @@ func BenchmarkGraphFromTargets_Jellyfin(b *testing.B) { noDeps: true, noCheckDeps: false, expectedLayers: []map[string]*InstallInfo{ - {"jellyfin": {Source: AUR, Reason: Explicit, Version: "10.8.8-1", AURBase: ptrString("jellyfin")}}, - {"dotnet-sdk-6.0": {Source: Sync, Reason: MakeDep, Version: "6.0.100-1", SyncDBName: ptrString("community")}}, + {"jellyfin": {Source: AUR, Reason: Explicit, Version: "10.8.8-1", AURBase: new("jellyfin")}}, + {"dotnet-sdk-6.0": {Source: Sync, Reason: MakeDep, Version: "6.0.100-1", SyncDBName: new("community")}}, }, }, { @@ -389,14 +388,14 @@ func BenchmarkGraphFromTargets_Jellyfin(b *testing.B) { noDeps: false, noCheckDeps: false, expectedLayers: []map[string]*InstallInfo{ - {"jellyfin": {Source: AUR, Reason: Explicit, Version: "10.8.8-1", AURBase: ptrString("jellyfin")}}, + {"jellyfin": {Source: AUR, Reason: Explicit, Version: "10.8.8-1", AURBase: new("jellyfin")}}, { - "jellyfin-web": {Source: AUR, Reason: Dep, Version: "10.8.8-1", AURBase: ptrString("jellyfin")}, - "jellyfin-server": {Source: AUR, Reason: Dep, Version: "10.8.8-1", AURBase: ptrString("jellyfin")}, + "jellyfin-web": {Source: AUR, Reason: Dep, Version: "10.8.8-1", AURBase: new("jellyfin")}, + "jellyfin-server": {Source: AUR, Reason: Dep, Version: "10.8.8-1", AURBase: new("jellyfin")}, }, { - "dotnet-sdk-6.0": {Source: Sync, Reason: MakeDep, Version: "6.0.100-1", SyncDBName: ptrString("community")}, - "dotnet-runtime-6.0": {Source: Sync, Reason: Dep, Version: "6.0.100-1", SyncDBName: ptrString("community")}, + "dotnet-sdk-6.0": {Source: Sync, Reason: MakeDep, Version: "6.0.100-1", SyncDBName: new("community")}, + "dotnet-runtime-6.0": {Source: Sync, Reason: Dep, Version: "6.0.100-1", SyncDBName: new("community")}, }, }, }, @@ -431,24 +430,24 @@ func BenchmarkGraphFromTargets_CephProvides(b *testing.B) { name: "CephBinWithLibsBin", targets: []string{"ceph-bin", "ceph-libs-bin"}, expectedLayers: []map[string]*InstallInfo{ - {"ceph-bin": {Source: AUR, Reason: Explicit, Version: "17.2.6-2", AURBase: ptrString("ceph-bin")}}, - {"ceph-libs-bin": {Source: AUR, Reason: Explicit, Version: "17.2.6-2", AURBase: ptrString("ceph-bin")}}, + {"ceph-bin": {Source: AUR, Reason: Explicit, Version: "17.2.6-2", AURBase: new("ceph-bin")}}, + {"ceph-libs-bin": {Source: AUR, Reason: Explicit, Version: "17.2.6-2", AURBase: new("ceph-bin")}}, }, }, { name: "CephOnly", targets: []string{"ceph"}, expectedLayers: []map[string]*InstallInfo{ - {"ceph": {Source: AUR, Reason: Explicit, Version: "17.2.6-2", AURBase: ptrString("ceph")}}, - {"ceph-libs": {Source: AUR, Reason: Dep, Version: "17.2.6-2", AURBase: ptrString("ceph")}}, + {"ceph": {Source: AUR, Reason: Explicit, Version: "17.2.6-2", AURBase: new("ceph")}}, + {"ceph-libs": {Source: AUR, Reason: Dep, Version: "17.2.6-2", AURBase: new("ceph")}}, }, }, { name: "CephBinOnly", targets: []string{"ceph-bin"}, expectedLayers: []map[string]*InstallInfo{ - {"ceph-bin": {Source: AUR, Reason: Explicit, Version: "17.2.6-2", AURBase: ptrString("ceph-bin")}}, - {"ceph-libs": {Source: AUR, Reason: Dep, Version: "17.2.6-2", AURBase: ptrString("ceph")}}, + {"ceph-bin": {Source: AUR, Reason: Explicit, Version: "17.2.6-2", AURBase: new("ceph-bin")}}, + {"ceph-libs": {Source: AUR, Reason: Dep, Version: "17.2.6-2", AURBase: new("ceph")}}, }, }, } @@ -481,8 +480,8 @@ func BenchmarkGraphFromTargets_AndroidSDK(b *testing.B) { name: "WithJDK", targets: []string{"android-sdk", "jdk11-openjdk"}, expectedLayers: []map[string]*InstallInfo{ - {"android-sdk": {Source: AUR, Reason: Explicit, Version: "26.1.1-2", AURBase: ptrString("android-sdk")}}, - {"jdk11-openjdk": {Source: Sync, Reason: Explicit, Version: "11.0.12.u7-1", SyncDBName: ptrString("community")}}, + {"android-sdk": {Source: AUR, Reason: Explicit, Version: "26.1.1-2", AURBase: new("android-sdk")}}, + {"jdk11-openjdk": {Source: Sync, Reason: Explicit, Version: "11.0.12.u7-1", SyncDBName: new("community")}}, }, } @@ -566,7 +565,7 @@ func BenchmarkGraphDependOn(b *testing.B) { for i := 0; i < b.N; i++ { graph := NewGraph() // Create a chain of 20 dependencies - for j := 0; j < 20; j++ { + for j := range 20 { _ = graph.DependOn( "pkg"+string(rune('A'+j)), "pkg"+string(rune('A'+j+1)), diff --git a/pkg/dep/dep_graph_ops_test.go b/pkg/dep/dep_graph_ops_test.go index 9d62901f..a75409ba 100644 --- a/pkg/dep/dep_graph_ops_test.go +++ b/pkg/dep/dep_graph_ops_test.go @@ -1,5 +1,4 @@ //go:build !integration -// +build !integration package dep @@ -15,10 +14,10 @@ import ( mapset "github.com/deckarep/golang-set/v2" "github.com/stretchr/testify/require" - "github.com/Jguer/yay/v12/pkg/db/mock" - mockaur "github.com/Jguer/yay/v12/pkg/dep/mock" - "github.com/Jguer/yay/v12/pkg/query" - "github.com/Jguer/yay/v12/pkg/text" + "github.com/Jguer/yay/v13/pkg/db/mock" + mockaur "github.com/Jguer/yay/v13/pkg/dep/mock" + "github.com/Jguer/yay/v13/pkg/query" + "github.com/Jguer/yay/v13/pkg/text" ) func TestGrapher_GraphFromTargetsBranches(t *testing.T) { diff --git a/pkg/dep/dep_graph_rpc_test.go b/pkg/dep/dep_graph_rpc_test.go index ef5b1da5..27175779 100644 --- a/pkg/dep/dep_graph_rpc_test.go +++ b/pkg/dep/dep_graph_rpc_test.go @@ -1,5 +1,4 @@ //go:build !integration -// +build !integration // Package dep provides tests for tree resolution and parsing using RPC/.SRCINFO metadata // instead of PKGBUILD parsing. These tests validate: @@ -18,10 +17,10 @@ import ( aurc "github.com/Jguer/aur" "github.com/stretchr/testify/require" - "github.com/Jguer/yay/v12/pkg/db/mock" - mockaur "github.com/Jguer/yay/v12/pkg/dep/mock" - aur "github.com/Jguer/yay/v12/pkg/query" - "github.com/Jguer/yay/v12/pkg/text" + "github.com/Jguer/yay/v13/pkg/db/mock" + mockaur "github.com/Jguer/yay/v13/pkg/dep/mock" + aur "github.com/Jguer/yay/v13/pkg/query" + "github.com/Jguer/yay/v13/pkg/text" ) // TestGrapher_ReliableParser_AWSCliGit tests the reliable parsing capability @@ -283,11 +282,11 @@ func TestGrapher_SplitPackages_Clion(t *testing.T) { }} installInfos := map[string]*InstallInfo{ - "clion exp": {Source: AUR, Reason: Explicit, Version: "2025.3.1.1-1", AURBase: ptrString("clion"), LastModified: 1768325120, Maintainer: "Zrax"}, - "clion-jre exp": {Source: AUR, Reason: Explicit, Version: "2025.3.1.1-1", AURBase: ptrString("clion"), LastModified: 1768325120, Maintainer: "Zrax"}, - "clion-cmake exp": {Source: AUR, Reason: Explicit, Version: "2025.3.1.1-1", AURBase: ptrString("clion"), LastModified: 1768325120, Maintainer: "Zrax"}, - "clion-gdb exp": {Source: AUR, Reason: Explicit, Version: "2025.3.1.1-1", AURBase: ptrString("clion"), LastModified: 1768325120, Maintainer: "Zrax"}, - "clion-lldb exp": {Source: AUR, Reason: Explicit, Version: "2025.3.1.1-1", AURBase: ptrString("clion"), LastModified: 1768325120, Maintainer: "Zrax"}, + "clion exp": {Source: AUR, Reason: Explicit, Version: "2025.3.1.1-1", AURBase: new("clion"), LastModified: 1768325120, Maintainer: "Zrax"}, + "clion-jre exp": {Source: AUR, Reason: Explicit, Version: "2025.3.1.1-1", AURBase: new("clion"), LastModified: 1768325120, Maintainer: "Zrax"}, + "clion-cmake exp": {Source: AUR, Reason: Explicit, Version: "2025.3.1.1-1", AURBase: new("clion"), LastModified: 1768325120, Maintainer: "Zrax"}, + "clion-gdb exp": {Source: AUR, Reason: Explicit, Version: "2025.3.1.1-1", AURBase: new("clion"), LastModified: 1768325120, Maintainer: "Zrax"}, + "clion-lldb exp": {Source: AUR, Reason: Explicit, Version: "2025.3.1.1-1", AURBase: new("clion"), LastModified: 1768325120, Maintainer: "Zrax"}, } tests := []struct { @@ -567,11 +566,11 @@ func TestGrapher_SplitPackages_NX(t *testing.T) { }} installInfos := map[string]*InstallInfo{ - "nxproxy exp": {Source: AUR, Reason: Explicit, Version: "3.5.99.27-3", AURBase: ptrString("nx"), LastModified: 1693834449, Maintainer: "harrietobrien"}, - "nxagent exp": {Source: AUR, Reason: Explicit, Version: "3.5.99.27-3", AURBase: ptrString("nx"), LastModified: 1693834449, Maintainer: "harrietobrien"}, - "nx-x11 dep": {Source: AUR, Reason: Dep, Version: "3.5.99.27-3", AURBase: ptrString("nx"), LastModified: 1693834449, Maintainer: "harrietobrien"}, - "libxcomp dep": {Source: AUR, Reason: Dep, Version: "3.5.99.27-3", AURBase: ptrString("nx"), LastModified: 1693834449, Maintainer: "harrietobrien"}, - "libxcomp exp": {Source: AUR, Reason: Explicit, Version: "3.5.99.27-3", AURBase: ptrString("nx"), LastModified: 1693834449, Maintainer: "harrietobrien"}, + "nxproxy exp": {Source: AUR, Reason: Explicit, Version: "3.5.99.27-3", AURBase: new("nx"), LastModified: 1693834449, Maintainer: "harrietobrien"}, + "nxagent exp": {Source: AUR, Reason: Explicit, Version: "3.5.99.27-3", AURBase: new("nx"), LastModified: 1693834449, Maintainer: "harrietobrien"}, + "nx-x11 dep": {Source: AUR, Reason: Dep, Version: "3.5.99.27-3", AURBase: new("nx"), LastModified: 1693834449, Maintainer: "harrietobrien"}, + "libxcomp dep": {Source: AUR, Reason: Dep, Version: "3.5.99.27-3", AURBase: new("nx"), LastModified: 1693834449, Maintainer: "harrietobrien"}, + "libxcomp exp": {Source: AUR, Reason: Explicit, Version: "3.5.99.27-3", AURBase: new("nx"), LastModified: 1693834449, Maintainer: "harrietobrien"}, } tests := []struct { diff --git a/pkg/dep/dep_graph_test.go b/pkg/dep/dep_graph_test.go index 35b3b52f..39f987b4 100644 --- a/pkg/dep/dep_graph_test.go +++ b/pkg/dep/dep_graph_test.go @@ -1,5 +1,4 @@ //go:build !integration -// +build !integration package dep @@ -18,17 +17,13 @@ import ( mapset "github.com/deckarep/golang-set/v2" "github.com/stretchr/testify/require" - "github.com/Jguer/yay/v12/pkg/db" - "github.com/Jguer/yay/v12/pkg/db/mock" - mockaur "github.com/Jguer/yay/v12/pkg/dep/mock" - aur "github.com/Jguer/yay/v12/pkg/query" - "github.com/Jguer/yay/v12/pkg/text" + "github.com/Jguer/yay/v13/pkg/db" + "github.com/Jguer/yay/v13/pkg/db/mock" + mockaur "github.com/Jguer/yay/v13/pkg/dep/mock" + aur "github.com/Jguer/yay/v13/pkg/query" + "github.com/Jguer/yay/v13/pkg/text" ) -func ptrString(s string) *string { - return &s -} - func getFromFile(t testing.TB, filePath string) mockaur.GetFunc { t.Helper() f, err := os.Open(filePath) @@ -165,7 +160,7 @@ func TestGrapher_GraphFromTargets_jellyfin(t *testing.T) { Source: AUR, Reason: Explicit, Version: "10.8.8-1", - AURBase: ptrString("jellyfin"), + AURBase: new("jellyfin"), LastModified: 1669830147, Maintainer: "z3ntu", }, @@ -175,7 +170,7 @@ func TestGrapher_GraphFromTargets_jellyfin(t *testing.T) { Source: Sync, Reason: MakeDep, Version: "6.0.100-1", - SyncDBName: ptrString("community"), + SyncDBName: new("community"), }, }, }, @@ -198,7 +193,7 @@ func TestGrapher_GraphFromTargets_jellyfin(t *testing.T) { Source: AUR, Reason: Explicit, Version: "10.8.8-1", - AURBase: ptrString("jellyfin"), + AURBase: new("jellyfin"), LastModified: 1669830147, Maintainer: "z3ntu", }, @@ -208,7 +203,7 @@ func TestGrapher_GraphFromTargets_jellyfin(t *testing.T) { Source: AUR, Reason: Dep, Version: "10.8.8-1", - AURBase: ptrString("jellyfin"), + AURBase: new("jellyfin"), LastModified: 1669830147, Maintainer: "z3ntu", }, @@ -216,7 +211,7 @@ func TestGrapher_GraphFromTargets_jellyfin(t *testing.T) { Source: AUR, Reason: Dep, Version: "10.8.8-1", - AURBase: ptrString("jellyfin"), + AURBase: new("jellyfin"), LastModified: 1669830147, Maintainer: "z3ntu", }, @@ -226,13 +221,13 @@ func TestGrapher_GraphFromTargets_jellyfin(t *testing.T) { Source: Sync, Reason: MakeDep, Version: "6.0.100-1", - SyncDBName: ptrString("community"), + SyncDBName: new("community"), }, "dotnet-runtime-6.0": { Source: Sync, Reason: Dep, Version: "6.0.100-1", - SyncDBName: ptrString("community"), + SyncDBName: new("community"), }, }, }, @@ -340,7 +335,7 @@ func TestGrapher_GraphProvides_androidsdk(t *testing.T) { Source: AUR, Reason: Explicit, Version: "26.1.1-2", - AURBase: ptrString("android-sdk"), + AURBase: new("android-sdk"), LastModified: 1647982720, Maintainer: "dreamingincode", }, @@ -350,7 +345,7 @@ func TestGrapher_GraphProvides_androidsdk(t *testing.T) { Source: Sync, Reason: Explicit, Version: "11.0.12.u7-1", - SyncDBName: ptrString("community"), + SyncDBName: new("community"), }, }, }, @@ -455,31 +450,31 @@ func TestGrapher_GraphFromAUR_Deps_ceph_bin(t *testing.T) { Source: AUR, Reason: Explicit, Version: "17.2.6-2", - AURBase: ptrString("ceph-bin"), + AURBase: new("ceph-bin"), }, "ceph-libs-bin exp": { Source: AUR, Reason: Explicit, Version: "17.2.6-2", - AURBase: ptrString("ceph-bin"), + AURBase: new("ceph-bin"), }, "ceph exp": { Source: AUR, Reason: Explicit, Version: "17.2.6-2", - AURBase: ptrString("ceph"), + AURBase: new("ceph"), }, "ceph-libs exp": { Source: AUR, Reason: Explicit, Version: "17.2.6-2", - AURBase: ptrString("ceph"), + AURBase: new("ceph"), }, "ceph-libs dep": { Source: AUR, Reason: Dep, Version: "17.2.6-2", - AURBase: ptrString("ceph"), + AURBase: new("ceph"), }, } @@ -644,25 +639,25 @@ func TestGrapher_GraphFromAUR_Deps_gourou(t *testing.T) { Source: AUR, Reason: Explicit, Version: "0.8.1", - AURBase: ptrString("gourou"), + AURBase: new("gourou"), }, "libzip dep": { Source: Sync, Reason: Dep, Version: "1.9.2-1", - SyncDBName: ptrString("extra"), + SyncDBName: new("extra"), }, "libzip exp": { Source: Sync, Reason: Explicit, Version: "1.9.2-1", - SyncDBName: ptrString("extra"), + SyncDBName: new("extra"), }, "libzip-git exp": { Source: AUR, Reason: Explicit, Version: "1.9.2.r159.gb3ac716c-1", - AURBase: ptrString("libzip-git"), + AURBase: new("libzip-git"), }, } @@ -814,13 +809,13 @@ func TestGrapher_GraphFromTargets_ReinstalledDeps(t *testing.T) { Source: AUR, Reason: Dep, Version: "0.8.1", - AURBase: ptrString("gourou"), + AURBase: new("gourou"), }, "libzip dep": { Source: Sync, Reason: Dep, Version: "1.9.2-1", - SyncDBName: ptrString("extra"), + SyncDBName: new("extra"), }, } @@ -926,7 +921,7 @@ func TestGrapher_GraphFromTargets_TargetNotFound(t *testing.T) { Source: AUR, Reason: Explicit, Version: "1.0.0", - AURBase: ptrString("okpkg"), + AURBase: new("okpkg"), }, }, }, layers, layers) @@ -1028,7 +1023,7 @@ func TestGrapher_GraphFromAUR_SplitPkgInternalDeps(t *testing.T) { Source: AUR, Reason: Explicit, Version: "1.24.0.r37-1", - AURBase: ptrString("gstreamer-git"), + AURBase: new("gstreamer-git"), LastModified: 1700000000, Maintainer: "testmaint", }, @@ -1036,7 +1031,7 @@ func TestGrapher_GraphFromAUR_SplitPkgInternalDeps(t *testing.T) { Source: AUR, Reason: Dep, Version: "1.24.0.r37-1", - AURBase: ptrString("gstreamer-git"), + AURBase: new("gstreamer-git"), LastModified: 1700000000, Maintainer: "testmaint", }, @@ -1044,7 +1039,7 @@ func TestGrapher_GraphFromAUR_SplitPkgInternalDeps(t *testing.T) { Source: AUR, Reason: Explicit, Version: "1.24.0.r37-1", - AURBase: ptrString("gstreamer-git"), + AURBase: new("gstreamer-git"), LastModified: 1700000000, Maintainer: "testmaint", }, @@ -1052,7 +1047,7 @@ func TestGrapher_GraphFromAUR_SplitPkgInternalDeps(t *testing.T) { Source: AUR, Reason: Dep, Version: "1.24.0.r37-1", - AURBase: ptrString("gstreamer-git"), + AURBase: new("gstreamer-git"), LastModified: 1700000000, Maintainer: "testmaint", }, @@ -1060,7 +1055,7 @@ func TestGrapher_GraphFromAUR_SplitPkgInternalDeps(t *testing.T) { Source: AUR, Reason: Explicit, Version: "1.24.0.r37-1", - AURBase: ptrString("gstreamer-git"), + AURBase: new("gstreamer-git"), LastModified: 1700000000, Maintainer: "testmaint", }, diff --git a/pkg/dep/dep_unit_test.go b/pkg/dep/dep_unit_test.go index 82e13e3e..777bfbab 100644 --- a/pkg/dep/dep_unit_test.go +++ b/pkg/dep/dep_unit_test.go @@ -1,5 +1,4 @@ //go:build !integration -// +build !integration package dep @@ -15,11 +14,11 @@ import ( gosrc "github.com/Morganamilo/go-srcinfo" "github.com/stretchr/testify/require" - "github.com/Jguer/yay/v12/pkg/db" - "github.com/Jguer/yay/v12/pkg/db/mock" - mockaur "github.com/Jguer/yay/v12/pkg/dep/mock" - "github.com/Jguer/yay/v12/pkg/dep/topo" - "github.com/Jguer/yay/v12/pkg/text" + "github.com/Jguer/yay/v13/pkg/db" + "github.com/Jguer/yay/v13/pkg/db/mock" + mockaur "github.com/Jguer/yay/v13/pkg/dep/mock" + "github.com/Jguer/yay/v13/pkg/dep/topo" + "github.com/Jguer/yay/v13/pkg/text" ) func TestDepSplitDep(t *testing.T) { diff --git a/pkg/dep/target_handler.go b/pkg/dep/target_handler.go index bd33b8b0..57a0098f 100644 --- a/pkg/dep/target_handler.go +++ b/pkg/dep/target_handler.go @@ -1,6 +1,6 @@ package dep -import "github.com/Jguer/yay/v12/pkg/text" +import "github.com/Jguer/yay/v13/pkg/text" type Target struct { DB string diff --git a/pkg/dep/topo/dep_extended_test.go b/pkg/dep/topo/dep_extended_test.go index 1860f342..befbbd84 100644 --- a/pkg/dep/topo/dep_extended_test.go +++ b/pkg/dep/topo/dep_extended_test.go @@ -1,5 +1,4 @@ //go:build !integration -// +build !integration package topo diff --git a/pkg/download/abs.go b/pkg/download/abs.go index db773d89..815297d0 100644 --- a/pkg/download/abs.go +++ b/pkg/download/abs.go @@ -10,7 +10,7 @@ import ( "github.com/leonelquinteros/gotext" - "github.com/Jguer/yay/v12/pkg/settings/exe" + "github.com/Jguer/yay/v13/pkg/settings/exe" ) const ( diff --git a/pkg/download/abs_test.go b/pkg/download/abs_test.go index 3f9c6ed2..3295be4a 100644 --- a/pkg/download/abs_test.go +++ b/pkg/download/abs_test.go @@ -1,5 +1,4 @@ //go:build !integration -// +build !integration package download @@ -13,7 +12,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/Jguer/yay/v12/pkg/settings/exe" + "github.com/Jguer/yay/v13/pkg/settings/exe" ) const gitExtrasPKGBUILD = `pkgname=git-extras diff --git a/pkg/download/aur.go b/pkg/download/aur.go index ccf9cee1..030adb4d 100644 --- a/pkg/download/aur.go +++ b/pkg/download/aur.go @@ -15,8 +15,8 @@ import ( "github.com/leonelquinteros/gotext" - "github.com/Jguer/yay/v12/pkg/settings/exe" - "github.com/Jguer/yay/v12/pkg/text" + "github.com/Jguer/yay/v13/pkg/settings/exe" + "github.com/Jguer/yay/v13/pkg/text" ) func AURPKGBUILD(httpClient HTTPRequestDoer, pkgName, aurURL string) ([]byte, error) { diff --git a/pkg/download/aur_integration_test.go b/pkg/download/aur_integration_test.go index 7e6f7840..54925513 100644 --- a/pkg/download/aur_integration_test.go +++ b/pkg/download/aur_integration_test.go @@ -17,8 +17,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/Jguer/yay/v12/pkg/settings/exe" - "github.com/Jguer/yay/v12/pkg/text" + "github.com/Jguer/yay/v13/pkg/settings/exe" + "github.com/Jguer/yay/v13/pkg/text" ) // WHEN some AUR bases exist and others are fresh diff --git a/pkg/download/aur_test.go b/pkg/download/aur_test.go index ec48a445..3c77abe4 100644 --- a/pkg/download/aur_test.go +++ b/pkg/download/aur_test.go @@ -1,5 +1,4 @@ //go:build !integration -// +build !integration package download @@ -13,7 +12,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/Jguer/yay/v12/pkg/settings/exe" + "github.com/Jguer/yay/v13/pkg/settings/exe" ) func TestGetAURPkgbuild(t *testing.T) { diff --git a/pkg/download/unified.go b/pkg/download/unified.go index be9185d1..90d9e412 100644 --- a/pkg/download/unified.go +++ b/pkg/download/unified.go @@ -12,10 +12,10 @@ import ( "github.com/Jguer/aur" - "github.com/Jguer/yay/v12/pkg/db" - "github.com/Jguer/yay/v12/pkg/settings/exe" - "github.com/Jguer/yay/v12/pkg/settings/parser" - "github.com/Jguer/yay/v12/pkg/text" + "github.com/Jguer/yay/v13/pkg/db" + "github.com/Jguer/yay/v13/pkg/settings/exe" + "github.com/Jguer/yay/v13/pkg/settings/parser" + "github.com/Jguer/yay/v13/pkg/text" ) // HTTPRequestDoer is an interface for HTTP clients that can perform GET requests. diff --git a/pkg/download/unified_integration_test.go b/pkg/download/unified_integration_test.go index 89642521..c13567e3 100644 --- a/pkg/download/unified_integration_test.go +++ b/pkg/download/unified_integration_test.go @@ -15,10 +15,10 @@ import ( "github.com/Jguer/aur" - mockaur "github.com/Jguer/yay/v12/pkg/dep/mock" - "github.com/Jguer/yay/v12/pkg/settings/exe" - "github.com/Jguer/yay/v12/pkg/settings/parser" - "github.com/Jguer/yay/v12/pkg/text" + mockaur "github.com/Jguer/yay/v13/pkg/dep/mock" + "github.com/Jguer/yay/v13/pkg/settings/exe" + "github.com/Jguer/yay/v13/pkg/settings/parser" + "github.com/Jguer/yay/v13/pkg/text" ) func integrationCmdBuilder(t *testing.T) (*text.Logger, *exe.CmdBuilder) { diff --git a/pkg/download/unified_test.go b/pkg/download/unified_test.go index a8bc51f4..3cde192f 100644 --- a/pkg/download/unified_test.go +++ b/pkg/download/unified_test.go @@ -1,5 +1,4 @@ //go:build !integration -// +build !integration package download @@ -17,10 +16,10 @@ import ( "github.com/Jguer/aur" - mockaur "github.com/Jguer/yay/v12/pkg/dep/mock" - "github.com/Jguer/yay/v12/pkg/settings/exe" - "github.com/Jguer/yay/v12/pkg/settings/parser" - "github.com/Jguer/yay/v12/pkg/text" + mockaur "github.com/Jguer/yay/v13/pkg/dep/mock" + "github.com/Jguer/yay/v13/pkg/settings/exe" + "github.com/Jguer/yay/v13/pkg/settings/parser" + "github.com/Jguer/yay/v13/pkg/text" ) func newTestLogger() *text.Logger { diff --git a/pkg/download/utils_test.go b/pkg/download/utils_test.go index 11cb7d6a..6253eacf 100644 --- a/pkg/download/utils_test.go +++ b/pkg/download/utils_test.go @@ -12,9 +12,9 @@ import ( alpm "github.com/Jguer/dyalpm" - "github.com/Jguer/yay/v12/pkg/db" - "github.com/Jguer/yay/v12/pkg/db/mock" - "github.com/Jguer/yay/v12/pkg/settings/exe" + "github.com/Jguer/yay/v13/pkg/db" + "github.com/Jguer/yay/v13/pkg/db/mock" + "github.com/Jguer/yay/v13/pkg/settings/exe" ) type testRunner struct{} diff --git a/pkg/intrange/intrange_test.go b/pkg/intrange/intrange_test.go index 18856271..da617969 100644 --- a/pkg/intrange/intrange_test.go +++ b/pkg/intrange/intrange_test.go @@ -1,5 +1,4 @@ //go:build !integration -// +build !integration package intrange diff --git a/pkg/menus/clean_menu.go b/pkg/menus/clean_menu.go index 4e10df37..f44a3778 100644 --- a/pkg/menus/clean_menu.go +++ b/pkg/menus/clean_menu.go @@ -9,9 +9,9 @@ import ( mapset "github.com/deckarep/golang-set/v2" "github.com/leonelquinteros/gotext" - "github.com/Jguer/yay/v12/pkg/runtime" - "github.com/Jguer/yay/v12/pkg/settings" - "github.com/Jguer/yay/v12/pkg/text" + "github.com/Jguer/yay/v13/pkg/runtime" + "github.com/Jguer/yay/v13/pkg/settings" + "github.com/Jguer/yay/v13/pkg/text" ) func anyExistInCache(pkgbuildDirs map[string]string) bool { diff --git a/pkg/menus/diff_menu.go b/pkg/menus/diff_menu.go index 3f6b7a46..37e46e19 100644 --- a/pkg/menus/diff_menu.go +++ b/pkg/menus/diff_menu.go @@ -11,10 +11,10 @@ import ( mapset "github.com/deckarep/golang-set/v2" "github.com/leonelquinteros/gotext" - "github.com/Jguer/yay/v12/pkg/runtime" - "github.com/Jguer/yay/v12/pkg/settings" - "github.com/Jguer/yay/v12/pkg/settings/exe" - "github.com/Jguer/yay/v12/pkg/text" + "github.com/Jguer/yay/v13/pkg/runtime" + "github.com/Jguer/yay/v13/pkg/settings" + "github.com/Jguer/yay/v13/pkg/settings/exe" + "github.com/Jguer/yay/v13/pkg/text" ) const ( diff --git a/pkg/menus/edit_clean_ops_test.go b/pkg/menus/edit_clean_ops_test.go index 3bf36739..4af833a9 100644 --- a/pkg/menus/edit_clean_ops_test.go +++ b/pkg/menus/edit_clean_ops_test.go @@ -1,5 +1,4 @@ //go:build !integration -// +build !integration package menus @@ -15,10 +14,10 @@ import ( mapset "github.com/deckarep/golang-set/v2" "github.com/stretchr/testify/require" - "github.com/Jguer/yay/v12/pkg/runtime" - "github.com/Jguer/yay/v12/pkg/settings" - "github.com/Jguer/yay/v12/pkg/settings/parser" - "github.com/Jguer/yay/v12/pkg/text" + "github.com/Jguer/yay/v13/pkg/runtime" + "github.com/Jguer/yay/v13/pkg/settings" + "github.com/Jguer/yay/v13/pkg/settings/parser" + "github.com/Jguer/yay/v13/pkg/text" ) func TestEditor(t *testing.T) { diff --git a/pkg/menus/edit_menu.go b/pkg/menus/edit_menu.go index 74981f60..aef4e9f0 100644 --- a/pkg/menus/edit_menu.go +++ b/pkg/menus/edit_menu.go @@ -14,9 +14,9 @@ import ( mapset "github.com/deckarep/golang-set/v2" "github.com/leonelquinteros/gotext" - "github.com/Jguer/yay/v12/pkg/runtime" - "github.com/Jguer/yay/v12/pkg/settings" - "github.com/Jguer/yay/v12/pkg/text" + "github.com/Jguer/yay/v13/pkg/runtime" + "github.com/Jguer/yay/v13/pkg/settings" + "github.com/Jguer/yay/v13/pkg/text" ) // Editor returns the preferred system editor. diff --git a/pkg/menus/menu.go b/pkg/menus/menu.go index e1872b20..2d2c754a 100644 --- a/pkg/menus/menu.go +++ b/pkg/menus/menu.go @@ -3,12 +3,13 @@ package menus import ( "fmt" "os" + "strings" "github.com/leonelquinteros/gotext" - "github.com/Jguer/yay/v12/pkg/intrange" - "github.com/Jguer/yay/v12/pkg/settings" - "github.com/Jguer/yay/v12/pkg/text" + "github.com/Jguer/yay/v13/pkg/intrange" + "github.com/Jguer/yay/v13/pkg/settings" + "github.com/Jguer/yay/v13/pkg/text" mapset "github.com/deckarep/golang-set/v2" ) @@ -16,26 +17,26 @@ import ( func pkgbuildNumberMenu(logger *text.Logger, pkgbuildDirs map[string]string, bases []string, installed mapset.Set[string], ) { - toPrint := "" + var toPrint strings.Builder for n, pkgBase := range bases { dir := pkgbuildDirs[pkgBase] - toPrint += fmt.Sprintf(text.Magenta("%3d")+" %-40s", len(pkgbuildDirs)-n, - text.Bold(pkgBase)) + toPrint.WriteString(fmt.Sprintf(text.Magenta("%3d")+" %-40s", len(pkgbuildDirs)-n, + text.Bold(pkgBase))) if installed.Contains(pkgBase) { - toPrint += text.Bold(text.Green(gotext.Get(" (Installed)"))) + toPrint.WriteString(text.Bold(text.Green(gotext.Get(" (Installed)")))) } // TODO: remove or refactor to check if git dir is unclean if _, err := os.Stat(dir); !os.IsNotExist(err) { - toPrint += text.Bold(text.Green(gotext.Get(" (Build Files Exist)"))) + toPrint.WriteString(text.Bold(text.Green(gotext.Get(" (Build Files Exist)")))) } - toPrint += "\n" + toPrint.WriteString("\n") } - logger.Print(toPrint) + logger.Print(toPrint.String()) } func selectionMenu(logger *text.Logger, pkgbuildDirs map[string]string, bases []string, installed mapset.Set[string], diff --git a/pkg/menus/menus_ops_test.go b/pkg/menus/menus_ops_test.go index fca54ce6..bcdd192d 100644 --- a/pkg/menus/menus_ops_test.go +++ b/pkg/menus/menus_ops_test.go @@ -1,5 +1,4 @@ //go:build !integration -// +build !integration package menus @@ -14,8 +13,8 @@ import ( mapset "github.com/deckarep/golang-set/v2" "github.com/stretchr/testify/require" - "github.com/Jguer/yay/v12/pkg/settings/parser" - "github.com/Jguer/yay/v12/pkg/text" + "github.com/Jguer/yay/v13/pkg/settings/parser" + "github.com/Jguer/yay/v13/pkg/text" ) func TestSelectionMenu(t *testing.T) { diff --git a/pkg/news/news.go b/pkg/news/news.go index f0227126..5404b911 100644 --- a/pkg/news/news.go +++ b/pkg/news/news.go @@ -7,10 +7,11 @@ import ( "html" "io" "net/http" + "slices" "strings" "time" - "github.com/Jguer/yay/v12/pkg/text" + "github.com/Jguer/yay/v13/pkg/text" ) type item struct { @@ -86,8 +87,8 @@ func PrintNewsFeed(ctx context.Context, client *http.Client, logger *text.Logger } if bottomUp { - for i := len(rssGot.Channel.Items) - 1; i >= 0; i-- { - rssGot.Channel.Items[i].printNews(logger, cutOffDate, all, quiet) + for _, v := range slices.Backward(rssGot.Channel.Items) { + v.printNews(logger, cutOffDate, all, quiet) } } else { for i := 0; i < len(rssGot.Channel.Items); i++ { diff --git a/pkg/news/news_test.go b/pkg/news/news_test.go index 01d489ac..253e9abb 100644 --- a/pkg/news/news_test.go +++ b/pkg/news/news_test.go @@ -1,5 +1,4 @@ //go:build !integration -// +build !integration package news @@ -16,7 +15,7 @@ import ( "github.com/stretchr/testify/assert" "gopkg.in/h2non/gock.v1" - "github.com/Jguer/yay/v12/pkg/text" + "github.com/Jguer/yay/v13/pkg/text" ) const lastNews = ` diff --git a/pkg/query/aur_warnings.go b/pkg/query/aur_warnings.go index 69b44732..1067c172 100644 --- a/pkg/query/aur_warnings.go +++ b/pkg/query/aur_warnings.go @@ -8,8 +8,8 @@ import ( "github.com/Jguer/aur" alpm "github.com/Jguer/dyalpm" - "github.com/Jguer/yay/v12/pkg/db" - "github.com/Jguer/yay/v12/pkg/text" + "github.com/Jguer/yay/v13/pkg/db" + "github.com/Jguer/yay/v13/pkg/text" ) type AURWarnings struct { diff --git a/pkg/query/filter.go b/pkg/query/filter.go index 0e07d977..393590c8 100644 --- a/pkg/query/filter.go +++ b/pkg/query/filter.go @@ -3,8 +3,8 @@ package query import ( "github.com/leonelquinteros/gotext" - "github.com/Jguer/yay/v12/pkg/settings/parser" - "github.com/Jguer/yay/v12/pkg/text" + "github.com/Jguer/yay/v13/pkg/settings/parser" + "github.com/Jguer/yay/v13/pkg/text" ) func RemoveInvalidTargets(logger *text.Logger, targets []string, mode parser.TargetMode) []string { diff --git a/pkg/query/metric_test.go b/pkg/query/metric_test.go index 3ea5b6cf..52206ee2 100644 --- a/pkg/query/metric_test.go +++ b/pkg/query/metric_test.go @@ -1,5 +1,4 @@ //go:build !integration -// +build !integration package query diff --git a/pkg/query/query_builder.go b/pkg/query/query_builder.go index d9f71251..d7576f9e 100644 --- a/pkg/query/query_builder.go +++ b/pkg/query/query_builder.go @@ -15,11 +15,11 @@ import ( mapset "github.com/deckarep/golang-set/v2" "github.com/leonelquinteros/gotext" - "github.com/Jguer/yay/v12/pkg/db" - "github.com/Jguer/yay/v12/pkg/intrange" - settingslua "github.com/Jguer/yay/v12/pkg/settings/lua" - "github.com/Jguer/yay/v12/pkg/settings/parser" - "github.com/Jguer/yay/v12/pkg/text" + "github.com/Jguer/yay/v13/pkg/db" + "github.com/Jguer/yay/v13/pkg/intrange" + settingslua "github.com/Jguer/yay/v13/pkg/settings/lua" + "github.com/Jguer/yay/v13/pkg/settings/parser" + "github.com/Jguer/yay/v13/pkg/text" ) type SearchVerbosity int diff --git a/pkg/query/query_builder_bench_test.go b/pkg/query/query_builder_bench_test.go index 65effd29..46d7023d 100644 --- a/pkg/query/query_builder_bench_test.go +++ b/pkg/query/query_builder_bench_test.go @@ -7,9 +7,9 @@ import ( "strings" "testing" - settingslua "github.com/Jguer/yay/v12/pkg/settings/lua" - "github.com/Jguer/yay/v12/pkg/settings/parser" - "github.com/Jguer/yay/v12/pkg/text" + settingslua "github.com/Jguer/yay/v13/pkg/settings/lua" + "github.com/Jguer/yay/v13/pkg/settings/parser" + "github.com/Jguer/yay/v13/pkg/text" ) // BenchmarkApplySearchFilter_noLua measures applySearchFilter when no Lua diff --git a/pkg/query/query_builder_searchfilter_test.go b/pkg/query/query_builder_searchfilter_test.go index caa4642d..6d26917a 100644 --- a/pkg/query/query_builder_searchfilter_test.go +++ b/pkg/query/query_builder_searchfilter_test.go @@ -1,5 +1,4 @@ //go:build !integration -// +build !integration package query @@ -8,9 +7,9 @@ import ( "strings" "testing" - settingslua "github.com/Jguer/yay/v12/pkg/settings/lua" - "github.com/Jguer/yay/v12/pkg/settings/parser" - "github.com/Jguer/yay/v12/pkg/text" + settingslua "github.com/Jguer/yay/v13/pkg/settings/lua" + "github.com/Jguer/yay/v13/pkg/settings/parser" + "github.com/Jguer/yay/v13/pkg/text" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/pkg/query/query_builder_test.go b/pkg/query/query_builder_test.go index a6daa902..cda380fb 100644 --- a/pkg/query/query_builder_test.go +++ b/pkg/query/query_builder_test.go @@ -1,5 +1,4 @@ //go:build !integration -// +build !integration package query @@ -12,10 +11,10 @@ import ( "github.com/Jguer/aur" - "github.com/Jguer/yay/v12/pkg/db/mock" - mockaur "github.com/Jguer/yay/v12/pkg/dep/mock" - "github.com/Jguer/yay/v12/pkg/settings/parser" - "github.com/Jguer/yay/v12/pkg/text" + "github.com/Jguer/yay/v13/pkg/db/mock" + mockaur "github.com/Jguer/yay/v13/pkg/dep/mock" + "github.com/Jguer/yay/v13/pkg/settings/parser" + "github.com/Jguer/yay/v13/pkg/text" "github.com/stretchr/testify/assert" ) diff --git a/pkg/query/types.go b/pkg/query/types.go index 43df16a5..c4955d20 100644 --- a/pkg/query/types.go +++ b/pkg/query/types.go @@ -8,8 +8,8 @@ import ( alpm "github.com/Jguer/dyalpm" "github.com/leonelquinteros/gotext" - "github.com/Jguer/yay/v12/pkg/db" - "github.com/Jguer/yay/v12/pkg/text" + "github.com/Jguer/yay/v13/pkg/db" + "github.com/Jguer/yay/v13/pkg/text" ) type Pkg = aur.Pkg diff --git a/pkg/query/version_diff.go b/pkg/query/version_diff.go index 12baefd6..7e244a81 100644 --- a/pkg/query/version_diff.go +++ b/pkg/query/version_diff.go @@ -4,7 +4,7 @@ import ( "strings" "unicode" - "github.com/Jguer/yay/v12/pkg/text" + "github.com/Jguer/yay/v13/pkg/text" alpm "github.com/Jguer/dyalpm" ) diff --git a/pkg/query/version_diff_test.go b/pkg/query/version_diff_test.go index 16fcecad..b2bed2f4 100644 --- a/pkg/query/version_diff_test.go +++ b/pkg/query/version_diff_test.go @@ -1,12 +1,11 @@ //go:build !integration -// +build !integration package query import ( "testing" - "github.com/Jguer/yay/v12/pkg/text" + "github.com/Jguer/yay/v13/pkg/text" ) func TestVersionDiff(t *testing.T) { diff --git a/pkg/runtime/pacman.go b/pkg/runtime/pacman.go index c63762b5..0a10ad71 100644 --- a/pkg/runtime/pacman.go +++ b/pkg/runtime/pacman.go @@ -4,7 +4,7 @@ import ( "fmt" "os" - "github.com/Jguer/yay/v12/pkg/settings/parser" + "github.com/Jguer/yay/v13/pkg/settings/parser" pacmanconf "github.com/Morganamilo/go-pacmanconf" "golang.org/x/term" diff --git a/pkg/runtime/pacman_test.go b/pkg/runtime/pacman_test.go index 5a844af9..65e48ced 100644 --- a/pkg/runtime/pacman_test.go +++ b/pkg/runtime/pacman_test.go @@ -1,5 +1,4 @@ //go:build !integration -// +build !integration package runtime @@ -13,7 +12,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/Jguer/yay/v12/pkg/settings/parser" + "github.com/Jguer/yay/v13/pkg/settings/parser" ) // normalizePath removes trailing slashes from paths (except for root "/"). diff --git a/pkg/runtime/runtime.go b/pkg/runtime/runtime.go index 43dab033..c10fdff3 100644 --- a/pkg/runtime/runtime.go +++ b/pkg/runtime/runtime.go @@ -10,13 +10,13 @@ import ( "github.com/leonelquinteros/gotext" - "github.com/Jguer/yay/v12/pkg/query" - "github.com/Jguer/yay/v12/pkg/settings" - "github.com/Jguer/yay/v12/pkg/settings/exe" - settingslua "github.com/Jguer/yay/v12/pkg/settings/lua" - "github.com/Jguer/yay/v12/pkg/settings/parser" - "github.com/Jguer/yay/v12/pkg/text" - "github.com/Jguer/yay/v12/pkg/vcs" + "github.com/Jguer/yay/v13/pkg/query" + "github.com/Jguer/yay/v13/pkg/settings" + "github.com/Jguer/yay/v13/pkg/settings/exe" + settingslua "github.com/Jguer/yay/v13/pkg/settings/lua" + "github.com/Jguer/yay/v13/pkg/settings/parser" + "github.com/Jguer/yay/v13/pkg/text" + "github.com/Jguer/yay/v13/pkg/vcs" "github.com/Jguer/aur" "github.com/Jguer/aur/metadata" diff --git a/pkg/runtime/runtime_test.go b/pkg/runtime/runtime_test.go index e919769b..05d6ba06 100644 --- a/pkg/runtime/runtime_test.go +++ b/pkg/runtime/runtime_test.go @@ -1,5 +1,4 @@ //go:build !integration -// +build !integration package runtime_test @@ -12,10 +11,10 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/Jguer/yay/v12/pkg/db/mock" - "github.com/Jguer/yay/v12/pkg/runtime" - "github.com/Jguer/yay/v12/pkg/settings" - "github.com/Jguer/yay/v12/pkg/settings/parser" + "github.com/Jguer/yay/v13/pkg/db/mock" + "github.com/Jguer/yay/v13/pkg/runtime" + "github.com/Jguer/yay/v13/pkg/settings" + "github.com/Jguer/yay/v13/pkg/settings/parser" ) func TestBuildRuntime(t *testing.T) { diff --git a/pkg/settings/args.go b/pkg/settings/args.go index 1ca3e073..9ed9ca90 100644 --- a/pkg/settings/args.go +++ b/pkg/settings/args.go @@ -4,7 +4,7 @@ import ( "strconv" "strings" - "github.com/Jguer/yay/v12/pkg/settings/parser" + "github.com/Jguer/yay/v13/pkg/settings/parser" ) func (c *Configuration) ParseCommandLine(a *parser.Arguments) error { diff --git a/pkg/settings/config.go b/pkg/settings/config.go index 5d75eb23..cb35c4b4 100644 --- a/pkg/settings/config.go +++ b/pkg/settings/config.go @@ -9,8 +9,8 @@ import ( "path/filepath" "strings" - "github.com/Jguer/yay/v12/pkg/settings/parser" - "github.com/Jguer/yay/v12/pkg/text" + "github.com/Jguer/yay/v13/pkg/settings/parser" + "github.com/Jguer/yay/v13/pkg/text" "github.com/leonelquinteros/gotext" ) diff --git a/pkg/settings/config_test.go b/pkg/settings/config_test.go index 9610ba92..bbd93645 100644 --- a/pkg/settings/config_test.go +++ b/pkg/settings/config_test.go @@ -1,5 +1,4 @@ //go:build !integration -// +build !integration package settings diff --git a/pkg/settings/dirs_test.go b/pkg/settings/dirs_test.go index 04813cba..289f37d9 100644 --- a/pkg/settings/dirs_test.go +++ b/pkg/settings/dirs_test.go @@ -1,5 +1,4 @@ //go:build !integration -// +build !integration package settings diff --git a/pkg/settings/exe/cmd_builder.go b/pkg/settings/exe/cmd_builder.go index d19ccd88..d4996fa2 100644 --- a/pkg/settings/exe/cmd_builder.go +++ b/pkg/settings/exe/cmd_builder.go @@ -15,9 +15,9 @@ import ( mapset "github.com/deckarep/golang-set/v2" "github.com/leonelquinteros/gotext" - "github.com/Jguer/yay/v12/pkg/settings" - "github.com/Jguer/yay/v12/pkg/settings/parser" - "github.com/Jguer/yay/v12/pkg/text" + "github.com/Jguer/yay/v13/pkg/settings" + "github.com/Jguer/yay/v13/pkg/settings/parser" + "github.com/Jguer/yay/v13/pkg/text" ) const SudoLoopDuration = 241 diff --git a/pkg/settings/exe/cmd_builder_test.go b/pkg/settings/exe/cmd_builder_test.go index f5c953c3..b3e44110 100644 --- a/pkg/settings/exe/cmd_builder_test.go +++ b/pkg/settings/exe/cmd_builder_test.go @@ -1,5 +1,4 @@ //go:build !integration -// +build !integration package exe @@ -12,8 +11,8 @@ import ( "github.com/stretchr/testify/require" - "github.com/Jguer/yay/v12/pkg/settings/parser" - "github.com/Jguer/yay/v12/pkg/text" + "github.com/Jguer/yay/v13/pkg/settings/parser" + "github.com/Jguer/yay/v13/pkg/text" ) func TestBuildGitCmd(t *testing.T) { diff --git a/pkg/settings/exe/exec.go b/pkg/settings/exe/exec.go index cbc73d4d..a5aafb0e 100644 --- a/pkg/settings/exe/exec.go +++ b/pkg/settings/exe/exec.go @@ -7,7 +7,7 @@ import ( "strings" "syscall" - "github.com/Jguer/yay/v12/pkg/text" + "github.com/Jguer/yay/v13/pkg/text" ) type Runner interface { diff --git a/pkg/settings/exe/mock.go b/pkg/settings/exe/mock.go index eff69eb9..959eed7b 100644 --- a/pkg/settings/exe/mock.go +++ b/pkg/settings/exe/mock.go @@ -6,7 +6,7 @@ import ( "os/exec" "sync" - "github.com/Jguer/yay/v12/pkg/settings/parser" + "github.com/Jguer/yay/v13/pkg/settings/parser" ) type Call struct { diff --git a/pkg/settings/exe/runner_test.go b/pkg/settings/exe/runner_test.go index 5b756eab..6f591e99 100644 --- a/pkg/settings/exe/runner_test.go +++ b/pkg/settings/exe/runner_test.go @@ -1,5 +1,4 @@ //go:build !integration -// +build !integration package exe @@ -12,7 +11,7 @@ import ( "github.com/stretchr/testify/require" - "github.com/Jguer/yay/v12/pkg/text" + "github.com/Jguer/yay/v13/pkg/text" ) func TestOSRunnerCapture(t *testing.T) { diff --git a/pkg/settings/lua/load.go b/pkg/settings/lua/load.go index 6947ade0..74901c01 100644 --- a/pkg/settings/lua/load.go +++ b/pkg/settings/lua/load.go @@ -4,7 +4,7 @@ import ( "errors" "fmt" - "github.com/Jguer/yay/v12/pkg/text" + "github.com/Jguer/yay/v13/pkg/text" ) // Load loads path, applies its yay.opt values onto cfg, and returns the live engine. diff --git a/pkg/settings/lua/log.go b/pkg/settings/lua/log.go index 585a24f7..246f36b8 100644 --- a/pkg/settings/lua/log.go +++ b/pkg/settings/lua/log.go @@ -1,7 +1,7 @@ package lua import ( - "github.com/Jguer/yay/v12/pkg/text" + "github.com/Jguer/yay/v13/pkg/text" glua "github.com/yuin/gopher-lua" ) diff --git a/pkg/settings/lua/log_test.go b/pkg/settings/lua/log_test.go index 935ed247..1e23291e 100644 --- a/pkg/settings/lua/log_test.go +++ b/pkg/settings/lua/log_test.go @@ -7,7 +7,7 @@ import ( "github.com/stretchr/testify/require" - "github.com/Jguer/yay/v12/pkg/text" + "github.com/Jguer/yay/v13/pkg/text" ) func withColorDisabled(t *testing.T) { diff --git a/pkg/settings/lua/lua.go b/pkg/settings/lua/lua.go index 9f1d5a31..d1a41196 100644 --- a/pkg/settings/lua/lua.go +++ b/pkg/settings/lua/lua.go @@ -5,7 +5,7 @@ import ( "fmt" "reflect" - "github.com/Jguer/yay/v12/pkg/text" + "github.com/Jguer/yay/v13/pkg/text" lua "github.com/yuin/gopher-lua" ) diff --git a/pkg/settings/migrations.go b/pkg/settings/migrations.go index bac7a076..e04db06b 100644 --- a/pkg/settings/migrations.go +++ b/pkg/settings/migrations.go @@ -3,8 +3,8 @@ package settings import ( "fmt" - "github.com/Jguer/yay/v12/pkg/db" - "github.com/Jguer/yay/v12/pkg/text" + "github.com/Jguer/yay/v13/pkg/db" + "github.com/Jguer/yay/v13/pkg/text" "github.com/leonelquinteros/gotext" ) diff --git a/pkg/settings/migrations_test.go b/pkg/settings/migrations_test.go index d3252e77..8cc011fb 100644 --- a/pkg/settings/migrations_test.go +++ b/pkg/settings/migrations_test.go @@ -1,5 +1,4 @@ //go:build !integration -// +build !integration package settings @@ -13,7 +12,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/Jguer/yay/v12/pkg/text" + "github.com/Jguer/yay/v13/pkg/text" ) func newTestLogger() *text.Logger { diff --git a/pkg/settings/parser/parser_test.go b/pkg/settings/parser/parser_test.go index 51d03bb0..99ab790c 100644 --- a/pkg/settings/parser/parser_test.go +++ b/pkg/settings/parser/parser_test.go @@ -1,5 +1,4 @@ //go:build !integration -// +build !integration package parser diff --git a/pkg/sync/build/installer.go b/pkg/sync/build/installer.go index b8e27ce1..80628386 100644 --- a/pkg/sync/build/installer.go +++ b/pkg/sync/build/installer.go @@ -6,14 +6,15 @@ import ( "fmt" "maps" "os" + "slices" - "github.com/Jguer/yay/v12/pkg/db" - "github.com/Jguer/yay/v12/pkg/dep" - "github.com/Jguer/yay/v12/pkg/settings" - "github.com/Jguer/yay/v12/pkg/settings/exe" - "github.com/Jguer/yay/v12/pkg/settings/parser" - "github.com/Jguer/yay/v12/pkg/text" - "github.com/Jguer/yay/v12/pkg/vcs" + "github.com/Jguer/yay/v13/pkg/db" + "github.com/Jguer/yay/v13/pkg/dep" + "github.com/Jguer/yay/v13/pkg/settings" + "github.com/Jguer/yay/v13/pkg/settings/exe" + "github.com/Jguer/yay/v13/pkg/settings/parser" + "github.com/Jguer/yay/v13/pkg/text" + "github.com/Jguer/yay/v13/pkg/vcs" mapset "github.com/deckarep/golang-set/v2" "github.com/leonelquinteros/gotext" @@ -109,9 +110,9 @@ func (installer *Installer) Install(ctx context.Context, // Reorganize targets into layers of dependencies var errs []error - for i := len(targets) - 1; i >= 0; i-- { + for i, v := range slices.Backward(targets) { lastLayer := i == 0 - errI := installer.handleLayer(ctx, cmdArgs, targets[i], pkgBuildDirs, lastLayer, excluded) + errI := installer.handleLayer(ctx, cmdArgs, v, pkgBuildDirs, lastLayer, excluded) if errI == nil && lastLayer { // success after rollups return nil @@ -125,7 +126,7 @@ func (installer *Installer) Install(ctx context.Context, // rollup installer.log.Warnln(gotext.Get("Failed to install layer, rolling up to next layer."), "error:", errI) - targets[i-1] = mergeLayers(targets[i-1], targets[i]) + targets[i-1] = mergeLayers(targets[i-1], v) } } diff --git a/pkg/sync/build/installer_test.go b/pkg/sync/build/installer_test.go index 9229e026..372b291d 100644 --- a/pkg/sync/build/installer_test.go +++ b/pkg/sync/build/installer_test.go @@ -13,22 +13,18 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/Jguer/yay/v12/pkg/db/mock" - "github.com/Jguer/yay/v12/pkg/dep" - "github.com/Jguer/yay/v12/pkg/settings/exe" - "github.com/Jguer/yay/v12/pkg/settings/parser" - "github.com/Jguer/yay/v12/pkg/text" - "github.com/Jguer/yay/v12/pkg/vcs" + "github.com/Jguer/yay/v13/pkg/db/mock" + "github.com/Jguer/yay/v13/pkg/dep" + "github.com/Jguer/yay/v13/pkg/settings/exe" + "github.com/Jguer/yay/v13/pkg/settings/parser" + "github.com/Jguer/yay/v13/pkg/text" + "github.com/Jguer/yay/v13/pkg/vcs" ) func newTestLogger() *text.Logger { return text.NewLogger(io.Discard, io.Discard, strings.NewReader(""), true, "test") } -func ptrString(s string) *string { - return &s -} - func TestInstaller_InstallNeeded(t *testing.T) { t.Parallel() @@ -88,7 +84,6 @@ func TestInstaller_InstallNeeded(t *testing.T) { } for _, tc := range testCases { - tc := tc t.Run(tc.desc, func(td *testing.T) { td.Parallel() tmpDir := td.TempDir() @@ -151,8 +146,8 @@ func TestInstaller_InstallNeeded(t *testing.T) { Source: dep.AUR, Reason: dep.Explicit, Version: "91.0.0-1", - SrcinfoPath: ptrString(tmpDir + "/.SRCINFO"), - AURBase: ptrString("yay"), + SrcinfoPath: new(tmpDir + "/.SRCINFO"), + AURBase: new("yay"), }, }, } @@ -244,8 +239,8 @@ func TestInstaller_BuildOnlySkipsInstall(t *testing.T) { Source: dep.AUR, Reason: dep.Explicit, Version: "91.0.0-1", - SrcinfoPath: ptrString(tmpDir + "/.SRCINFO"), - AURBase: ptrString("yay"), + SrcinfoPath: new(tmpDir + "/.SRCINFO"), + AURBase: new("yay"), }, }, } @@ -321,14 +316,14 @@ func TestInstaller_InstallMixedSourcesAndLayers(t *testing.T) { Source: dep.AUR, Reason: dep.Explicit, Version: "91.0.0-1", - SrcinfoPath: ptrString(tmpDir + "/.SRCINFO"), - AURBase: ptrString("yay"), + SrcinfoPath: new(tmpDir + "/.SRCINFO"), + AURBase: new("yay"), }, "linux": { Source: dep.Sync, Reason: dep.Dep, Version: "17.0.0-1", - SyncDBName: ptrString("core"), + SyncDBName: new("core"), }, }, }, @@ -350,15 +345,15 @@ func TestInstaller_InstallMixedSourcesAndLayers(t *testing.T) { Source: dep.AUR, Reason: dep.Explicit, Version: "91.0.0-1", - SrcinfoPath: ptrString(tmpDir + "/.SRCINFO"), - AURBase: ptrString("yay"), + SrcinfoPath: new(tmpDir + "/.SRCINFO"), + AURBase: new("yay"), }, }, { "linux": { Source: dep.Sync, Reason: dep.Dep, Version: "17.0.0-1", - SyncDBName: ptrString("core"), + SyncDBName: new("core"), }, }, }, @@ -376,13 +371,13 @@ func TestInstaller_InstallMixedSourcesAndLayers(t *testing.T) { Source: dep.Sync, Reason: dep.Explicit, Version: "18.0.0-1", - SyncDBName: ptrString("extra"), + SyncDBName: new("extra"), }, "linux": { Source: dep.Sync, Reason: dep.Explicit, Version: "17.0.0-1", - SyncDBName: ptrString("core"), + SyncDBName: new("core"), }, }, }, @@ -404,15 +399,15 @@ func TestInstaller_InstallMixedSourcesAndLayers(t *testing.T) { Source: dep.AUR, Reason: dep.Explicit, Version: "91.0.0-1", - SrcinfoPath: ptrString(tmpDir + "/.SRCINFO"), - AURBase: ptrString("yay"), + SrcinfoPath: new(tmpDir + "/.SRCINFO"), + AURBase: new("yay"), }, "jellyfin-server": { Source: dep.AUR, Reason: dep.Explicit, Version: "10.8.8-1", - SrcinfoPath: ptrString(tmpDirJfin + "/.SRCINFO"), - AURBase: ptrString("jellyfin"), + SrcinfoPath: new(tmpDirJfin + "/.SRCINFO"), + AURBase: new("jellyfin"), }, }, }, @@ -436,16 +431,16 @@ func TestInstaller_InstallMixedSourcesAndLayers(t *testing.T) { Source: dep.AUR, Reason: dep.Explicit, Version: "91.0.0-1", - SrcinfoPath: ptrString(tmpDir + "/.SRCINFO"), - AURBase: ptrString("yay"), + SrcinfoPath: new(tmpDir + "/.SRCINFO"), + AURBase: new("yay"), }, }, { "jellyfin-server": { Source: dep.AUR, Reason: dep.MakeDep, Version: "10.8.8-1", - SrcinfoPath: ptrString(tmpDirJfin + "/.SRCINFO"), - AURBase: ptrString("jellyfin"), + SrcinfoPath: new(tmpDirJfin + "/.SRCINFO"), + AURBase: new("jellyfin"), }, }, }, @@ -453,7 +448,6 @@ func TestInstaller_InstallMixedSourcesAndLayers(t *testing.T) { } for _, tc := range testCases { - tc := tc t.Run(tc.desc, func(td *testing.T) { pkgTar := tmpDir + "/yay-91.0.0-1-x86_64.pkg.tar.zst" jfinPkgTar := tmpDirJfin + "/jellyfin-server-10.8.8-1-x86_64.pkg.tar.zst" @@ -610,8 +604,8 @@ func TestInstaller_CompileFailed(t *testing.T) { Source: dep.AUR, Reason: dep.Explicit, Version: "91.0.0-1", - SrcinfoPath: ptrString(tmpDir + "/.SRCINFO"), - AURBase: ptrString("yay"), + SrcinfoPath: new(tmpDir + "/.SRCINFO"), + AURBase: new("yay"), }, }, }, @@ -628,8 +622,8 @@ func TestInstaller_CompileFailed(t *testing.T) { Source: dep.AUR, Reason: dep.Explicit, Version: "91.0.0-1", - SrcinfoPath: ptrString(tmpDir + "/.SRCINFO"), - AURBase: ptrString("yay"), + SrcinfoPath: new(tmpDir + "/.SRCINFO"), + AURBase: new("yay"), }, }, }, @@ -642,15 +636,15 @@ func TestInstaller_CompileFailed(t *testing.T) { failPkgInstall: false, targets: []map[string]*dep.InstallInfo{ {"bob": { - AURBase: ptrString("yay"), + AURBase: new("yay"), }}, { "yay": { Source: dep.AUR, Reason: dep.Explicit, Version: "91.0.0-1", - SrcinfoPath: ptrString(tmpDir + "/.SRCINFO"), - AURBase: ptrString("yay"), + SrcinfoPath: new(tmpDir + "/.SRCINFO"), + AURBase: new("yay"), }, }, }, @@ -658,7 +652,6 @@ func TestInstaller_CompileFailed(t *testing.T) { } for _, tc := range testCases { - tc := tc t.Run(tc.desc, func(td *testing.T) { td.Parallel() pkgTar := tmpDir + "/yay-91.0.0-1-x86_64.pkg.tar.zst" @@ -759,23 +752,23 @@ func TestInstaller_InstallSplitPackage(t *testing.T) { Source: dep.AUR, Reason: dep.Explicit, Version: "10.8.4-1", - SrcinfoPath: ptrString(tmpDir + "/.SRCINFO"), - AURBase: ptrString("jellyfin"), + SrcinfoPath: new(tmpDir + "/.SRCINFO"), + AURBase: new("jellyfin"), }}, { "jellyfin-server": { Source: dep.AUR, Reason: dep.Dep, Version: "10.8.4-1", - SrcinfoPath: ptrString(tmpDir + "/.SRCINFO"), - AURBase: ptrString("jellyfin"), + SrcinfoPath: new(tmpDir + "/.SRCINFO"), + AURBase: new("jellyfin"), }, "jellyfin-web": { Source: dep.AUR, Reason: dep.Dep, Version: "10.8.4-1", - SrcinfoPath: ptrString(tmpDir + "/.SRCINFO"), - AURBase: ptrString("jellyfin"), + SrcinfoPath: new(tmpDir + "/.SRCINFO"), + AURBase: new("jellyfin"), }, }, { @@ -783,19 +776,19 @@ func TestInstaller_InstallSplitPackage(t *testing.T) { Source: dep.Sync, Reason: dep.Dep, Version: "6.0.12.sdk112-1", - SyncDBName: ptrString("community"), + SyncDBName: new("community"), }, "aspnet-runtime": { Source: dep.Sync, Reason: dep.Dep, Version: "6.0.12.sdk112-1", - SyncDBName: ptrString("community"), + SyncDBName: new("community"), }, "dotnet-sdk-6.0": { Source: dep.Sync, Reason: dep.MakeDep, Version: "6.0.12.sdk112-1", - SyncDBName: ptrString("community"), + SyncDBName: new("community"), }, }, }, @@ -816,7 +809,6 @@ func TestInstaller_InstallSplitPackage(t *testing.T) { } for _, tc := range testCases { - tc := tc t.Run(tc.desc, func(td *testing.T) { td.Parallel() pkgTars := []string{ @@ -953,7 +945,6 @@ func TestInstaller_InstallDownloadOnly(t *testing.T) { } for _, tc := range testCases { - tc := tc t.Run(tc.desc, func(td *testing.T) { td.Parallel() tmpDir := td.TempDir() @@ -1015,8 +1006,8 @@ func TestInstaller_InstallDownloadOnly(t *testing.T) { Source: dep.AUR, Reason: dep.Explicit, Version: "91.0.0-1", - SrcinfoPath: ptrString(tmpDir + "/.SRCINFO"), - AURBase: ptrString("yay"), + SrcinfoPath: new(tmpDir + "/.SRCINFO"), + AURBase: new("yay"), }, }, } @@ -1079,7 +1070,6 @@ func TestInstaller_InstallGroup(t *testing.T) { } for _, tc := range testCases { - tc := tc t.Run(tc.desc, func(td *testing.T) { td.Parallel() tmpDir := td.TempDir() @@ -1119,7 +1109,7 @@ func TestInstaller_InstallGroup(t *testing.T) { Reason: dep.Explicit, Version: "", IsGroup: true, - SyncDBName: ptrString("community"), + SyncDBName: new("community"), }, }, } @@ -1196,8 +1186,8 @@ func TestInstaller_InstallRebuild(t *testing.T) { Source: dep.AUR, Reason: dep.Explicit, Version: "91.0.0-1", - SrcinfoPath: ptrString(tmpDir + "/.SRCINFO"), - AURBase: ptrString("yay"), + SrcinfoPath: new(tmpDir + "/.SRCINFO"), + AURBase: new("yay"), }, }, }, @@ -1220,8 +1210,8 @@ func TestInstaller_InstallRebuild(t *testing.T) { Source: dep.AUR, Reason: dep.Explicit, Version: "91.0.0-1", - SrcinfoPath: ptrString(tmpDir + "/.SRCINFO"), - AURBase: ptrString("yay"), + SrcinfoPath: new(tmpDir + "/.SRCINFO"), + AURBase: new("yay"), }, }, }, @@ -1244,8 +1234,8 @@ func TestInstaller_InstallRebuild(t *testing.T) { Source: dep.AUR, Reason: dep.Explicit, Version: "91.0.0-1", - SrcinfoPath: ptrString(tmpDir + "/.SRCINFO"), - AURBase: ptrString("yay"), + SrcinfoPath: new(tmpDir + "/.SRCINFO"), + AURBase: new("yay"), }, }, }, @@ -1268,8 +1258,8 @@ func TestInstaller_InstallRebuild(t *testing.T) { Source: dep.AUR, Reason: dep.Dep, Version: "91.0.0-1", - SrcinfoPath: ptrString(tmpDir + "/.SRCINFO"), - AURBase: ptrString("yay"), + SrcinfoPath: new(tmpDir + "/.SRCINFO"), + AURBase: new("yay"), }, }, }, @@ -1277,7 +1267,6 @@ func TestInstaller_InstallRebuild(t *testing.T) { } for _, tc := range testCases { - tc := tc t.Run(tc.desc, func(td *testing.T) { td.Parallel() tmpDir := td.TempDir() @@ -1396,7 +1385,6 @@ func TestInstaller_InstallUpgrade(t *testing.T) { } for _, tc := range testCases { - tc := tc t.Run(tc.desc, func(td *testing.T) { td.Parallel() mockDB := &mock.DBExecutor{} @@ -1421,7 +1409,7 @@ func TestInstaller_InstallUpgrade(t *testing.T) { Source: dep.Sync, Reason: dep.Dep, Version: "17.0.0-1", - SyncDBName: ptrString("core"), + SyncDBName: new("core"), }, }, } @@ -1485,8 +1473,8 @@ func TestInstaller_KeepSrc(t *testing.T) { Source: dep.AUR, Reason: dep.Explicit, Version: "92.0.0-1", - SrcinfoPath: ptrString(tmpDir + "/.SRCINFO"), - AURBase: ptrString("yay"), + SrcinfoPath: new(tmpDir + "/.SRCINFO"), + AURBase: new("yay"), }, }, }, @@ -1494,7 +1482,6 @@ func TestInstaller_KeepSrc(t *testing.T) { } for _, tc := range testCases { - tc := tc t.Run(tc.desc, func(td *testing.T) { td.Parallel() tmpDir := td.TempDir() @@ -1596,8 +1583,8 @@ func TestInstaller_InstallAsExplicit(t *testing.T) { Source: dep.AUR, Reason: dep.Dep, Version: "91.0.0-1", - SrcinfoPath: ptrString(tmpDir + "/.SRCINFO"), - AURBase: ptrString("yay"), + SrcinfoPath: new(tmpDir + "/.SRCINFO"), + AURBase: new("yay"), }, }, }, @@ -1623,7 +1610,7 @@ func TestInstaller_InstallAsExplicit(t *testing.T) { Source: dep.Sync, Reason: dep.Dep, Version: "17.0.0-1", - SyncDBName: ptrString("core"), + SyncDBName: new("core"), }, }, }, @@ -1636,7 +1623,6 @@ func TestInstaller_InstallAsExplicit(t *testing.T) { } for _, tc := range testCases { - tc := tc t.Run(tc.desc, func(td *testing.T) { td.Parallel() pkgTar := tmpDir + "/yay-91.0.0-1-x86_64.pkg.tar.zst" diff --git a/pkg/sync/build/pkg_archive.go b/pkg/sync/build/pkg_archive.go index 0ac1fcaa..191dc3be 100644 --- a/pkg/sync/build/pkg_archive.go +++ b/pkg/sync/build/pkg_archive.go @@ -10,10 +10,10 @@ import ( "github.com/leonelquinteros/gotext" - "github.com/Jguer/yay/v12/pkg/settings" - "github.com/Jguer/yay/v12/pkg/settings/exe" - "github.com/Jguer/yay/v12/pkg/settings/parser" - "github.com/Jguer/yay/v12/pkg/vcs" + "github.com/Jguer/yay/v13/pkg/settings" + "github.com/Jguer/yay/v13/pkg/settings/exe" + "github.com/Jguer/yay/v13/pkg/settings/parser" + "github.com/Jguer/yay/v13/pkg/vcs" ) func installPkgArchive(ctx context.Context, diff --git a/pkg/sync/build/pkg_archive_test.go b/pkg/sync/build/pkg_archive_test.go index 733e6270..889e7221 100644 --- a/pkg/sync/build/pkg_archive_test.go +++ b/pkg/sync/build/pkg_archive_test.go @@ -9,7 +9,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/Jguer/yay/v12/pkg/settings/exe" + "github.com/Jguer/yay/v13/pkg/settings/exe" ) func TestParsePackageList(t *testing.T) { diff --git a/pkg/sync/post_install.go b/pkg/sync/post_install.go index ad4d18a4..1ea7ebe8 100644 --- a/pkg/sync/post_install.go +++ b/pkg/sync/post_install.go @@ -4,8 +4,8 @@ import ( "maps" "slices" - "github.com/Jguer/yay/v12/pkg/dep" - settingslua "github.com/Jguer/yay/v12/pkg/settings/lua" + "github.com/Jguer/yay/v13/pkg/dep" + settingslua "github.com/Jguer/yay/v13/pkg/settings/lua" ) // postInstallEvent flattens the resolved topo layers into the PostInstall @@ -14,9 +14,7 @@ import ( func postInstallEvent(targets []map[string]*dep.InstallInfo, failedAndIgnored map[string]error) *settingslua.PostInstallEvent { merged := map[string]*dep.InstallInfo{} for _, layer := range targets { - for name, info := range layer { - merged[name] = info - } + maps.Copy(merged, layer) } names := slices.Sorted(maps.Keys(merged)) diff --git a/pkg/sync/post_install_test.go b/pkg/sync/post_install_test.go index 24869896..a4ae1194 100644 --- a/pkg/sync/post_install_test.go +++ b/pkg/sync/post_install_test.go @@ -1,5 +1,4 @@ //go:build !integration -// +build !integration package sync @@ -8,8 +7,8 @@ import ( "github.com/stretchr/testify/assert" - "github.com/Jguer/yay/v12/pkg/dep" - settingslua "github.com/Jguer/yay/v12/pkg/settings/lua" + "github.com/Jguer/yay/v13/pkg/dep" + settingslua "github.com/Jguer/yay/v13/pkg/settings/lua" ) func TestPostInstallEvent(t *testing.T) { diff --git a/pkg/sync/srcinfo/pgp/keys.go b/pkg/sync/srcinfo/pgp/keys.go index 92ad6829..2f36b8fe 100644 --- a/pkg/sync/srcinfo/pgp/keys.go +++ b/pkg/sync/srcinfo/pgp/keys.go @@ -10,8 +10,8 @@ import ( gosrc "github.com/Morganamilo/go-srcinfo" "github.com/leonelquinteros/gotext" - "github.com/Jguer/yay/v12/pkg/settings/exe" - "github.com/Jguer/yay/v12/pkg/text" + "github.com/Jguer/yay/v13/pkg/settings/exe" + "github.com/Jguer/yay/v13/pkg/text" ) // pgpKeySet maps a PGP key with a list of PKGBUILDs that require it. diff --git a/pkg/sync/srcinfo/pgp/keys_test.go b/pkg/sync/srcinfo/pgp/keys_test.go index c5583bf9..92369f72 100644 --- a/pkg/sync/srcinfo/pgp/keys_test.go +++ b/pkg/sync/srcinfo/pgp/keys_test.go @@ -1,5 +1,4 @@ //go:build !integration -// +build !integration package pgp @@ -17,8 +16,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/Jguer/yay/v12/pkg/settings/exe" - "github.com/Jguer/yay/v12/pkg/text" + "github.com/Jguer/yay/v13/pkg/settings/exe" + "github.com/Jguer/yay/v13/pkg/text" ) func newTestLogger() *text.Logger { diff --git a/pkg/sync/srcinfo/service.go b/pkg/sync/srcinfo/service.go index 7792c72c..f779a054 100644 --- a/pkg/sync/srcinfo/service.go +++ b/pkg/sync/srcinfo/service.go @@ -9,13 +9,13 @@ import ( gosrc "github.com/Morganamilo/go-srcinfo" "github.com/leonelquinteros/gotext" - "github.com/Jguer/yay/v12/pkg/db" - "github.com/Jguer/yay/v12/pkg/dep" - "github.com/Jguer/yay/v12/pkg/settings" - "github.com/Jguer/yay/v12/pkg/settings/exe" - "github.com/Jguer/yay/v12/pkg/sync/srcinfo/pgp" - "github.com/Jguer/yay/v12/pkg/text" - "github.com/Jguer/yay/v12/pkg/vcs" + "github.com/Jguer/yay/v13/pkg/db" + "github.com/Jguer/yay/v13/pkg/dep" + "github.com/Jguer/yay/v13/pkg/settings" + "github.com/Jguer/yay/v13/pkg/settings/exe" + "github.com/Jguer/yay/v13/pkg/sync/srcinfo/pgp" + "github.com/Jguer/yay/v13/pkg/text" + "github.com/Jguer/yay/v13/pkg/vcs" ) type Service struct { diff --git a/pkg/sync/srcinfo/service_test.go b/pkg/sync/srcinfo/service_test.go index 2d7c95ef..7b218df3 100644 --- a/pkg/sync/srcinfo/service_test.go +++ b/pkg/sync/srcinfo/service_test.go @@ -10,12 +10,12 @@ import ( "github.com/stretchr/testify/assert" - "github.com/Jguer/yay/v12/pkg/db/mock" - "github.com/Jguer/yay/v12/pkg/dep" - "github.com/Jguer/yay/v12/pkg/settings" - "github.com/Jguer/yay/v12/pkg/settings/exe" - "github.com/Jguer/yay/v12/pkg/text" - "github.com/Jguer/yay/v12/pkg/vcs" + "github.com/Jguer/yay/v13/pkg/db/mock" + "github.com/Jguer/yay/v13/pkg/dep" + "github.com/Jguer/yay/v13/pkg/settings" + "github.com/Jguer/yay/v13/pkg/settings/exe" + "github.com/Jguer/yay/v13/pkg/text" + "github.com/Jguer/yay/v13/pkg/vcs" ) func newTestLogger() *text.Logger { diff --git a/pkg/sync/sync.go b/pkg/sync/sync.go index a3e90ef8..dab57de0 100644 --- a/pkg/sync/sync.go +++ b/pkg/sync/sync.go @@ -5,17 +5,17 @@ import ( "errors" "sync" - "github.com/Jguer/yay/v12/pkg/completion" - "github.com/Jguer/yay/v12/pkg/db" - "github.com/Jguer/yay/v12/pkg/dep" - "github.com/Jguer/yay/v12/pkg/runtime" - "github.com/Jguer/yay/v12/pkg/settings" - settingslua "github.com/Jguer/yay/v12/pkg/settings/lua" - "github.com/Jguer/yay/v12/pkg/settings/parser" - "github.com/Jguer/yay/v12/pkg/sync/build" - "github.com/Jguer/yay/v12/pkg/sync/srcinfo" - "github.com/Jguer/yay/v12/pkg/sync/workdir" - "github.com/Jguer/yay/v12/pkg/text" + "github.com/Jguer/yay/v13/pkg/completion" + "github.com/Jguer/yay/v13/pkg/db" + "github.com/Jguer/yay/v13/pkg/dep" + "github.com/Jguer/yay/v13/pkg/runtime" + "github.com/Jguer/yay/v13/pkg/settings" + settingslua "github.com/Jguer/yay/v13/pkg/settings/lua" + "github.com/Jguer/yay/v13/pkg/settings/parser" + "github.com/Jguer/yay/v13/pkg/sync/build" + "github.com/Jguer/yay/v13/pkg/sync/srcinfo" + "github.com/Jguer/yay/v13/pkg/sync/workdir" + "github.com/Jguer/yay/v13/pkg/text" "github.com/leonelquinteros/gotext" ) diff --git a/pkg/sync/workdir/aur_post_download.go b/pkg/sync/workdir/aur_post_download.go index 559b6800..e1bde5c9 100644 --- a/pkg/sync/workdir/aur_post_download.go +++ b/pkg/sync/workdir/aur_post_download.go @@ -1,9 +1,9 @@ package workdir import ( - "github.com/Jguer/yay/v12/pkg/dep" - "github.com/Jguer/yay/v12/pkg/runtime" - settingslua "github.com/Jguer/yay/v12/pkg/settings/lua" + "github.com/Jguer/yay/v13/pkg/dep" + "github.com/Jguer/yay/v13/pkg/runtime" + settingslua "github.com/Jguer/yay/v13/pkg/settings/lua" mapset "github.com/deckarep/golang-set/v2" ) diff --git a/pkg/sync/workdir/aur_post_download_test.go b/pkg/sync/workdir/aur_post_download_test.go index 77ba600f..b8aa0260 100644 --- a/pkg/sync/workdir/aur_post_download_test.go +++ b/pkg/sync/workdir/aur_post_download_test.go @@ -1,5 +1,4 @@ //go:build !integration -// +build !integration package workdir @@ -12,9 +11,9 @@ import ( "github.com/stretchr/testify/require" glua "github.com/yuin/gopher-lua" - "github.com/Jguer/yay/v12/pkg/dep" - "github.com/Jguer/yay/v12/pkg/runtime" - settingslua "github.com/Jguer/yay/v12/pkg/settings/lua" + "github.com/Jguer/yay/v13/pkg/dep" + "github.com/Jguer/yay/v13/pkg/runtime" + settingslua "github.com/Jguer/yay/v13/pkg/settings/lua" ) func TestAURPostDownloadEventsUseAURPreInstallPayload(t *testing.T) { @@ -73,8 +72,8 @@ func TestRunAURPostDownloadLuaHooksRunsBasesInSortedOrder(t *testing.T) { mapset.NewThreadUnsafeSet[string](), []map[string]*dep.InstallInfo{ { - "a": {Source: dep.AUR, AURBase: ptrString("a-base")}, - "z": {Source: dep.AUR, AURBase: ptrString("z-base")}, + "a": {Source: dep.AUR, AURBase: new("a-base")}, + "z": {Source: dep.AUR, AURBase: new("z-base")}, }, }) require.NoError(t, err) diff --git a/pkg/sync/workdir/aur_preinstall.go b/pkg/sync/workdir/aur_preinstall.go index 63e6c306..90d88796 100644 --- a/pkg/sync/workdir/aur_preinstall.go +++ b/pkg/sync/workdir/aur_preinstall.go @@ -10,9 +10,9 @@ import ( "path/filepath" "slices" - "github.com/Jguer/yay/v12/pkg/dep" - "github.com/Jguer/yay/v12/pkg/runtime" - settingslua "github.com/Jguer/yay/v12/pkg/settings/lua" + "github.com/Jguer/yay/v13/pkg/dep" + "github.com/Jguer/yay/v13/pkg/runtime" + settingslua "github.com/Jguer/yay/v13/pkg/settings/lua" gosrc "github.com/Morganamilo/go-srcinfo" mapset "github.com/deckarep/golang-set/v2" diff --git a/pkg/sync/workdir/aur_preinstall_test.go b/pkg/sync/workdir/aur_preinstall_test.go index 1334b861..f0f8db98 100644 --- a/pkg/sync/workdir/aur_preinstall_test.go +++ b/pkg/sync/workdir/aur_preinstall_test.go @@ -1,5 +1,4 @@ //go:build !integration -// +build !integration package workdir @@ -14,10 +13,10 @@ import ( "github.com/stretchr/testify/require" glua "github.com/yuin/gopher-lua" - "github.com/Jguer/yay/v12/pkg/dep" - "github.com/Jguer/yay/v12/pkg/runtime" - "github.com/Jguer/yay/v12/pkg/settings" - settingslua "github.com/Jguer/yay/v12/pkg/settings/lua" + "github.com/Jguer/yay/v13/pkg/dep" + "github.com/Jguer/yay/v13/pkg/runtime" + "github.com/Jguer/yay/v13/pkg/settings" + settingslua "github.com/Jguer/yay/v13/pkg/settings/lua" ) func TestAURPreInstallEventsFromPackageFiles(t *testing.T) { @@ -115,8 +114,8 @@ func TestRunAURPreInstallLuaHooksRunsBasesInSortedOrder(t *testing.T) { mapset.NewThreadUnsafeSet[string](), []map[string]*dep.InstallInfo{ { - "a": {Source: dep.AUR, AURBase: ptrString("a-base")}, - "z": {Source: dep.AUR, AURBase: ptrString("z-base")}, + "a": {Source: dep.AUR, AURBase: new("a-base")}, + "z": {Source: dep.AUR, AURBase: new("z-base")}, }, }) require.NoError(t, err) @@ -234,7 +233,3 @@ pkgname = demo-doc return dir } - -func ptrString(s string) *string { - return &s -} diff --git a/pkg/sync/workdir/aur_source.go b/pkg/sync/workdir/aur_source.go index 36efde0f..38e6374e 100644 --- a/pkg/sync/workdir/aur_source.go +++ b/pkg/sync/workdir/aur_source.go @@ -10,8 +10,8 @@ import ( mapset "github.com/deckarep/golang-set/v2" "github.com/leonelquinteros/gotext" - "github.com/Jguer/yay/v12/pkg/settings/exe" - "github.com/Jguer/yay/v12/pkg/text" + "github.com/Jguer/yay/v13/pkg/settings/exe" + "github.com/Jguer/yay/v13/pkg/text" ) type ErrDownloadSource struct { diff --git a/pkg/sync/workdir/aur_source_test.go b/pkg/sync/workdir/aur_source_test.go index 9b744303..6700dc05 100644 --- a/pkg/sync/workdir/aur_source_test.go +++ b/pkg/sync/workdir/aur_source_test.go @@ -1,5 +1,4 @@ //go:build !integration -// +build !integration package workdir @@ -13,7 +12,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/Jguer/yay/v12/pkg/settings/exe" + "github.com/Jguer/yay/v13/pkg/settings/exe" ) type TestMakepkgBuilder struct { diff --git a/pkg/sync/workdir/clean.go b/pkg/sync/workdir/clean.go index 4fb77e81..79d0b36f 100644 --- a/pkg/sync/workdir/clean.go +++ b/pkg/sync/workdir/clean.go @@ -5,11 +5,11 @@ import ( "github.com/leonelquinteros/gotext" - "github.com/Jguer/yay/v12/pkg/runtime" - "github.com/Jguer/yay/v12/pkg/settings" - "github.com/Jguer/yay/v12/pkg/settings/exe" - "github.com/Jguer/yay/v12/pkg/settings/parser" - "github.com/Jguer/yay/v12/pkg/text" + "github.com/Jguer/yay/v13/pkg/runtime" + "github.com/Jguer/yay/v13/pkg/settings" + "github.com/Jguer/yay/v13/pkg/settings/exe" + "github.com/Jguer/yay/v13/pkg/settings/parser" + "github.com/Jguer/yay/v13/pkg/text" ) func removeMake(ctx context.Context, config *settings.Configuration, diff --git a/pkg/sync/workdir/merge.go b/pkg/sync/workdir/merge.go index 593f218f..3249bd77 100644 --- a/pkg/sync/workdir/merge.go +++ b/pkg/sync/workdir/merge.go @@ -6,7 +6,7 @@ import ( "github.com/leonelquinteros/gotext" - "github.com/Jguer/yay/v12/pkg/settings/exe" + "github.com/Jguer/yay/v13/pkg/settings/exe" ) func gitMerge(ctx context.Context, cmdBuilder exe.ICmdBuilder, dir string) error { diff --git a/pkg/sync/workdir/preparer.go b/pkg/sync/workdir/preparer.go index c1c8c5ae..27162fc9 100644 --- a/pkg/sync/workdir/preparer.go +++ b/pkg/sync/workdir/preparer.go @@ -8,16 +8,16 @@ import ( "path/filepath" "strings" - "github.com/Jguer/yay/v12/pkg/db" - "github.com/Jguer/yay/v12/pkg/dep" - "github.com/Jguer/yay/v12/pkg/download" - "github.com/Jguer/yay/v12/pkg/menus" - "github.com/Jguer/yay/v12/pkg/runtime" - "github.com/Jguer/yay/v12/pkg/settings" - "github.com/Jguer/yay/v12/pkg/settings/exe" - "github.com/Jguer/yay/v12/pkg/settings/parser" - "github.com/Jguer/yay/v12/pkg/sync/build" - "github.com/Jguer/yay/v12/pkg/text" + "github.com/Jguer/yay/v13/pkg/db" + "github.com/Jguer/yay/v13/pkg/dep" + "github.com/Jguer/yay/v13/pkg/download" + "github.com/Jguer/yay/v13/pkg/menus" + "github.com/Jguer/yay/v13/pkg/runtime" + "github.com/Jguer/yay/v13/pkg/settings" + "github.com/Jguer/yay/v13/pkg/settings/exe" + "github.com/Jguer/yay/v13/pkg/settings/parser" + "github.com/Jguer/yay/v13/pkg/sync/build" + "github.com/Jguer/yay/v13/pkg/text" gosrc "github.com/Morganamilo/go-srcinfo" mapset "github.com/deckarep/golang-set/v2" diff --git a/pkg/sync/workdir/preparer_test.go b/pkg/sync/workdir/preparer_test.go index 163477f5..5d66ed04 100644 --- a/pkg/sync/workdir/preparer_test.go +++ b/pkg/sync/workdir/preparer_test.go @@ -1,5 +1,4 @@ //go:build !integration -// +build !integration package workdir @@ -10,8 +9,8 @@ import ( "github.com/stretchr/testify/assert" - "github.com/Jguer/yay/v12/pkg/settings" - "github.com/Jguer/yay/v12/pkg/text" + "github.com/Jguer/yay/v13/pkg/settings" + "github.com/Jguer/yay/v13/pkg/text" ) func newTestLogger() *text.Logger { diff --git a/pkg/sync/workdir/workdir_ops_test.go b/pkg/sync/workdir/workdir_ops_test.go index 83baabf7..c1106bfb 100644 --- a/pkg/sync/workdir/workdir_ops_test.go +++ b/pkg/sync/workdir/workdir_ops_test.go @@ -1,5 +1,4 @@ //go:build !integration -// +build !integration package workdir @@ -11,10 +10,10 @@ import ( "github.com/stretchr/testify/require" - "github.com/Jguer/yay/v12/pkg/runtime" - "github.com/Jguer/yay/v12/pkg/settings" - "github.com/Jguer/yay/v12/pkg/settings/parser" - "github.com/Jguer/yay/v12/pkg/text" + "github.com/Jguer/yay/v13/pkg/runtime" + "github.com/Jguer/yay/v13/pkg/settings" + "github.com/Jguer/yay/v13/pkg/settings/parser" + "github.com/Jguer/yay/v13/pkg/text" ) func TestMergePkgbuilds(t *testing.T) { diff --git a/pkg/text/color_test.go b/pkg/text/color_test.go index d6851056..26405fdc 100644 --- a/pkg/text/color_test.go +++ b/pkg/text/color_test.go @@ -1,5 +1,4 @@ //go:build !integration -// +build !integration package text diff --git a/pkg/text/text.go b/pkg/text/text.go index d2f93566..21abfbbf 100644 --- a/pkg/text/text.go +++ b/pkg/text/text.go @@ -25,7 +25,7 @@ func SplitDBFromName(pkg string) (db, name string) { func LessRunes(iRunes, jRunes []rune) bool { maxLen := min(len(iRunes), len(jRunes)) - for idx := 0; idx < maxLen; idx++ { + for idx := range maxLen { ir := iRunes[idx] jr := jRunes[idx] diff --git a/pkg/text/text_test.go b/pkg/text/text_test.go index 70448cc6..5f0355de 100644 --- a/pkg/text/text_test.go +++ b/pkg/text/text_test.go @@ -1,5 +1,4 @@ //go:build !integration -// +build !integration package text diff --git a/pkg/text/time_test.go b/pkg/text/time_test.go index f3f25d97..0e203861 100644 --- a/pkg/text/time_test.go +++ b/pkg/text/time_test.go @@ -1,5 +1,4 @@ //go:build !integration -// +build !integration package text diff --git a/pkg/text/utils_coverage_test.go b/pkg/text/utils_coverage_test.go index 22e04543..32e1efb9 100644 --- a/pkg/text/utils_coverage_test.go +++ b/pkg/text/utils_coverage_test.go @@ -1,5 +1,4 @@ //go:build !integration -// +build !integration package text diff --git a/pkg/upgrade/service.go b/pkg/upgrade/service.go index 754e8806..8e9fd1cb 100644 --- a/pkg/upgrade/service.go +++ b/pkg/upgrade/service.go @@ -12,15 +12,15 @@ import ( mapset "github.com/deckarep/golang-set/v2" "github.com/leonelquinteros/gotext" - "github.com/Jguer/yay/v12/pkg/db" - "github.com/Jguer/yay/v12/pkg/dep" - "github.com/Jguer/yay/v12/pkg/dep/topo" - "github.com/Jguer/yay/v12/pkg/intrange" - "github.com/Jguer/yay/v12/pkg/query" - "github.com/Jguer/yay/v12/pkg/settings" - settingslua "github.com/Jguer/yay/v12/pkg/settings/lua" - "github.com/Jguer/yay/v12/pkg/text" - "github.com/Jguer/yay/v12/pkg/vcs" + "github.com/Jguer/yay/v13/pkg/db" + "github.com/Jguer/yay/v13/pkg/dep" + "github.com/Jguer/yay/v13/pkg/dep/topo" + "github.com/Jguer/yay/v13/pkg/intrange" + "github.com/Jguer/yay/v13/pkg/query" + "github.com/Jguer/yay/v13/pkg/settings" + settingslua "github.com/Jguer/yay/v13/pkg/settings/lua" + "github.com/Jguer/yay/v13/pkg/text" + "github.com/Jguer/yay/v13/pkg/vcs" ) const cutOffExtra = 2 diff --git a/pkg/upgrade/service_test.go b/pkg/upgrade/service_test.go index 30bb12f4..d14e2448 100644 --- a/pkg/upgrade/service_test.go +++ b/pkg/upgrade/service_test.go @@ -1,5 +1,4 @@ //go:build !integration -// +build !integration package upgrade @@ -15,24 +14,20 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/Jguer/yay/v12/pkg/db" - "github.com/Jguer/yay/v12/pkg/db/mock" - "github.com/Jguer/yay/v12/pkg/dep" - "github.com/Jguer/yay/v12/pkg/dep/topo" - "github.com/Jguer/yay/v12/pkg/query" - "github.com/Jguer/yay/v12/pkg/settings" - settingslua "github.com/Jguer/yay/v12/pkg/settings/lua" - "github.com/Jguer/yay/v12/pkg/settings/parser" - "github.com/Jguer/yay/v12/pkg/text" - "github.com/Jguer/yay/v12/pkg/vcs" + "github.com/Jguer/yay/v13/pkg/db" + "github.com/Jguer/yay/v13/pkg/db/mock" + "github.com/Jguer/yay/v13/pkg/dep" + "github.com/Jguer/yay/v13/pkg/dep/topo" + "github.com/Jguer/yay/v13/pkg/query" + "github.com/Jguer/yay/v13/pkg/settings" + settingslua "github.com/Jguer/yay/v13/pkg/settings/lua" + "github.com/Jguer/yay/v13/pkg/settings/parser" + "github.com/Jguer/yay/v13/pkg/text" + "github.com/Jguer/yay/v13/pkg/vcs" - mockaur "github.com/Jguer/yay/v12/pkg/dep/mock" + mockaur "github.com/Jguer/yay/v13/pkg/dep/mock" ) -func ptrString(s string) *string { - return &s -} - func newUpgradeSelectTestService(input io.Reader, luaEngine *settingslua.Engine) *UpgradeService { logger := text.NewLogger(io.Discard, io.Discard, input, true, "test") u := &UpgradeService{ @@ -57,7 +52,7 @@ func newUpgradeSelectTestGraph(t *testing.T) *topo.Graph[string, *dep.InstallInf Value: &dep.InstallInfo{ Reason: dep.Explicit, Source: dep.Sync, - SyncDBName: ptrString("core"), + SyncDBName: new("core"), LocalVersion: "1.0", Version: "2.0", Upgrade: true, @@ -69,7 +64,7 @@ func newUpgradeSelectTestGraph(t *testing.T) *topo.Graph[string, *dep.InstallInf Value: &dep.InstallInfo{ Reason: dep.Explicit, Source: dep.AUR, - AURBase: ptrString("yay"), + AURBase: new("yay"), LocalVersion: "1.0", Version: "2.0", Upgrade: true, @@ -84,7 +79,7 @@ func newUpgradeSelectTestGraph(t *testing.T) *topo.Graph[string, *dep.InstallInf Value: &dep.InstallInfo{ Reason: dep.Explicit, Source: dep.AUR, - AURBase: ptrString("example"), + AURBase: new("example"), LocalVersion: "1.0", Version: "2.0", Upgrade: true, @@ -95,7 +90,7 @@ func newUpgradeSelectTestGraph(t *testing.T) *topo.Graph[string, *dep.InstallInf Value: &dep.InstallInfo{ Reason: dep.Dep, Source: dep.Sync, - SyncDBName: ptrString("core"), + SyncDBName: new("core"), Version: "1.0", Upgrade: true, }, @@ -112,7 +107,7 @@ func TestUpgradeService_GraphUpgrades(t *testing.T) { AURBase: nil, LocalVersion: "4.5.0-1", Version: "5.0.0-1", - SyncDBName: ptrString("core"), + SyncDBName: new("core"), Upgrade: true, Devel: false, } @@ -120,7 +115,7 @@ func TestUpgradeService_GraphUpgrades(t *testing.T) { exampleDepInfoDevel := &dep.InstallInfo{ Source: dep.AUR, Reason: dep.Dep, - AURBase: ptrString("example"), + AURBase: new("example"), LocalVersion: "2.2.1.r32.41baa362-1", Version: "latest-commit", Upgrade: true, @@ -131,7 +126,7 @@ func TestUpgradeService_GraphUpgrades(t *testing.T) { newDepInfo := &dep.InstallInfo{ Source: dep.Sync, Reason: dep.Dep, - SyncDBName: ptrString("core"), + SyncDBName: new("core"), Version: "3.0.1-2", LocalVersion: "", Upgrade: true, @@ -141,7 +136,7 @@ func TestUpgradeService_GraphUpgrades(t *testing.T) { exampleDepInfoAUR := &dep.InstallInfo{ Source: dep.AUR, Reason: dep.Dep, - AURBase: ptrString("example"), + AURBase: new("example"), LocalVersion: "2.2.1.r32.41baa362-1", Version: "2.2.1.r69.g8a10460-1", Upgrade: true, @@ -152,7 +147,7 @@ func TestUpgradeService_GraphUpgrades(t *testing.T) { yayDepInfo := &dep.InstallInfo{ Reason: dep.Explicit, Source: dep.AUR, - AURBase: ptrString("yay"), + AURBase: new("yay"), LocalVersion: "10.2.3", Version: "10.2.4", Upgrade: true, @@ -470,7 +465,7 @@ func TestUpgradeService_GraphUpgradesMissingDep(t *testing.T) { exampleDepInfoAUR := &dep.InstallInfo{ Source: dep.AUR, Reason: dep.Dep, - AURBase: ptrString("example"), + AURBase: new("example"), LocalVersion: "2.2.1.r32.41baa362-1", Version: "2.2.1.r69.g8a10460-1", Upgrade: true, @@ -480,7 +475,7 @@ func TestUpgradeService_GraphUpgradesMissingDep(t *testing.T) { yayDepInfo := &dep.InstallInfo{ Reason: dep.Explicit, Source: dep.AUR, - AURBase: ptrString("yay"), + AURBase: new("yay"), LocalVersion: "10.2.3", Version: "10.2.4", Upgrade: true, @@ -956,7 +951,7 @@ func TestUpgradeService_GraphUpgrades_zfs_dkms(t *testing.T) { zfsDKMSInfo := &dep.InstallInfo{ Reason: dep.Explicit, Source: dep.AUR, - AURBase: ptrString("zfs-dkms"), + AURBase: new("zfs-dkms"), LocalVersion: "2.1.10-1", Version: "2.1.11-1", Upgrade: true, @@ -966,7 +961,7 @@ func TestUpgradeService_GraphUpgrades_zfs_dkms(t *testing.T) { zfsUtilsInfo := &dep.InstallInfo{ Reason: dep.Dep, Source: dep.AUR, - AURBase: ptrString("zfs-utils"), + AURBase: new("zfs-utils"), LocalVersion: "2.1.10-1", Version: "2.1.11-1", Upgrade: true, diff --git a/pkg/upgrade/sources.go b/pkg/upgrade/sources.go index b64808b4..e2294b31 100644 --- a/pkg/upgrade/sources.go +++ b/pkg/upgrade/sources.go @@ -5,10 +5,10 @@ import ( "github.com/leonelquinteros/gotext" - "github.com/Jguer/yay/v12/pkg/db" - "github.com/Jguer/yay/v12/pkg/query" - "github.com/Jguer/yay/v12/pkg/text" - "github.com/Jguer/yay/v12/pkg/vcs" + "github.com/Jguer/yay/v13/pkg/db" + "github.com/Jguer/yay/v13/pkg/query" + "github.com/Jguer/yay/v13/pkg/text" + "github.com/Jguer/yay/v13/pkg/vcs" ) func UpDevel( diff --git a/pkg/upgrade/sources_test.go b/pkg/upgrade/sources_test.go index 838d8802..121232b4 100644 --- a/pkg/upgrade/sources_test.go +++ b/pkg/upgrade/sources_test.go @@ -1,5 +1,4 @@ //go:build !integration -// +build !integration package upgrade @@ -14,9 +13,9 @@ import ( alpm "github.com/Jguer/dyalpm" - "github.com/Jguer/yay/v12/pkg/db/mock" - "github.com/Jguer/yay/v12/pkg/text" - "github.com/Jguer/yay/v12/pkg/vcs" + "github.com/Jguer/yay/v13/pkg/db/mock" + "github.com/Jguer/yay/v13/pkg/text" + "github.com/Jguer/yay/v13/pkg/vcs" ) func Test_upAUR(t *testing.T) { diff --git a/pkg/upgrade/upgrade.go b/pkg/upgrade/upgrade.go index 9960d9d4..2120364b 100644 --- a/pkg/upgrade/upgrade.go +++ b/pkg/upgrade/upgrade.go @@ -4,9 +4,9 @@ import ( "fmt" "strings" - "github.com/Jguer/yay/v12/pkg/db" - "github.com/Jguer/yay/v12/pkg/query" - "github.com/Jguer/yay/v12/pkg/text" + "github.com/Jguer/yay/v13/pkg/db" + "github.com/Jguer/yay/v13/pkg/query" + "github.com/Jguer/yay/v13/pkg/text" ) // Filter decides if specific package should be included in the results. diff --git a/pkg/upgrade/upgrade_test.go b/pkg/upgrade/upgrade_test.go index 2dfa26dc..4c7718e7 100644 --- a/pkg/upgrade/upgrade_test.go +++ b/pkg/upgrade/upgrade_test.go @@ -1,13 +1,12 @@ //go:build !integration -// +build !integration package upgrade import ( "testing" - "github.com/Jguer/yay/v12/pkg/query" - "github.com/Jguer/yay/v12/pkg/text" + "github.com/Jguer/yay/v13/pkg/query" + "github.com/Jguer/yay/v13/pkg/text" ) func TestGetVersionDiff(t *testing.T) { diff --git a/pkg/vcs/vcs.go b/pkg/vcs/vcs.go index ba9eb61e..c531df99 100644 --- a/pkg/vcs/vcs.go +++ b/pkg/vcs/vcs.go @@ -16,8 +16,8 @@ import ( gosrc "github.com/Morganamilo/go-srcinfo" "github.com/leonelquinteros/gotext" - "github.com/Jguer/yay/v12/pkg/settings/exe" - "github.com/Jguer/yay/v12/pkg/text" + "github.com/Jguer/yay/v13/pkg/settings/exe" + "github.com/Jguer/yay/v13/pkg/text" ) const defaultTimeout = 15 * time.Second diff --git a/pkg/vcs/vcs_test.go b/pkg/vcs/vcs_test.go index d5e76991..7ee1a04f 100644 --- a/pkg/vcs/vcs_test.go +++ b/pkg/vcs/vcs_test.go @@ -1,5 +1,4 @@ //go:build !integration -// +build !integration package vcs @@ -18,9 +17,9 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/Jguer/yay/v12/pkg/db" - "github.com/Jguer/yay/v12/pkg/settings/exe" - "github.com/Jguer/yay/v12/pkg/text" + "github.com/Jguer/yay/v13/pkg/db" + "github.com/Jguer/yay/v13/pkg/settings/exe" + "github.com/Jguer/yay/v13/pkg/text" ) func newTestLogger() *text.Logger { diff --git a/print.go b/print.go index 7fdc7611..0a8fd9f9 100644 --- a/print.go +++ b/print.go @@ -15,14 +15,14 @@ import ( "github.com/leonelquinteros/gotext" "golang.org/x/sys/unix" - "github.com/Jguer/yay/v12/pkg/db" - "github.com/Jguer/yay/v12/pkg/dep" - "github.com/Jguer/yay/v12/pkg/query" - "github.com/Jguer/yay/v12/pkg/runtime" - "github.com/Jguer/yay/v12/pkg/settings" - "github.com/Jguer/yay/v12/pkg/settings/parser" - "github.com/Jguer/yay/v12/pkg/text" - "github.com/Jguer/yay/v12/pkg/upgrade" + "github.com/Jguer/yay/v13/pkg/db" + "github.com/Jguer/yay/v13/pkg/dep" + "github.com/Jguer/yay/v13/pkg/query" + "github.com/Jguer/yay/v13/pkg/runtime" + "github.com/Jguer/yay/v13/pkg/settings" + "github.com/Jguer/yay/v13/pkg/settings/parser" + "github.com/Jguer/yay/v13/pkg/text" + "github.com/Jguer/yay/v13/pkg/upgrade" ) // printInfo prints package info like pacman -Si. diff --git a/print_test.go b/print_test.go index b08bf444..3eafed1f 100644 --- a/print_test.go +++ b/print_test.go @@ -1,5 +1,4 @@ //go:build !integration -// +build !integration package main @@ -18,15 +17,15 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/Jguer/yay/v12/pkg/db" - "github.com/Jguer/yay/v12/pkg/db/mock" - mockaur "github.com/Jguer/yay/v12/pkg/dep/mock" - "github.com/Jguer/yay/v12/pkg/runtime" - "github.com/Jguer/yay/v12/pkg/settings" - "github.com/Jguer/yay/v12/pkg/settings/exe" - "github.com/Jguer/yay/v12/pkg/settings/parser" - "github.com/Jguer/yay/v12/pkg/text" - "github.com/Jguer/yay/v12/pkg/vcs" + "github.com/Jguer/yay/v13/pkg/db" + "github.com/Jguer/yay/v13/pkg/db/mock" + mockaur "github.com/Jguer/yay/v13/pkg/dep/mock" + "github.com/Jguer/yay/v13/pkg/runtime" + "github.com/Jguer/yay/v13/pkg/settings" + "github.com/Jguer/yay/v13/pkg/settings/exe" + "github.com/Jguer/yay/v13/pkg/settings/parser" + "github.com/Jguer/yay/v13/pkg/text" + "github.com/Jguer/yay/v13/pkg/vcs" ) func TestPrintUpdateList(t *testing.T) { diff --git a/query.go b/query.go index 86af9891..0ae29597 100644 --- a/query.go +++ b/query.go @@ -11,12 +11,12 @@ import ( mapset "github.com/deckarep/golang-set/v2" "github.com/leonelquinteros/gotext" - "github.com/Jguer/yay/v12/pkg/db" - "github.com/Jguer/yay/v12/pkg/query" - "github.com/Jguer/yay/v12/pkg/runtime" - "github.com/Jguer/yay/v12/pkg/settings" - "github.com/Jguer/yay/v12/pkg/settings/parser" - "github.com/Jguer/yay/v12/pkg/text" + "github.com/Jguer/yay/v13/pkg/db" + "github.com/Jguer/yay/v13/pkg/query" + "github.com/Jguer/yay/v13/pkg/runtime" + "github.com/Jguer/yay/v13/pkg/settings" + "github.com/Jguer/yay/v13/pkg/settings/parser" + "github.com/Jguer/yay/v13/pkg/text" ) // SyncSearch presents a query to the local repos and to the AUR. diff --git a/query_test.go b/query_test.go index 215c580a..23198620 100644 --- a/query_test.go +++ b/query_test.go @@ -1,5 +1,4 @@ //go:build !integration -// +build !integration package main @@ -13,13 +12,13 @@ import ( "strings" "testing" - "github.com/Jguer/yay/v12/pkg/db/mock" - mockaur "github.com/Jguer/yay/v12/pkg/dep/mock" - "github.com/Jguer/yay/v12/pkg/query" - "github.com/Jguer/yay/v12/pkg/runtime" - "github.com/Jguer/yay/v12/pkg/settings" - "github.com/Jguer/yay/v12/pkg/settings/exe" - "github.com/Jguer/yay/v12/pkg/settings/parser" + "github.com/Jguer/yay/v13/pkg/db/mock" + mockaur "github.com/Jguer/yay/v13/pkg/dep/mock" + "github.com/Jguer/yay/v13/pkg/query" + "github.com/Jguer/yay/v13/pkg/runtime" + "github.com/Jguer/yay/v13/pkg/settings" + "github.com/Jguer/yay/v13/pkg/settings/exe" + "github.com/Jguer/yay/v13/pkg/settings/parser" "github.com/Jguer/aur" "github.com/stretchr/testify/assert" diff --git a/scripts/go.mod b/scripts/go.mod index 0fb7c5c0..e0e359fb 100644 --- a/scripts/go.mod +++ b/scripts/go.mod @@ -1,4 +1,4 @@ -module github.com/Jguer/yay/v12/scripts +module github.com/Jguer/yay/v13/scripts go 1.26 diff --git a/sync.go b/sync.go index 14d1db49..5057808a 100644 --- a/sync.go +++ b/sync.go @@ -8,14 +8,14 @@ import ( "github.com/leonelquinteros/gotext" - "github.com/Jguer/yay/v12/pkg/db" - "github.com/Jguer/yay/v12/pkg/dep" - "github.com/Jguer/yay/v12/pkg/runtime" - "github.com/Jguer/yay/v12/pkg/settings" - "github.com/Jguer/yay/v12/pkg/settings/exe" - "github.com/Jguer/yay/v12/pkg/settings/parser" - "github.com/Jguer/yay/v12/pkg/sync" - "github.com/Jguer/yay/v12/pkg/upgrade" + "github.com/Jguer/yay/v13/pkg/db" + "github.com/Jguer/yay/v13/pkg/dep" + "github.com/Jguer/yay/v13/pkg/runtime" + "github.com/Jguer/yay/v13/pkg/settings" + "github.com/Jguer/yay/v13/pkg/settings/exe" + "github.com/Jguer/yay/v13/pkg/settings/parser" + "github.com/Jguer/yay/v13/pkg/sync" + "github.com/Jguer/yay/v13/pkg/upgrade" ) func syncInstall(ctx context.Context, diff --git a/sync_test.go b/sync_test.go index 4b44a33e..f9edcbed 100644 --- a/sync_test.go +++ b/sync_test.go @@ -1,5 +1,4 @@ //go:build !integration -// +build !integration package main @@ -23,15 +22,15 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/Jguer/yay/v12/pkg/db" - "github.com/Jguer/yay/v12/pkg/db/mock" - mockaur "github.com/Jguer/yay/v12/pkg/dep/mock" - "github.com/Jguer/yay/v12/pkg/runtime" - "github.com/Jguer/yay/v12/pkg/settings" - "github.com/Jguer/yay/v12/pkg/settings/exe" - "github.com/Jguer/yay/v12/pkg/settings/parser" - "github.com/Jguer/yay/v12/pkg/text" - "github.com/Jguer/yay/v12/pkg/vcs" + "github.com/Jguer/yay/v13/pkg/db" + "github.com/Jguer/yay/v13/pkg/db/mock" + mockaur "github.com/Jguer/yay/v13/pkg/dep/mock" + "github.com/Jguer/yay/v13/pkg/runtime" + "github.com/Jguer/yay/v13/pkg/settings" + "github.com/Jguer/yay/v13/pkg/settings/exe" + "github.com/Jguer/yay/v13/pkg/settings/parser" + "github.com/Jguer/yay/v13/pkg/text" + "github.com/Jguer/yay/v13/pkg/vcs" ) func TestSyncUpgrade(t *testing.T) { diff --git a/vcs.go b/vcs.go index 6e6efb99..b4dd91be 100644 --- a/vcs.go +++ b/vcs.go @@ -7,11 +7,11 @@ import ( "github.com/Jguer/aur" "github.com/leonelquinteros/gotext" - "github.com/Jguer/yay/v12/pkg/db" - "github.com/Jguer/yay/v12/pkg/dep" - "github.com/Jguer/yay/v12/pkg/runtime" - "github.com/Jguer/yay/v12/pkg/sync/srcinfo" - "github.com/Jguer/yay/v12/pkg/sync/workdir" + "github.com/Jguer/yay/v13/pkg/db" + "github.com/Jguer/yay/v13/pkg/dep" + "github.com/Jguer/yay/v13/pkg/runtime" + "github.com/Jguer/yay/v13/pkg/sync/srcinfo" + "github.com/Jguer/yay/v13/pkg/sync/workdir" ) func infoToInstallInfo(info []aur.Pkg) []map[string]*dep.InstallInfo { diff --git a/vcs_ops_test.go b/vcs_ops_test.go index e89cf967..9a25e558 100644 --- a/vcs_ops_test.go +++ b/vcs_ops_test.go @@ -1,5 +1,4 @@ //go:build !integration -// +build !integration package main @@ -9,7 +8,7 @@ import ( "github.com/Jguer/aur" "github.com/stretchr/testify/require" - "github.com/Jguer/yay/v12/pkg/dep" + "github.com/Jguer/yay/v13/pkg/dep" ) func TestInfoToInstallInfo(t *testing.T) { @@ -20,10 +19,6 @@ func TestInfoToInstallInfo(t *testing.T) { require.Len(t, info, 1) require.Len(t, info[0], 2) - require.Equal(t, &dep.InstallInfo{AURBase: ptr("foo-base"), Source: dep.AUR}, info[0]["foo"]) - require.Equal(t, &dep.InstallInfo{AURBase: ptr("bar-base"), Source: dep.AUR}, info[0]["bar"]) -} - -func ptr(s string) *string { - return &s + require.Equal(t, &dep.InstallInfo{AURBase: new("foo-base"), Source: dep.AUR}, info[0]["foo"]) + require.Equal(t, &dep.InstallInfo{AURBase: new("bar-base"), Source: dep.AUR}, info[0]["bar"]) } diff --git a/vote.go b/vote.go index 2ed29da3..b71ebd27 100644 --- a/vote.go +++ b/vote.go @@ -8,7 +8,7 @@ import ( "github.com/Jguer/votar/pkg/vote" "github.com/leonelquinteros/gotext" - "github.com/Jguer/yay/v12/pkg/text" + "github.com/Jguer/yay/v13/pkg/text" ) type ErrAURVote struct { diff --git a/vote_ops_test.go b/vote_ops_test.go index 2cc431eb..b52e6ed5 100644 --- a/vote_ops_test.go +++ b/vote_ops_test.go @@ -1,5 +1,4 @@ //go:build !integration -// +build !integration package main @@ -12,8 +11,8 @@ import ( "github.com/Jguer/aur" "github.com/stretchr/testify/require" - mockaur "github.com/Jguer/yay/v12/pkg/dep/mock" - "github.com/Jguer/yay/v12/pkg/text" + mockaur "github.com/Jguer/yay/v13/pkg/dep/mock" + "github.com/Jguer/yay/v13/pkg/text" ) func TestHandlePackageVoteNoResults(t *testing.T) {