Merge pull request #1405 from rsteube/devbox-updates-0.1.0

devbox: updates from 0.1.0
carapace-sh · Nov 6, 2022 · a0af0eb · a0af0eb
2 parents 71c8dc0 + 30651e2
commit a0af0eb
Show file tree

Hide file tree

Showing 5 changed files with 32 additions and 2 deletions.
diff --git a/completers/devbox_completer/cmd/add.go b/completers/devbox_completer/cmd/add.go
@@ -13,7 +13,18 @@ var addCmd = &cobra.Command{
 
 func init() {
 	carapace.Gen(addCmd).Standalone()
+	addCmd.Flags().StringP("config", "c", "", "path to directory containing a devbox.json config file")
 	rootCmd.AddCommand(addCmd)
 
-	// TODO nix package search
+	carapace.Gen(addCmd).FlagCompletion(carapace.ActionMap{
+		"config": carapace.ActionDirectories(),
+	})
+
+	// TODO devbox is currently hardcoded against `nixpkgs` alias which is implicitly added as prefix.
+	// This channel also has no sqlitedb so package names cannot be completed
+	// carapace.Gen(addCmd).PositionalAnyCompletion(
+	// 	carapace.ActionCallback(func(c carapace.Context) carapace.Action {
+	// 		return nix.ActionChannelPackages().Invoke(c).Filter(c.Parts).ToA()
+	// 	}),
+	// )
 }
diff --git a/completers/devbox_completer/cmd/build.go b/completers/devbox_completer/cmd/build.go
@@ -13,13 +13,15 @@ var buildCmd = &cobra.Command{
 
 func init() {
 	carapace.Gen(buildCmd).Standalone()
+	buildCmd.Flags().StringP("config", "c", "", "path to directory containing a devbox.json config file")
 	buildCmd.Flags().String("engine", "docker", "Engine used to build the container: 'docker', 'podman'")
 	buildCmd.Flags().String("name", "devbox", "name for the container")
 	buildCmd.Flags().Bool("no-cache", false, "Do not use a cache")
 	buildCmd.Flags().StringSlice("tags", []string{}, "tags for the container")
 	rootCmd.AddCommand(buildCmd)
 
 	carapace.Gen(buildCmd).FlagCompletion(carapace.ActionMap{
+		"config": carapace.ActionDirectories(),
 		"engine": carapace.ActionValues("docker", "podman"),
 	})
 

diff --git a/completers/devbox_completer/cmd/plan.go b/completers/devbox_completer/cmd/plan.go
@@ -13,8 +13,13 @@ var planCmd = &cobra.Command{
 
 func init() {
 	carapace.Gen(planCmd).Standalone()
+	planCmd.Flags().StringP("config", "c", "", "path to directory containing a devbox.json config file")
 	rootCmd.AddCommand(planCmd)
 
+	carapace.Gen(planCmd).FlagCompletion(carapace.ActionMap{
+		"config": carapace.ActionDirectories(),
+	})
+
 	carapace.Gen(planCmd).PositionalCompletion(
 		carapace.ActionDirectories(),
 	)

diff --git a/completers/devbox_completer/cmd/rm.go b/completers/devbox_completer/cmd/rm.go
@@ -14,11 +14,17 @@ var rmCmd = &cobra.Command{
 
 func init() {
 	carapace.Gen(rmCmd).Standalone()
+	rmCmd.Flags().StringP("config", "c", "", "path to directory containing a devbox.json config file")
 	rootCmd.AddCommand(rmCmd)
 
+	carapace.Gen(rmCmd).FlagCompletion(carapace.ActionMap{
+		"config": carapace.ActionDirectories(),
+	})
+
 	carapace.Gen(rmCmd).PositionalAnyCompletion(
 		carapace.ActionCallback(func(c carapace.Context) carapace.Action {
-			return devbox.ActionInstalledPackages().Invoke(c).Filter(c.Args).ToA()
+			dir := rmCmd.Flag("config").Value.String()
+			return devbox.ActionInstalledPackages().Chdir(dir).Invoke(c).Filter(c.Args).ToA()
 		}),
 	)
 }
diff --git a/completers/devbox_completer/cmd/shell.go b/completers/devbox_completer/cmd/shell.go
@@ -13,8 +13,14 @@ var shellCmd = &cobra.Command{
 
 func init() {
 	carapace.Gen(shellCmd).Standalone()
+	shellCmd.Flags().StringP("config", "c", "", "path to directory containing a devbox.json config file")
+	shellCmd.Flags().Bool("print-env", false, "Print script to setup shell environment")
 	rootCmd.AddCommand(shellCmd)
 
+	carapace.Gen(shellCmd).FlagCompletion(carapace.ActionMap{
+		"config": carapace.ActionDirectories(),
+	})
+
 	carapace.Gen(shellCmd).PositionalCompletion(
 		carapace.ActionDirectories(),
 	)