Outsource 'run' command to modules

Author: juho05

commands/new.go

@@ -118,7 +118,7 @@ func newServer(projectName string) error {
 	case "ts":
 		err = modules.Execute("js", "latest", "server", "new", "server", "--typescript")
 	default:
-		return cli.Error("Unsupported language: %s", language)
+		return cli.Error("'new server' is not supported for '%s'", language)
 	}
 	if err != nil {
 		return err
@@ -204,7 +204,7 @@ func newClient() error {
 		libraryVersion := external.LibraryVersionFromCGVersion("code-game-project", "javascript-client", cgVersion)
 		err = modules.Execute("js", libraryVersion, "client", "new", "client", "--typescript", "--library-version="+libraryVersion, "--game-name="+name, "--url="+trimURL(url))
 	default:
-		return cli.Error("Unsupported language: %s", language)
+		return cli.Error("'new client' is not supported for '%s'", language)
 	}
 	if err != nil {
 		return err

commands/run.go

@@ -1,112 +1,37 @@
 package commands
 
 import (
-	"errors"
-	"fmt"
 	"os"
-	"os/exec"
-	"path/filepath"
-	"strings"
 
 	"github.com/Bananenpro/cli"
-	"github.com/Bananenpro/pflag"
 	"github.com/code-game-project/codegame-cli/util/cgfile"
+	"github.com/code-game-project/codegame-cli/util/modules"
 )
 
 func Run() error {
-	flagSet := pflag.NewFlagSet("run", pflag.ExitOnError)
-	flagSet.ParseErrorsWhitelist = pflag.ParseErrorsWhitelist{
-		UnknownFlags:           true,
-		PassUnknownFlagsToArgs: true,
-	}
-
-	var overrideURL string
-	flagSet.StringVarP(&overrideURL, "override-url", "u", "", "Override the game URL in .codegame.json for this specific run.")
-	var help bool
-	flagSet.BoolVarP(&help, "help", "h", false, "Show help.")
-
-	if help {
-		fmt.Fprintf(os.Stderr, "Usage: %s run [...]\n", os.Args[0])
-		fmt.Fprintln(os.Stderr, "\nOptions:")
-		flagSet.PrintDefaults()
-		os.Exit(1)
-	}
-	flagSet.Parse(os.Args[2:])
-
-	root, err := findProjectRoot()
-	if err != nil {
-		return cli.Error("Not in a CodeGame project directory")
-	}
-	wd, _ := os.Getwd()
-	rootRelative, err := filepath.Rel(wd, root)
+	rootRelative, err := cgfile.FindProjectRootRelative()
 	if err != nil {
 		return err
 	}
 
-	data, err := cgfile.LoadCodeGameFile(root)
+	data, err := cgfile.LoadCodeGameFile(rootRelative)
 	if err != nil {
 		return cli.Error("Failed to load .codegame.json")
 	}
 
-	url := data.URL
-	if overrideURL != "" {
-		url = overrideURL
+	args := []string{"run"}
+	if len(os.Args) > 2 {
+		args = append(args, os.Args[2:]...)
 	}
 
-	var cmdName string
-	args := []string{}
 	switch data.Lang {
 	case "go":
-		cmdName = "go"
-		args = append(args, []string{"run", filepath.Join(rootRelative, "main.go")}...)
+		err = modules.Execute("go", "latest", "client", args...)
 	default:
 		return cli.Error("'run' is not supported for '%s'", data.Lang)
 	}
-	args = append(args, flagSet.Args()...)
-
-	env := make([]string, 0, len(os.Environ())+1)
-	env = append(env, "CG_GAME_URL="+url)
-	env = append(env, os.Environ()...)
-
-	if _, err := exec.LookPath(cmdName); err != nil {
-		cli.Error("'%s' ist not installed!", cmdName)
-		return err
-	}
-
-	cmd := exec.Command(cmdName, args...)
-	cmd.Stdin = os.Stdin
-	cmd.Stdout = os.Stdout
-	cmd.Stderr = os.Stderr
-	cmd.Env = env
-
-	err = cmd.Run()
 	if err != nil {
-		cli.Error("Failed to run 'CG_GAME_URL=%s %s %s'", url, cmdName, strings.Join(args, " "))
+		return err
 	}
 	return nil
 }
-
-func findProjectRoot() (string, error) {
-	dir, err := os.Getwd()
-	if err != nil {
-		return "", err
-	}
-
-	for {
-		entries, err := os.ReadDir(dir)
-		if err != nil {
-			return "", err
-		}
-		for _, entry := range entries {
-			if !entry.IsDir() && entry.Name() == ".codegame.json" {
-				return dir, nil
-			}
-		}
-
-		parent := filepath.Dir(filepath.Clean(dir))
-		if parent == dir {
-			return "", errors.New("not found")
-		}
-		dir = parent
-	}
-}

util/cgfile/project.go

@@ -0,0 +1,42 @@
+package cgfile
+
+import (
+	"os"
+	"path/filepath"
+
+	"github.com/Bananenpro/cli"
+)
+
+func FindProjectRoot() (string, error) {
+	dir, err := os.Getwd()
+	if err != nil {
+		return "", err
+	}
+
+	for {
+		entries, err := os.ReadDir(dir)
+		if err != nil {
+			return "", err
+		}
+		for _, entry := range entries {
+			if !entry.IsDir() && entry.Name() == ".codegame.json" {
+				return dir, nil
+			}
+		}
+
+		parent := filepath.Dir(filepath.Clean(dir))
+		if parent == dir {
+			return "", cli.Error("Not in a CodeGame project directory")
+		}
+		dir = parent
+	}
+}
+
+func FindProjectRootRelative() (string, error) {
+	root, err := FindProjectRoot()
+	if err != nil {
+		return "", err
+	}
+	wd, _ := os.Getwd()
+	return filepath.Rel(wd, root)
+}

util/exec/exec.go

@@ -5,6 +5,7 @@ import (
 	"os"
 	"os/exec"
 	"runtime"
+	"strings"
 
 	"github.com/Bananenpro/cli"
 )
@@ -41,7 +42,7 @@ func Execute(hidden bool, programName string, args ...string) (string, error) {
 		if outStr != "" {
 			err = cli.Error("'%s' returned with an error:\n%s", programName, outStr)
 		} else {
-			err = cli.Error("Failed to execute '%s'.", programName)
+			err = cli.Error("Failed to execute '%s %s'.", programName, strings.Join(args, " "))
 		}
 	}