Merge pull request #587 from rusq/wsp-new

Shortcut to workspace auth wizard

Author: rusq

cmd/slackdump/internal/workspace/del.go

@@ -19,7 +19,7 @@ var (
 //go:embed assets/del.md
 var delMD string
 
-var CmdWspDel = &base.Command{
+var cmdWspDel = &base.Command{
 	UsageLine:   baseCommand + " del [flags]",
 	Short:       "deletes the saved workspace credentials",
 	Long:        delMD,
@@ -29,11 +29,11 @@ var CmdWspDel = &base.Command{
 }
 
 func init() {
-	CmdWspDel.Run = runWspDel
+	cmdWspDel.Run = runWspDel
 }
 
 var (
-	delAll = CmdWspDel.Flag.Bool("a", false, "delete all workspaces")
+	delAll = cmdWspDel.Flag.Bool("a", false, "delete all workspaces")
 )
 
 func runWspDel(ctx context.Context, cmd *base.Command, args []string) error {

cmd/slackdump/internal/workspace/import.go

@@ -13,7 +13,7 @@ import (
 //go:embed assets/import.md
 var importMd string
 
-var CmdImport = &base.Command{
+var cmdWspImport = &base.Command{
 	UsageLine:   baseCommand + " import [flags] filename",
 	Short:       "import credentials from .env or secrets.txt file",
 	Long:        importMd,

cmd/slackdump/internal/workspace/list.go

@@ -23,7 +23,7 @@ import (
 //go:embed assets/list.md
 var listMd string
 
-var CmdWspList = &base.Command{
+var cmdWspList = &base.Command{
 	UsageLine:  baseCommand + " list [flags]",
 	Short:      "list saved authentication information",
 	Long:       listMd,
@@ -32,12 +32,12 @@ var CmdWspList = &base.Command{
 }
 
 var (
-	bare = CmdWspList.Flag.Bool("b", false, "bare output format (just names)")
-	all  = CmdWspList.Flag.Bool("a", false, "all information, including user")
+	bare = cmdWspList.Flag.Bool("b", false, "bare output format (just names)")
+	all  = cmdWspList.Flag.Bool("a", false, "all information, including user")
 )
 
 func init() {
-	CmdWspList.Run = runList
+	cmdWspList.Run = runList
 }
 
 func runList(ctx context.Context, cmd *base.Command, args []string) error {

cmd/slackdump/internal/workspace/new.go

@@ -19,7 +19,7 @@ import (
 //go:embed assets/new.md
 var newMD string
 
-var CmdWspNew = &base.Command{
+var cmdWspNew = &base.Command{
 	UsageLine:  baseCommand + " new [flags] <name>",
 	Short:      "authenticate in a Slack Workspace",
 	Long:       newMD,
@@ -29,9 +29,9 @@ var CmdWspNew = &base.Command{
 }
 
 func init() {
-	wspcfg.SetWspFlags(&CmdWspNew.Flag)
+	wspcfg.SetWspFlags(&cmdWspNew.Flag)
 
-	CmdWspNew.Run = runWspNew
+	cmdWspNew.Run = runWspNew
 }
 
 // runWspNew authenticates in the new workspace.

cmd/slackdump/internal/workspace/select.go

@@ -9,7 +9,7 @@ import (
 	"github.com/rusq/slackdump/v3/internal/cache"
 )
 
-var CmdWspSelect = &base.Command{
+var cmdWspSelect = &base.Command{
 	UsageLine: baseCommand + " select [flags]",
 	Short:     "choose a previously saved workspace",
 	Long: `
@@ -32,7 +32,7 @@ To get the full list of authenticated workspaces, run:
 }
 
 func init() {
-	CmdWspSelect.Run = runSelect
+	cmdWspSelect.Run = runSelect
 }
 
 func runSelect(ctx context.Context, cmd *base.Command, args []string) error {

cmd/slackdump/internal/workspace/wiz.go

@@ -0,0 +1,22 @@
+package workspace
+
+import (
+	"github.com/rusq/slackdump/v3/cmd/slackdump/internal/cfg"
+	"github.com/rusq/slackdump/v3/cmd/slackdump/internal/golang/base"
+	"github.com/rusq/slackdump/v3/cmd/slackdump/internal/workspace/workspaceui"
+)
+
+var cmdWspWiz = &base.Command{
+	Run:       workspaceui.WorkspaceNew,
+	UsageLine: baseCommand + " wiz [flags]",
+	Short:     "starts new workspace wizard",
+	Long: `# Workspace Wizard
+Use this command to start the Workspace creation wizard.
+
+The behaviour is the same as if one chooses Slackdump Wizard ==> Workspace ==> New.
+`,
+	FlagMask:    cfg.OmitAll,
+	PrintFlags:  false,
+	RequireAuth: false,
+	HideWizard:  true,
+}

cmd/slackdump/internal/workspace/workspace.go

@@ -40,22 +40,21 @@ an environment file.
 
 To learn more about different login options, run:
 
-	slackdump help workspace
+    slackdump workspace help <sub-command>
 
 Workspaces are stored on this device in the system Cache directory, which is
 automatically detected to be:
+
     ` + cfg.CacheDir() + `
 `,
-	CustomFlags: false,
-	FlagMask:    flagmask,
-	PrintFlags:  false,
-	RequireAuth: false,
+	FlagMask: flagmask,
 	Commands: []*base.Command{
-		CmdWspNew,
-		CmdImport,
-		CmdWspList,
-		CmdWspSelect,
-		CmdWspDel,
+		cmdWspNew,
+		cmdWspImport,
+		cmdWspList,
+		cmdWspSelect,
+		cmdWspDel,
+		cmdWspWiz,
 	},
 }