🔽 Reduced dependencies

Author: bdsoha

README.md

@@ -3,7 +3,7 @@
 > ⚡ CLI companion to charge the **Kloud Workspace** batteries
 
 [![Stars](https://img.shields.io/github/stars/kloudkit?style=for-the-badge&logo=data%3Aimage%2Fsvg%2Bxml%3Bbase64%2CPHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHZpZXdCb3g9IjAgMCAyNTYgMjU2Ij4KPHBhdGggZD0iTTIzNS4yNCw4NC4zOGwtMjguMDYsMjMuNjgsOC41NiwzNS4zOWExMy4zNCwxMy4zNCwwLDAsMS01LjA5LDEzLjkxLDEzLjU0LDEzLjU0LDAsMCwxLTE1LC42OUwxNjQsMTM5bC0zMS42NSwxOS4wNmExMy41MSwxMy41MSwwLDAsMS0xNS0uNjksMTMuMzIsMTMuMzIsMCwwLDEtNS4xLTEzLjkxbDguNTYtMzUuMzlMOTIuNzYsODQuMzhhMTMuMzksMTMuMzksMCwwLDEsNy42Ni0yMy41OGwzNi45NC0yLjkyLDE0LjIxLTMzLjY2YTEzLjUxLDEzLjUxLDAsMCwxLDI0Ljg2LDBsMTQuMjEsMzMuNjYsMzYuOTQsMi45MmExMy4zOSwxMy4zOSwwLDAsMSw3LjY2LDIzLjU4Wk04OC4xMSwxMTEuODlhOCw4LDAsMCwwLTExLjMyLDBMMTguMzQsMTcwLjM0YTgsOCwwLDAsMCwxMS4zMiwxMS4zMmw1OC40NS01OC40NUE4LDgsMCwwLDAsODguMTEsMTExLjg5Wm0tLjUsNjEuMTlMMzQuMzQsMjI2LjM0YTgsOCwwLDAsMCwxMS4zMiwxMS4zMmw1My4yNi01My4yN2E4LDgsMCwwLDAtMTEuMzEtMTEuMzFabTczLTEtNTQuMjksNTQuMjhhOCw4LDAsMCwwLDExLjMyLDExLjMybDU0LjI4LTU0LjI4YTgsOCwwLDAsMC0xMS4zMS0xMS4zMloiIHN0eWxlPSJmaWxsOiAjQ0FEM0Y1OyIvPgo8L3N2Zz4%3D&logoColor=c6d0f5&labelColor=414559&color=yellow)](https://github.com/kloudkit/ws-meta/stargazers)
-[![Docker](https://img.shields.io/badge/latest-a?style=for-the-badge&logo=docker&logoColor=c6d0f5&label=docker&labelColor=414559&color=ef9f76)](https://github.com/kloudkit/workspace/pkgs/container/workspace)
+[![Docker](https://img.shields.io/badge/latest-a?style=for-the-badge&logo=docker&logoColor=c6d0f5&label=docker&labelColor=414559&color=ef9f76)](https://github.com/orgs/kloudkit/packages/container/package/workspace)
 [![Documentation](https://img.shields.io/badge/Browse-a?style=for-the-badge&logo=readthedocs&logoColor=c6d0f5&label=Documentation&labelColor=414559&color=85c1dc)](https://ws.kloudkit.com)
 [![License](https://img.shields.io/github/license/kloudkit/ws-cli?style=for-the-badge&logo=opensourceinitiative&logoColor=c6d0f5&labelColor=414559&color=8caaee)](https://github.com/kloudkit/ws-cli/blob/main/LICENSE)
 

cmd/feature/info.go

@@ -2,7 +2,6 @@ package feature
 
 import (
 	"fmt"
-	"strings"
 
 	"github.com/kloudkit/ws-cli/internals/features"
 	"github.com/kloudkit/ws-cli/internals/styles"
@@ -25,15 +24,15 @@ var infoCmd = &cobra.Command{
 		fmt.Fprintf(
 			cmd.OutOrStdout(),
 			"\n%s\n  %s\n\n",
-			styles.InfoBadge().Render(strings.ToUpper(feature.Name)),
+			styles.Title().Render(feature.Name),
 			feature.Description,
 		)
 
 		if len(feature.Vars) > 0 {
 			fmt.Fprintf(
 				cmd.OutOrStdout(),
 				"%s\n",
-				styles.Badge().Render("Options"),
+				styles.Header().Render("Options"),
 			)
 
 			listItems := make([]any, len(feature.Vars))

cmd/feature/install.go

@@ -1,15 +1,14 @@
 package feature
 
 import (
-	"context"
 	"fmt"
 	"os"
+	"os/exec"
 	"path/filepath"
 	"slices"
 	"sort"
+	"strings"
 
-	"github.com/apenella/go-ansible/v2/pkg/execute"
-	"github.com/apenella/go-ansible/v2/pkg/playbook"
 	"github.com/kloudkit/ws-cli/internals/features"
 	"github.com/kloudkit/ws-cli/internals/styles"
 	"github.com/spf13/cobra"
@@ -42,19 +41,26 @@ var installCmd = &cobra.Command{
 }
 
 func runAnsiblePlaybook(featurePath string, vars map[string]any) error {
-	playbookCmd := &playbook.AnsiblePlaybookCmd{
-		Playbooks: []string{featurePath},
-		PlaybookOptions: &playbook.AnsiblePlaybookOptions{
-			ExtraVars: vars,
-		},
+	args := []string{featurePath}
+
+	if len(vars) > 0 {
+		var extraVars []string
+		for key, value := range vars {
+			extraVars = append(extraVars, fmt.Sprintf("%s=%v", key, value))
+		}
+		args = append(args, "--extra-vars", strings.Join(extraVars, " "))
 	}
 
-	exec := execute.NewDefaultExecute(execute.WithCmd(playbookCmd))
+	cmd := exec.Command("ansible-playbook", args...)
+	cmd.Stdout = os.Stdout
+	cmd.Stderr = os.Stderr
 
-	return exec.Execute(context.Background())
+	return cmd.Run()
 }
 
 func installFeatureByName(cmd *cobra.Command, featureName, featuresDir string) error {
+	fmt.Fprintf(cmd.OutOrStdout(), "%s\n", styles.Title().Render(fmt.Sprintf("Installing %s", featureName)))
+
 	rawVars, _ := cmd.Flags().GetStringToString("opt")
 
 	vars := make(map[string]any, len(rawVars))

cmd/feature/list.go

@@ -2,7 +2,6 @@ package feature
 
 import (
 	"fmt"
-	"strings"
 
 	"github.com/kloudkit/ws-cli/internals/features"
 	"github.com/kloudkit/ws-cli/internals/styles"
@@ -26,30 +25,25 @@ var listCmd = &cobra.Command{
 			return nil
 		}
 
-		fmt.Fprintf(
-			cmd.OutOrStdout(),
-			"\n%s\n\n",
-			styles.InfoBadge().Render(fmt.Sprintf("%d FEATURES AVAILABLE", len(availableFeatures))),
-		)
-
-		featuresTable := styles.Table("NAME", "DESCRIPTION", "OPTIONS")
+		fmt.Fprintf(cmd.OutOrStdout(), "%s\n", styles.TitleWithCount("Features available", len(availableFeatures)))
 
+		maxNameLen := 0
 		for _, feature := range availableFeatures {
-			var options string
-			if len(feature.Vars) > 0 {
-				var styledVars []string
-				for _, v := range feature.Vars {
-					styledVars = append(styledVars, styles.Key().UnsetBold().Render(v))
-				}
-				options = strings.Join(styledVars, ", ")
-			} else {
-				options = styles.Muted().Render("-")
+			if len(feature.Name) > maxNameLen {
+				maxNameLen = len(feature.Name)
 			}
+		}
+
+		var featureItems []any
+		for _, feature := range availableFeatures {
+			item := styles.Key().Width(maxNameLen).Render(feature.Name) +
+				styles.Muted().Render(" — ") +
+				styles.Value().Render(feature.Description)
 
-			featuresTable.Row(feature.Name, feature.Description, options)
+			featureItems = append(featureItems, item)
 		}
 
-		fmt.Fprintln(cmd.OutOrStdout(), featuresTable.String())
+		fmt.Fprintln(cmd.OutOrStdout(), styles.List(featureItems...))
 
 		return nil
 	},

cmd/info/env.go

@@ -20,7 +20,7 @@ func showEnvironment(writer io.Writer) {
 		}
 	}
 
-	fmt.Fprintf(writer, "\n%s\n\n", styles.InfoBadge().Render(fmt.Sprintf("%d WORKSPACE VARIABLES", len(wsVars))))
+	fmt.Fprintf(writer, "%s\n", styles.TitleWithCount("Workspace variables", len(wsVars)))
 
 	sort.Slice(wsVars, func(i, j int) bool {
 		return wsVars[i][0] < wsVars[j][0]

cmd/info/extensions.go

@@ -32,7 +32,7 @@ func fetchExtensions() [][]string {
 func showExtensions(writer io.Writer) {
 	extensions := fetchExtensions()
 
-	fmt.Fprintf(writer, "\n%s\n\n", styles.InfoBadge().Render(fmt.Sprintf("%d EXTENSIONS", len(extensions))))
+	fmt.Fprintf(writer, "%s\n", styles.TitleWithCount("Extensions", len(extensions)))
 
 	fmt.Fprintln(writer)
 

cmd/info/info.go

@@ -44,9 +44,7 @@ func readJson(content map[string]any, key string) string {
 func showVersion(writer io.Writer) {
 	content := readJsonFile()
 
-	fmt.Fprintf(writer, "\n%s\n\n", styles.InfoBadge().Render("VERSIONS"))
-
-	fmt.Fprintln(writer)
+	fmt.Fprintf(writer, "%s\n", styles.Title().Render("Versions"))
 
 	t := styles.Table().Rows(
 		[]string{"workspace", readJson(content, "version")},

cmd/info/uptime.go

@@ -55,24 +55,26 @@ func showUptime(writer io.Writer) {
 	started, running, err := readStartup()
 
 	if err != nil {
-		fmt.Fprintf(writer, "%s\n\n", styles.WarningBadge().Render("WARNING"))
+		fmt.Fprintf(writer, "%s\n", styles.Title().Render("Warning"))
 		fmt.Fprintf(writer, "%s\n", styles.Warning().Render("Could not read workspace startup time"))
 		return
 	}
 
-	var statusBadge string
+	var statusValue string
 	if running.Hours() < 1 {
-		statusBadge = styles.InfoBadge().Render("RECENTLY STARTED")
+		statusValue = "Recently started"
 	} else if running.Hours() < 36 {
-		statusBadge = styles.SuccessBadge().Render("ACTIVE")
+		statusValue = "Active"
 	} else {
-		statusBadge = styles.Highlighted().Render("LONG RUNNING")
+		statusValue = "Long running"
 	}
-	fmt.Fprintf(writer, "\n%s\n\n", statusBadge)
+
+	fmt.Fprintf(writer, "%s\n", styles.Title().Render("Uptime"))
 
 	t := styles.Table().Rows(
 		[]string{"Started at", styles.Code().Render(started.Format("2006-01-02 15:04:05 MST"))},
 		[]string{"Running for", styles.Value().Render(humanizeDuration(running))},
+		[]string{"Status", styles.Value().Render(statusValue)},
 	)
 
 	fmt.Fprintf(writer, "%s\n\n", t.Render())

cmd/info/version.go

@@ -1,3 +1,3 @@
 package info
 
-var Version = "0.0.33"
+var Version = "0.0.35"

cmd/root.go

@@ -1,9 +1,10 @@
 package cmd
 
 import (
-	"fmt"
+	"context"
 	"os"
 
+	"github.com/charmbracelet/fang"
 	"github.com/kloudkit/ws-cli/cmd/clip"
 	"github.com/kloudkit/ws-cli/cmd/feature"
 	"github.com/kloudkit/ws-cli/cmd/info"
@@ -24,56 +25,21 @@ var rootCmd = &cobra.Command{
 	SilenceErrors: true,
 }
 
-var noColor bool
-
-var versionCmd = &cobra.Command{
-	Use:   "version",
-	Short: "Display the installed workspace version",
-	RunE: func(cmd *cobra.Command, args []string) error {
-		fmt.Fprintln(cmd.OutOrStdout(), styles.Value().Render(info.Version))
-		return nil
-	},
-}
-
 func Execute() {
-	if err := rootCmd.Execute(); err != nil {
-
-		fmt.Fprintf(os.Stderr, "%s %s\n",
-			styles.ErrorBadge().Render("ERROR"),
-			styles.Error().Render(err.Error()),
-		)
-
-		// Add usage hint for command resolution errors
-		// if strings.Contains(err.Error(), "unknown command") {
-		// 	fmt.Fprintf(os.Stderr, "Run '%s --help' for usage.\n", rootCmd.Use)
-		// }
+	ctx := context.Background()
 
-		// Print the original error again to maintain the expected behavior
-		// fmt.Fprintf(os.Stderr, "Error: %s\n", err.Error())
+	fangOptions := []fang.Option{
+		fang.WithColorSchemeFunc(styles.FrappeColorScheme),
+		fang.WithVersion(info.Version),
+		fang.WithoutManpage(),
+	}
 
+	if err := fang.Execute(ctx, rootCmd, fangOptions...); err != nil {
 		os.Exit(1)
 	}
 }
 
 func init() {
-	rootCmd.PersistentFlags().BoolVar(&noColor, "no-color", false, "Disable color output")
-
-	rootCmd.SetHelpTemplate(styles.HelpTemplate())
-	rootCmd.SetUsageTemplate(styles.UsageTemplate())
-	rootCmd.SetFlagErrorFunc(func(cmd *cobra.Command, err error) error {
-		return err
-	})
-
-	cobra.OnInitialize(func() {
-		if _, exists := os.LookupEnv("WS_LOGGING_NO_COLOR"); exists {
-			styles.ColorEnabled = false
-		}
-
-		if noColor {
-			styles.ColorEnabled = false
-		}
-	})
-
 	rootCmd.AddCommand(
 		clip.ClipCmd,
 		feature.FeatureCmd,
@@ -83,6 +49,5 @@ func init() {
 		info.InfoCmd,
 		log.LogCmd,
 		logs.LogsCmd,
-		versionCmd,
 	)
 }