Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
47 changes: 47 additions & 0 deletions internal/app/install.go
Original file line number Diff line number Diff line change
Expand Up @@ -159,13 +159,60 @@ func (s Service) resolveInstallRequest(target string, cli install.Options, prefe
return repo, opts, nil
}

if repo, pkg, ok := findPackageByRepo(cfg, target); ok {
opts, err := s.resolveInstallOptionsWithConfig(cfg, repo, pkg, cli, preferCacheDir)
if err != nil {
return "", install.Options{}, err
}
return repo, opts, nil
}

opts, err := s.resolveInstallOptionsWithConfig(cfg, target, cfgpkg.Section{}, cli, preferCacheDir)
if err != nil {
return "", install.Options{}, err
}
return target, opts, nil
}

func findPackageByRepo(cfg *cfgpkg.File, target string) (string, cfgpkg.Section, bool) {
if cfg == nil {
return "", cfgpkg.Section{}, false
}

matchedRepo := ""
matchedPkg := cfgpkg.Section{}
matchCount := 0
normalizedTarget, normalizeErr := install.NormalizeRepoTarget(target)

for _, pkg := range cfg.Packages {
repo := util.DerefString(pkg.Repo)
if repo == "" {
continue
}
if repo == target {
matchCount++
matchedRepo = repo
matchedPkg = pkg
continue
}
if normalizeErr != nil {
continue
}
normalizedRepo, err := install.NormalizeRepoTarget(repo)
if err != nil || normalizedRepo != normalizedTarget {
continue
}
matchCount++
matchedRepo = repo
matchedPkg = pkg
}

if matchCount != 1 {
return "", cfgpkg.Section{}, false
}
return matchedRepo, matchedPkg, true
}

func (s Service) DownloadTarget(target string, opts install.Options) (RunResult, error) {
var err error
opts, err = s.resolveInstallOptions(target, opts, true)
Expand Down
43 changes: 43 additions & 0 deletions internal/app/install_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -610,6 +610,49 @@ asset_filters = ["windows"]
}
}

func TestInstallTargetResolvesManagedPackageRepo(t *testing.T) {
cfg := mustLoadFromString(t, `
[global]
target = "~/.local/bin"

[packages.gomi]
repo = "babarot/gomi"
target = "~/managed/bin"
tag = "v1.6.3"
`)
runner := &fakeRunner{
result: RunResult{
URL: "https://github.com/babarot/gomi/releases/download/v1.6.3/gomi.tar.gz",
ExtractedFiles: []string{"./gomi"},
},
}
svc := Service{
Runner: runner,
LoadConfig: func() (*cfgpkg.File, error) {
return cfg, nil
},
}

_, err := svc.InstallTarget("babarot/gomi", install.Options{})
if err != nil {
t.Fatalf("install target: %v", err)
}

expectedTarget, err := util.Expand("~/managed/bin")
if err != nil {
t.Fatalf("expand target: %v", err)
}
globalTarget, err := util.Expand("~/.local/bin")
if err != nil {
t.Fatalf("expand global target: %v", err)
}

assert.Eq(t, "babarot/gomi", runner.target)
assert.Eq(t, expectedTarget, runner.opts.Output)
assert.NotEq(t, globalTarget, runner.opts.Output)
assert.Eq(t, "v1.6.3", runner.opts.Tag)
}

func TestInstallTargetRejectsManagedPackageWithoutRepo(t *testing.T) {
cfg := mustLoadFromString(t, `
[packages.picoclaw]
Expand Down
Loading