Use Bananenpro/cli lib

Author: juho05

go.mod

@@ -3,6 +3,7 @@ module github.com/code-game-project/codegame-cli-go
 go 1.18
 
 require (
+	github.com/Bananenpro/cli v0.1.2
 	github.com/code-game-project/codegame-cli v0.5.2
 	github.com/spf13/pflag v1.0.5
 )

go.sum

@@ -1,5 +1,7 @@
 github.com/AlecAivazis/survey/v2 v2.3.5 h1:A8cYupsAZkjaUmhtTYv3sSqc7LO5mp1XDfqe5E/9wRQ=
 github.com/AlecAivazis/survey/v2 v2.3.5/go.mod h1:4AuI9b7RjAR+G7v9+C4YSlX/YL3K3cWNXgWXOhllqvI=
+github.com/Bananenpro/cli v0.1.2 h1:X6Fb80PxfhIItabAjp4G9roLCpj7Q0FvYc5jxX/8nAw=
+github.com/Bananenpro/cli v0.1.2/go.mod h1:JBXpIAXo/D0rlsfgCViQBicjcJY6UWUldmxvKM+ijRc=
 github.com/Netflix/go-expect v0.0.0-20220104043353-73e0943537d2 h1:+vx7roKuyA63nhn5WAunQHLTznkw5W8b1Xc0dNjp83s=
 github.com/Netflix/go-expect v0.0.0-20220104043353-73e0943537d2/go.mod h1:HBCaDeC1lPdgDeDbhX8XFpy1jqjK0IBG8W5K+xYqA0w=
 github.com/adrg/xdg v0.4.0 h1:RzRqFcjH4nE5C6oTAxhBtoE2IRyjBSa62SCbyPidvls=

main.go

@@ -6,9 +6,9 @@ import (
 	"path/filepath"
 	"strings"
 
+	"github.com/Bananenpro/cli"
 	"github.com/code-game-project/codegame-cli-go/new/client"
 	"github.com/code-game-project/codegame-cli-go/new/server"
-	"github.com/code-game-project/codegame-cli/cli"
 	"github.com/spf13/pflag"
 )
 

new/client/client.go

@@ -8,8 +8,8 @@ import (
 
 	_ "embed"
 
+	"github.com/Bananenpro/cli"
 	"github.com/code-game-project/codegame-cli-go/new"
-	"github.com/code-game-project/codegame-cli/cli"
 	"github.com/code-game-project/codegame-cli/util"
 )
 
@@ -41,12 +41,12 @@ func CreateNewClient(projectName, gameName, serverURL, libraryVersion string, ge
 		return err
 	}
 
-	cli.Begin("Installing correct go-client version...")
+	cli.BeginLoading("Installing go-client...")
 	_, err = util.Execute(true, "go", "get", fmt.Sprintf("%s@%s", libraryURL, libraryTag))
 	if err != nil {
 		return err
 	}
-	cli.Finish()
+	cli.FinishLoading()
 
 	var eventNames []string
 	if generateWrappers {
@@ -61,21 +61,19 @@ func CreateNewClient(projectName, gameName, serverURL, libraryVersion string, ge
 		}
 	}
 
-	cli.Begin("Creating project template...")
 	err = createGoClientTemplate(projectName, module, gameName, serverURL, libraryURL, generateWrappers, eventNames)
 	if err != nil {
 		return err
 	}
-	cli.Finish()
 
-	cli.Begin("Installing dependencies...")
+	cli.BeginLoading("Installing dependencies...")
 
 	_, err = util.Execute(true, "go", "mod", "tidy")
 	if err != nil {
 		return err
 	}
 
-	cli.Finish()
+	cli.FinishLoading()
 
 	return nil
 }

new/server/server.go

@@ -7,8 +7,8 @@ import (
 
 	_ "embed"
 
+	"github.com/Bananenpro/cli"
 	"github.com/code-game-project/codegame-cli-go/new"
-	"github.com/code-game-project/codegame-cli/cli"
 	"github.com/code-game-project/codegame-cli/util"
 )
 
@@ -38,7 +38,7 @@ func CreateNewServer(projectName, libraryVersion string) error {
 		return err
 	}
 
-	cli.Begin("Installing correct go-server version...")
+	cli.BeginLoading("Installing go-server...")
 	libraryURL, libraryTag, err := getLibraryURL(libraryVersion)
 	if err != nil {
 		return err
@@ -48,23 +48,21 @@ func CreateNewServer(projectName, libraryVersion string) error {
 	if err != nil {
 		return err
 	}
-	cli.Finish()
+	cli.FinishLoading()
 
-	cli.Begin("Creating project template...")
 	err = createTemplate(projectName, module, libraryURL)
 	if err != nil {
 		return err
 	}
-	cli.Finish()
 
-	cli.Begin("Installing dependencies...")
+	cli.BeginLoading("Installing dependencies...")
 
 	_, err = util.Execute(true, "go", "mod", "tidy")
 	if err != nil {
 		return err
 	}
 
-	cli.Finish()
+	cli.FinishLoading()
 
 	return nil
 }