feat!: change bin names to params not flags (#4)

Instead of `b -i --jq` we do `b -i jq`

.vscode/launch.json

@@ -10,7 +10,7 @@
       "request": "launch",
       "mode": "debug",
       "program": "${workspaceRoot}/cmd/b/main.go",
-      "args": ["-aui"]
+      "args": ["-h"]
     } 
   ]
 }

README.md

@@ -24,17 +24,20 @@ The package includes a `Binary` struct that represents a binary file, including
 ### 🐾 How to use `b` as binary
 
 ```bash
-# List all installed binaries and defined in b.yaml
+# List all installed binaries and/or defined in b.yaml
 b --all
 
 # Print as JSON
 b -ao json
 
-# Install all binaries
+# Install all binaries defined in b.yaml
 b -a --install
 
 # Install or update jq
-b -iu --jq
+b -iu jq
+
+# Force install jq, overwriting existing binary
+b -fi jq
 
 # Upgrade all binaries
 b -aiu
@@ -95,7 +98,7 @@ The `Binary` struct represents a binary file, including its name, file path, ver
 
 ```go
 bin := binary.Binary{Name: "mybinary", Version: "1.0.0"}
-bin.EnsureBinary()
+bin.EnsureBinary(true, false)
 ```
 
 Have a look into [pkg/binary](./pkg/binary/) for more details.

pkg/binaries/k9s/k9s.go

@@ -17,6 +17,9 @@ func Binary(options *binaries.BinaryOptions) *binary.Binary {
 			Context: context.Background(),
 		}
 	}
+	if options.Envs == nil {
+		options.Envs = map[string]string{}
+	}
 	return &binary.Binary{
 		Context:    options.Context,
 		Envs:       options.Envs,
@@ -32,6 +35,8 @@ func Binary(options *binaries.BinaryOptions) *binary.Binary {
 		VersionF: binary.GithubLatest,
 		IsTarGz:  true,
 		VersionLocalF: func(b *binary.Binary) (string, error) {
+			// If this is not set, k9s will fail...
+			b.Envs["K9S_LOGS_DIR"] = "/tmp"
 			s, err := b.Exec("version", "-s")
 			if err != nil {
 				return "", err

pkg/binary/binary.go

@@ -2,7 +2,6 @@ package binary
 
 import (
 	"context"
-	"fmt"
 	"os"
 	"path/filepath"
 
@@ -94,21 +93,21 @@ func (b *Binary) BinaryExists() bool {
 }
 
 func (b *Binary) EnsureBinary(update bool) error {
-	exists := b.BinaryExists()
-	if b.File == "" {
-		return fmt.Errorf("unable to determine binary path")
-	}
-
-	if exists {
+	if b.BinaryExists() {
 		if !update {
 			return nil
 		}
 		local := b.LocalBinary()
+
 		if local.Version == local.Enforced || local.Enforced == "" && local.Latest == local.Version {
 			return nil
 		}
 	}
 
+	return b.DownloadBinary()
+}
+
+func (b *Binary) DownloadBinary() error {
 	err := os.MkdirAll(filepath.Dir(b.File), 0755)
 	if err != nil {
 		return err

pkg/binary/download.go

@@ -72,6 +72,10 @@ func (b *Binary) extractSingleFileFromTarGz(stream io.Reader) error {
 }
 
 func (b *Binary) downloadBinary() error {
+	path := b.BinaryPath()
+	if path == "" {
+		return fmt.Errorf("unable to determine binary path")
+	}
 	var err error
 	if b.Version == "" && b.VersionF != nil {
 		b.Version, err = b.VersionF(b)

pkg/cli/cli.go

@@ -24,7 +24,9 @@ type CmdBinaryOptions struct {
 	all       bool
 	available bool
 	ensure    map[*binary.Binary]*bool
+	lookup    map[string]*binary.Binary
 	force     bool
+	update    bool
 	install   bool
 	check     bool
 }
@@ -34,16 +36,18 @@ func NewCmdBinary(options *CmdBinaryOptions) *cobra.Command {
 		options = &CmdBinaryOptions{}
 	}
 	options.ensure = make(map[*binary.Binary]*bool)
+	options.lookup = make(map[string]*binary.Binary)
 	for _, b := range options.Binaries {
 		options.ensure[b] = new(bool)
+		options.lookup[b.Name] = b
 	}
 
 	configExample := ""
 	if !options.NoConfig {
 		configExample = " and defined in b.yaml"
 	}
 	cmd := &cobra.Command{
-		Use:   "b",
+		Use:   "b [flags] [...binaries]",
 		Short: "Manage all binaries",
 		Long:  "Ensure that all binaries needed are installed and up to date",
 		PreRunE: func(cmd *cobra.Command, args []string) error {
@@ -69,7 +73,10 @@ func NewCmdBinary(options *CmdBinaryOptions) *cobra.Command {
 			b -a --install
 
 			# Install or update jq
-			b -iu --jq
+			b -iu jq
+
+			# Force install jq, overwriting existing binary
+			b -fi jq
 
 			# Upgrade all binaries
 			b -aiu
@@ -100,10 +107,8 @@ func (o *CmdBinaryOptions) AddFlags(cmd *cobra.Command) {
 		cmd.Flags().BoolVar(&o.available, "list", false, "List all available binaries")
 	}
 	cmd.Flags().BoolVarP(&o.all, "all", "a", false, all)
-	for _, b := range o.Binaries {
-		cmd.Flags().BoolVar(o.ensure[b], b.Name, false, b.Name+" binary")
-	}
-	cmd.Flags().BoolVarP(&o.force, "upgrade", "u", false, "Upgrade if already installed")
+	cmd.Flags().BoolVarP(&o.force, "force", "f", false, "Force download, overwriting existing binaries")
+	cmd.Flags().BoolVarP(&o.update, "upgrade", "u", false, "Upgrade if already installed")
 	cmd.Flags().BoolVarP(&o.install, "install", "i", false, "Install if not installed")
 	cmd.Flags().BoolVarP(&o.check, "check", "c", false, "Check if binary is up to date")
 }
@@ -113,6 +118,20 @@ func (o *CmdBinaryOptions) Complete(cmd *cobra.Command, args []string) error {
 		return nil
 	}
 
+	if len(args) > 0 {
+		if o.all {
+			return cmdutil.UsageErrorf(cmd, "Cannot use --all with arguments")
+		}
+
+		for _, arg := range args {
+			b, ok := o.lookup[arg]
+			if !ok {
+				return cmdutil.UsageErrorf(cmd, "Unknown binary %s", arg)
+			}
+			*o.ensure[b] = true
+		}
+	}
+
 	if o.config != nil {
 		for _, lb := range *o.config {
 			for b, do := range o.ensure {

pkg/cli/helper.go

@@ -46,14 +46,22 @@ func (o *CmdBinaryOptions) installBinaries() error {
 	for b, do := range o.ensure {
 		if *do {
 			wg.Add(1)
-			tracker := pw.AddTracker(fmt.Sprintf("Ensuring %s is installed", b.Name), 0)
 
 			go func() {
+				tracker := pw.AddTracker(fmt.Sprintf("Ensuring %s is installed", b.Name), 0)
 				b.Tracker = tracker
+
+				var err error
+				if o.force {
+					err = b.DownloadBinary()
+				} else {
+					err = b.EnsureBinary(o.update)
+				}
+
 				progress.ProgressDone(
 					tracker,
 					fmt.Sprintf("%s is installed", b.Name),
-					b.EnsureBinary(o.force),
+					err,
 				)
 				wg.Done()
 			}()