Merge branch 'CU-1ty8v5h'

command/bash.go

@@ -21,6 +21,7 @@ var bashCmd = &cobra.Command{
 	Run: func(cmd *cobra.Command, args []string) {
 		bash()
 	},
+	ValidArgs: []string{"--root"},
 }
 
 var bashRoot bool

command/completion.go

@@ -0,0 +1,56 @@
+package command
+
+import (
+	"fmt"
+	"os"
+
+	"github.com/spf13/cobra"
+)
+
+var completionDesc = `To load completions:
+
+Bash:
+
+  $ source <(%[1]s completion bash)
+
+  # To load completions for each session, execute once:
+
+  $ echo "\nsource <(%[1]s completion bash)" >> ~/.bashrc
+
+Zsh:
+
+  # If shell completion is not already enabled in your environment,
+  # you will need to enable it.  You can execute the following once:
+
+  $ echo "autoload -U compinit; compinit" >> ~/.zshrc
+
+  # To load completions for each session, execute once:
+  $ %[1]s completion zsh > "${fpath[1]}/_%[1]s"
+
+You will need to start a new shell for this setup to take effect.
+`
+
+// completionCmd represents the completion command
+var completionCmd = &cobra.Command{
+	Use:                   "completion [bash|zsh]",
+	Short:                 "Generate completion script",
+	Long:                  fmt.Sprintf(completionDesc, rootCmd.Root().Name()),
+	DisableFlagsInUseLine: true,
+	ValidArgs:             []string{"bash", "zsh"},
+	Run: func(cmd *cobra.Command, args []string) {
+		if len(args) > 0 {
+			switch args[0] {
+			case "bash":
+				_ = cmd.Root().GenBashCompletion(os.Stdout)
+			case "zsh":
+				_ = cmd.Root().GenZshCompletion(os.Stdout)
+			}
+		} else {
+			fmt.Printf(completionDesc, rootCmd.Root().Name())
+		}
+	},
+}
+
+func init() {
+	rootCmd.AddCommand(completionCmd)
+}

command/deploy.go

@@ -36,7 +36,8 @@ Laravel: only the database is downloaded`,
 	Run: func(cmd *cobra.Command, args []string) {
 		deploy()
 	},
-	Example: "dl deploy\ndl deploy -d\ndl deploy -f -o bitrix,upload",
+	Example:   "dl deploy\ndl deploy -d\ndl deploy -f -o bitrix,upload",
+	ValidArgs: []string{"--database", "--files", "--override"},
 }
 
 var (

command/root.go

@@ -38,7 +38,7 @@ func Execute() {
 
 	rootCmd.SetUsageTemplate(usageTemplate)
 	rootCmd.DisableAutoGenTag = true
-	rootCmd.CompletionOptions.DisableDefaultCmd = true
+	// rootCmd.CompletionOptions.DisableDefaultCmd = true
 
 	cobra.CheckErr(rootCmd.Execute())
 }

command/service.go

@@ -29,9 +29,10 @@ var source string
 var localNetworkName = "dl_default"
 
 var serviceCmd = &cobra.Command{
-	Use:   "service",
-	Short: "Local services configuration",
-	Long:  `Local services configuration (portainer, mailcatcher, traefik).`,
+	Use:       "service",
+	Short:     "Local services configuration",
+	Long:      `Local services configuration (portainer, mailcatcher, traefik).`,
+	ValidArgs: []string{"up", "down", "recreate", "restart"},
 }
 
 // getServicesContainer local services containers

command/service_down.go

@@ -26,6 +26,7 @@ Valid parameters for the "--service" flag: portainer, mail, traefik`,
 	Run: func(cmd *cobra.Command, args []string) {
 		downService()
 	},
+	ValidArgs: []string{"--service"},
 }
 
 func downService() {

command/service_recreate.go

@@ -17,4 +17,5 @@ var recreateServiceCmd = &cobra.Command{
 		downService()
 		upService()
 	},
+	ValidArgs: []string{"--service"},
 }

command/service_up.go

@@ -31,6 +31,7 @@ var upServiceCmd = &cobra.Command{
 	Run: func(cmd *cobra.Command, args []string) {
 		upService()
 	},
+	ValidArgs: []string{"--service", "--restart"},
 }
 
 func upService() {