Pass library version as a command line argument

Author: juho05

main.go

@@ -18,11 +18,11 @@ func main() {
 	var url string
 	pflag.StringVar(&url, "url", "", "The URL of the game. (required for clients)")
 
-	var cgVersion string
-	pflag.StringVar(&cgVersion, "cg-version", "", "The CodeGame protocol version of the game, e.g. 0.6 (required for clients)")
+	var supportsWrappers bool
+	pflag.BoolVar(&supportsWrappers, "supports-wrappers", false, "Whether the wrappers are supported. (required for clients)")
 
-	var cgeVersion string
-	pflag.StringVar(&cgeVersion, "cge-version", "", "The CGE version of the game, e.g. 0.3 (required for clients)")
+	var libraryVersion string
+	pflag.StringVar(&libraryVersion, "library-version", "latest", "The version of the Go library to use, e.g. 0.8")
 
 	pflag.Usage = func() {
 		fmt.Fprintf(os.Stderr, "Usage: %s <command> [...]\n", os.Args[0])
@@ -48,7 +48,7 @@ func main() {
 
 	switch command {
 	case "new":
-		err = new(projectName, gameName, url, cgVersion, cgeVersion)
+		err = new(projectName, gameName, url, libraryVersion, supportsWrappers)
 	default:
 		err = fmt.Errorf("Unknown command: %s\n", command)
 	}
@@ -58,15 +58,15 @@ func main() {
 	}
 }
 
-func new(projectName, gameName, url, cgVersion, cgeVersion string) error {
+func new(projectName, gameName, url, libraryVersion string, supportsWrappers bool) error {
 	projectType := strings.ToLower(pflag.Arg(1))
 
 	var err error
 	switch projectType {
 	case "client":
-		err = client.CreateNewClient(projectName, gameName, url, cgVersion, cgeVersion)
+		err = client.CreateNewClient(projectName, gameName, url, libraryVersion, supportsWrappers)
 	case "server":
-		err = server.CreateNewServer(projectName)
+		err = server.CreateNewServer(projectName, libraryVersion)
 	default:
 		err = fmt.Errorf("Unknown project type: %s\n", projectType)
 	}

new/client/client.go

@@ -24,7 +24,7 @@ var goClientWrapperGameTemplate string
 //go:embed templates/wrappers/events.go.tmpl
 var goClientWrapperEventsTemplate string
 
-func CreateNewClient(projectName, gameName, serverURL, cgVersion, cgeVersion string) error {
+func CreateNewClient(projectName, gameName, serverURL, libraryVersion string, supportsWrappers bool) error {
 	module, err := cli.Input("Project module path:")
 	if err != nil {
 		return err
@@ -38,18 +38,13 @@ func CreateNewClient(projectName, gameName, serverURL, cgVersion, cgeVersion str
 		return err
 	}
 
-	libraryURL, libraryTag, err := getGoClientLibraryURL(projectName, cgVersion)
+	libraryURL, libraryTag, err := getGoClientLibraryURL(libraryVersion)
 	if err != nil {
 		return err
 	}
 
-	cgeMajor, cgeMinor, _, err := external.ParseVersion(cgeVersion)
-	if err != nil {
-		return cli.Error(err.Error())
-	}
-
 	wrappers := false
-	if cgeMajor > 0 || cgeMinor >= 3 {
+	if supportsWrappers {
 		wrappers, err = cli.YesNo("Do you want to generate helper functions?", true)
 		if err != nil {
 			return err
@@ -67,7 +62,7 @@ func CreateNewClient(projectName, gameName, serverURL, cgVersion, cgeVersion str
 	cli.Finish()
 
 	cli.Begin("Creating project template...")
-	err = createGoClientTemplate(libraryTag, projectName, module, gameName, serverURL, libraryURL, cgeVersion, wrappers)
+	err = createGoClientTemplate(projectName, module, gameName, serverURL, libraryURL, wrappers)
 	if err != nil {
 		return err
 	}
@@ -98,17 +93,20 @@ func CreateNewClient(projectName, gameName, serverURL, cgVersion, cgeVersion str
 	return nil
 }
 
-func createGoClientTemplate(libraryTag, projectName, modulePath, gameName, serverURL, libraryURL, cgeVersion string, wrappers bool) error {
+func createGoClientTemplate(projectName, modulePath, gameName, serverURL, libraryURL string, wrappers bool) error {
 	if !wrappers {
 		return execGoClientMainTemplate(projectName, serverURL, libraryURL)
 	}
 
+	cgeVersion, err := external.GetCGEVersion(util.BaseURL(serverURL, util.IsSSL(serverURL)))
+	if err != nil {
+		return err
+	}
+
 	return execGoClientWrappersTemplate(projectName, modulePath, gameName, serverURL, libraryURL, cgeVersion)
 }
 
-func getGoClientLibraryURL(projectName, cgVersion string) (url string, tag string, err error) {
-	clientVersion := external.ClientVersionFromCGVersion("code-game-project", "go-client", cgVersion)
-
+func getGoClientLibraryURL(clientVersion string) (url string, tag string, err error) {
 	if clientVersion == "latest" {
 		var err error
 		clientVersion, err = external.LatestGithubTag("code-game-project", "go-client")

new/server/server.go

@@ -24,7 +24,7 @@ var goServerCGETemplate string
 //go:embed templates/event_definitions.go.tmpl
 var goServerEventsTemplate string
 
-func CreateNewServer(projectName string) error {
+func CreateNewServer(projectName, libraryVersion string) error {
 	module, err := cli.Input("Project module path:")
 	if err != nil {
 		return err
@@ -44,12 +44,22 @@ func CreateNewServer(projectName string) error {
 		return err
 	}
 
-	libraryURL, err := getServerLibraryURL()
+	libraryURL, libraryTag, err := getServerLibraryURL(libraryVersion)
 	if err != nil {
 		return err
 	}
 	cli.Finish()
 
+	cli.Begin("Installing correct go-server version...")
+	out, err = external.ExecuteHidden("go", "get", fmt.Sprintf("%s@%s", libraryURL, libraryTag))
+	if err != nil {
+		if out != "" {
+			cli.Error(out)
+		}
+		return err
+	}
+	cli.Finish()
+
 	cli.Begin("Creating project template...")
 	err = createGoServerTemplate(projectName, module, cgeVersion, libraryURL)
 	if err != nil {
@@ -126,16 +136,25 @@ func executeGoServerTemplate(templateText, fileName, projectName, cgeVersion, li
 	})
 }
 
-func getServerLibraryURL() (string, error) {
-	tag, err := external.LatestGithubTag("code-game-project", "go-server")
-	if err != nil {
-		return "", err
+func getServerLibraryURL(serverVersion string) (url string, tag string, err error) {
+	if serverVersion == "latest" {
+		var err error
+		serverVersion, err = external.LatestGithubTag("code-game-project", "go-server")
+		if err != nil {
+			return "", "", err
+		}
+		serverVersion = strings.TrimPrefix(strings.Join(strings.Split(serverVersion, ".")[:2], "."), "v")
 	}
-	majorVersion := strings.TrimPrefix(strings.Split(tag, ".")[0], "v")
 
+	majorVersion := strings.Split(serverVersion, ".")[0]
+	tag, err = external.GithubTagFromVersion("code-game-project", "go-server", serverVersion)
+	if err != nil {
+		return "", "", err
+	}
 	path := "github.com/code-game-project/go-server/cg"
 	if majorVersion != "0" && majorVersion != "1" {
 		path = fmt.Sprintf("github.com/code-game-project/go-server/v%s/cg", majorVersion)
 	}
-	return path, nil
+
+	return path, tag, nil
 }