refactor(cli): user add command

Author: fiftin

cli/cmd/migrate.go

@@ -12,8 +12,6 @@ func init() {
 var migrateCmd = &cobra.Command{
 	Use:   "migrate",
 	Short: "Execute migrations",
-	// Long:  `All software has versions. This is Hugo's`,
-
 	Run: func(cmd *cobra.Command, args []string) {
 		store := createStore()
 		defer store.Close()

cli/cmd/root.go

@@ -21,9 +21,9 @@ var configPath string
 var rootCmd = &cobra.Command{
 	Use:   "semaphore",
 	Short: "Ansible Semaphore is a beautiful web UI for Ansible",
-	Long: `A Fast and Flexible Static Site Generator built with
-                love by spf13 and friends in Go.
-                Complete documentation is available at https://ansible-semaphore.com`,
+	Long: 	`Ansible Semaphore is a beautiful web UI for Ansible.
+Source code is available at https://github.com/ansible-semaphore/semaphore.
+Complete documentation is available at https://ansible-semaphore.com.`,
 	Run: func(cmd *cobra.Command, args []string) {
 		if len(args) == 0 && configPath == "" {
 			_ = cmd.Help()

cli/cmd/service.go

@@ -12,9 +12,7 @@ func init() {
 
 var serviceCmd = &cobra.Command{
 	Use:   "service",
-	Short: "Run Ansible Semaphore service",
-	// Long:  `All software has versions. This is Hugo's`,
-
+	Short: "Run Semaphore service",
 	Run: func(cmd *cobra.Command, args []string) {
 		runService()
 	},

cli/cmd/setup.go

@@ -19,7 +19,6 @@ func init() {
 var setupCmd = &cobra.Command{
 	Use:   "setup",
 	Short: "Perform interactive setup",
-	// Long:  `All software has versions. This is Hugo's`,
 	Run: func(cmd *cobra.Command, args []string) {
 		doSetup()
 	},

cli/cmd/user.go

@@ -5,27 +5,24 @@ import (
 	"os"
 )
 
-type UserAddArgs struct {
-	Username string
-	Name     string
-	Email    string
-	Password string
+type userArgs struct {
+	login    string
+	name     string
+	email    string
+	password string
 }
 
-var UserAdd *UserAddArgs
-
 func init() {
 	rootCmd.AddCommand(userCmd)
 }
 
 var userCmd = &cobra.Command{
 	Use:   "user",
 	Short: "Manage users",
-	// Long:  `All software has versions. This is Hugo's`,
 	Run: func(cmd *cobra.Command, args []string) {
 		if len(args) == 0 {
 			_ = cmd.Help()
 			os.Exit(0)
 		}
 	},
-}
+}

cli/cmd/user_add.go

@@ -6,30 +6,34 @@ import (
 	"github.com/spf13/cobra"
 )
 
+var newUserArgs userArgs
+
 func init() {
+	userAddCmd.PersistentFlags().StringVar(&newUserArgs.login, "login", "", "New user login")
+	userAddCmd.PersistentFlags().StringVar(&newUserArgs.name, "name", "", "New user name")
+	userAddCmd.PersistentFlags().StringVar(&newUserArgs.email, "email", "", "New user email")
+	userAddCmd.PersistentFlags().StringVar(&newUserArgs.password, "password", "", "New user password")
 	userCmd.AddCommand(userAddCmd)
 }
 
 var userAddCmd = &cobra.Command{
 	Use:   "add",
-	Short: "Print the version number of Semaphore",
-
-	// Long:  `All software has versions. This is Hugo's`,
+	Short: "Add new user",
 	Run: func(cmd *cobra.Command, args []string) {
 		store := createStore()
 		defer store.Close()
 
 		if _, err := store.CreateUser(db.UserWithPwd{
-			Pwd: UserAdd.Password,
+			Pwd: newUserArgs.password,
 			User: db.User{
-				Name: UserAdd.Name,
-				Username: UserAdd.Username,
-				Email: UserAdd.Email,
+				Name: newUserArgs.name,
+				Username: newUserArgs.login,
+				Email: newUserArgs.email,
 			},
 		}); err != nil {
 			panic(err)
 		}
 
-		fmt.Printf("User %s <%s> added!", UserAdd.Username, UserAdd.Email)
+		fmt.Printf("User %s <%s> added!", newUserArgs.login, newUserArgs.email)
 	},
 }

cli/cmd/version.go

@@ -12,8 +12,7 @@ func init() {
 
 var versionCmd = &cobra.Command{
 	Use:   "version",
-	Short: "Print the version number of Semaphore",
-	// Long:  `All software has versions. This is Hugo's`,
+	Short: "Print the version of Semaphore",
 	Run: func(cmd *cobra.Command, args []string) {
 		fmt.Println(util.Version)
 	},