lab: Update lab's description

lab is a command line utility for GitLab. It does wrap around git currently, however, that isn't lab's primary purpose. Update lab's description. Additional fix: Remove some dead code. Additional fix: Warn git wrapper users that git wrap functionality will eventually be removed. Signed-off-by: Prarit Bhargava <[email protected]>
zaquestion · Mar 10, 2021 · 73fd2bc · 73fd2bc
1 parent c79e750
commit 73fd2bc
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 9 deletions.
diff --git a/cmd/root.go b/cmd/root.go
@@ -19,7 +19,7 @@ import (
 // RootCmd represents the base command when called without any subcommands
 var RootCmd = &cobra.Command{
 	Use:   "lab",
-	Short: "A Git Wrapper for GitLab",
+	Short: "lab: A GitLab Command Line Interface Utility",
 	Long:  ``,
 	Run: func(cmd *cobra.Command, args []string) {
 		if ok, err := cmd.Flags().GetBool("version"); err == nil && ok {
@@ -76,13 +76,6 @@ func helpFunc(cmd *cobra.Command, args []string) {
 		}
 		return
 	}
-
-	formatChar := "\n"
-	git := git.New()
-	git.Stdout = nil
-	git.Stderr = nil
-	usage, _ := git.CombinedOutput()
-	fmt.Printf("%s%sThese GitLab commands are provided by lab:\n%s\n\n", string(usage), formatChar, labUsageFormat(cmd.Root()))
 }
 
 var helpCmd = &cobra.Command{
@@ -206,6 +199,7 @@ func Execute() {
 		}
 
 		// Passthrough to git for any unrecognized commands
+		log.Println("Warning: lab's git passthrough command support will be removed in a later release.")
 		err = git.New(os.Args[1:]...).Run()
 		if exiterr, ok := err.(*exec.ExitError); ok {
 			if status, ok := exiterr.Sys().(syscall.WaitStatus); ok {
@@ -228,6 +222,7 @@ func Execute() {
 			}
 		}
 		if !knownFlag {
+			log.Println("Warning: lab's git passthrough command support will be removed in a later release.")
 			git.New(os.Args[1:]...).Run()
 			return
 		}

diff --git a/cmd/root_test.go b/cmd/root_test.go
@@ -116,7 +116,7 @@ func TestRootNoArg(t *testing.T) {
 		t.Log(string(b))
 		t.Fatal(err)
 	}
-	assert.Contains(t, string(b), `A Git Wrapper for GitLab
+	assert.Contains(t, string(b), `lab: A GitLab Command Line Interface Utility
 
 Usage:
   lab [flags]