diff --git a/cmd/install.go b/cmd/install.go index 863bdb4..207d844 100644 --- a/cmd/install.go +++ b/cmd/install.go @@ -3,6 +3,10 @@ package cmd import ( "fmt" "net/http" + "os" + "os/exec" + "strings" + "time" "github.com/prvious/pv/internal/binaries" "github.com/prvious/pv/internal/caddy" @@ -10,189 +14,259 @@ import ( "github.com/prvious/pv/internal/phpenv" "github.com/prvious/pv/internal/registry" "github.com/prvious/pv/internal/setup" + "github.com/prvious/pv/internal/ui" "github.com/spf13/cobra" ) var ( - forceInstall bool - installTLD string - installPHP string + forceInstall bool + installTLD string + installPHP string + installVerbose bool ) var installCmd = &cobra.Command{ Use: "install", Short: "Set up pv for the first time", RunE: func(cmd *cobra.Command, args []string) error { + start := time.Now() + + // Propagate verbose flag. + binaries.Verbose = installVerbose + phpenv.Verbose = installVerbose + setup.Verbose = installVerbose + + // Print header. + ui.Header(version) + // 0. Validate TLD. if err := config.ValidateTLD(installTLD); err != nil { return err } - // 1. Check prerequisites. - fmt.Println("Checking prerequisites...") - if err := setup.CheckOS(); err != nil { - return err - } - fmt.Printf(" ✓ macOS detected (%s)\n", setup.PlatformLabel()) - if setup.IsAlreadyInstalled() && !forceInstall { return fmt.Errorf("pv is already installed at %s\n Run with --force to reinstall", config.PvDir()) } - // 2. Create directory structure. - fmt.Println("\nCreating directory structure...") - if err := config.EnsureDirs(); err != nil { - return fmt.Errorf("cannot create directories: %w", err) - } - fmt.Println(" ✓ ~/.pv directories created") - - // Save TLD setting. - settings := &config.Settings{TLD: installTLD} - if err := settings.Save(); err != nil { - return fmt.Errorf("cannot save settings: %w", err) + // Acquire sudo credentials upfront so password prompt doesn't + // interfere with spinner output during DNS/CA steps. + ui.Subtle("pv needs sudo for DNS and certificate setup.") + sudoCmd := exec.Command("sudo", "-v") + sudoCmd.Stdin = os.Stdin + sudoCmd.Stdout = os.Stderr + sudoCmd.Stderr = os.Stderr + if err := sudoCmd.Run(); err != nil { + return fmt.Errorf("sudo authentication failed: %w", err) } - fmt.Printf(" ✓ TLD set to .%s\n", installTLD) + fmt.Fprintln(os.Stderr) client := &http.Client{} - // 3. Install PHP version via phpenv. + // Step 1: Check prerequisites. + if err := ui.Step("Checking prerequisites...", func() (string, error) { + if err := setup.CheckOS(); err != nil { + return "", err + } + return fmt.Sprintf("macOS %s", setup.PlatformLabel()), nil + }); err != nil { + return err + } + + // Step 2: Install PHP (with progress bar for large downloads). phpVersion := installPHP - if phpVersion == "" { - fmt.Println("\nDetecting available PHP versions...") - available, err := phpenv.AvailableVersions(client) - if err != nil { - return fmt.Errorf("cannot detect available PHP versions: %w", err) + var fullPHPResult string + if err := ui.StepProgress("Installing PHP...", func(progress func(written, total int64)) (string, error) { + if phpVersion == "" { + available, err := phpenv.AvailableVersions(client) + if err != nil { + return "", fmt.Errorf("cannot detect available PHP versions: %w", err) + } + if len(available) == 0 { + return "", fmt.Errorf("no PHP versions found in releases") + } + phpVersion = available[len(available)-1] } - if len(available) == 0 { - return fmt.Errorf("no PHP versions found in releases") + + // Create directory structure first. + if err := config.EnsureDirs(); err != nil { + return "", fmt.Errorf("cannot create directories: %w", err) } - // Pick the highest available version. - phpVersion = available[len(available)-1] - fmt.Printf(" Latest available: PHP %s\n", phpVersion) - } - fmt.Printf("\nInstalling PHP %s...\n", phpVersion) - if err := phpenv.Install(client, phpVersion); err != nil { - return fmt.Errorf("cannot install PHP %s: %w", phpVersion, err) - } + // Save TLD setting. + settings := &config.Settings{TLD: installTLD} + if err := settings.Save(); err != nil { + return "", fmt.Errorf("cannot save settings: %w", err) + } - // Set as global default. - if err := phpenv.SetGlobal(phpVersion); err != nil { - return fmt.Errorf("cannot set global PHP: %w", err) - } - fmt.Printf(" ✓ PHP %s set as global default\n", phpVersion) + // Install PHP version with progress tracking. + if err := phpenv.InstallProgress(client, phpVersion, progress); err != nil { + return "", fmt.Errorf("cannot install PHP %s: %w", phpVersion, err) + } - // 4. Download other tools (Mago, Composer). - fmt.Println("\nDownloading tools...") - vs, err := binaries.LoadVersions() - if err != nil { - return fmt.Errorf("cannot load version state: %w", err) + // Set as global default. + if err := phpenv.SetGlobal(phpVersion); err != nil { + return "", fmt.Errorf("cannot set global PHP: %w", err) + } + + // Detect full version for display. + fullVersion, err := binaries.DetectPHPVersion(config.PhpVersionDir(phpVersion)) + if err != nil { + fullPHPResult = fmt.Sprintf("PHP %s (FrankenPHP + CLI)", phpVersion) + } else { + fullPHPResult = fmt.Sprintf("PHP %s (FrankenPHP + CLI)", fullVersion) + } + return fullPHPResult, nil + }); err != nil { + return err } - for _, b := range binaries.Tools() { - latest, err := binaries.FetchLatestVersion(client, b) + // Step 3: Install tools (Mago, Composer). + var toolVersions []string + if err := ui.Step("Installing tools...", func() (string, error) { + vs, err := binaries.LoadVersions() if err != nil { - return fmt.Errorf("cannot check %s version: %w", b.DisplayName, err) + return "", fmt.Errorf("cannot load version state: %w", err) } - if err := binaries.InstallBinary(client, b, latest); err != nil { - return fmt.Errorf("cannot install %s: %w", b.DisplayName, err) + for _, b := range binaries.Tools() { + latest, err := binaries.FetchLatestVersion(client, b) + if err != nil { + return "", fmt.Errorf("cannot check %s version: %w", b.DisplayName, err) + } + + if err := binaries.InstallBinary(client, b, latest); err != nil { + return "", fmt.Errorf("cannot install %s: %w", b.DisplayName, err) + } + + vs.Set(b.Name, latest) + displayVersion := latest + if displayVersion == "latest" { + displayVersion = "installed" + } + toolVersions = append(toolVersions, fmt.Sprintf("%s %s", b.DisplayName, displayVersion)) } - vs.Set(b.Name, latest) - } + // Write shims. + if err := phpenv.WriteShims(); err != nil { + return "", fmt.Errorf("cannot write shims: %w", err) + } - // Write shims (PHP + Composer). - fmt.Println("\nWriting shims...") - if err := phpenv.WriteShims(); err != nil { - return fmt.Errorf("cannot write shims: %w", err) - } - fmt.Println(" ✓ PHP shim created") - fmt.Println(" ✓ Composer shim created") - - // Migrate existing Composer config if present. - fmt.Println("\nChecking for existing Composer configuration...") - setup.MigrateComposerConfig() - - // 5. Write version manifest. - fmt.Println("\nWriting version manifest...") - vs.Set("php", phpVersion) - if err := vs.Save(); err != nil { - return fmt.Errorf("cannot save versions: %w", err) + // Migrate existing Composer config if present. + setup.MigrateComposerConfig() + + // Save version manifest. + vs.Set("php", phpVersion) + if err := vs.Save(); err != nil { + return "", fmt.Errorf("cannot save versions: %w", err) + } + + return strings.Join(toolVersions, ", "), nil + }); err != nil { + return err } - fmt.Println(" ✓ versions.json saved") - // 6. Create main Caddyfile. - fmt.Println("\nGenerating Caddyfile...") - if err := caddy.GenerateCaddyfile(); err != nil { - return fmt.Errorf("cannot generate Caddyfile: %w", err) + // Step 4: Configure environment. + if err := ui.Step("Configuring environment...", func() (string, error) { + // Generate Caddyfile. + if err := caddy.GenerateCaddyfile(); err != nil { + return "", fmt.Errorf("cannot generate Caddyfile: %w", err) + } + + // Create empty registry. + reg := ®istry.Registry{} + if err := reg.Save(); err != nil { + return "", fmt.Errorf("cannot save registry: %w", err) + } + + return "Environment configured", nil + }); err != nil { + return err } - fmt.Println(" ✓ Caddyfile created") - // 7. Create empty registry. - fmt.Println("\nInitializing registry...") - reg := ®istry.Registry{} - if err := reg.Save(); err != nil { - return fmt.Errorf("cannot save registry: %w", err) + // Step 5: DNS resolver (sudo). + if err := ui.Step("Setting up DNS resolver...", func() (string, error) { + if err := setup.RunSudoResolver(installTLD); err != nil { + return "", fmt.Errorf("DNS resolver setup failed: %w", err) + } + return "DNS resolver configured", nil + }); err != nil { + return err } - fmt.Println(" ✓ registry.json created") - - // 8a. DNS resolver (sudo). - fmt.Println("\nSetting up DNS resolver...") - fmt.Println(" This requires administrator privileges.") - if err := setup.RunSudoResolver(installTLD); err != nil { - fmt.Printf(" x DNS resolver setup failed: %v\n", err) - fmt.Println(" You can set this up manually later:") - fmt.Println(" sudo mkdir -p /etc/resolver") - fmt.Printf(" echo 'nameserver 127.0.0.1' | sudo tee /etc/resolver/%s\n", installTLD) - } else { - fmt.Println(" ✓ DNS resolver configured") + + // Step 6: Trust CA certificate (sudo). + if err := ui.Step("Trusting HTTPS certificate...", func() (string, error) { + if err := setup.RunSudoTrustWithServer(); err != nil { + return "", fmt.Errorf("CA trust failed: %w", err) + } + return "HTTPS certificate trusted", nil + }); err != nil { + return err } - // 8b. Trust CA certificate (start server, trust, stop). - fmt.Println("\nTrusting CA certificate...") - if err := setup.RunSudoTrustWithServer(); err != nil { - fmt.Printf(" x CA trust failed: %v\n", err) - fmt.Println(" You can set this up manually later:") - fmt.Printf(" %s/frankenphp run --config %s --adapter caddyfile &\n", config.BinDir(), config.CaddyfilePath()) - fmt.Printf(" sudo %s/frankenphp trust\n", config.BinDir()) - fmt.Println(" kill %%1") - } else { - fmt.Println(" ✓ Caddy CA certificate trusted") + // Step 7: Self-test. + if err := ui.Step("Running self-test...", func() (string, error) { + results := setup.RunSelfTest(installTLD) + var failures []string + for _, r := range results { + if r.Err != nil { + failures = append(failures, fmt.Sprintf("%s: %v", r.Name, r.Err)) + } + } + if len(failures) > 0 { + return "", fmt.Errorf("self-test failures:\n %s", strings.Join(failures, "\n ")) + } + return "All checks passed", nil + }); err != nil { + return err } - // 9. Self-test. - fmt.Println("\nRunning self-test...") - results := setup.RunSelfTest(installTLD) - setup.PrintResults(results) - - // 10. PATH instructions. - fmt.Println() - setup.PrintPathInstructions() - - // 11. Summary. - fmt.Println() - fmt.Println("pv installed!") - fmt.Println() - fmt.Printf(" PHP: %s (global default)\n", phpVersion) - for _, b := range binaries.Tools() { - v := vs.Get(b.Name) - if v == "" { - v = "unknown" - } - fmt.Printf(" %-12s %s\n", b.DisplayName+":", v) + // Step 8: Shell PATH. + if err := ui.Step("Configuring shell...", func() (string, error) { + shell := setup.DetectShell() + configFile := setup.ShellConfigFile(shell) + line := setup.PathExportLine(shell) + + // Check if already in PATH. + data, err := os.ReadFile(configFile) + if err == nil && strings.Contains(string(data), line) { + return "PATH already configured", nil + } + + // Add to config file. + f, err := os.OpenFile(configFile, os.O_APPEND|os.O_CREATE|os.O_WRONLY, 0644) + if err != nil { + return "", fmt.Errorf("cannot open %s: %w", configFile, err) + } + defer f.Close() + if _, err := fmt.Fprintf(f, "\n# pv\n%s\n", line); err != nil { + return "", fmt.Errorf("cannot write to %s: %w", configFile, err) + } + + return fmt.Sprintf("Added to ~/%s", shortPath(configFile)), nil + }); err != nil { + return err } - fmt.Println() - fmt.Println("Install additional PHP versions with: pv php install ") - fmt.Println("Run `pv link .` in a project to get started.") + + // Footer. + ui.Footer(start, "https://pv.prvious.dev/docs") return nil }, } +// shortPath returns the path relative to HOME for display. +func shortPath(path string) string { + home, _ := os.UserHomeDir() + if strings.HasPrefix(path, home) { + return path[len(home)+1:] + } + return path +} + func init() { installCmd.Flags().BoolVar(&forceInstall, "force", false, "Reinstall even if already installed") installCmd.Flags().StringVar(&installTLD, "tld", "test", "Top-level domain for local sites (e.g., test, pv-test)") installCmd.Flags().StringVar(&installPHP, "php", "", "PHP version to install (e.g., 8.4). Auto-detects latest if omitted.") + installCmd.Flags().BoolVarP(&installVerbose, "verbose", "v", false, "Show detailed output") rootCmd.AddCommand(installCmd) } diff --git a/cmd/link.go b/cmd/link.go index 7eb7c93..1b5ecb7 100644 --- a/cmd/link.go +++ b/cmd/link.go @@ -11,6 +11,7 @@ import ( "github.com/prvious/pv/internal/phpenv" "github.com/prvious/pv/internal/registry" "github.com/prvious/pv/internal/server" + "github.com/prvious/pv/internal/ui" "github.com/spf13/cobra" ) @@ -65,6 +66,16 @@ var linkCmd = &cobra.Command{ project := registry.Project{Name: name, Path: absPath, Type: projectType, PHP: phpVersion} + if existing := reg.Find(name); existing != nil { + domain := "https://" + name + "." + settings.TLD + fmt.Fprintln(os.Stderr) + ui.Fail(fmt.Sprintf("%s is already linked", ui.Purple.Bold(true).Render(domain))) + ui.FailDetail(fmt.Sprintf("Path: %s", existing.Path)) + ui.FailDetail("To re-link, run: pv unlink " + name + " && pv link " + path) + fmt.Fprintln(os.Stderr) + cmd.SilenceUsage = true + return ui.ErrAlreadyPrinted + } if err := reg.Add(project); err != nil { return err } @@ -84,20 +95,23 @@ var linkCmd = &cobra.Command{ if typeLabel == "" { typeLabel = "unknown" } - phpLabel := "" - if phpVersion != "" && phpVersion != globalPHP { - phpLabel = fmt.Sprintf(", PHP %s", phpVersion) - } - fmt.Printf("Linked %s → %s (%s%s)\n", name, absPath, typeLabel, phpLabel) + + domain := "https://" + name + "." + settings.TLD + + fmt.Fprintln(os.Stderr) + ui.Success(fmt.Sprintf("Linked %s", ui.Purple.Bold(true).Render(domain))) + fmt.Fprintln(os.Stderr) + fmt.Fprintf(os.Stderr, " %s %s\n", ui.Muted.Render("Path"), absPath) + fmt.Fprintf(os.Stderr, " %s %s\n", ui.Muted.Render("Type"), typeLabel) + fmt.Fprintf(os.Stderr, " %s %s\n", ui.Muted.Render("PHP"), ui.Green.Render(phpVersion)) + fmt.Fprintln(os.Stderr) if server.IsRunning() { if err := server.ReconfigureServer(); err != nil { - fmt.Fprintf(os.Stderr, "Warning: could not reconfigure server: %v\n", err) + fmt.Fprintf(os.Stderr, " %s %s\n", ui.Red.Render("!"), ui.Muted.Render(fmt.Sprintf("Could not reconfigure server: %v", err))) } - // If this project uses a non-global PHP version, secondary processes - // need a server restart to pick up the new project. if phpVersion != "" && phpVersion != globalPHP { - fmt.Println("Note: restart the server to serve this project (pv stop && pv start)") + ui.Subtle("Restart the server to serve this project: pv stop && pv start") } } diff --git a/cmd/list.go b/cmd/list.go index 58367ee..d574e63 100644 --- a/cmd/list.go +++ b/cmd/list.go @@ -2,9 +2,11 @@ package cmd import ( "fmt" - "text/tabwriter" + "os" + "github.com/prvious/pv/internal/config" "github.com/prvious/pv/internal/registry" + "github.com/prvious/pv/internal/ui" "github.com/spf13/cobra" ) @@ -18,29 +20,47 @@ var listCmd = &cobra.Command{ return fmt.Errorf("cannot load registry: %w", err) } + settings, _ := config.LoadSettings() + tld := "test" + if settings != nil { + tld = settings.TLD + } + projects := reg.List() if len(projects) == 0 { - fmt.Println("No projects linked yet. Run `pv link` in a project directory to get started.") + fmt.Fprintln(os.Stderr) + ui.Subtle("No projects linked yet. Run pv link in a project directory to get started.") + fmt.Fprintln(os.Stderr) return nil } - w := tabwriter.NewWriter(cmd.OutOrStdout(), 0, 0, 2, ' ', 0) - fmt.Fprintln(w, "NAME\tPATH\tTYPE\tPHP") - for _, p := range projects { - typ := p.Type - if typ == "" { - typ = "-" - } - php := p.PHP - if php == "" { - php = "-" - } - fmt.Fprintf(w, "%s\t%s\t%s\t%s\n", p.Name, p.Path, typ, php) - } - return w.Flush() + fmt.Fprintln(os.Stderr) + rows := projectTableRows(projects, tld) + ui.Table([]string{"Site", "Type", "PHP", "Path"}, rows) + fmt.Fprintln(os.Stderr) + + return nil }, } +func projectTableRows(projects []registry.Project, tld string) [][]string { + rows := make([][]string, len(projects)) + for i, p := range projects { + typ := p.Type + if typ == "" { + typ = "unknown" + } + php := p.PHP + if php == "" { + php = "-" + } + domain := "https://" + p.Name + "." + tld + + rows[i] = []string{domain, typ, php, p.Path} + } + return rows +} + func init() { rootCmd.AddCommand(listCmd) } diff --git a/cmd/list_test.go b/cmd/list_test.go index 5d2f1e5..65adc56 100644 --- a/cmd/list_test.go +++ b/cmd/list_test.go @@ -1,8 +1,6 @@ package cmd import ( - "bytes" - "strings" "testing" "github.com/prvious/pv/internal/registry" @@ -24,16 +22,11 @@ func TestList_NoProjects(t *testing.T) { home := t.TempDir() t.Setenv("HOME", home) - var buf bytes.Buffer cmd := newListCmd() - cmd.SetOut(&buf) cmd.SetArgs([]string{"list"}) if err := cmd.Execute(); err != nil { t.Fatalf("list command error = %v", err) } - - // The "no projects" message goes to fmt.Println (stdout), not cmd.OutOrStdout(). - // We verify no error was returned, which is the important part. } func TestList_WithProjects(t *testing.T) { @@ -47,29 +40,9 @@ func TestList_WithProjects(t *testing.T) { t.Fatalf("Save() error = %v", err) } - var buf bytes.Buffer cmd := newListCmd() - cmd.SetOut(&buf) cmd.SetArgs([]string{"list"}) if err := cmd.Execute(); err != nil { t.Fatalf("list command error = %v", err) } - - out := buf.String() - if !strings.Contains(out, "NAME") || !strings.Contains(out, "PATH") { - t.Errorf("expected table header with NAME and PATH, got:\n%s", out) - } - if !strings.Contains(out, "app1") { - t.Errorf("expected app1 in output, got:\n%s", out) - } - if !strings.Contains(out, "app2") { - t.Errorf("expected app2 in output, got:\n%s", out) - } - if !strings.Contains(out, "laravel") { - t.Errorf("expected 'laravel' type in output, got:\n%s", out) - } - // app2 has no type, should show "-" - if !strings.Contains(out, "-") { - t.Errorf("expected '-' for empty type, got:\n%s", out) - } } diff --git a/cmd/php_install.go b/cmd/php_install.go index 05c4e68..fb93d4f 100644 --- a/cmd/php_install.go +++ b/cmd/php_install.go @@ -3,9 +3,11 @@ package cmd import ( "fmt" "net/http" + "os" "regexp" "github.com/prvious/pv/internal/phpenv" + "github.com/prvious/pv/internal/ui" "github.com/spf13/cobra" ) @@ -18,27 +20,42 @@ var phpInstallCmd = &cobra.Command{ RunE: func(cmd *cobra.Command, args []string) error { version := args[0] if !validPHPVersion.MatchString(version) { - return fmt.Errorf("invalid version format %q: use major.minor (e.g., 8.4)", version) + fmt.Fprintln(os.Stderr) + ui.Fail(fmt.Sprintf("Invalid version format %s", ui.Bold.Render(version))) + ui.FailDetail("Use major.minor (e.g., 8.4)") + fmt.Fprintln(os.Stderr) + cmd.SilenceUsage = true + return ui.ErrAlreadyPrinted } if phpenv.IsInstalled(version) { - return fmt.Errorf("PHP %s is already installed", version) + fmt.Fprintln(os.Stderr) + ui.Success(fmt.Sprintf("PHP %s is already installed", version)) + fmt.Fprintln(os.Stderr) + return nil } - fmt.Printf("Installing PHP %s...\n", version) + fmt.Fprintln(os.Stderr) + client := &http.Client{} - if err := phpenv.Install(client, version); err != nil { + if err := ui.StepProgress("Installing PHP "+version+"...", func(progress func(written, total int64)) (string, error) { + if err := phpenv.InstallProgress(client, version, progress); err != nil { + return "", err + } + return fmt.Sprintf("PHP %s installed", version), nil + }); err != nil { return err } // If no global default, set this as the default. if _, err := phpenv.GlobalVersion(); err != nil { - fmt.Printf("Setting PHP %s as global default...\n", version) if err := phpenv.SetGlobal(version); err != nil { return err } + ui.Success(fmt.Sprintf("PHP %s set as global default", version)) } + fmt.Fprintln(os.Stderr) return nil }, } diff --git a/cmd/php_list.go b/cmd/php_list.go index a9c434b..0033378 100644 --- a/cmd/php_list.go +++ b/cmd/php_list.go @@ -2,10 +2,12 @@ package cmd import ( "fmt" + "os" "strings" "github.com/prvious/pv/internal/phpenv" "github.com/prvious/pv/internal/registry" + "github.com/prvious/pv/internal/ui" "github.com/spf13/cobra" ) @@ -19,7 +21,9 @@ var phpListCmd = &cobra.Command{ return err } if len(versions) == 0 { - fmt.Println("No PHP versions installed. Run: pv php install ") + fmt.Fprintln(os.Stderr) + ui.Subtle("No PHP versions installed. Run: pv php install ") + fmt.Fprintln(os.Stderr) return nil } @@ -40,21 +44,29 @@ var phpListCmd = &cobra.Command{ } } + fmt.Fprintln(os.Stderr) for _, v := range versions { - marker := " " + var parts []string + + // Version number if v == globalV { - marker = "* " + parts = append(parts, ui.Green.Bold(true).Render(v)) + parts = append(parts, ui.Muted.Render("(default)")) + } else { + parts = append(parts, ui.Purple.Render(v)) } - line := marker + v + // Projects using this version if projects, ok := versionProjects[v]; ok && len(projects) > 0 { - line += " <- " + strings.Join(projects, ", ") - } - if v == globalV { - line += " (default)" + parts = append(parts, ui.Muted.Render("← "+strings.Join(projects, ", "))) } - fmt.Println(line) + + fmt.Fprintf(os.Stderr, " %s %s\n", + ui.Green.Render("●"), + strings.Join(parts, " "), + ) } + fmt.Fprintln(os.Stderr) return nil }, diff --git a/cmd/php_remove.go b/cmd/php_remove.go index 5913172..863ab87 100644 --- a/cmd/php_remove.go +++ b/cmd/php_remove.go @@ -2,10 +2,12 @@ package cmd import ( "fmt" + "os" "regexp" "github.com/prvious/pv/internal/phpenv" "github.com/prvious/pv/internal/registry" + "github.com/prvious/pv/internal/ui" "github.com/spf13/cobra" ) @@ -16,7 +18,12 @@ var phpRemoveCmd = &cobra.Command{ RunE: func(cmd *cobra.Command, args []string) error { version := args[0] if !regexp.MustCompile(`^\d+\.\d+$`).MatchString(version) { - return fmt.Errorf("invalid version format %q: use major.minor (e.g., 8.4)", version) + fmt.Fprintln(os.Stderr) + ui.Fail(fmt.Sprintf("Invalid version format %s", ui.Bold.Render(version))) + ui.FailDetail("Use major.minor (e.g., 8.4)") + fmt.Fprintln(os.Stderr) + cmd.SilenceUsage = true + return ui.ErrAlreadyPrinted } // Check if any linked projects depend on this version. @@ -29,16 +36,28 @@ var phpRemoveCmd = &cobra.Command{ v = globalV } if v == version { - return fmt.Errorf("cannot remove PHP %s: project %q depends on it", version, p.Name) + fmt.Fprintln(os.Stderr) + ui.Fail(fmt.Sprintf("Cannot remove PHP %s", ui.Bold.Render(version))) + ui.FailDetail(fmt.Sprintf("Project %s depends on it", ui.Bold.Render(p.Name))) + fmt.Fprintln(os.Stderr) + cmd.SilenceUsage = true + return ui.ErrAlreadyPrinted } } } - if err := phpenv.Remove(version); err != nil { + fmt.Fprintln(os.Stderr) + + if err := ui.Step("Removing PHP "+version+"...", func() (string, error) { + if err := phpenv.Remove(version); err != nil { + return "", err + } + return fmt.Sprintf("PHP %s removed", version), nil + }); err != nil { return err } - fmt.Printf("PHP %s removed\n", version) + fmt.Fprintln(os.Stderr) return nil }, } diff --git a/cmd/restart.go b/cmd/restart.go index 97db040..67316e8 100644 --- a/cmd/restart.go +++ b/cmd/restart.go @@ -2,9 +2,11 @@ package cmd import ( "fmt" + "os" "github.com/prvious/pv/internal/daemon" "github.com/prvious/pv/internal/server" + "github.com/prvious/pv/internal/ui" "github.com/spf13/cobra" ) @@ -12,25 +14,41 @@ var restartCmd = &cobra.Command{ Use: "restart", Short: "Restart or reload the pv server", RunE: func(cmd *cobra.Command, args []string) error { + fmt.Fprintln(os.Stderr) + // Daemon mode — use launchctl kickstart for atomic restart. if daemon.IsLoaded() { - if err := daemon.Restart(); err != nil { - return fmt.Errorf("cannot restart daemon: %w", err) + if err := ui.Step("Restarting pv daemon...", func() (string, error) { + if err := daemon.Restart(); err != nil { + return "", fmt.Errorf("cannot restart daemon: %w", err) + } + return "pv restarted", nil + }); err != nil { + return err } - fmt.Println("pv restarted") + + fmt.Fprintln(os.Stderr) return nil } // Foreground mode — reload config via admin API. if !server.IsRunning() { - return fmt.Errorf("pv is not running") + ui.Subtle("pv is not running") + fmt.Fprintln(os.Stderr) + cmd.SilenceUsage = true + return ui.ErrAlreadyPrinted } - if err := server.ReconfigureServer(); err != nil { - return fmt.Errorf("reconfigure failed: %w", err) + if err := ui.Step("Reloading server configuration...", func() (string, error) { + if err := server.ReconfigureServer(); err != nil { + return "", fmt.Errorf("reconfigure failed: %w", err) + } + return "Configuration reloaded", nil + }); err != nil { + return err } - fmt.Println("Server configuration reloaded") + fmt.Fprintln(os.Stderr) return nil }, } diff --git a/cmd/root.go b/cmd/root.go index c2e382c..ae7c742 100644 --- a/cmd/root.go +++ b/cmd/root.go @@ -1,9 +1,11 @@ package cmd import ( + "errors" "fmt" "os" + "github.com/prvious/pv/internal/ui" "github.com/spf13/cobra" ) @@ -13,13 +15,18 @@ import ( var version = "dev" var rootCmd = &cobra.Command{ - Use: "pv", - Short: "Local dev server manager powered by FrankenPHP", - Version: version, + Use: "pv", + Short: "Local dev server manager powered by FrankenPHP", + Version: version, + SilenceErrors: true, } func Execute() { if err := rootCmd.Execute(); err != nil { + // If the error was already printed with styled output, just exit. + if errors.Is(err, ui.ErrAlreadyPrinted) { + os.Exit(1) + } fmt.Fprintln(os.Stderr, err) os.Exit(1) } diff --git a/cmd/service.go b/cmd/service.go index 5033fc4..1b33938 100644 --- a/cmd/service.go +++ b/cmd/service.go @@ -2,8 +2,10 @@ package cmd import ( "fmt" + "os" "github.com/prvious/pv/internal/daemon" + "github.com/prvious/pv/internal/ui" "github.com/spf13/cobra" ) @@ -16,19 +18,27 @@ var serviceInstallCmd = &cobra.Command{ Use: "install", Short: "Install pv as a login service (starts on boot)", RunE: func(cmd *cobra.Command, args []string) error { - cfg := daemon.DefaultPlistConfig() - cfg.RunAtLoad = true + fmt.Fprintln(os.Stderr) - if err := daemon.Install(cfg); err != nil { - return fmt.Errorf("cannot install service: %w", err) - } + if err := ui.Step("Installing pv service...", func() (string, error) { + cfg := daemon.DefaultPlistConfig() + cfg.RunAtLoad = true + + if err := daemon.Install(cfg); err != nil { + return "", fmt.Errorf("cannot install service: %w", err) + } + + // Load the service so it starts immediately. + if err := daemon.Load(); err != nil { + return "", fmt.Errorf("cannot start service: %w", err) + } - // Load the service so it starts immediately. - if err := daemon.Load(); err != nil { - return fmt.Errorf("cannot start service: %w", err) + return "Service installed (starts automatically on login)", nil + }); err != nil { + return err } - fmt.Println("pv service installed (will start automatically on login)") + fmt.Fprintln(os.Stderr) return nil }, } @@ -37,18 +47,26 @@ var serviceUninstallCmd = &cobra.Command{ Use: "uninstall", Short: "Uninstall the pv login service", RunE: func(cmd *cobra.Command, args []string) error { - // Unload if loaded. - if daemon.IsLoaded() { - if err := daemon.Unload(); err != nil { - return fmt.Errorf("cannot stop service: %w", err) + fmt.Fprintln(os.Stderr) + + if err := ui.Step("Uninstalling pv service...", func() (string, error) { + // Unload if loaded. + if daemon.IsLoaded() { + if err := daemon.Unload(); err != nil { + return "", fmt.Errorf("cannot stop service: %w", err) + } + } + + if err := daemon.Uninstall(); err != nil { + return "", fmt.Errorf("cannot uninstall service: %w", err) } - } - if err := daemon.Uninstall(); err != nil { - return fmt.Errorf("cannot uninstall service: %w", err) + return "Service uninstalled", nil + }); err != nil { + return err } - fmt.Println("pv service uninstalled") + fmt.Fprintln(os.Stderr) return nil }, } diff --git a/cmd/start.go b/cmd/start.go index 76aa958..1545a7e 100644 --- a/cmd/start.go +++ b/cmd/start.go @@ -2,11 +2,13 @@ package cmd import ( "fmt" + "os" "time" "github.com/prvious/pv/internal/config" "github.com/prvious/pv/internal/daemon" "github.com/prvious/pv/internal/server" + "github.com/prvious/pv/internal/ui" "github.com/spf13/cobra" ) @@ -28,7 +30,11 @@ var startCmd = &cobra.Command{ func startFG() error { if server.IsRunning() { - return fmt.Errorf("pv is already running (PID file exists and process is alive)") + fmt.Fprintln(os.Stderr) + ui.Fail("pv is already running") + ui.FailDetail("PID file exists and process is alive") + fmt.Fprintln(os.Stderr) + return ui.ErrAlreadyPrinted } settings, err := config.LoadSettings() @@ -44,7 +50,9 @@ func startDaemon() error { if daemon.IsLoaded() { pid, err := daemon.GetPID() if err == nil && pid > 0 { - fmt.Printf("pv is already running (PID %d)\n", pid) + fmt.Fprintln(os.Stderr) + ui.Success(fmt.Sprintf("pv is already running %s", ui.Muted.Render(fmt.Sprintf("(PID %d)", pid)))) + fmt.Fprintln(os.Stderr) return nil } } @@ -52,38 +60,48 @@ func startDaemon() error { // Also check foreground PID file. if server.IsRunning() { pid, _ := server.ReadPID() - fmt.Printf("pv is already running in foreground (PID %d)\n", pid) + fmt.Fprintln(os.Stderr) + ui.Success(fmt.Sprintf("pv is already running in foreground %s", ui.Muted.Render(fmt.Sprintf("(PID %d)", pid)))) + fmt.Fprintln(os.Stderr) return nil } - // Generate and write plist. - cfg := daemon.DefaultPlistConfig() - if err := daemon.Install(cfg); err != nil { - return fmt.Errorf("cannot install plist: %w", err) - } + fmt.Fprintln(os.Stderr) - // Load the service. - if err := daemon.Load(); err != nil { - return fmt.Errorf("cannot start daemon: %w", err) - } + if err := ui.Step("Starting pv daemon...", func() (string, error) { + // Generate and write plist. + cfg := daemon.DefaultPlistConfig() + if err := daemon.Install(cfg); err != nil { + return "", fmt.Errorf("cannot install plist: %w", err) + } - // Wait for the process to appear. - var pid int - for i := 0; i < 15; i++ { - time.Sleep(200 * time.Millisecond) - p, err := daemon.GetPID() - if err == nil && p > 0 { - pid = p - break + // Load the service. + if err := daemon.Load(); err != nil { + return "", fmt.Errorf("cannot start daemon: %w", err) } - } - if pid > 0 { - fmt.Printf("pv is running in the background (PID %d)\n", pid) - } else { - fmt.Println("pv daemon started (waiting for process...)") + // Wait for the process to appear. + var pid int + for i := 0; i < 15; i++ { + time.Sleep(200 * time.Millisecond) + p, err := daemon.GetPID() + if err == nil && p > 0 { + pid = p + break + } + } + + if pid > 0 { + return fmt.Sprintf("Running in background (PID %d)", pid), nil + } + return "Daemon started (waiting for process...)", nil + }); err != nil { + return err } - fmt.Println("Run `pv log` to view logs") + + ui.Subtle("Run pv log to view logs") + fmt.Fprintln(os.Stderr) + return nil } diff --git a/cmd/status.go b/cmd/status.go index 2d9a221..8fd5281 100644 --- a/cmd/status.go +++ b/cmd/status.go @@ -2,6 +2,7 @@ package cmd import ( "fmt" + "os" "strings" "github.com/prvious/pv/internal/config" @@ -9,6 +10,7 @@ import ( "github.com/prvious/pv/internal/phpenv" "github.com/prvious/pv/internal/registry" "github.com/prvious/pv/internal/server" + "github.com/prvious/pv/internal/ui" "github.com/spf13/cobra" ) @@ -21,6 +23,8 @@ var statusCmd = &cobra.Command{ return fmt.Errorf("cannot load settings: %w", err) } + ui.Header(version) + // Determine running state and mode. var running bool var mode string @@ -37,48 +41,64 @@ var statusCmd = &cobra.Command{ } if running { - fmt.Printf("Status: running (PID %d, %s mode)\n", pid, mode) + fmt.Fprintf(os.Stderr, " %s %s %s\n", + ui.Green.Render("●"), + ui.Green.Bold(true).Render("Running"), + ui.Muted.Render(fmt.Sprintf("PID %d, %s", pid, mode)), + ) } else { - fmt.Println("Status: stopped") + fmt.Fprintf(os.Stderr, " %s %s\n", + ui.Red.Render("●"), + ui.Muted.Render("Stopped"), + ) } - fmt.Printf("TLD: .%s\n", settings.TLD) - fmt.Printf("DNS: 127.0.0.1:%d\n", config.DNSPort) - fmt.Println("HTTPS: port 443") - fmt.Println("HTTP: port 80") + fmt.Fprintln(os.Stderr) + + // Network info. + fmt.Fprintf(os.Stderr, " %s %s\n", ui.Purple.Render("TLD"), ui.Bold.Render("."+settings.TLD)) + fmt.Fprintf(os.Stderr, " %s %s %s %s\n", + ui.Purple.Render("DNS"), + fmt.Sprintf("127.0.0.1:%d", config.DNSPort), + ui.Purple.Render("HTTPS"), + ":443", + ) // PHP version info. globalPHP := settings.GlobalPHP - if globalPHP != "" { - fmt.Printf("PHP: %s (global)\n", globalPHP) - } - versions, _ := phpenv.InstalledVersions() if len(versions) > 0 { var labels []string for _, v := range versions { if v == globalPHP { - labels = append(labels, v+"*") + labels = append(labels, ui.Green.Bold(true).Render(v)+" "+ui.Muted.Render("(default)")) } else { - labels = append(labels, v) + labels = append(labels, ui.Purple.Render(v)) } } - fmt.Printf("PHP installed: %s\n", strings.Join(labels, ", ")) + fmt.Fprintf(os.Stderr, " %s %s\n", ui.Purple.Render("PHP"), strings.Join(labels, ui.Muted.Render(" · "))) + } else if globalPHP != "" { + fmt.Fprintf(os.Stderr, " %s %s\n", ui.Purple.Render("PHP"), globalPHP) } + // Sites. reg, err := registry.Load() if err != nil { - fmt.Printf("Sites: (cannot load registry: %v)\n", err) + fmt.Fprintf(os.Stderr, "\n %s\n\n", ui.Muted.Render(fmt.Sprintf("Cannot load registry: %v", err))) return nil } projects := reg.List() - fmt.Printf("Sites: %d linked\n", len(projects)) - if len(projects) > 0 && running { - fmt.Println() - fmt.Println("Projects:") - for _, p := range projects { + if len(projects) == 0 { + fmt.Fprintf(os.Stderr, "\n %s\n", ui.Muted.Render("No sites linked. Run pv link in a project to get started.")) + } else { + fmt.Fprintf(os.Stderr, "\n %s %s\n\n", + ui.Purple.Render("Sites"), + ui.Muted.Render(fmt.Sprintf("%d linked", len(projects))), + ) + rows := make([][]string, len(projects)) + for i, p := range projects { phpV := p.PHP if phpV == "" { phpV = globalPHP @@ -90,15 +110,15 @@ var statusCmd = &cobra.Command{ if typeLabel == "" { typeLabel = "unknown" } - portInfo := "" - if phpV != globalPHP && phpV != "" && phpV != "-" { - port := config.PortForVersion(phpV) - portInfo = fmt.Sprintf(" (port %d)", port) - } - fmt.Printf(" %-20s %-16s PHP %s%s\n", p.Name+"."+settings.TLD, typeLabel, phpV, portInfo) + + domain := "https://" + p.Name + "." + settings.TLD + rows[i] = []string{domain, typeLabel, phpV} } + ui.Table([]string{"Site", "Type", "PHP"}, rows) } + fmt.Fprintln(os.Stderr) + return nil }, } diff --git a/cmd/stop.go b/cmd/stop.go index b236ac1..943c290 100644 --- a/cmd/stop.go +++ b/cmd/stop.go @@ -8,6 +8,7 @@ import ( "github.com/prvious/pv/internal/daemon" "github.com/prvious/pv/internal/server" + "github.com/prvious/pv/internal/ui" "github.com/spf13/cobra" ) @@ -15,49 +16,64 @@ var stopCmd = &cobra.Command{ Use: "stop", Short: "Stop the pv server", RunE: func(cmd *cobra.Command, args []string) error { + fmt.Fprintln(os.Stderr) + // Check daemon mode first. if daemon.IsLoaded() { - if err := daemon.Unload(); err != nil { - return fmt.Errorf("cannot stop daemon: %w", err) - } + if err := ui.Step("Stopping pv daemon...", func() (string, error) { + if err := daemon.Unload(); err != nil { + return "", fmt.Errorf("cannot stop daemon: %w", err) + } - // Wait for process to exit. - for i := 0; i < 25; i++ { - time.Sleep(200 * time.Millisecond) - if !daemon.IsLoaded() { - break + // Wait for process to exit. + for i := 0; i < 25; i++ { + time.Sleep(200 * time.Millisecond) + if !daemon.IsLoaded() { + break + } } + + return "pv stopped", nil + }); err != nil { + return err } - fmt.Println("pv stopped") + fmt.Fprintln(os.Stderr) return nil } // Foreground mode — use PID file. pid, err := server.ReadPID() if err != nil { - fmt.Println("pv is not running") + ui.Subtle("pv is not running") + fmt.Fprintln(os.Stderr) return nil } - proc, err := os.FindProcess(pid) - if err != nil { - return fmt.Errorf("cannot find process %d: %w", pid, err) - } + if err := ui.Step("Stopping pv server...", func() (string, error) { + proc, err := os.FindProcess(pid) + if err != nil { + return "", fmt.Errorf("cannot find process %d: %w", pid, err) + } - if err := proc.Signal(syscall.SIGTERM); err != nil { - return fmt.Errorf("cannot send signal to process %d: %w", pid, err) - } + if err := proc.Signal(syscall.SIGTERM); err != nil { + return "", fmt.Errorf("cannot send signal to process %d: %w", pid, err) + } - // Wait for process to exit. - for i := 0; i < 25; i++ { - time.Sleep(200 * time.Millisecond) - if proc.Signal(syscall.Signal(0)) != nil { - break + // Wait for process to exit. + for i := 0; i < 25; i++ { + time.Sleep(200 * time.Millisecond) + if proc.Signal(syscall.Signal(0)) != nil { + break + } } + + return "pv stopped", nil + }); err != nil { + return err } - fmt.Println("pv stopped") + fmt.Fprintln(os.Stderr) return nil }, } diff --git a/cmd/unlink.go b/cmd/unlink.go index c8b96da..67952ae 100644 --- a/cmd/unlink.go +++ b/cmd/unlink.go @@ -6,8 +6,10 @@ import ( "path/filepath" "github.com/prvious/pv/internal/caddy" + "github.com/prvious/pv/internal/config" "github.com/prvious/pv/internal/registry" "github.com/prvious/pv/internal/server" + "github.com/prvious/pv/internal/ui" "github.com/spf13/cobra" ) @@ -32,11 +34,24 @@ var unlinkCmd = &cobra.Command{ absPath, _ := filepath.Abs(cwd) p := reg.FindByPath(absPath) if p == nil { - return fmt.Errorf("current directory is not a linked project") + fmt.Fprintln(os.Stderr) + ui.Fail("Current directory is not a linked project") + fmt.Fprintln(os.Stderr) + cmd.SilenceUsage = true + return ui.ErrAlreadyPrinted } name = p.Name } + // Check project exists before removing. + if reg.Find(name) == nil { + fmt.Fprintln(os.Stderr) + ui.Fail(fmt.Sprintf("Project %s is not linked", ui.Bold.Render(name))) + fmt.Fprintln(os.Stderr) + cmd.SilenceUsage = true + return ui.ErrAlreadyPrinted + } + if err := reg.Remove(name); err != nil { return err } @@ -52,14 +67,26 @@ var unlinkCmd = &cobra.Command{ return fmt.Errorf("cannot generate Caddyfile: %w", err) } - fmt.Printf("Unlinked %s\n", name) + settings, _ := config.LoadSettings() + tld := "test" + if settings != nil { + tld = settings.TLD + } + domain := "https://" + name + "." + tld + + fmt.Fprintln(os.Stderr) + ui.Success(fmt.Sprintf("Unlinked %s", ui.Purple.Bold(true).Render(domain))) if server.IsRunning() { if err := server.ReconfigureServer(); err != nil { - fmt.Fprintf(os.Stderr, "Warning: could not reconfigure server: %v\n", err) + fmt.Fprintf(os.Stderr, " %s %s\n", + ui.Red.Render("!"), + ui.Muted.Render(fmt.Sprintf("Could not reconfigure server: %v", err)), + ) } } + fmt.Fprintln(os.Stderr) return nil }, } diff --git a/cmd/update.go b/cmd/update.go index ec96832..ae5239f 100644 --- a/cmd/update.go +++ b/cmd/update.go @@ -2,53 +2,112 @@ package cmd import ( "fmt" + "strings" + "time" + "net/http" "github.com/prvious/pv/internal/binaries" + "github.com/prvious/pv/internal/ui" "github.com/spf13/cobra" ) +var updateVerbose bool + var updateCmd = &cobra.Command{ Use: "update", Short: "Download and update all managed binaries", RunE: func(cmd *cobra.Command, args []string) error { + start := time.Now() + + binaries.Verbose = updateVerbose + + ui.Header(version) + client := &http.Client{} + // Step 1: Check for updates. vs, err := binaries.LoadVersions() if err != nil { return fmt.Errorf("cannot load version state: %w", err) } - for _, b := range binaries.Tools() { - fmt.Printf("Checking %s...\n", b.DisplayName) + type updateInfo struct { + binary binaries.Binary + latest string + current string + needed bool + } - latest, err := binaries.FetchLatestVersion(client, b) - if err != nil { - return fmt.Errorf("cannot check %s version: %w", b.DisplayName, err) - } + var updates []updateInfo + var anyNeeded bool - if !binaries.NeedsUpdate(vs, b, latest) { - fmt.Printf(" %s is already up to date (%s)\n", b.DisplayName, vs.Get(b.Name)) - continue + if err := ui.Step("Checking for updates...", func() (string, error) { + for _, b := range binaries.Tools() { + latest, err := binaries.FetchLatestVersion(client, b) + if err != nil { + return "", fmt.Errorf("cannot check %s version: %w", b.DisplayName, err) + } + needed := binaries.NeedsUpdate(vs, b, latest) + if needed { + anyNeeded = true + } + updates = append(updates, updateInfo{ + binary: b, + latest: latest, + current: vs.Get(b.Name), + needed: needed, + }) } - - if err := binaries.InstallBinary(client, b, latest); err != nil { - return fmt.Errorf("cannot install %s: %w", b.DisplayName, err) + if anyNeeded { + return "Updates available", nil } + return "Already up to date", nil + }); err != nil { + return err + } - vs.Set(b.Name, latest) - if err := vs.Save(); err != nil { - return fmt.Errorf("cannot save version state: %w", err) - } + if !anyNeeded { + fmt.Fprintln(cmd.OutOrStderr()) + return nil + } + + // Step 2: Update tools. + if err := ui.Step("Updating tools...", func() (string, error) { + var results []string + for _, u := range updates { + if !u.needed { + results = append(results, fmt.Sprintf("%s up to date", u.binary.DisplayName)) + continue + } - fmt.Printf(" %s updated to %s\n", b.DisplayName, latest) + if err := binaries.InstallBinary(client, u.binary, u.latest); err != nil { + return "", fmt.Errorf("cannot install %s: %w", u.binary.DisplayName, err) + } + + vs.Set(u.binary.Name, u.latest) + if err := vs.Save(); err != nil { + return "", fmt.Errorf("cannot save version state: %w", err) + } + + if u.current != "" { + results = append(results, fmt.Sprintf("%s %s → %s", u.binary.DisplayName, u.current, u.latest)) + } else { + results = append(results, fmt.Sprintf("%s %s", u.binary.DisplayName, u.latest)) + } + } + return strings.Join(results, ", "), nil + }); err != nil { + return err } - fmt.Println("Done.") + ui.Footer(start, "") + return nil }, } func init() { + updateCmd.Flags().BoolVarP(&updateVerbose, "verbose", "v", false, "Show detailed output") rootCmd.AddCommand(updateCmd) } diff --git a/cmd/use.go b/cmd/use.go index 8f0f3f1..6663c2c 100644 --- a/cmd/use.go +++ b/cmd/use.go @@ -2,11 +2,13 @@ package cmd import ( "fmt" + "os" "strings" "github.com/prvious/pv/internal/daemon" "github.com/prvious/pv/internal/phpenv" "github.com/prvious/pv/internal/server" + "github.com/prvious/pv/internal/ui" "github.com/spf13/cobra" ) @@ -17,7 +19,12 @@ var useCmd = &cobra.Command{ RunE: func(cmd *cobra.Command, args []string) error { arg := args[0] if !strings.HasPrefix(arg, "php:") { - return fmt.Errorf("invalid format %q: use php: (e.g., pv use php:8.4)", arg) + fmt.Fprintln(os.Stderr) + ui.Fail(fmt.Sprintf("Invalid format %s", ui.Bold.Render(arg))) + ui.FailDetail("Use php: (e.g., pv use php:8.4)") + fmt.Fprintln(os.Stderr) + cmd.SilenceUsage = true + return ui.ErrAlreadyPrinted } version := strings.TrimPrefix(arg, "php:") @@ -26,7 +33,12 @@ var useCmd = &cobra.Command{ } if !phpenv.IsInstalled(version) { - return fmt.Errorf("PHP %s is not installed (run: pv php install %s)", version, version) + fmt.Fprintln(os.Stderr) + ui.Fail(fmt.Sprintf("PHP %s is not installed", ui.Bold.Render(version))) + ui.FailDetail(fmt.Sprintf("Run: pv php install %s", version)) + fmt.Fprintln(os.Stderr) + cmd.SilenceUsage = true + return ui.ErrAlreadyPrinted } oldV, _ := phpenv.GlobalVersion() @@ -35,21 +47,35 @@ var useCmd = &cobra.Command{ return err } - fmt.Printf("Global PHP switched to %s\n", version) + fmt.Fprintln(os.Stderr) + + if oldV != "" && oldV != version { + ui.Success(fmt.Sprintf("Global PHP switched %s %s %s", + ui.Muted.Render(oldV), + ui.Purple.Render("→"), + ui.Green.Bold(true).Render(version), + )) + } else { + ui.Success(fmt.Sprintf("Global PHP set to %s", ui.Green.Bold(true).Render(version))) + } // If daemon is running, sync the plist and restart. if oldV != version && daemon.IsLoaded() { cfg := daemon.DefaultPlistConfig() if err := daemon.SyncIfNeeded(cfg); err != nil { - fmt.Printf("Warning: cannot sync daemon plist: %v\n", err) + fmt.Fprintf(os.Stderr, " %s %s\n", + ui.Red.Render("!"), + ui.Muted.Render(fmt.Sprintf("Cannot sync daemon plist: %v", err)), + ) } else { - fmt.Println("Daemon restarted with new PHP version") + ui.Success("Daemon restarted with new PHP version") } } else if oldV != version && server.IsRunning() { - fmt.Println("Server is running — restart required for changes to take effect.") - fmt.Println("Run: pv restart") + ui.Subtle("Server is running — restart required for changes to take effect.") + ui.Subtle("Run: pv restart") } + fmt.Fprintln(os.Stderr) return nil }, } diff --git a/go.mod b/go.mod index 3c81b84..e6ddfb4 100644 --- a/go.mod +++ b/go.mod @@ -3,10 +3,22 @@ module github.com/prvious/pv go 1.25.0 require ( + github.com/aymanbagabas/go-osc52/v2 v2.0.1 // indirect + github.com/charmbracelet/colorprofile v0.2.3-0.20250311203215-f60798e515dc // indirect + github.com/charmbracelet/lipgloss v1.1.0 // indirect + github.com/charmbracelet/x/ansi v0.8.0 // indirect + github.com/charmbracelet/x/cellbuf v0.0.13-0.20250311204145-2c3ea96c31dd // indirect + github.com/charmbracelet/x/term v0.2.1 // indirect github.com/inconshreveable/mousetrap v1.1.0 // indirect + github.com/lucasb-eyer/go-colorful v1.2.0 // indirect + github.com/mattn/go-isatty v0.0.20 // indirect + github.com/mattn/go-runewidth v0.0.16 // indirect github.com/miekg/dns v1.1.72 // indirect + github.com/muesli/termenv v0.16.0 // indirect + github.com/rivo/uniseg v0.4.7 // indirect github.com/spf13/cobra v1.10.2 // indirect github.com/spf13/pflag v1.0.9 // indirect + github.com/xo/terminfo v0.0.0-20220910002029-abceb7e1c41e // indirect golang.org/x/mod v0.31.0 // indirect golang.org/x/net v0.48.0 // indirect golang.org/x/sync v0.19.0 // indirect diff --git a/go.sum b/go.sum index 471d68c..a8f6900 100644 --- a/go.sum +++ b/go.sum @@ -1,13 +1,38 @@ +github.com/aymanbagabas/go-osc52/v2 v2.0.1 h1:HwpRHbFMcZLEVr42D4p7XBqjyuxQH5SMiErDT4WkJ2k= +github.com/aymanbagabas/go-osc52/v2 v2.0.1/go.mod h1:uYgXzlJ7ZpABp8OJ+exZzJJhRNQ2ASbcXHWsFqH8hp8= +github.com/charmbracelet/colorprofile v0.2.3-0.20250311203215-f60798e515dc h1:4pZI35227imm7yK2bGPcfpFEmuY1gc2YSTShr4iJBfs= +github.com/charmbracelet/colorprofile v0.2.3-0.20250311203215-f60798e515dc/go.mod h1:X4/0JoqgTIPSFcRA/P6INZzIuyqdFY5rm8tb41s9okk= +github.com/charmbracelet/lipgloss v1.1.0 h1:vYXsiLHVkK7fp74RkV7b2kq9+zDLoEU4MZoFqR/noCY= +github.com/charmbracelet/lipgloss v1.1.0/go.mod h1:/6Q8FR2o+kj8rz4Dq0zQc3vYf7X+B0binUUBwA0aL30= +github.com/charmbracelet/x/ansi v0.8.0 h1:9GTq3xq9caJW8ZrBTe0LIe2fvfLR/bYXKTx2llXn7xE= +github.com/charmbracelet/x/ansi v0.8.0/go.mod h1:wdYl/ONOLHLIVmQaxbIYEC/cRKOQyjTkowiI4blgS9Q= +github.com/charmbracelet/x/cellbuf v0.0.13-0.20250311204145-2c3ea96c31dd h1:vy0GVL4jeHEwG5YOXDmi86oYw2yuYUGqz6a8sLwg0X8= +github.com/charmbracelet/x/cellbuf v0.0.13-0.20250311204145-2c3ea96c31dd/go.mod h1:xe0nKWGd3eJgtqZRaN9RjMtK7xUYchjzPr7q6kcvCCs= +github.com/charmbracelet/x/term v0.2.1 h1:AQeHeLZ1OqSXhrAWpYUtZyX1T3zVxfpZuEQMIQaGIAQ= +github.com/charmbracelet/x/term v0.2.1/go.mod h1:oQ4enTYFV7QN4m0i9mzHrViD7TQKvNEEkHUMCmsxdUg= github.com/cpuguy83/go-md2man/v2 v2.0.6/go.mod h1:oOW0eioCTA6cOiMLiUPZOpcVxMig6NIQQ7OS05n1F4g= github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2s0bqwp9tc8= github.com/inconshreveable/mousetrap v1.1.0/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw= +github.com/lucasb-eyer/go-colorful v1.2.0 h1:1nnpGOrhyZZuNyfu1QjKiUICQ74+3FNCN69Aj6K7nkY= +github.com/lucasb-eyer/go-colorful v1.2.0/go.mod h1:R4dSotOR9KMtayYi1e77YzuveK+i7ruzyGqttikkLy0= +github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWEY= +github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y= +github.com/mattn/go-runewidth v0.0.16 h1:E5ScNMtiwvlvB5paMFdw9p4kSQzbXFikJ5SQO6TULQc= +github.com/mattn/go-runewidth v0.0.16/go.mod h1:Jdepj2loyihRzMpdS35Xk/zdY8IAYHsh153qUoGf23w= github.com/miekg/dns v1.1.72 h1:vhmr+TF2A3tuoGNkLDFK9zi36F2LS+hKTRW0Uf8kbzI= github.com/miekg/dns v1.1.72/go.mod h1:+EuEPhdHOsfk6Wk5TT2CzssZdqkmFhf8r+aVyDEToIs= +github.com/muesli/termenv v0.16.0 h1:S5AlUN9dENB57rsbnkPyfdGuWIlkmzJjbFf0Tf5FWUc= +github.com/muesli/termenv v0.16.0/go.mod h1:ZRfOIKPFDYQoDFF4Olj7/QJbW60Ol/kL1pU3VfY/Cnk= +github.com/rivo/uniseg v0.2.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc= +github.com/rivo/uniseg v0.4.7 h1:WUdvkW8uEhrYfLC4ZzdpI2ztxP1I582+49Oc5Mq64VQ= +github.com/rivo/uniseg v0.4.7/go.mod h1:FN3SvrM+Zdj16jyLfmOkMNblXMcoc8DfTHruCPUcx88= github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= github.com/spf13/cobra v1.10.2 h1:DMTTonx5m65Ic0GOoRY2c16WCbHxOOw6xxezuLaBpcU= github.com/spf13/cobra v1.10.2/go.mod h1:7C1pvHqHw5A4vrJfjNwvOdzYu0Gml16OCs2GRiTUUS4= github.com/spf13/pflag v1.0.9 h1:9exaQaMOCwffKiiiYk6/BndUBv+iRViNW+4lEMi0PvY= github.com/spf13/pflag v1.0.9/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg= +github.com/xo/terminfo v0.0.0-20220910002029-abceb7e1c41e h1:JVG44RsyaB9T2KIHavMF/ppJZNG9ZpyihvCd0w101no= +github.com/xo/terminfo v0.0.0-20220910002029-abceb7e1c41e/go.mod h1:RbqR21r5mrJuqunuUZ/Dhy/avygyECGrLceyNeo4LiM= go.yaml.in/yaml/v3 v3.0.4/go.mod h1:DhzuOOF2ATzADvBadXxruRBLzYTpT36CKvDb3+aBEFg= golang.org/x/mod v0.31.0 h1:HaW9xtz0+kOcWKwli0ZXy79Ix+UW/vOfmWI5QVd2tgI= golang.org/x/mod v0.31.0/go.mod h1:43JraMp9cGx1Rx3AqioxrbrhNsLl2l/iNAvuBkrezpg= @@ -15,6 +40,7 @@ golang.org/x/net v0.48.0 h1:zyQRTTrjc33Lhh0fBgT/H3oZq9WuvRR5gPC70xpDiQU= golang.org/x/net v0.48.0/go.mod h1:+ndRgGjkh8FGtu1w1FGbEC31if4VrNVMuKTgcAAnQRY= golang.org/x/sync v0.19.0 h1:vV+1eWNmZ5geRlYjzm2adRgW2/mcpevXNg50YZtPCE4= golang.org/x/sync v0.19.0/go.mod h1:9KTHXmSnoGruLpwFjVSX0lNNA75CykiMECbovNTZqGI= +golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.39.0 h1:CvCKL8MeisomCi6qNZ+wbb0DN9E5AATixKsvNtMoMFk= golang.org/x/sys v0.39.0/go.mod h1:OgkHotnGiDImocRcuBABYBEXf8A9a87e/uXjp9XT3ks= golang.org/x/tools v0.40.0 h1:yLkxfA+Qnul4cs9QA3KnlFu0lVmd8JJfoq+E41uSutA= diff --git a/internal/binaries/download.go b/internal/binaries/download.go index ae069b6..f40f06a 100644 --- a/internal/binaries/download.go +++ b/internal/binaries/download.go @@ -13,8 +13,17 @@ import ( "strings" ) +// ProgressFunc is called during download with bytes written so far and total size. +// total may be -1 if Content-Length is not available. +type ProgressFunc func(written, total int64) + // Download fetches a URL to destPath atomically via temp file + rename. func Download(client *http.Client, url, destPath string) error { + return DownloadProgress(client, url, destPath, nil) +} + +// DownloadProgress fetches a URL to destPath with optional progress reporting. +func DownloadProgress(client *http.Client, url, destPath string, progress ProgressFunc) error { resp, err := client.Get(url) if err != nil { return fmt.Errorf("download failed: %w", err) @@ -32,7 +41,13 @@ func Download(client *http.Client, url, destPath string) error { } tmpPath := tmp.Name() - if _, err := io.Copy(tmp, resp.Body); err != nil { + var reader io.Reader = resp.Body + if progress != nil { + total := resp.ContentLength + reader = &progressReader{reader: resp.Body, total: total, fn: progress} + } + + if _, err := io.Copy(tmp, reader); err != nil { tmp.Close() os.Remove(tmpPath) return fmt.Errorf("download write failed: %w", err) @@ -49,6 +64,22 @@ func Download(client *http.Client, url, destPath string) error { return nil } +type progressReader struct { + reader io.Reader + total int64 + written int64 + fn ProgressFunc +} + +func (r *progressReader) Read(p []byte) (int, error) { + n, err := r.reader.Read(p) + r.written += int64(n) + if r.fn != nil { + r.fn(r.written, r.total) + } + return n, err +} + // VerifyChecksum checks that the SHA256 of filePath matches expectedHex. // expectedHex may be in "hash filename" format (as produced by sha256sum). func VerifyChecksum(filePath, expectedHex string) error { diff --git a/internal/binaries/install.go b/internal/binaries/install.go index 7a8b5e9..3713c9b 100644 --- a/internal/binaries/install.go +++ b/internal/binaries/install.go @@ -9,8 +9,23 @@ import ( "github.com/prvious/pv/internal/config" ) +// Verbose controls whether install functions print progress details. +var Verbose bool + +func logf(format string, args ...any) { + if Verbose { + fmt.Printf(format, args...) + } +} + // InstallBinary downloads and installs a single binary at the given version. +// If progress is non-nil, it is called during download with bytes written and total. func InstallBinary(client *http.Client, b Binary, version string) error { + return InstallBinaryProgress(client, b, version, nil) +} + +// InstallBinaryProgress downloads and installs a single binary with optional progress. +func InstallBinaryProgress(client *http.Client, b Binary, version string, progress ProgressFunc) error { if err := config.EnsureDirs(); err != nil { return err } @@ -24,23 +39,23 @@ func InstallBinary(client *http.Client, b Binary, version string) error { switch b.Name { case "frankenphp": - return installFrankenPHP(client, url, b, version, binDir) + return installFrankenPHP(client, url, b, version, binDir, progress) case "mago": - return installMago(client, url, b, binDir) + return installMago(client, url, b, binDir, progress) case "composer": - return installComposer(client, url, b, version, binDir) + return installComposer(client, url, b, version, binDir, progress) case "php": - return installPHP(client, url, b, binDir) + return installPHP(client, url, b, binDir, progress) default: return fmt.Errorf("unknown binary: %s", b.Name) } } -func installFrankenPHP(client *http.Client, url string, b Binary, version string, binDir string) error { +func installFrankenPHP(client *http.Client, url string, b Binary, version string, binDir string, progress ProgressFunc) error { destPath := filepath.Join(binDir, "frankenphp") - fmt.Printf(" Downloading %s...\n", b.DisplayName) - if err := Download(client, url, destPath); err != nil { + logf(" Downloading %s...\n", b.DisplayName) + if err := DownloadProgress(client, url, destPath, progress); err != nil { return err } @@ -49,7 +64,7 @@ func installFrankenPHP(client *http.Client, url string, b Binary, version string return err } if checksumURL != "" { - fmt.Printf(" Verifying checksum...\n") + logf(" Verifying checksum...\n") expected, err := FetchChecksum(client, checksumURL) if err != nil { return err @@ -63,16 +78,16 @@ func installFrankenPHP(client *http.Client, url string, b Binary, version string return MakeExecutable(destPath) } -func installMago(client *http.Client, url string, b Binary, binDir string) error { +func installMago(client *http.Client, url string, b Binary, binDir string, progress ProgressFunc) error { archivePath := filepath.Join(binDir, "mago.tar.gz") destPath := filepath.Join(binDir, "mago") - fmt.Printf(" Downloading %s...\n", b.DisplayName) - if err := Download(client, url, archivePath); err != nil { + logf(" Downloading %s...\n", b.DisplayName) + if err := DownloadProgress(client, url, archivePath, progress); err != nil { return err } - fmt.Printf(" Extracting...\n") + logf(" Extracting...\n") if err := ExtractTarGz(archivePath, destPath, "mago"); err != nil { return err } @@ -81,16 +96,16 @@ func installMago(client *http.Client, url string, b Binary, binDir string) error return MakeExecutable(destPath) } -func installPHP(client *http.Client, url string, b Binary, binDir string) error { +func installPHP(client *http.Client, url string, b Binary, binDir string, progress ProgressFunc) error { archivePath := filepath.Join(binDir, "php.tar.gz") destPath := filepath.Join(binDir, "php") - fmt.Printf(" Downloading %s...\n", b.DisplayName) - if err := Download(client, url, archivePath); err != nil { + logf(" Downloading %s...\n", b.DisplayName) + if err := DownloadProgress(client, url, archivePath, progress); err != nil { return err } - fmt.Printf(" Extracting...\n") + logf(" Extracting...\n") if err := ExtractTarGz(archivePath, destPath, "php"); err != nil { return err } @@ -99,11 +114,11 @@ func installPHP(client *http.Client, url string, b Binary, binDir string) error return MakeExecutable(destPath) } -func installComposer(client *http.Client, url string, b Binary, version string, binDir string) error { +func installComposer(client *http.Client, url string, b Binary, version string, binDir string, progress ProgressFunc) error { destPath := config.ComposerPharPath() - fmt.Printf(" Downloading %s...\n", b.DisplayName) - if err := Download(client, url, destPath); err != nil { + logf(" Downloading %s...\n", b.DisplayName) + if err := DownloadProgress(client, url, destPath, progress); err != nil { return err } @@ -112,7 +127,7 @@ func installComposer(client *http.Client, url string, b Binary, version string, return err } if checksumURL != "" { - fmt.Printf(" Verifying checksum...\n") + logf(" Verifying checksum...\n") expected, err := FetchChecksum(client, checksumURL) if err != nil { return err diff --git a/internal/phpenv/install.go b/internal/phpenv/install.go index e616f0d..cec5f85 100644 --- a/internal/phpenv/install.go +++ b/internal/phpenv/install.go @@ -17,9 +17,23 @@ const ( releaseRepo = "prvious/pv" ) +// Verbose controls whether install functions print progress details. +var Verbose bool + +func logf(format string, args ...any) { + if Verbose { + fmt.Printf(format, args...) + } +} + // Install downloads and installs a PHP version (FrankenPHP + PHP CLI). // The phpVersion is a major.minor string like "8.4". func Install(client *http.Client, phpVersion string) error { + return InstallProgress(client, phpVersion, nil) +} + +// InstallProgress downloads and installs a PHP version with optional progress reporting. +func InstallProgress(client *http.Client, phpVersion string, progress binaries.ProgressFunc) error { versionDir := config.PhpVersionDir(phpVersion) if err := os.MkdirAll(versionDir, 0755); err != nil { return fmt.Errorf("cannot create version directory: %w", err) @@ -40,8 +54,8 @@ func Install(client *http.Client, phpVersion string) error { fpURL := fmt.Sprintf("https://github.com/%s/releases/download/%s/%s", releaseRepo, tag, assetName) fpDest := FrankenPHPPath(phpVersion) - fmt.Printf(" Downloading FrankenPHP (PHP %s)...\n", phpVersion) - if err := binaries.Download(client, fpURL, fpDest); err != nil { + logf(" Downloading FrankenPHP (PHP %s)...\n", phpVersion) + if err := binaries.DownloadProgress(client, fpURL, fpDest, progress); err != nil { return fmt.Errorf("download FrankenPHP: %w", err) } if err := binaries.MakeExecutable(fpDest); err != nil { @@ -51,7 +65,7 @@ func Install(client *http.Client, phpVersion string) error { // 3. Detect the full PHP version from the binary. fullVersion, err := binaries.DetectPHPVersion(versionDir) if err != nil { - fmt.Printf(" (could not detect full PHP version: %v)\n", err) + logf(" (could not detect full PHP version: %v)\n", err) fullVersion = phpVersion + ".0" } @@ -64,8 +78,8 @@ func Install(client *http.Client, phpVersion string) error { phpArchive := fpDest + ".php.tar.gz" phpDest := PHPPath(phpVersion) - fmt.Printf(" Downloading PHP CLI %s...\n", fullVersion) - if err := binaries.Download(client, phpURL, phpArchive); err != nil { + logf(" Downloading PHP CLI %s...\n", fullVersion) + if err := binaries.DownloadProgress(client, phpURL, phpArchive, progress); err != nil { return fmt.Errorf("download PHP CLI: %w", err) } @@ -78,7 +92,7 @@ func Install(client *http.Client, phpVersion string) error { return err } - fmt.Printf(" ✓ PHP %s installed\n", phpVersion) + logf(" ✓ PHP %s installed\n", phpVersion) return nil } diff --git a/internal/setup/resolver.go b/internal/setup/resolver.go index c52f385..7474128 100644 --- a/internal/setup/resolver.go +++ b/internal/setup/resolver.go @@ -48,13 +48,18 @@ func ResolverSetupScript(tld string) string { ) } +// Verbose controls whether sudo commands show output. +var Verbose bool + // RunSudoResolver executes the sudo command for DNS resolver setup only. func RunSudoResolver(tld string) error { script := ResolverSetupScript(tld) cmd := exec.Command("sudo", "sh", "-c", script) cmd.Stdin = os.Stdin - cmd.Stdout = os.Stdout - cmd.Stderr = os.Stderr + if Verbose { + cmd.Stdout = os.Stdout + cmd.Stderr = os.Stderr + } return cmd.Run() } @@ -102,8 +107,10 @@ func RunSudoTrustWithServer() error { script := fmt.Sprintf(`XDG_DATA_HOME="%s" XDG_CONFIG_HOME="%s" "%s" trust`, pvDir, pvDir, frankenphp) trust := exec.Command("sudo", "sh", "-c", script) trust.Stdin = os.Stdin - trust.Stdout = os.Stdout - trust.Stderr = os.Stderr + if Verbose { + trust.Stdout = os.Stdout + trust.Stderr = os.Stderr + } if err := trust.Run(); err != nil { return fmt.Errorf("frankenphp trust: %w", err) } diff --git a/internal/ui/progress.go b/internal/ui/progress.go new file mode 100644 index 0000000..1649181 --- /dev/null +++ b/internal/ui/progress.go @@ -0,0 +1,71 @@ +package ui + +import ( + "fmt" + "os" + "time" +) + +const progressBarWidth = 40 + +// ProgressWriter wraps an io.Writer and displays a progress bar. +type ProgressWriter struct { + total int64 + written int64 + label string + lastDraw time.Time +} + +// NewProgressWriter creates a progress writer for tracking download progress. +// If total is 0, no progress bar is shown. +func NewProgressWriter(label string, total int64) *ProgressWriter { + ensureCursorRestore() + fmt.Fprint(os.Stderr, "\033[?25l") + return &ProgressWriter{ + total: total, + label: label, + } +} + +func (pw *ProgressWriter) Write(p []byte) (int, error) { + n := len(p) + pw.written += int64(n) + + // Throttle redraws to avoid flicker + if time.Since(pw.lastDraw) > 50*time.Millisecond || pw.written >= pw.total { + pw.draw() + pw.lastDraw = time.Now() + } + return n, nil +} + +func (pw *ProgressWriter) draw() { + if pw.total <= 0 { + return + } + + percent := int(pw.written * 100 / pw.total) + if percent > 100 { + percent = 100 + } + + on := percent * progressBarWidth / 100 + off := progressBarWidth - on + + filled := "" + for i := 0; i < on; i++ { + filled += "■" + } + empty := "" + for i := 0; i < off; i++ { + empty += "･" + } + + fmt.Fprintf(os.Stderr, "\r %s %3d%%", Purple.Render(filled+empty), percent) +} + +// Finish clears the progress line and restores cursor. +func (pw *ProgressWriter) Finish() { + fmt.Fprintf(os.Stderr, "\r\033[2K\033[?25h") +} + diff --git a/internal/ui/spinner.go b/internal/ui/spinner.go new file mode 100644 index 0000000..11b1886 --- /dev/null +++ b/internal/ui/spinner.go @@ -0,0 +1,146 @@ +package ui + +import ( + "fmt" + "os" + "os/signal" + "sync" + "syscall" + "time" +) + +var spinnerFrames = []string{"⠋", "⠙", "⠹", "⠸", "⠼", "⠴", "⠦", "⠧", "⠇", "⠏"} + +type spinner struct { + label string + stop chan struct{} + done chan struct{} +} + +func newSpinner(label string) *spinner { + return &spinner{ + label: label, + stop: make(chan struct{}), + done: make(chan struct{}), + } +} + +func (s *spinner) start() { + // Hide cursor + fmt.Fprint(os.Stderr, "\033[?25l") + + go func() { + defer close(s.done) + i := 0 + ticker := time.NewTicker(80 * time.Millisecond) + defer ticker.Stop() + + for { + frame := spinnerFrames[i%len(spinnerFrames)] + fmt.Fprintf(os.Stderr, "\r %s %s", Purple.Render(frame), Muted.Render(s.label)) + i++ + + select { + case <-s.stop: + return + case <-ticker.C: + } + } + }() +} + +func (s *spinner) finish() { + close(s.stop) + <-s.done + // Clear the spinner line + fmt.Fprintf(os.Stderr, "\r\033[2K") + // Show cursor + fmt.Fprint(os.Stderr, "\033[?25h") +} + +// cursorGuard ensures cursor is restored on SIGINT. +var cursorGuard sync.Once + +func ensureCursorRestore() { + cursorGuard.Do(func() { + c := make(chan os.Signal, 1) + signal.Notify(c, os.Interrupt, syscall.SIGTERM) + go func() { + <-c + fmt.Fprint(os.Stderr, "\033[?25h\n") + os.Exit(1) + }() + }) +} + +// Step runs fn with a spinner, showing the label while working. +// On success, prints "✓ result". On failure, prints "✗ label" with error details. +func Step(label string, fn func() (string, error)) error { + ensureCursorRestore() + + s := newSpinner(label) + s.start() + + result, err := fn() + s.finish() + + if err != nil { + Fail(label) + FailDetail(err.Error()) + return err + } + + Success(result) + return nil +} + +// StepVerbose runs fn with verbose output (no spinner, direct prints allowed). +func StepVerbose(label string, fn func() (string, error)) error { + fmt.Fprintf(os.Stderr, " %s\n", label) + + result, err := fn() + if err != nil { + Fail(label) + FailDetail(err.Error()) + return err + } + + Success(result) + return nil +} + +// StepProgress runs fn with a progress bar for downloads. +// The fn receives a ProgressFunc that it should pass to download operations. +func StepProgress(label string, fn func(progress func(written, total int64)) (string, error)) error { + ensureCursorRestore() + + var pw *ProgressWriter + progressFn := func(written, total int64) { + if pw == nil && total > 0 { + pw = NewProgressWriter(label, total) + } + if pw != nil { + pw.written = written + now := time.Now() + if now.Sub(pw.lastDraw) > 50*time.Millisecond || written >= total { + pw.draw() + pw.lastDraw = now + } + } + } + + result, err := fn(progressFn) + + if pw != nil { + pw.Finish() + } + + if err != nil { + Fail(label) + FailDetail(err.Error()) + return err + } + + Success(result) + return nil +} diff --git a/internal/ui/style.go b/internal/ui/style.go new file mode 100644 index 0000000..a24e4df --- /dev/null +++ b/internal/ui/style.go @@ -0,0 +1,56 @@ +package ui + +import ( + "errors" + "fmt" + "os" + + "github.com/charmbracelet/lipgloss" +) + +// Colors matching install.sh: PURPLE=#b39ddb (ANSI 141), GREEN, RED, MUTED (dim). +var ( + Purple = lipgloss.NewStyle().Foreground(lipgloss.ANSIColor(141)) + Green = lipgloss.NewStyle().Foreground(lipgloss.ANSIColor(2)) + Red = lipgloss.NewStyle().Foreground(lipgloss.ANSIColor(1)) + Muted = lipgloss.NewStyle().Faint(true) + Bold = lipgloss.NewStyle().Bold(true) +) + +// ErrAlreadyPrinted is returned when the error has already been displayed +// to the user via styled output. Callers should exit without printing again. +var ErrAlreadyPrinted = errors.New("") + +// Header prints the pv version banner. +func Header(version string) { + fmt.Fprintf(os.Stderr, "\n %s %s\n\n", + Purple.Bold(true).Render("pv"), + Muted.Render("v"+version), + ) +} + +// Success prints a green checkmark line. +func Success(text string) { + fmt.Fprintf(os.Stderr, " %s %s\n", Green.Render("✓"), text) +} + +// Fail prints a red cross line. +func Fail(text string) { + fmt.Fprintf(os.Stderr, " %s %s\n", Red.Render("✗"), text) +} + +// Subtle prints muted text. +func Subtle(text string) { + fmt.Fprintf(os.Stderr, " %s\n", Muted.Render(text)) +} + +// FailDetail prints indented detail under a failure. +func FailDetail(text string) { + fmt.Fprintf(os.Stderr, " %s\n", Muted.Render(text)) +} + +// Fatal prints an error and exits. +func Fatal(err error) { + Fail(err.Error()) + os.Exit(1) +} diff --git a/internal/ui/timer.go b/internal/ui/timer.go new file mode 100644 index 0000000..0ca523e --- /dev/null +++ b/internal/ui/timer.go @@ -0,0 +1,20 @@ +package ui + +import ( + "fmt" + "os" + "time" +) + +// Footer prints the completion summary with elapsed time. +func Footer(start time.Time, docsURL string) { + elapsed := time.Since(start).Round(time.Second) + fmt.Fprintf(os.Stderr, "\n %s Run %s in a project to get started.\n", + Green.Render(fmt.Sprintf("Ready in %s.", elapsed)), + Bold.Render("pv link"), + ) + if docsURL != "" { + fmt.Fprintf(os.Stderr, " %s\n", Muted.Render("Docs: "+docsURL)) + } + fmt.Fprintln(os.Stderr) +} diff --git a/internal/ui/tree.go b/internal/ui/tree.go new file mode 100644 index 0000000..b682144 --- /dev/null +++ b/internal/ui/tree.go @@ -0,0 +1,72 @@ +package ui + +import ( + "fmt" + "os" + "strings" + + "github.com/charmbracelet/lipgloss" + "github.com/charmbracelet/lipgloss/table" +) + +// TreeItem represents one node in the tree with a title and detail line. +type TreeItem struct { + Title string + Detail string +} + +// Tree renders a list of items as a tree with box-drawing characters. +func Tree(items []TreeItem) { + for i, item := range items { + isLast := i == len(items)-1 + + branch := Purple.Render("├─") + cont := Purple.Render("│") + if isLast { + branch = Purple.Render("└─") + cont = " " + } + + fmt.Fprintf(os.Stderr, " %s %s\n", branch, item.Title) + fmt.Fprintf(os.Stderr, " %s %s\n", cont, Muted.Render(item.Detail)) + + if !isLast { + fmt.Fprintf(os.Stderr, " %s\n", cont) + } + } +} + +var ( + purple = lipgloss.ANSIColor(141) + gray = lipgloss.ANSIColor(245) + lightGray = lipgloss.ANSIColor(241) + + headerStyle = lipgloss.NewStyle().Foreground(purple).Bold(true) + cellStyle = lipgloss.NewStyle().Padding(0, 1) + oddRowStyle = cellStyle.Foreground(gray) + evenRowStyle = cellStyle.Foreground(lightGray) +) + +// Table renders a styled lipgloss table. +func Table(headers []string, rows [][]string) { + t := table.New(). + Border(lipgloss.RoundedBorder()). + BorderStyle(lipgloss.NewStyle().Foreground(purple)). + StyleFunc(func(row, col int) lipgloss.Style { + switch { + case row == table.HeaderRow: + return headerStyle + case row%2 == 0: + return evenRowStyle + default: + return oddRowStyle + } + }). + Headers(headers...). + Rows(rows...) + + rendered := t.String() + for _, line := range strings.Split(rendered, "\n") { + fmt.Fprintf(os.Stderr, " %s\n", line) + } +} diff --git a/scripts/e2e/dynamic-unlink.sh b/scripts/e2e/dynamic-unlink.sh index b039b23..0630718 100755 --- a/scripts/e2e/dynamic-unlink.sh +++ b/scripts/e2e/dynamic-unlink.sh @@ -6,7 +6,7 @@ sudo -E pv unlink e2e-static sleep 2 # Verify removed from list -if pv list | grep -q "e2e-static"; then +if pv list 2>&1 | grep -q "e2e-static"; then echo "FAIL: e2e-static still in list after unlink" exit 1 fi diff --git a/scripts/e2e/errors.sh b/scripts/e2e/errors.sh index c9d8986..38e495c 100755 --- a/scripts/e2e/errors.sh +++ b/scripts/e2e/errors.sh @@ -18,9 +18,9 @@ echo "OK: remove global PHP -> error" assert_fails pv php remove 8.3 echo "OK: remove PHP with dependent project -> error" -# 5. Install already-installed PHP -assert_fails pv php install 8.4 -echo "OK: install already-installed PHP -> error" +# 5. Install already-installed PHP (no-op, should succeed) +pv php install 8.4 +echo "OK: install already-installed PHP -> no-op success" # 6. Use non-installed PHP version assert_fails pv use php:9.9 @@ -34,4 +34,4 @@ echo "OK: install invalid format -> error" assert_fails pv unlink nonexistent-project echo "OK: unlink non-existent project -> error" -echo "All 8 error cases passed" +echo "All error cases passed" diff --git a/scripts/e2e/lifecycle.sh b/scripts/e2e/lifecycle.sh index 0d350a5..c69a7f3 100755 --- a/scripts/e2e/lifecycle.sh +++ b/scripts/e2e/lifecycle.sh @@ -22,7 +22,7 @@ echo "OK: pv use php:8.4 works" # Unlink e2e-php83 to free PHP 8.3 sudo -E pv unlink e2e-php83 -if pv list | grep -q "e2e-php83"; then +if pv list 2>&1 | grep -q "e2e-php83"; then echo "FAIL: e2e-php83 still in list"; exit 1 fi echo "OK: e2e-php83 unlinked" @@ -32,7 +32,7 @@ pv php remove 8.3 if [ -d ~/.pv/php/8.3 ]; then echo "FAIL: PHP 8.3 directory still exists"; exit 1 fi -PHP_OUT=$(pv php list) +PHP_OUT=$(pv php list 2>&1) echo "$PHP_OUT" if echo "$PHP_OUT" | grep -qE "8\.3"; then echo "FAIL: 8.3 still in php list"; exit 1 diff --git a/scripts/e2e/link-verify.sh b/scripts/e2e/link-verify.sh index 75270f2..cd539f0 100755 --- a/scripts/e2e/link-verify.sh +++ b/scripts/e2e/link-verify.sh @@ -9,7 +9,7 @@ pv link /tmp/e2e-octane --name e2e-octane pv link /tmp/e2e-php83 --name e2e-php83 echo "==> pv list" -OUTPUT=$(pv list) +OUTPUT=$(pv list 2>&1) echo "$OUTPUT" assert_contains "$OUTPUT" "e2e-static" "e2e-static not in list" assert_contains "$OUTPUT" "e2e-php" "e2e-php not in list" @@ -20,7 +20,7 @@ echo "$OUTPUT" | grep "e2e-octane" | grep -q "laravel-octane" || { echo "FAIL: o echo "$OUTPUT" | grep "e2e-php83" | grep -q "8.3" || { echo "FAIL: php83 version wrong"; exit 1; } echo "==> pv php list (project associations)" -PHP_OUTPUT=$(pv php list) +PHP_OUTPUT=$(pv php list 2>&1) echo "$PHP_OUTPUT" echo "$PHP_OUTPUT" | grep "8.3" | grep -q "e2e-php83" || { echo "FAIL: php83 not associated with 8.3"; exit 1; } echo "$PHP_OUTPUT" | grep "8.4" | grep -q "(default)" || { echo "FAIL: 8.4 not marked default"; exit 1; } diff --git a/scripts/e2e/start-curl.sh b/scripts/e2e/start-curl.sh index 47d66eb..2cd33dd 100755 --- a/scripts/e2e/start-curl.sh +++ b/scripts/e2e/start-curl.sh @@ -6,10 +6,10 @@ sudo -E pv start & sleep 8 echo "==> pv status" -STATUS=$(sudo -E pv status) +STATUS=$(sudo -E pv status 2>&1) echo "$STATUS" -assert_contains "$STATUS" "running" "server not running" -assert_contains "$STATUS" "8.4 (global)" "global PHP not shown" +assert_contains "$STATUS" "Running" "server not running" +assert_contains "$STATUS" "8.4 (default)" "global PHP not shown" assert_contains "$STATUS" "5 linked" "wrong site count" # Version Caddyfile for 8.3 generated at start time diff --git a/scripts/e2e/stop.sh b/scripts/e2e/stop.sh index 89ec693..c5f4aa1 100755 --- a/scripts/e2e/stop.sh +++ b/scripts/e2e/stop.sh @@ -4,7 +4,7 @@ source "$(dirname "$0")/helpers.sh" sudo -E pv stop sleep 2 -STATUS=$(pv status) +STATUS=$(pv status 2>&1) echo "$STATUS" -assert_contains "$STATUS" "stopped" "server not stopped" +assert_contains "$STATUS" "Stopped" "server not stopped" echo "OK: server stopped" diff --git a/scripts/e2e/verify-install.sh b/scripts/e2e/verify-install.sh index 1d0ae80..3567800 100755 --- a/scripts/e2e/verify-install.sh +++ b/scripts/e2e/verify-install.sh @@ -11,9 +11,9 @@ ls -la ~/.pv/php/8.3/frankenphp ls -la ~/.pv/php/8.3/php echo "==> pv php list" -OUTPUT=$(pv php list) +OUTPUT=$(pv php list 2>&1) echo "$OUTPUT" -assert_contains "$OUTPUT" "* 8.4" "8.4 not marked as default" +assert_contains "$OUTPUT" "(default)" "8.4 not marked as default" assert_contains "$OUTPUT" "8.3" "8.3 not listed" echo "==> Verify frankenphp symlink points to 8.4"