mirror of
https://github.com/runkids/skillshare.git
synced 2026-11-20 12:23:22 +00:00
feat(install): install config entries from the dashboard and name repos by owner
Bare `skillshare install` already restores everything .metadata.json records but the disk lacks, yet the dashboard could only re-clone missing tracked repos through a separate rehydrate path. Expose the CLI's install-from-config flow instead (GET /api/install/missing, POST /api/install/from-config) so both surfaces share one detection and one installer, and drop the old missingTrackedRepos plumbing from update responses. The install summary now counts tracked repos and their skills apart from standalone skills, since "Installed 1 skill" hid a whole repo. New tracked repos are named `_<owner>-<repo>` so two `skills` repos no longer collide; existing installs keep their names. `check` passes the stale status through so the dashboard can offer to prune skills deleted upstream.
This commit is contained in:
@@ -1,8 +1,6 @@
|
||||
package main
|
||||
|
||||
import (
|
||||
"strings"
|
||||
|
||||
"skillshare/internal/config"
|
||||
"skillshare/internal/install"
|
||||
)
|
||||
@@ -13,37 +11,6 @@ var (
|
||||
_ install.InstallContext = (*projectInstallContext)(nil)
|
||||
)
|
||||
|
||||
// storeToSkillEntryDTOs converts MetadataStore entries to []install.SkillEntryDTO.
|
||||
func storeToSkillEntryDTOs(store *install.MetadataStore) []install.SkillEntryDTO {
|
||||
names := store.List() // sorted
|
||||
dtos := make([]install.SkillEntryDTO, 0, len(names))
|
||||
for _, name := range names {
|
||||
entry := store.Get(name)
|
||||
if entry == nil {
|
||||
continue
|
||||
}
|
||||
relPath := install.KeyToRelPath(name, entry)
|
||||
group, bareName := splitMetadataRelPath(relPath)
|
||||
dtos = append(dtos, install.SkillEntryDTO{
|
||||
Name: bareName,
|
||||
Source: entry.Source,
|
||||
Tracked: entry.Tracked,
|
||||
Group: group,
|
||||
Branch: entry.Branch,
|
||||
})
|
||||
}
|
||||
return dtos
|
||||
}
|
||||
|
||||
func splitMetadataRelPath(relPath string) (group, name string) {
|
||||
relPath = strings.Trim(relPath, "/")
|
||||
idx := strings.LastIndex(relPath, "/")
|
||||
if idx < 0 {
|
||||
return "", relPath
|
||||
}
|
||||
return relPath[:idx], relPath[idx+1:]
|
||||
}
|
||||
|
||||
// ---------------------------------------------------------------------------
|
||||
// globalInstallContext
|
||||
// ---------------------------------------------------------------------------
|
||||
@@ -56,7 +23,7 @@ type globalInstallContext struct {
|
||||
|
||||
func (g *globalInstallContext) SourcePath() string { return g.cfg.EffectiveSkillsSource() }
|
||||
func (g *globalInstallContext) ConfigSkills() []install.SkillEntryDTO {
|
||||
return storeToSkillEntryDTOs(g.store)
|
||||
return install.MetadataSkillEntries(g.store)
|
||||
}
|
||||
func (g *globalInstallContext) Reconcile() error {
|
||||
return config.ReconcileGlobalSkills(g.cfg, g.store)
|
||||
@@ -79,18 +46,7 @@ type projectInstallContext struct {
|
||||
|
||||
func (p *projectInstallContext) SourcePath() string { return p.runtime.sourcePath }
|
||||
func (p *projectInstallContext) ConfigSkills() []install.SkillEntryDTO {
|
||||
skills := p.runtime.config.Skills
|
||||
dtos := make([]install.SkillEntryDTO, 0, len(skills))
|
||||
for _, s := range skills {
|
||||
dtos = append(dtos, install.SkillEntryDTO{
|
||||
Name: s.Name,
|
||||
Source: s.Source,
|
||||
Tracked: s.Tracked,
|
||||
Group: s.Group,
|
||||
Branch: s.Branch,
|
||||
})
|
||||
}
|
||||
return dtos
|
||||
return config.ProjectSkillEntries(p.runtime.config.Skills)
|
||||
}
|
||||
func (p *projectInstallContext) Reconcile() error {
|
||||
return reconcileProjectRemoteSkills(p.runtime)
|
||||
|
||||
@@ -747,6 +747,37 @@ func buildInstallSummary(installed, failed, skipped int, noun string) string {
|
||||
return strings.Join(parts, ", ")
|
||||
}
|
||||
|
||||
// buildConfigInstallSummary formats the summary for installing from config,
|
||||
// counting tracked repos apart from single skills.
|
||||
func buildConfigInstallSummary(r install.ConfigInstallResult) string {
|
||||
var parts []string
|
||||
plainInstalled := r.Installed - r.InstalledRepos
|
||||
if r.InstalledRepos > 0 {
|
||||
parts = append(parts, fmt.Sprintf("Installed %s (%s)",
|
||||
plural(r.InstalledRepos, "tracked repo"), plural(r.InstalledRepoSkills, "skill")))
|
||||
if plainInstalled > 0 {
|
||||
parts = append(parts, plural(plainInstalled, "skill"))
|
||||
}
|
||||
} else {
|
||||
parts = append(parts, "Installed "+plural(plainInstalled, "skill"))
|
||||
}
|
||||
if r.Skipped > 0 {
|
||||
skipped := fmt.Sprintf("%d skipped", r.Skipped)
|
||||
if r.SkippedRepos > 0 {
|
||||
kinds := []string{plural(r.SkippedRepos, "repo")}
|
||||
if n := r.Skipped - r.SkippedRepos; n > 0 {
|
||||
kinds = append(kinds, plural(n, "skill"))
|
||||
}
|
||||
skipped += " (" + strings.Join(kinds, ", ") + ")"
|
||||
}
|
||||
parts = append(parts, skipped)
|
||||
}
|
||||
if len(r.FailedSkills) > 0 {
|
||||
parts = append(parts, fmt.Sprintf("%d failed", len(r.FailedSkills)))
|
||||
}
|
||||
return strings.Join(parts, ", ")
|
||||
}
|
||||
|
||||
func handleDirectInstall(source *install.Source, cfg *config.Config, opts install.InstallOptions) (installLogSummary, error) {
|
||||
logSummary := installLogSummary{
|
||||
Source: source.Raw,
|
||||
@@ -895,18 +926,11 @@ func installFromGlobalConfig(cfg *config.Config, opts install.InstallOptions) (i
|
||||
}
|
||||
|
||||
elapsed := time.Since(installStart)
|
||||
parts := []string{"Installed " + plural(result.Installed, "skill")}
|
||||
if result.Skipped > 0 {
|
||||
parts = append(parts, fmt.Sprintf("%d skipped", result.Skipped))
|
||||
}
|
||||
if len(result.FailedSkills) > 0 {
|
||||
parts = append(parts, fmt.Sprintf("%d failed", len(result.FailedSkills)))
|
||||
}
|
||||
status := "success"
|
||||
if len(result.FailedSkills) > 0 {
|
||||
status = "error"
|
||||
}
|
||||
ui.StepResult(status, strings.Join(parts, ", "), elapsed)
|
||||
ui.StepResult(status, buildConfigInstallSummary(result), elapsed)
|
||||
|
||||
// Show failed details
|
||||
if len(result.FailedSkills) > 0 {
|
||||
|
||||
@@ -144,7 +144,7 @@ func installFromProjectConfig(runtime *projectRuntime, opts install.InstallOptio
|
||||
|
||||
spinner.Stop()
|
||||
fmt.Println()
|
||||
ui.Done(ui.MarkOK, "Installed "+plural(result.Installed, "skill"), time.Since(spinner.Started()))
|
||||
ui.Done(ui.MarkOK, buildConfigInstallSummary(result), time.Since(spinner.Started()))
|
||||
ui.Next("skillshare sync", "link them into your targets")
|
||||
|
||||
return summary, nil
|
||||
|
||||
@@ -526,3 +526,25 @@ func TestDisplayInstallResults_SkippedFallbackLabel(t *testing.T) {
|
||||
t.Errorf("expected fallback 'same repo' label, got:\n%s", output)
|
||||
}
|
||||
}
|
||||
|
||||
func TestBuildConfigInstallSummary(t *testing.T) {
|
||||
tests := []struct {
|
||||
name string
|
||||
in install.ConfigInstallResult
|
||||
want string
|
||||
}{
|
||||
{"skills only", install.ConfigInstallResult{Installed: 3, Skipped: 1}, "Installed 3 skills, 1 skipped"},
|
||||
{"tracked repo", install.ConfigInstallResult{Installed: 1, InstalledRepos: 1, InstalledRepoSkills: 12, Skipped: 9, SkippedRepos: 1},
|
||||
"Installed 1 tracked repo (12 skills), 9 skipped (1 repo, 8 skills)"},
|
||||
{"repo and skills", install.ConfigInstallResult{Installed: 3, InstalledRepos: 1, InstalledRepoSkills: 5, FailedSkills: []string{"x"}},
|
||||
"Installed 1 tracked repo (5 skills), 2 skills, 1 failed"},
|
||||
{"only repos skipped", install.ConfigInstallResult{Skipped: 2, SkippedRepos: 2}, "Installed 0 skills, 2 skipped (2 repos)"},
|
||||
}
|
||||
for _, tt := range tests {
|
||||
t.Run(tt.name, func(t *testing.T) {
|
||||
if got := buildConfigInstallSummary(tt.in); got != tt.want {
|
||||
t.Errorf("got %q, want %q", got, tt.want)
|
||||
}
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
@@ -250,3 +250,13 @@ func ReconcileProjectAgents(projectRoot string, store *install.MetadataStore, ag
|
||||
|
||||
return nil
|
||||
}
|
||||
|
||||
// ProjectSkillEntries lists a project's config skills as install entries, the
|
||||
// project counterpart of install.MetadataSkillEntries.
|
||||
func ProjectSkillEntries(skills []SkillEntry) []install.SkillEntryDTO {
|
||||
dtos := make([]install.SkillEntryDTO, 0, len(skills))
|
||||
for _, s := range skills {
|
||||
dtos = append(dtos, install.SkillEntryDTO{Name: s.Name, Source: s.Source, Tracked: s.Tracked, Group: s.Group, Branch: s.Branch})
|
||||
}
|
||||
return dtos
|
||||
}
|
||||
|
||||
@@ -72,8 +72,13 @@ type InstallContext interface {
|
||||
|
||||
// ConfigInstallResult summarises the outcome of InstallFromConfig.
|
||||
type ConfigInstallResult struct {
|
||||
Installed int
|
||||
Skipped int
|
||||
InstalledSkills []string
|
||||
FailedSkills []string
|
||||
Installed int
|
||||
Skipped int
|
||||
// Tracked repos counted within Installed/Skipped, so the summary can tell
|
||||
// a whole repo apart from a single skill.
|
||||
InstalledRepos int
|
||||
InstalledRepoSkills int // skills inside InstalledRepos
|
||||
SkippedRepos int
|
||||
InstalledSkills []string
|
||||
FailedSkills []string
|
||||
}
|
||||
|
||||
@@ -356,9 +356,3 @@ func GetTrackedRepos(sourceDir string, walk ...sourcewalk.Options) ([]string, er
|
||||
func GetMissingTrackedRepos(sourceDir string, walks ...sourcewalk.Options) ([]TrackedRepoMeta, error) {
|
||||
return getMissingTrackedReposImpl(sourceDir, walks...)
|
||||
}
|
||||
|
||||
// RehydrateMissingTrackedRepos re-clones tracked repos declared in metadata whose
|
||||
// clone directories are absent on disk. Repos already present are left untouched.
|
||||
func RehydrateMissingTrackedRepos(sourceDir string, parseOpts ParseOptions, opts InstallOptions) ([]RehydrateResult, error) {
|
||||
return rehydrateMissingTrackedReposImpl(sourceDir, parseOpts, opts)
|
||||
}
|
||||
|
||||
@@ -103,6 +103,44 @@ func matchDiscoveredSkillBySubdir(discovery *DiscoveryResult, subdir string) (Sk
|
||||
return SkillInfo{}, false
|
||||
}
|
||||
|
||||
// MetadataSkillEntries lists the entries of a metadata store as config skills,
|
||||
// sorted by key; it is the global-mode source of InstallContext.ConfigSkills.
|
||||
func MetadataSkillEntries(store *MetadataStore) []SkillEntryDTO {
|
||||
names := store.List() // sorted
|
||||
dtos := make([]SkillEntryDTO, 0, len(names))
|
||||
for _, name := range names {
|
||||
entry := store.Get(name)
|
||||
if entry == nil {
|
||||
continue
|
||||
}
|
||||
group, bareName := splitTrackedRelPath(filepath.ToSlash(KeyToRelPath(name, entry)))
|
||||
dtos = append(dtos, SkillEntryDTO{
|
||||
Name: bareName,
|
||||
Source: entry.Source,
|
||||
Tracked: entry.Tracked,
|
||||
Group: group,
|
||||
Branch: entry.Branch,
|
||||
})
|
||||
}
|
||||
return dtos
|
||||
}
|
||||
|
||||
// MissingFromConfig returns the config skills InstallFromConfig would install:
|
||||
// entries with a name whose directory does not exist on disk.
|
||||
func MissingFromConfig(ctx InstallContext) []SkillEntryDTO {
|
||||
sourcePath := ctx.SourcePath()
|
||||
var missing []SkillEntryDTO
|
||||
for _, skill := range ctx.ConfigSkills() {
|
||||
if _, bareName := skill.EffectiveParts(); strings.TrimSpace(bareName) == "" {
|
||||
continue
|
||||
}
|
||||
if _, err := os.Stat(filepath.Join(sourcePath, filepath.FromSlash(skill.FullName()))); err != nil {
|
||||
missing = append(missing, skill)
|
||||
}
|
||||
}
|
||||
return missing
|
||||
}
|
||||
|
||||
// InstallFromConfig iterates over the remote skills listed in the config
|
||||
// (via ctx.ConfigSkills) and installs each one that is not already present.
|
||||
// It handles both tracked repos and plain skills, delegates per-skill hooks
|
||||
@@ -150,6 +188,9 @@ func InstallFromConfig(ctx InstallContext, opts InstallOptions) (ConfigInstallRe
|
||||
if _, err := os.Stat(destPath); err == nil {
|
||||
if locked == "" || InstalledCommit(destPath, store.GetByPath(displayName)) == locked {
|
||||
result.Skipped++
|
||||
if skill.Tracked {
|
||||
result.SkippedRepos++
|
||||
}
|
||||
if !opts.Quiet {
|
||||
ui.StepDone(displayName, "skipped (already exists)")
|
||||
}
|
||||
@@ -230,6 +271,8 @@ func InstallFromConfig(ctx InstallContext, opts InstallOptions) (ConfigInstallRe
|
||||
}
|
||||
result.InstalledSkills = append(result.InstalledSkills, installed.skills...)
|
||||
result.Installed++
|
||||
result.InstalledRepos++
|
||||
result.InstalledRepoSkills += installed.skillCount
|
||||
}
|
||||
|
||||
// ── Phase 2: grouped plain skills (clone once per repo) ──
|
||||
@@ -341,9 +384,10 @@ func InstallFromConfig(ctx InstallContext, opts InstallOptions) (ConfigInstallRe
|
||||
// trackedInstallOutcome captures the result of a single tracked-repo install
|
||||
// within the config loop.
|
||||
type trackedInstallOutcome struct {
|
||||
failed bool
|
||||
action string // only meaningful on dry-run
|
||||
skills []string // skills names to record
|
||||
failed bool
|
||||
action string // only meaningful on dry-run
|
||||
skills []string // skills names to record
|
||||
skillCount int // skills discovered in the repo
|
||||
}
|
||||
|
||||
// installTrackedFromConfig installs a single tracked repo from config and
|
||||
@@ -356,6 +400,7 @@ func installTrackedFromConfig(
|
||||
opts InstallOptions,
|
||||
) trackedInstallOutcome {
|
||||
trackOpts := opts
|
||||
trackOpts.Name = source.Name // keep the name recorded in config
|
||||
if groupDir != "" {
|
||||
trackOpts.Into = groupDir
|
||||
}
|
||||
@@ -380,7 +425,7 @@ func installTrackedFromConfig(
|
||||
if len(skills) == 0 {
|
||||
skills = []string{displayName}
|
||||
}
|
||||
return trackedInstallOutcome{skills: skills}
|
||||
return trackedInstallOutcome{skills: skills, skillCount: trackedResult.SkillCount}
|
||||
}
|
||||
|
||||
// installPlainFromConfig installs a single non-tracked skill from config.
|
||||
|
||||
@@ -81,70 +81,6 @@ func getMissingTrackedReposImpl(sourceDir string, walks ...sourcewalk.Options) (
|
||||
return missing, nil
|
||||
}
|
||||
|
||||
// RehydrateResult reports the outcome of rehydrating one missing tracked repo.
|
||||
type RehydrateResult struct {
|
||||
Name string `json:"name"`
|
||||
Action string `json:"action"` // "rehydrated" | "error"
|
||||
Error string `json:"error,omitempty"`
|
||||
}
|
||||
|
||||
// rehydrateMissingTrackedReposImpl re-clones tracked repos declared in metadata
|
||||
// whose clone directories are absent on disk. It mirrors the tracked-repo phase
|
||||
// of InstallFromConfig (bare `skillshare install`); repos already on disk are
|
||||
// left untouched. See issue #212.
|
||||
func rehydrateMissingTrackedReposImpl(sourceDir string, parseOpts ParseOptions, opts InstallOptions) ([]RehydrateResult, error) {
|
||||
store, err := LoadMetadata(sourceDir)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
existingRepos, err := GetTrackedRepos(sourceDir, sourcewalk.Options{Follow: opts.SourceFollow})
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
existing := make(map[string]bool, len(existingRepos))
|
||||
for _, repo := range existingRepos {
|
||||
existing[repo] = true
|
||||
}
|
||||
|
||||
opts.Quiet = true
|
||||
opts.Update = false
|
||||
var results []RehydrateResult
|
||||
for _, key := range store.List() {
|
||||
entry := store.Get(key)
|
||||
if entry == nil || !entry.Tracked {
|
||||
continue
|
||||
}
|
||||
relPath := filepath.ToSlash(KeyToRelPath(key, entry))
|
||||
if !strings.HasPrefix(filepath.Base(relPath), "_") {
|
||||
continue
|
||||
}
|
||||
if existing[relPath] {
|
||||
continue
|
||||
}
|
||||
|
||||
groupDir, bareName := splitTrackedRelPath(relPath)
|
||||
source, perr := ParseSourceWithOptions(entry.Source, parseOpts)
|
||||
if perr != nil {
|
||||
results = append(results, RehydrateResult{Name: relPath, Action: "error", Error: "invalid source: " + perr.Error()})
|
||||
continue
|
||||
}
|
||||
source.Name = bareName
|
||||
source.ApplyRecordedBranch(entry.Branch)
|
||||
|
||||
trackOpts := opts
|
||||
trackOpts.Name = bareName
|
||||
if groupDir != "" {
|
||||
trackOpts.Into = groupDir
|
||||
}
|
||||
if _, ierr := InstallTrackedRepo(source, sourceDir, trackOpts); ierr != nil {
|
||||
results = append(results, RehydrateResult{Name: relPath, Action: "error", Error: ierr.Error()})
|
||||
continue
|
||||
}
|
||||
results = append(results, RehydrateResult{Name: relPath, Action: "rehydrated"})
|
||||
}
|
||||
return results, nil
|
||||
}
|
||||
|
||||
// splitTrackedRelPath splits a tracked repo's relative path into its parent
|
||||
// group directory and base name (the base retains its leading "_").
|
||||
func splitTrackedRelPath(relPath string) (group, name string) {
|
||||
|
||||
@@ -17,13 +17,16 @@ func installTrackedRepoImpl(source *Source, sourceDir string, opts InstallOption
|
||||
return nil, err
|
||||
}
|
||||
|
||||
// Determine repo name: opts.Name > source.Name (from config) > TrackName (derived from URL)
|
||||
// Determine repo name: opts.Name (--name or the name recorded in config) >
|
||||
// TrackName (owner-repo, so two repos both called "skills" don't collide) >
|
||||
// source.Name. ParseSource always fills source.Name with the URL basename,
|
||||
// so it must not win over TrackName.
|
||||
repoName := opts.Name
|
||||
if repoName == "" {
|
||||
repoName = source.Name
|
||||
repoName = source.TrackName()
|
||||
}
|
||||
if repoName == "" {
|
||||
repoName = source.TrackName()
|
||||
repoName = source.Name
|
||||
}
|
||||
|
||||
// Prefix with _ to indicate tracked repo (avoid double prefix if user already added _)
|
||||
|
||||
@@ -57,9 +57,25 @@ func fileURL(p string) string {
|
||||
return "file://" + p
|
||||
}
|
||||
|
||||
// TestRehydrateMissingTrackedRepos_ReclonesAbsent verifies that a tracked repo
|
||||
// declared in metadata but absent on disk is re-cloned (issue #212).
|
||||
func TestRehydrateMissingTrackedRepos_ReclonesAbsent(t *testing.T) {
|
||||
// metadataInstallContext is a global-mode InstallContext over a metadata file.
|
||||
type metadataInstallContext struct{ dir string }
|
||||
|
||||
func (c metadataInstallContext) SourcePath() string { return c.dir }
|
||||
func (c metadataInstallContext) ConfigSkills() []SkillEntryDTO {
|
||||
return MetadataSkillEntries(LoadMetadataOrNew(c.dir))
|
||||
}
|
||||
func (metadataInstallContext) Reconcile() error { return nil }
|
||||
func (metadataInstallContext) PostInstallSkill(string) error { return nil }
|
||||
func (metadataInstallContext) Mode() string { return "global" }
|
||||
func (metadataInstallContext) GitLabHosts() []string { return nil }
|
||||
func (metadataInstallContext) AzureHosts() []string { return nil }
|
||||
func (metadataInstallContext) CNBHosts() []string { return nil }
|
||||
func (metadataInstallContext) GiteaHosts() []string { return nil }
|
||||
|
||||
// TestInstallFromConfig_ReclonesMissingTrackedRepo verifies that a tracked repo
|
||||
// declared in metadata but absent on disk is listed as missing and re-cloned
|
||||
// under its recorded name (issue #212).
|
||||
func TestInstallFromConfig_ReclonesMissingTrackedRepo(t *testing.T) {
|
||||
remoteURL := makeRemote(t, "")
|
||||
sourceDir := t.TempDir()
|
||||
|
||||
@@ -69,27 +85,30 @@ func TestRehydrateMissingTrackedRepos_ReclonesAbsent(t *testing.T) {
|
||||
if err := store.Save(sourceDir); err != nil {
|
||||
t.Fatalf("save metadata: %v", err)
|
||||
}
|
||||
|
||||
results, err := RehydrateMissingTrackedRepos(sourceDir, ParseOptions{}, InstallOptions{SkipAudit: true})
|
||||
if err != nil {
|
||||
t.Fatalf("RehydrateMissingTrackedRepos() error = %v", err)
|
||||
ctx := metadataInstallContext{sourceDir}
|
||||
if missing := MissingFromConfig(ctx); len(missing) != 1 || !missing[0].Tracked {
|
||||
t.Fatalf("expected the tracked repo to be missing, got %+v", missing)
|
||||
}
|
||||
if len(results) != 1 || results[0].Action != "rehydrated" {
|
||||
t.Fatalf("unexpected results: %+v", results)
|
||||
|
||||
result, err := InstallFromConfig(ctx, InstallOptions{SkipAudit: true, Quiet: true})
|
||||
if err != nil {
|
||||
t.Fatalf("InstallFromConfig() error = %v", err)
|
||||
}
|
||||
if result.InstalledRepos != 1 || len(result.FailedSkills) != 0 {
|
||||
t.Fatalf("unexpected result: %+v", result)
|
||||
}
|
||||
if _, err := os.Stat(filepath.Join(sourceDir, "_team-skills", ".git")); err != nil {
|
||||
t.Fatalf("expected cloned repo at _team-skills: %v", err)
|
||||
}
|
||||
// After rehydration nothing should remain missing.
|
||||
if missing, _ := GetMissingTrackedRepos(sourceDir); len(missing) != 0 {
|
||||
t.Fatalf("expected no missing repos after rehydrate, got %+v", missing)
|
||||
if missing := MissingFromConfig(ctx); len(missing) != 0 {
|
||||
t.Fatalf("expected nothing missing after install, got %+v", missing)
|
||||
}
|
||||
}
|
||||
|
||||
// TestInstallTrackedRepo_NameFromSource verifies that when opts.Name is empty,
|
||||
// the directory name is taken from source.Name rather than being derived from
|
||||
// the remote URL via TrackName().
|
||||
func TestInstallTrackedRepo_NameFromSource(t *testing.T) {
|
||||
// TestInstallTrackedRepo_NameFromOptions verifies that a name passed in
|
||||
// opts.Name (--name, or the name recorded in config) wins over the
|
||||
// URL-derived TrackName().
|
||||
func TestInstallTrackedRepo_NameFromOptions(t *testing.T) {
|
||||
remoteURL := makeRemote(t, "")
|
||||
sourceDir := t.TempDir()
|
||||
|
||||
@@ -97,10 +116,9 @@ func TestInstallTrackedRepo_NameFromSource(t *testing.T) {
|
||||
Type: SourceTypeGitHTTPS,
|
||||
Raw: remoteURL,
|
||||
CloneURL: remoteURL,
|
||||
Name: "my-custom-name", // explicit name; should win over TrackName()
|
||||
}
|
||||
|
||||
result, err := InstallTrackedRepo(source, sourceDir, InstallOptions{})
|
||||
result, err := InstallTrackedRepo(source, sourceDir, InstallOptions{Name: "my-custom-name"})
|
||||
if err != nil {
|
||||
t.Fatalf("InstallTrackedRepo() error = %v", err)
|
||||
}
|
||||
@@ -119,6 +137,32 @@ func TestInstallTrackedRepo_NameFromSource(t *testing.T) {
|
||||
}
|
||||
}
|
||||
|
||||
// TestInstallTrackedRepo_SameBasenameDoesNotCollide verifies that two repos
|
||||
// whose URLs end in the same basename get distinct owner-repo directories,
|
||||
// even though ParseSource fills source.Name with that shared basename.
|
||||
func TestInstallTrackedRepo_SameBasenameDoesNotCollide(t *testing.T) {
|
||||
remoteURL := makeRemote(t, "")
|
||||
sourceDir := t.TempDir()
|
||||
seen := map[string]bool{}
|
||||
for _, owner := range []string{"alice", "bob"} {
|
||||
// Raw names the owner (TrackName reads it); the clone uses the local remote.
|
||||
source := &Source{
|
||||
Type: SourceTypeGitSSH,
|
||||
Raw: "git@example.com:" + owner + "/skills.git",
|
||||
CloneURL: remoteURL,
|
||||
Name: "skills", // what ParseSource fills in from the basename
|
||||
}
|
||||
result, err := InstallTrackedRepo(source, sourceDir, InstallOptions{SkipAudit: true})
|
||||
if err != nil {
|
||||
t.Fatalf("install %s: %v", owner, err)
|
||||
}
|
||||
if result.RepoName == "_skills" || seen[result.RepoName] {
|
||||
t.Fatalf("repo %s got colliding name %q", owner, result.RepoName)
|
||||
}
|
||||
seen[result.RepoName] = true
|
||||
}
|
||||
}
|
||||
|
||||
// TestInstallTrackedRepo_BranchFromSource verifies that when opts.Branch is
|
||||
// empty, the repo is cloned onto source.Branch rather than the remote default.
|
||||
func TestInstallTrackedRepo_BranchFromSource(t *testing.T) {
|
||||
@@ -130,11 +174,10 @@ func TestInstallTrackedRepo_BranchFromSource(t *testing.T) {
|
||||
Type: SourceTypeGitHTTPS,
|
||||
Raw: remoteURL,
|
||||
CloneURL: remoteURL,
|
||||
Name: "mybranch-skill",
|
||||
Branch: featureBranch, // should be used; opts.Branch is empty
|
||||
}
|
||||
|
||||
result, err := InstallTrackedRepo(source, sourceDir, InstallOptions{})
|
||||
result, err := InstallTrackedRepo(source, sourceDir, InstallOptions{Name: "mybranch-skill"})
|
||||
if err != nil {
|
||||
t.Fatalf("InstallTrackedRepo() error = %v", err)
|
||||
}
|
||||
@@ -173,8 +216,7 @@ func TestMissingTrackedReposFollowPolicy(t *testing.T) {
|
||||
if err != nil || len(missing) != 0 {
|
||||
t.Fatalf("present followed checkout reported missing: %+v %v", missing, err)
|
||||
}
|
||||
results, err := RehydrateMissingTrackedRepos(source, ParseOptions{}, InstallOptions{SourceFollow: walk.Follow})
|
||||
if err != nil || len(results) != 0 {
|
||||
t.Fatalf("present followed checkout rehydrated: %+v %v", results, err)
|
||||
if got := MissingFromConfig(metadataInstallContext{source}); len(got) != 0 {
|
||||
t.Fatalf("present followed checkout listed for install: %+v", got)
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,20 +1,18 @@
|
||||
package main
|
||||
package install
|
||||
|
||||
import (
|
||||
"testing"
|
||||
|
||||
"skillshare/internal/install"
|
||||
)
|
||||
|
||||
func TestStoreToSkillEntryDTOs_FullPathKeyWithGroup(t *testing.T) {
|
||||
store := install.NewMetadataStore()
|
||||
store.Set("team/_demo", &install.MetadataEntry{
|
||||
func TestMetadataSkillEntries_FullPathKeyWithGroup(t *testing.T) {
|
||||
store := NewMetadataStore()
|
||||
store.Set("team/_demo", &MetadataEntry{
|
||||
Source: "file:///tmp/demo",
|
||||
Tracked: true,
|
||||
Group: "team",
|
||||
})
|
||||
|
||||
dtos := storeToSkillEntryDTOs(store)
|
||||
dtos := MetadataSkillEntries(store)
|
||||
if len(dtos) != 1 {
|
||||
t.Fatalf("expected 1 dto, got %d", len(dtos))
|
||||
}
|
||||
@@ -31,15 +29,15 @@ func TestStoreToSkillEntryDTOs_FullPathKeyWithGroup(t *testing.T) {
|
||||
}
|
||||
}
|
||||
|
||||
func TestStoreToSkillEntryDTOs_LegacyBasenameKeyWithGroup(t *testing.T) {
|
||||
store := install.NewMetadataStore()
|
||||
store.Set("_demo", &install.MetadataEntry{
|
||||
func TestMetadataSkillEntries_LegacyBasenameKeyWithGroup(t *testing.T) {
|
||||
store := NewMetadataStore()
|
||||
store.Set("_demo", &MetadataEntry{
|
||||
Source: "file:///tmp/demo",
|
||||
Tracked: true,
|
||||
Group: "team",
|
||||
})
|
||||
|
||||
dtos := storeToSkillEntryDTOs(store)
|
||||
dtos := MetadataSkillEntries(store)
|
||||
if len(dtos) != 1 {
|
||||
t.Fatalf("expected 1 dto, got %d", len(dtos))
|
||||
}
|
||||
@@ -970,6 +970,10 @@ func (s *Source) TrackName() string {
|
||||
// Try extracting full path from HTTPS clone URL
|
||||
cloneURL = strings.TrimSuffix(cloneURL, ".git")
|
||||
if u, err := url.Parse(cloneURL); err == nil {
|
||||
// A local file:// remote has no owner; its full path is not a name.
|
||||
if u.Scheme == "file" {
|
||||
return s.Name
|
||||
}
|
||||
pathStr := strings.Trim(u.Path, "/")
|
||||
if pathStr != "" {
|
||||
return strings.ReplaceAll(pathStr, "/", "-")
|
||||
|
||||
@@ -777,6 +777,11 @@ func TestSource_TrackName(t *testing.T) {
|
||||
raw: "onprem.gitlab.internal/org/sub1/sub2/project",
|
||||
want: "org-sub1-sub2-project",
|
||||
},
|
||||
{
|
||||
name: "file URL keeps basename",
|
||||
raw: "file:///tmp/remotes/team-repo",
|
||||
want: "team-repo",
|
||||
},
|
||||
}
|
||||
for _, tt := range tests {
|
||||
t.Run(tt.name, func(t *testing.T) {
|
||||
|
||||
@@ -43,8 +43,7 @@ func (s *Server) planSkillCheck(sourceDir, projectRoot string, walk sourcewalk.O
|
||||
|
||||
// dashboardSkillResults converts resolved statuses to the dashboard payload,
|
||||
// which is narrower than the CLI's: a skill without a remote carries only its
|
||||
// name, status and message, and a skill removed upstream is reported as
|
||||
// update_available because the dashboard has no "stale" state.
|
||||
// name, status and message.
|
||||
func dashboardSkillResults(results []check.SkillResult) []skillCheckResult {
|
||||
out := make([]skillCheckResult, 0, len(results))
|
||||
for _, r := range results {
|
||||
@@ -52,15 +51,11 @@ func dashboardSkillResults(results []check.SkillResult) []skillCheckResult {
|
||||
out = append(out, skillCheckResult{Name: r.Name, Status: r.Status, Message: r.Message})
|
||||
continue
|
||||
}
|
||||
status := r.Status
|
||||
if status == "stale" {
|
||||
status = "update_available"
|
||||
}
|
||||
out = append(out, skillCheckResult{
|
||||
Name: r.Name,
|
||||
Source: r.Source,
|
||||
Version: r.Version,
|
||||
Status: status,
|
||||
Status: r.Status,
|
||||
InstalledAt: r.InstalledAt,
|
||||
})
|
||||
}
|
||||
|
||||
@@ -41,14 +41,13 @@ func decodeCheckPayload(t *testing.T, raw string) checkPayload {
|
||||
}
|
||||
|
||||
// wantDashboardSkills is what the dashboard reports for checktest.Seed. Unlike
|
||||
// the CLI it reports a skill removed upstream as update_available, and gives
|
||||
// only name, status and message for a skill without a remote.
|
||||
// the CLI it gives only name, status and message for a skill without a remote.
|
||||
func wantDashboardSkills(versions map[string]string) []skillCheckResult {
|
||||
statuses := map[string]string{
|
||||
"broken": "error",
|
||||
"changed": "update_available",
|
||||
"current": "up_to_date",
|
||||
"doomed": "update_available",
|
||||
"doomed": "stale",
|
||||
"notree": "update_available",
|
||||
"same": "up_to_date",
|
||||
"slash": "up_to_date",
|
||||
|
||||
@@ -0,0 +1,124 @@
|
||||
package server
|
||||
|
||||
import (
|
||||
"net/http"
|
||||
"time"
|
||||
|
||||
"skillshare/internal/config"
|
||||
"skillshare/internal/install"
|
||||
"skillshare/internal/projectdir"
|
||||
)
|
||||
|
||||
// serverInstallContext runs the CLI's bare `skillshare install` (install
|
||||
// everything recorded in config that is not on disk) for the dashboard.
|
||||
type serverInstallContext struct{ s *Server }
|
||||
|
||||
var _ install.InstallContext = serverInstallContext{}
|
||||
|
||||
func (c serverInstallContext) SourcePath() string { return c.s.cfg.EffectiveSkillsSource() }
|
||||
|
||||
func (c serverInstallContext) ConfigSkills() []install.SkillEntryDTO {
|
||||
if !c.s.IsProjectMode() {
|
||||
return install.MetadataSkillEntries(install.LoadMetadataOrNew(c.SourcePath()))
|
||||
}
|
||||
return config.ProjectSkillEntries(c.s.projectCfg.Skills)
|
||||
}
|
||||
|
||||
func (c serverInstallContext) Reconcile() error {
|
||||
c.s.reloadSkillsStore()
|
||||
c.s.reconcileSkillsConfig(c.SourcePath())
|
||||
return nil
|
||||
}
|
||||
|
||||
func (c serverInstallContext) PostInstallSkill(displayName string) error {
|
||||
if !c.s.IsProjectMode() {
|
||||
return nil
|
||||
}
|
||||
dir := c.s.gitignoreDir()
|
||||
if dir == "" {
|
||||
return nil
|
||||
}
|
||||
return install.UpdateGitIgnore(dir, c.s.projectGitignorePrefix()+"/"+displayName)
|
||||
}
|
||||
|
||||
func (c serverInstallContext) Mode() string { return c.s.installLogMode() }
|
||||
func (c serverInstallContext) GitLabHosts() []string { return c.s.parseOpts().GitLabHosts }
|
||||
func (c serverInstallContext) AzureHosts() []string { return c.s.parseOpts().AzureHosts }
|
||||
func (c serverInstallContext) CNBHosts() []string { return c.s.parseOpts().CNBHosts }
|
||||
func (c serverInstallContext) GiteaHosts() []string { return c.s.parseOpts().GiteaHosts }
|
||||
|
||||
type configEntryInfo struct {
|
||||
Name string `json:"name"`
|
||||
Source string `json:"source"`
|
||||
Tracked bool `json:"tracked"`
|
||||
Branch string `json:"branch,omitempty"`
|
||||
}
|
||||
|
||||
// handleMissingConfigEntries lists config entries that are not on disk, so the
|
||||
// dashboard can offer to install them (bare `skillshare install`).
|
||||
func (s *Server) handleMissingConfigEntries(w http.ResponseWriter, r *http.Request) {
|
||||
s.mu.RLock()
|
||||
missing := install.MissingFromConfig(serverInstallContext{s})
|
||||
s.mu.RUnlock()
|
||||
entries := make([]configEntryInfo, 0, len(missing))
|
||||
for _, m := range missing {
|
||||
entries = append(entries, configEntryInfo{Name: m.FullName(), Source: m.Source, Tracked: m.Tracked, Branch: m.Branch})
|
||||
}
|
||||
file := ".metadata.json"
|
||||
if s.IsProjectMode() {
|
||||
file = ".skillshare/config.yaml"
|
||||
}
|
||||
writeJSON(w, map[string]any{"entries": entries, "file": file})
|
||||
}
|
||||
|
||||
// handleInstallFromConfig installs every config entry missing on disk, like
|
||||
// bare `skillshare install`.
|
||||
func (s *Server) handleInstallFromConfig(w http.ResponseWriter, r *http.Request) {
|
||||
start := time.Now()
|
||||
s.mu.Lock()
|
||||
defer s.mu.Unlock()
|
||||
defer s.trackProjectLock()()
|
||||
|
||||
opts := install.InstallOptions{
|
||||
Quiet: true,
|
||||
AuditThreshold: s.auditThreshold(),
|
||||
SourceFollow: s.skillsWalk().Follow,
|
||||
}
|
||||
if s.IsProjectMode() {
|
||||
opts.AuditProjectRoot = s.projectRoot
|
||||
lock, err := install.LoadLock(projectdir.Resolve(s.projectRoot))
|
||||
if err != nil {
|
||||
writeError(w, http.StatusInternalServerError, err.Error())
|
||||
return
|
||||
}
|
||||
opts.Lock = lock
|
||||
}
|
||||
|
||||
result, err := install.InstallFromConfig(serverInstallContext{s}, opts)
|
||||
status, msg := "ok", ""
|
||||
if err != nil {
|
||||
status, msg = "error", err.Error()
|
||||
} else if len(result.FailedSkills) > 0 {
|
||||
status = "partial"
|
||||
}
|
||||
s.writeOpsLog("install", status, start, map[string]any{
|
||||
"source": "config",
|
||||
"mode": s.installLogMode(),
|
||||
"threshold": s.auditThreshold(),
|
||||
"scope": "ui",
|
||||
"installed_skills": result.InstalledSkills,
|
||||
"failed_skills": result.FailedSkills,
|
||||
}, msg)
|
||||
if err != nil {
|
||||
writeError(w, http.StatusInternalServerError, err.Error())
|
||||
return
|
||||
}
|
||||
|
||||
writeJSON(w, map[string]any{
|
||||
"installed": result.Installed,
|
||||
"installedRepos": result.InstalledRepos,
|
||||
"installedRepoSkills": result.InstalledRepoSkills,
|
||||
"skipped": result.Skipped,
|
||||
"failed": result.FailedSkills,
|
||||
})
|
||||
}
|
||||
@@ -0,0 +1,41 @@
|
||||
package server
|
||||
|
||||
import (
|
||||
"encoding/json"
|
||||
"net/http"
|
||||
"net/http/httptest"
|
||||
"testing"
|
||||
|
||||
"skillshare/internal/install"
|
||||
)
|
||||
|
||||
func TestHandleMissingConfigEntries_ListsAbsentEntries(t *testing.T) {
|
||||
s, src := newTestServer(t)
|
||||
store := install.LoadMetadataOrNew(src)
|
||||
store.Set("_team-skills", &install.MetadataEntry{Source: "https://github.com/team/skills.git", Tracked: true, Branch: "main"})
|
||||
if err := store.Save(src); err != nil {
|
||||
t.Fatalf("save metadata: %v", err)
|
||||
}
|
||||
|
||||
rr := httptest.NewRecorder()
|
||||
s.handleMissingConfigEntries(rr, httptest.NewRequest(http.MethodGet, "/api/install/missing", nil))
|
||||
var resp struct {
|
||||
Entries []configEntryInfo `json:"entries"`
|
||||
}
|
||||
if err := json.Unmarshal(rr.Body.Bytes(), &resp); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
want := configEntryInfo{Name: "_team-skills", Source: "https://github.com/team/skills.git", Tracked: true, Branch: "main"}
|
||||
if len(resp.Entries) != 1 || resp.Entries[0] != want {
|
||||
t.Fatalf("entries = %+v, want [%+v]", resp.Entries, want)
|
||||
}
|
||||
}
|
||||
|
||||
func TestHandleInstallFromConfig_NothingMissing(t *testing.T) {
|
||||
s, _ := newTestServer(t)
|
||||
rr := httptest.NewRecorder()
|
||||
s.handleInstallFromConfig(rr, httptest.NewRequest(http.MethodPost, "/api/install/from-config", nil))
|
||||
if rr.Code != http.StatusOK {
|
||||
t.Fatalf("expected 200, got %d: %s", rr.Code, rr.Body.String())
|
||||
}
|
||||
}
|
||||
@@ -27,28 +27,6 @@ type updateRequest struct {
|
||||
SkipAudit bool `json:"skipAudit"`
|
||||
}
|
||||
|
||||
// missingTrackedRepoInfo describes a tracked repo declared in metadata whose
|
||||
// clone directory is absent on disk. Carried in update responses so the UI can
|
||||
// warn and offer rehydration (issue #212).
|
||||
type missingTrackedRepoInfo struct {
|
||||
Name string `json:"name"`
|
||||
Source string `json:"source"`
|
||||
Branch string `json:"branch,omitempty"`
|
||||
}
|
||||
|
||||
// missingTrackedRepos returns tracked repos declared in metadata but absent on disk.
|
||||
func (s *Server) missingTrackedRepos() []missingTrackedRepoInfo {
|
||||
repos, err := install.GetMissingTrackedRepos(s.cfg.EffectiveSkillsSource(), s.skillsWalk())
|
||||
if err != nil || len(repos) == 0 {
|
||||
return nil
|
||||
}
|
||||
out := make([]missingTrackedRepoInfo, 0, len(repos))
|
||||
for _, r := range repos {
|
||||
out = append(out, missingTrackedRepoInfo{Name: r.Name, Source: r.Source, Branch: r.Branch})
|
||||
}
|
||||
return out
|
||||
}
|
||||
|
||||
type updateResultItem struct {
|
||||
Name string `json:"name"`
|
||||
Action string `json:"action"` // "updated", "up-to-date", "skipped", "error", "blocked"
|
||||
@@ -123,7 +101,7 @@ func (s *Server) handleUpdate(w http.ResponseWriter, r *http.Request) {
|
||||
"results_blocked": blocked,
|
||||
"scope": "ui",
|
||||
}, msg)
|
||||
writeJSON(w, map[string]any{"results": results, "missingTrackedRepos": s.missingTrackedRepos()})
|
||||
writeJSON(w, map[string]any{"results": results})
|
||||
return
|
||||
}
|
||||
|
||||
@@ -474,70 +452,6 @@ func (s *Server) updateAll(force, skipAudit bool) []updateResultItem {
|
||||
return results
|
||||
}
|
||||
|
||||
// handleMissingTrackedRepos returns tracked repos declared in metadata whose
|
||||
// clone directories are absent on disk (issue #212), so the UI can warn on load.
|
||||
func (s *Server) handleMissingTrackedRepos(w http.ResponseWriter, r *http.Request) {
|
||||
s.mu.RLock()
|
||||
repos := s.missingTrackedRepos()
|
||||
s.mu.RUnlock()
|
||||
if repos == nil {
|
||||
repos = []missingTrackedRepoInfo{}
|
||||
}
|
||||
writeJSON(w, map[string]any{"repos": repos})
|
||||
}
|
||||
|
||||
// handleRehydrateTrackedRepos re-clones tracked repos declared in metadata whose
|
||||
// clone directories are absent on disk (issue #212). Mirrors bare CLI install.
|
||||
func (s *Server) handleRehydrateTrackedRepos(w http.ResponseWriter, r *http.Request) {
|
||||
start := time.Now()
|
||||
s.mu.Lock()
|
||||
defer s.mu.Unlock()
|
||||
|
||||
sourceDir := s.cfg.EffectiveSkillsSource()
|
||||
opts := install.InstallOptions{
|
||||
AuditThreshold: s.updateAuditThreshold(),
|
||||
SourceDir: sourceDir,
|
||||
SourceFollow: s.skillsWalk().Follow,
|
||||
}
|
||||
if s.IsProjectMode() {
|
||||
opts.AuditProjectRoot = s.projectRoot
|
||||
}
|
||||
|
||||
results, err := install.RehydrateMissingTrackedRepos(sourceDir, s.parseOpts(), opts)
|
||||
if err != nil {
|
||||
writeError(w, http.StatusInternalServerError, err.Error())
|
||||
return
|
||||
}
|
||||
|
||||
// Reload metadata + reconcile config so newly cloned repos register.
|
||||
if st, lerr := install.LoadMetadataWithMigration(sourceDir, ""); lerr == nil && st != nil {
|
||||
s.skillsStore = st
|
||||
}
|
||||
s.reconcileSkillsConfig(sourceDir)
|
||||
|
||||
rehydrated, failed := 0, 0
|
||||
for _, res := range results {
|
||||
if res.Action == "rehydrated" {
|
||||
rehydrated++
|
||||
} else {
|
||||
failed++
|
||||
}
|
||||
}
|
||||
status, msg := "ok", ""
|
||||
if failed > 0 {
|
||||
status = "partial"
|
||||
msg = fmt.Sprintf("%d repo(s) failed to rehydrate", failed)
|
||||
}
|
||||
s.writeOpsLog("install", status, start, map[string]any{
|
||||
"name": "--rehydrate",
|
||||
"tracked": true,
|
||||
"scope": "ui",
|
||||
"rehydrated": rehydrated,
|
||||
"failed": failed,
|
||||
}, msg)
|
||||
writeJSON(w, map[string]any{"results": results})
|
||||
}
|
||||
|
||||
// getServerUpdatableSkills returns relative paths of skills that have metadata with a remote source.
|
||||
// It walks the source directory recursively to find nested skills (e.g. utils/ascii-box-check).
|
||||
func getServerUpdatableSkills(sourceDir string, store *install.MetadataStore, walk sourcewalk.Options) ([]string, error) {
|
||||
|
||||
@@ -205,7 +205,7 @@ func assertUpdateFollowLink(t *testing.T, link string) {
|
||||
}
|
||||
}
|
||||
|
||||
func TestHandleRehydrate_FollowedCheckoutWithMetadata(t *testing.T) {
|
||||
func TestHandleInstallFromConfig_FollowedCheckoutWithMetadata(t *testing.T) {
|
||||
for _, project := range []bool{false, true} {
|
||||
t.Run(fmt.Sprintf("project=%t", project), func(t *testing.T) {
|
||||
s, source := newUpdateFollowServer(t, project, true)
|
||||
@@ -220,19 +220,19 @@ func TestHandleRehydrate_FollowedCheckoutWithMetadata(t *testing.T) {
|
||||
if err := store.Save(source); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
if repos := s.missingTrackedRepos(); len(repos) != 0 {
|
||||
if repos, _ := install.GetMissingTrackedRepos(source, s.skillsWalk()); len(repos) != 0 {
|
||||
t.Fatalf("followed checkout reported missing: %+v", repos)
|
||||
}
|
||||
rr := httptest.NewRecorder()
|
||||
s.handleRehydrateTrackedRepos(rr, httptest.NewRequest(http.MethodPost, "/api/update/rehydrate", nil))
|
||||
s.handleInstallFromConfig(rr, httptest.NewRequest(http.MethodPost, "/api/install/from-config", nil))
|
||||
var resp struct {
|
||||
Results []install.RehydrateResult `json:"results"`
|
||||
Installed int `json:"installed"`
|
||||
}
|
||||
if err := json.Unmarshal(rr.Body.Bytes(), &resp); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
if rr.Code != http.StatusOK || len(resp.Results) != 0 {
|
||||
t.Fatalf("followed checkout rehydrated: %d %s", rr.Code, rr.Body.String())
|
||||
if rr.Code != http.StatusOK || resp.Installed != 0 {
|
||||
t.Fatalf("followed checkout reinstalled: %d %s", rr.Code, rr.Body.String())
|
||||
}
|
||||
assertUpdateFollowLink(t, link)
|
||||
})
|
||||
|
||||
@@ -98,12 +98,11 @@ func (s *Server) handleUpdateStream(w http.ResponseWriter, r *http.Request) {
|
||||
|
||||
var results []updateResultItem
|
||||
summary := struct {
|
||||
Updated int `json:"updated"`
|
||||
UpToDate int `json:"upToDate"`
|
||||
Blocked int `json:"blocked"`
|
||||
Errors int `json:"errors"`
|
||||
Skipped int `json:"skipped"`
|
||||
MissingTrackedRepos []missingTrackedRepoInfo `json:"missingTrackedRepos,omitempty"`
|
||||
Updated int `json:"updated"`
|
||||
UpToDate int `json:"upToDate"`
|
||||
Blocked int `json:"blocked"`
|
||||
Errors int `json:"errors"`
|
||||
Skipped int `json:"skipped"`
|
||||
}{}
|
||||
|
||||
for _, item := range items {
|
||||
@@ -148,12 +147,6 @@ func (s *Server) handleUpdateStream(w http.ResponseWriter, r *http.Request) {
|
||||
|
||||
// Surface tracked repos declared in metadata but absent on disk (issue #212).
|
||||
// Only relevant for the update-all flow, not targeted updates.
|
||||
if namesParam == "" {
|
||||
s.mu.RLock()
|
||||
summary.MissingTrackedRepos = s.missingTrackedRepos()
|
||||
s.mu.RUnlock()
|
||||
}
|
||||
|
||||
// Write ops log
|
||||
s.mu.Lock()
|
||||
status := "ok"
|
||||
|
||||
@@ -1,8 +1,6 @@
|
||||
package server
|
||||
|
||||
import (
|
||||
"net/http"
|
||||
"net/http/httptest"
|
||||
"os"
|
||||
"os/exec"
|
||||
"path/filepath"
|
||||
@@ -41,47 +39,6 @@ func initGitRepo(t *testing.T, dir string) {
|
||||
}
|
||||
}
|
||||
|
||||
// TestMissingTrackedRepos_ReportedFromMetadata verifies the server detects tracked
|
||||
// repos declared in metadata whose clone dirs are absent (issue #212).
|
||||
func TestMissingTrackedRepos_ReportedFromMetadata(t *testing.T) {
|
||||
s, src := newTestServer(t)
|
||||
|
||||
store := install.LoadMetadataOrNew(src)
|
||||
store.Set("_team-skills", &install.MetadataEntry{
|
||||
Source: "https://github.com/example/team-skills",
|
||||
Branch: "main",
|
||||
Tracked: true,
|
||||
})
|
||||
if err := store.Save(src); err != nil {
|
||||
t.Fatalf("save metadata: %v", err)
|
||||
}
|
||||
|
||||
missing := s.missingTrackedRepos()
|
||||
if len(missing) != 1 {
|
||||
t.Fatalf("expected 1 missing repo, got %d (%+v)", len(missing), missing)
|
||||
}
|
||||
if missing[0].Name != "_team-skills" || missing[0].Branch != "main" {
|
||||
t.Fatalf("unexpected missing repo: %+v", missing[0])
|
||||
}
|
||||
}
|
||||
|
||||
// TestHandleRehydrate_NoMissing_OK verifies the rehydrate endpoint succeeds with
|
||||
// an empty result set when nothing is missing.
|
||||
func TestHandleRehydrate_NoMissing_OK(t *testing.T) {
|
||||
s, _ := newTestServer(t)
|
||||
|
||||
req := httptest.NewRequest(http.MethodPost, "/api/update/rehydrate", nil)
|
||||
rr := httptest.NewRecorder()
|
||||
s.handleRehydrateTrackedRepos(rr, req)
|
||||
|
||||
if rr.Code != http.StatusOK {
|
||||
t.Fatalf("expected 200, got %d: %s", rr.Code, rr.Body.String())
|
||||
}
|
||||
if !strings.Contains(rr.Body.String(), "results") {
|
||||
t.Fatalf("expected results field, got %s", rr.Body.String())
|
||||
}
|
||||
}
|
||||
|
||||
func TestUpdateSingle_NestedTrackedRepo_Resolves(t *testing.T) {
|
||||
s, src := newTestServer(t)
|
||||
|
||||
|
||||
@@ -563,6 +563,8 @@ func (s *Server) registerRoutes() {
|
||||
s.mux.HandleFunc("POST /api/discover", s.handleDiscover)
|
||||
s.mux.HandleFunc("POST /api/install", s.handleInstall)
|
||||
s.mux.HandleFunc("POST /api/install/batch", s.handleInstallBatch)
|
||||
s.mux.HandleFunc("GET /api/install/missing", s.handleMissingConfigEntries)
|
||||
s.mux.HandleFunc("POST /api/install/from-config", s.handleInstallFromConfig)
|
||||
s.mux.HandleFunc("POST /api/uninstall/batch", s.handleBatchUninstall)
|
||||
s.mux.HandleFunc("POST /api/source-links", s.handleCreateSourceLink)
|
||||
s.mux.HandleFunc("DELETE /api/source-links/{name}", s.handleRemoveSourceLink)
|
||||
@@ -570,8 +572,6 @@ func (s *Server) registerRoutes() {
|
||||
// Update & Check
|
||||
s.mux.HandleFunc("POST /api/update", s.handleUpdate)
|
||||
s.mux.HandleFunc("GET /api/update/stream", s.handleUpdateStream)
|
||||
s.mux.HandleFunc("GET /api/update/missing-tracked-repos", s.handleMissingTrackedRepos)
|
||||
s.mux.HandleFunc("POST /api/update/rehydrate", s.handleRehydrateTrackedRepos)
|
||||
s.mux.HandleFunc("GET /api/check/stream", s.handleCheckStream)
|
||||
s.mux.HandleFunc("GET /api/check", s.handleCheck)
|
||||
|
||||
|
||||
@@ -46,7 +46,7 @@ skillshare sync
|
||||
```
|
||||
|
||||
**What happens:**
|
||||
1. Repo is cloned to `~/.config/skillshare/skills/_team-skills/`
|
||||
1. Repo is cloned to `~/.config/skillshare/skills/_team-shared-skills/`
|
||||
2. `.git` directory is preserved
|
||||
3. The clone directory is added to the managed `.gitignore` block so it stays machine-local and is not committed as a nested git repository
|
||||
4. Entire repo is security-audited using active install threshold (`audit.block_threshold` or `--threshold`)
|
||||
@@ -67,6 +67,8 @@ Tracked repos are prefixed with `_` to distinguish them from regular skills:
|
||||
└── _team-skills/ # Tracked repo (underscore prefix)
|
||||
```
|
||||
|
||||
The directory name comes from the owner and repo (`_<owner>-<repo>`), so `alice/skills` and `bob/skills` install as `_alice-skills` and `_bob-skills` instead of colliding. Use `--name` to pick a different name. Repos you installed earlier keep their current names.
|
||||
|
||||
A tracked repo installed with `--into` sits inside a folder, such as `devops/_team-skills/`. It is still treated as one repo: its skills are grouped under it, `status` counts them, and you update or uninstall it as `devops/_team-skills`. Below the top level, an `_` folder counts as a tracked repo only when it is a git clone, so a plain folder like `devops/_drafts/` stays a regular folder.
|
||||
|
||||
---
|
||||
|
||||
+3
-1
@@ -46,7 +46,7 @@ skillshare sync
|
||||
```
|
||||
|
||||
**何が起こるか:**
|
||||
1. リポジトリが `~/.config/skillshare/skills/_team-skills/` にクローンされます
|
||||
1. リポジトリが `~/.config/skillshare/skills/_team-shared-skills/` にクローンされます
|
||||
2. `.git` ディレクトリが保持されます
|
||||
3. クローンディレクトリは管理対象の `.gitignore` ブロックに追加され、マシンローカルにとどまり、ネストされた git リポジトリとしてコミットされないようになります
|
||||
4. リポジトリ全体が、有効なインストールしきい値(`audit.block_threshold` または `--threshold`)を使ってセキュリティ監査されます
|
||||
@@ -67,6 +67,8 @@ skillshare sync
|
||||
└── _team-skills/ # Tracked repo (underscore prefix)
|
||||
```
|
||||
|
||||
ディレクトリ名はオーナーとリポジトリ名から付けられます(`_<owner>-<repo>`)。そのため `alice/skills` と `bob/skills` はそれぞれ `_alice-skills` と `_bob-skills` としてインストールされ、衝突しません。別の名前にするには `--name` を使います。以前にインストールしたリポジトリは今の名前のままです。
|
||||
|
||||
`--into` でインストールした追跡リポジトリは、`devops/_team-skills/` のようにフォルダの中に置かれます。それでも 1 つのリポジトリとして扱われます。中の Skill はその下にまとめられ、`status` でも数えられ、更新やアンインストールには `devops/_team-skills` という名前を使います。最上位より下では、git clone された `_` フォルダだけが追跡リポジトリとみなされるため、`devops/_drafts/` のような普通のフォルダは通常のフォルダのままです。
|
||||
|
||||
---
|
||||
|
||||
+3
-1
@@ -46,7 +46,7 @@ skillshare sync
|
||||
```
|
||||
|
||||
**일어나는 일:**
|
||||
1. repo가 `~/.config/skillshare/skills/_team-skills/`로 clone됨
|
||||
1. repo가 `~/.config/skillshare/skills/_team-shared-skills/`로 clone됨
|
||||
2. `.git` 디렉터리가 보존됨
|
||||
3. clone 디렉터리가 관리되는 `.gitignore` 블록에 추가되어 머신 로컬 상태로 유지되며, 중첩된 git repo로 커밋되지 않음
|
||||
4. 활성 install 임계값(`audit.block_threshold` 또는 `--threshold`)을 사용해 전체 repo가 보안 감사됨
|
||||
@@ -67,6 +67,8 @@ Tracked repo는 일반 skill과 구분하기 위해 `_` 접두사가 붙습니
|
||||
└── _team-skills/ # Tracked repo (underscore prefix)
|
||||
```
|
||||
|
||||
디렉터리 이름은 소유자와 repo 이름으로 정해집니다(`_<owner>-<repo>`). 그래서 `alice/skills`와 `bob/skills`는 각각 `_alice-skills`, `_bob-skills`로 설치되어 충돌하지 않습니다. 다른 이름을 쓰려면 `--name`을 사용하세요. 이전에 설치한 repo는 기존 이름을 유지합니다.
|
||||
|
||||
`--into`로 설치한 tracked repo는 `devops/_team-skills/`처럼 폴더 안에 놓입니다. 그래도 하나의 repo로 취급됩니다. 안에 있는 skill은 그 아래로 묶이고, `status`에서도 집계되며, 업데이트나 제거할 때는 `devops/_team-skills`라는 이름을 사용합니다. 최상위 아래에서는 git clone된 `_` 폴더만 tracked repo로 간주되므로, `devops/_drafts/` 같은 일반 폴더는 그대로 일반 폴더입니다.
|
||||
|
||||
---
|
||||
|
||||
+3
-1
@@ -46,7 +46,7 @@ skillshare sync
|
||||
```
|
||||
|
||||
**发生了什么:**
|
||||
1. 仓库被克隆到 `~/.config/skillshare/skills/_team-skills/`
|
||||
1. 仓库被克隆到 `~/.config/skillshare/skills/_team-shared-skills/`
|
||||
2. 保留 `.git` 目录
|
||||
3. 克隆目录会被加入受管理的 `.gitignore` 区块,使其保持本机专属,不会作为嵌套 Git 仓库被提交
|
||||
4. 使用当前 install 阈值(`audit.block_threshold` 或 `--threshold`)对整个仓库进行安全审计
|
||||
@@ -67,6 +67,8 @@ Tracked repos 会以 `_` 为前缀,以便与普通 Skill 区分:
|
||||
└── _team-skills/ # Tracked Repo(下划线前缀)
|
||||
```
|
||||
|
||||
文件夹名称取自所有者和仓库(`_<owner>-<repo>`),因此 `alice/skills` 和 `bob/skills` 会分别安装为 `_alice-skills` 和 `_bob-skills`,不会互相冲突。要换名称可以用 `--name`。之前安装的 repo 保留原来的名称。
|
||||
|
||||
用 `--into` 安装的 tracked repo 会放在文件夹里,例如 `devops/_team-skills/`。它仍然被视为一个 repo:其中的 Skill 会归在它下面,`status` 会统计这些 Skill,更新或卸载时使用 `devops/_team-skills` 这个名称。在第一层以下,只有 git clone 得到的 `_` 文件夹才算 tracked repo,因此像 `devops/_drafts/` 这样的普通文件夹仍是普通文件夹。
|
||||
|
||||
---
|
||||
|
||||
+3
-1
@@ -46,7 +46,7 @@ skillshare sync
|
||||
```
|
||||
|
||||
**會發生什麼事:**
|
||||
1. Repo 會被 clone 到 `~/.config/skillshare/skills/_team-skills/`
|
||||
1. Repo 會被 clone 到 `~/.config/skillshare/skills/_team-shared-skills/`
|
||||
2. `.git` 目錄會被保留
|
||||
3. Clone 目錄會被加入受管理的 `.gitignore` 區塊,讓它保持機器本機、不會被當成巢狀 git repository 被 commit 進去
|
||||
4. 整個 repo 會用當前生效的安裝門檻(`audit.block_threshold` 或 `--threshold`)進行安全稽核
|
||||
@@ -67,6 +67,8 @@ Tracked repos 會以 `_` 為前綴,以便與一般 skills 區分:
|
||||
└── _team-skills/ # Tracked repo (underscore prefix)
|
||||
```
|
||||
|
||||
資料夾名稱取自擁有者與 repo(`_<owner>-<repo>`),所以 `alice/skills` 和 `bob/skills` 會分別安裝成 `_alice-skills` 與 `_bob-skills`,不會互相衝突。要換名稱可以用 `--name`。先前安裝的 repo 維持原本的名稱。
|
||||
|
||||
用 `--into` 安裝的 tracked repo 會放在資料夾裡,例如 `devops/_team-skills/`。它仍然視為一個 repo:裡面的 skills 會歸在它底下,`status` 會計入這些 skills,更新或解除安裝時使用 `devops/_team-skills` 這個名稱。在第一層以下,只有 git clone 出來的 `_` 資料夾才算 tracked repo,所以像 `devops/_drafts/` 這樣的一般資料夾仍是普通資料夾。
|
||||
|
||||
---
|
||||
|
||||
Reference in New Issue
Block a user