Use Bananenpro/cli lib

Author: juho05

go.mod

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

go.sum

@@ -1,7 +1,7 @@
-github.com/AlecAivazis/survey/v2 v2.3.4 h1:pchTU9rsLUSvWEl2Aq9Pv3k0IE2fkqtGxazskAMd9Ng=
-github.com/AlecAivazis/survey/v2 v2.3.4/go.mod h1:hrV6Y/kQCLhIZXGcriDCUBtB3wnN7156gMXJ3+b23xM=
 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=
@@ -40,8 +40,6 @@ golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBc
 golang.org/x/sys v0.0.0-20210927094055-39ccf1dd6fa6/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20211025201205-69cdffdb9359/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220422013727-9388b58f7150/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a h1:dGzPydgVsqGcTRVwiLJ1jVbufYwmzD3LfVPLKsKg+0k=
-golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220608164250-635b8c9b7f68 h1:z8Hj/bl9cOV2grsOpEaQFUaly0JWN3i97mo3jXKJNp0=
 golang.org/x/sys v0.0.0-20220608164250-635b8c9b7f68/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/term v0.0.0-20210503060354-a79de5458b56/go.mod h1:tfny5GFUkzUvx4ps4ajbZsCe5lw1metzhBm9T3x7oIY=

main.go

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

new/client/client.go

@@ -5,8 +5,8 @@ import (
 	"os"
 	"path/filepath"
 
+	"github.com/Bananenpro/cli"
 	"github.com/code-game-project/codegame-cli-js/new"
-	"github.com/code-game-project/codegame-cli/cli"
 	"github.com/code-game-project/codegame-cli/util"
 )
 
@@ -17,7 +17,7 @@ var indexJSNode string
 var tsConfig []byte
 
 func CreateNewClient(projectName, serverURL, libraryVersion string, typescript bool) error {
-	cli.Begin("Installing correct javascript-client version...")
+	cli.BeginLoading("Installing javascript-client...")
 
 	var version string
 	var err error
@@ -35,30 +35,26 @@ func CreateNewClient(projectName, serverURL, libraryVersion string, typescript b
 		return err
 	}
 
-	cli.Finish()
+	cli.FinishLoading()
 
-	cli.Begin("Creating project template...")
 	err = createTemplate(projectName, serverURL, typescript)
 	if err != nil {
 		return err
 	}
-	cli.Finish()
 
 	if typescript {
-		cli.Begin("Installing dependencies...")
+		cli.BeginLoading("Installing dependencies...")
 		_, err = util.Execute(true, "npm", "install", "--save-dev", "@types/node")
 		if err != nil {
 			return err
 		}
-		cli.Finish()
+		cli.FinishLoading()
 	}
 
-	cli.Begin("Writing configuration files...")
 	err = new.ConfigurePackageJSON()
 	if err != nil {
 		return err
 	}
-	cli.Finish()
 
 	return nil
 }

new/server/server.go

@@ -4,8 +4,8 @@ import (
 	_ "embed"
 	"os"
 
+	"github.com/Bananenpro/cli"
 	"github.com/code-game-project/codegame-cli-js/new"
-	"github.com/code-game-project/codegame-cli/cli"
 	"github.com/code-game-project/codegame-cli/util"
 )
 
@@ -15,7 +15,7 @@ var tsConfig []byte
 func CreateNewServer(projectName, libraryVersion string) error {
 	cli.Warn("This feature is not fully implemented yet.")
 
-	cli.Begin("Installing correct javascript-server version...")
+	cli.BeginLoading("Installing javascript-server...")
 
 	var version string
 	var err error
@@ -33,28 +33,24 @@ func CreateNewServer(projectName, libraryVersion string) error {
 		return err
 	}
 
-	cli.Finish()
+	cli.FinishLoading()
 
-	cli.Begin("Creating project template...")
 	err = createTemplate(projectName)
 	if err != nil {
 		return err
 	}
-	cli.Finish()
 
-	cli.Begin("Installing dependencies...")
+	cli.BeginLoading("Installing dependencies...")
 	_, err = util.Execute(true, "npm", "install", "--save-dev", "@types/node")
 	if err != nil {
 		return err
 	}
-	cli.Finish()
+	cli.FinishLoading()
 
-	cli.Begin("Writing configuration files...")
 	err = new.ConfigurePackageJSON()
 	if err != nil {
 		return err
 	}
-	cli.Finish()
 
 	return nil
 }

new/template.go

@@ -6,7 +6,7 @@ import (
 	"path/filepath"
 	"text/template"
 
-	"github.com/code-game-project/codegame-cli/cli"
+	"github.com/Bananenpro/cli"
 )
 
 func ExecTemplate(templateText, path string, data any) error {

new/util.go

@@ -7,7 +7,7 @@ import (
 	"sort"
 	"strings"
 
-	"github.com/code-game-project/codegame-cli/cli"
+	"github.com/Bananenpro/cli"
 	"github.com/code-game-project/codegame-cli/util"
 )