Print username and game URL seperately in session show command

juho05 · juho05 · commit fb6f3eb146f1 · 2022-08-08T00:06:03.000+02:00
diff --git a/cmd/new.go b/cmd/new.go
@@ -49,7 +49,7 @@ var newCmd = &cobra.Command{
 			abort(fmt.Errorf("project '%s' already exists.", projectName))
 		}
 
-		err = os.MkdirAll(projectName, 0755)
+		err = os.MkdirAll(projectName, 0o755)
 		abort(err)
 		err = os.Chdir(projectName)
 		abort(err)
@@ -251,7 +251,7 @@ func readme(projectName string) error {
 
 	fileContent := fmt.Sprintf("# %s", projectName)
 
-	return os.WriteFile("README.md", []byte(fileContent), 0644)
+	return os.WriteFile("README.md", []byte(fileContent), 0o644)
 }
 
 //go:embed templates/licenses/MIT.tmpl
@@ -314,6 +314,10 @@ func license() error {
 
 	if _, err := os.Stat("README.md"); err == nil {
 		err = writeReadmeLicense(licenseReadmeTemplate, external.GetUsername(), time.Now().Year())
+		if err != nil {
+			cli.Error("Failed to write license into README.md")
+			return nil
+		}
 	}
 
 	return nil
@@ -342,7 +346,7 @@ func writeLicense(templateText, username string, year int) error {
 }
 
 func writeReadmeLicense(templateText, username string, year int) error {
-	readme, err := os.OpenFile("README.md", os.O_APPEND|os.O_WRONLY, 0755)
+	readme, err := os.OpenFile("README.md", os.O_APPEND|os.O_WRONLY, 0o755)
 	if err != nil {
 		return fmt.Errorf("Failed to append license text to README.")
 	}
@@ -367,7 +371,7 @@ func writeReadmeLicense(templateText, username string, year int) error {
 }
 
 func execTemplate(templateText, path string, data any) error {
-	err := os.MkdirAll(filepath.Join(filepath.Dir(path)), 0755)
+	err := os.MkdirAll(filepath.Join(filepath.Dir(path)), 0o755)
 	if err != nil {
 		return err
 	}
diff --git a/cmd/session_show.go b/cmd/session_show.go
@@ -1,8 +1,6 @@
 package cmd
 
 import (
-	"fmt"
-
 	"github.com/mattn/go-colorable"
 	"github.com/spf13/cobra"
 )
@@ -17,7 +15,8 @@ var sessionShowCmd = &cobra.Command{
 		abortf("Failed to load session: %s", err)
 
 		out := colorable.NewColorableStdout()
-		printInfoProperty(out, "Name", fmt.Sprintf("%s@%s", session.Username, session.GameURL), 14)
+		printInfoProperty(out, "Game URL", session.GameURL, 14)
+		printInfoProperty(out, "Username", session.Username, 14)
 		printInfoProperty(out, "Game ID", session.GameId, 14)
 		printInfoProperty(out, "Player ID", session.PlayerId, 14)
 		printInfoProperty(out, "Player Secret", session.PlayerSecret, 14)
diff --git a/go.mod b/go.mod
@@ -3,9 +3,9 @@ module github.com/code-game-project/codegame-cli
 go 1.18
 
 require (
-	github.com/Bananenpro/cli v0.2.2
+	github.com/Bananenpro/cli v0.3.0
 	github.com/adrg/xdg v0.4.0
-	github.com/code-game-project/go-utils v0.2.8
+	github.com/code-game-project/go-utils v0.2.9
 	github.com/gomarkdown/markdown v0.0.0-20220731190611-dcdaee8e7a53
 	github.com/google/uuid v1.3.0
 	github.com/mattn/go-colorable v0.1.12
diff --git a/go.sum b/go.sum
@@ -2,12 +2,16 @@ github.com/AlecAivazis/survey/v2 v2.3.5 h1:A8cYupsAZkjaUmhtTYv3sSqc7LO5mp1XDfqe5
 github.com/AlecAivazis/survey/v2 v2.3.5/go.mod h1:4AuI9b7RjAR+G7v9+C4YSlX/YL3K3cWNXgWXOhllqvI=
 github.com/Bananenpro/cli v0.2.2 h1:7nMlgMGMT1rxkuqCiJuo/Jd89HTnw9psE3h/vQW57nk=
 github.com/Bananenpro/cli v0.2.2/go.mod h1:JBXpIAXo/D0rlsfgCViQBicjcJY6UWUldmxvKM+ijRc=
+github.com/Bananenpro/cli v0.3.0 h1:gQOzc22yv+rePT0nRYva1ccdva3hTGyUwrGdcnXqchU=
+github.com/Bananenpro/cli v0.3.0/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=
 github.com/adrg/xdg v0.4.0/go.mod h1:N6ag73EX4wyxeaoeHctc1mas01KZgsj5tYiAIwqJE/E=
 github.com/code-game-project/go-utils v0.2.8 h1:f6ZvORWmlf8uZnCSAhLJ23MdA5dGvcAPkijTLfbv+B4=
 github.com/code-game-project/go-utils v0.2.8/go.mod h1:kQ6kH9XDzdM2pnJUI1lw61Gp8XOams/E2dKABa1mBI8=
+github.com/code-game-project/go-utils v0.2.9 h1:ezaxxLBAQRwFnIXso+zKPL7AJnuAMIcMwrhLruoyOa8=
+github.com/code-game-project/go-utils v0.2.9/go.mod h1:kQ6kH9XDzdM2pnJUI1lw61Gp8XOams/E2dKABa1mBI8=
 github.com/cpuguy83/go-md2man/v2 v2.0.2/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o=
 github.com/creack/pty v1.1.17 h1:QeVUsEDNrLBW4tMgZHvxy18sKtr6VI492kBhUfhDJNI=
 github.com/creack/pty v1.1.17/go.mod h1:MOBLtS5ELjhRRrroQr9kyvTxUAFNvYEK993ew/Vr4O4=

Original file line number	Diff line number	Diff line change
`@@ -49,7 +49,7 @@ var newCmd = &cobra.Command{`
`49`	`49`	`abort(fmt.Errorf("project '%s' already exists.", projectName))`
`50`	`50`	`}`
`51`	`51`
`52`		`- err = os.MkdirAll(projectName, 0755)`
	`52`	`+ err = os.MkdirAll(projectName, 0o755)`
`53`	`53`	`abort(err)`
`54`	`54`	`err = os.Chdir(projectName)`
`55`	`55`	`abort(err)`
`@@ -251,7 +251,7 @@ func readme(projectName string) error {`
`251`	`251`
`252`	`252`	`fileContent := fmt.Sprintf("# %s", projectName)`
`253`	`253`
`254`		`- return os.WriteFile("README.md", []byte(fileContent), 0644)`
	`254`	`+ return os.WriteFile("README.md", []byte(fileContent), 0o644)`
`255`	`255`	`}`
`256`	`256`
`257`	`257`	`//go:embed templates/licenses/MIT.tmpl`
`@@ -314,6 +314,10 @@ func license() error {`
`314`	`314`
`315`	`315`	`if _, err := os.Stat("README.md"); err == nil {`
`316`	`316`	`err = writeReadmeLicense(licenseReadmeTemplate, external.GetUsername(), time.Now().Year())`
	`317`	`+ if err != nil {`
	`318`	`+ cli.Error("Failed to write license into README.md")`
	`319`	`+ return nil`
	`320`	`+ }`
`317`	`321`	`}`
`318`	`322`
`319`	`323`	`return nil`
`@@ -342,7 +346,7 @@ func writeLicense(templateText, username string, year int) error {`
`342`	`346`	`}`
`343`	`347`
`344`	`348`	`func writeReadmeLicense(templateText, username string, year int) error {`
`345`		`- readme, err := os.OpenFile("README.md", os.O_APPEND\|os.O_WRONLY, 0755)`
	`349`	`+ readme, err := os.OpenFile("README.md", os.O_APPEND\|os.O_WRONLY, 0o755)`
`346`	`350`	`if err != nil {`
`347`	`351`	`return fmt.Errorf("Failed to append license text to README.")`
`348`	`352`	`}`
`@@ -367,7 +371,7 @@ func writeReadmeLicense(templateText, username string, year int) error {`
`367`	`371`	`}`
`368`	`372`
`369`	`373`	`func execTemplate(templateText, path string, data any) error {`
`370`		`- err := os.MkdirAll(filepath.Join(filepath.Dir(path)), 0755)`
	`374`	`+ err := os.MkdirAll(filepath.Join(filepath.Dir(path)), 0o755)`
`371`	`375`	`if err != nil {`
`372`	`376`	`return err`
`373`	`377`	`}`