Refactor CLI

* eval command replaced with run
* run command replaced with exec

Author: rubiojr

main.go

@@ -102,7 +102,7 @@ func main() {
 
 	opts = append(opts, risor.WithImporter(newEmbedImporter()))
 
-	if len(os.Args) > 1 && os.Args[1] == "run" {
+	if len(os.Args) > 1 && os.Args[1] == "exec" {
 		m, err := os.ReadFile("main.risor")
 		if err != nil {
 			logger.Fatal("error reading main.risor")
@@ -111,7 +111,7 @@ func main() {
 		if len(os.Args) > 2 {
 			ros.SetScriptArgs(append([]string{"main.risor"}, os.Args[2:]...))
 		}
-	} else if len(os.Args) > 1 && os.Args[1] == "eval" {
+	} else if len(os.Args) > 1 && os.Args[1] == "run" {
 		if len(os.Args) < 3 {
 			logger.Fatal("missing script argument")
 		}

main.risor

@@ -178,17 +178,17 @@ cli.app({
             args: true,
             // This command is handled from the Go side.
             // It's here to provide a better help message.
-            name: "run",
-            aliases: ["r"],
+            name: "exec",
+            aliases: ["x"],
             usage: "Run main.risor from the current directory",
         }),
         cli.command({
             args: true,
             // This command is handled from the Go side.
             // It's here to provide a better help message.
-            name: "eval",
-            aliases: ["e"],
-            usage: "Evaluates a given Risor script",
+            name: "run",
+            aliases: ["r"],
+            usage: "Runs a given Risor script",
         }),
         cli.command({
             args: true,

script/test

@@ -2,4 +2,4 @@
 
 go build
 
-./rsx eval tests/tests.risor
+./rsx run tests/tests.risor

tests/tests.risor

@@ -66,8 +66,8 @@ test.with_temp_dir(func(tmp_dir) {
   )
   cd("test")
   test.stdout_equals(
-    'rsx eval runs main.risor',
-    '{_rsxbin} eval main.risor',
+    'rsx run runs main.risor',
+    '{_rsxbin} run main.risor',
     "Hello, World!\n",
   )
 })
@@ -81,9 +81,9 @@ test.with_temp_dir(func(tmp_dir) {
   )
   cd("test")
   test.raises(
-    'rsx eval without argument errors',
+    'rsx run without argument errors',
     func() {
-      exec(_rsxbin, ["eval"])
+      exec(_rsxbin, ["run"])
     }, errors.new("exit status 1"))
 })
 
@@ -96,8 +96,8 @@ test.with_temp_dir(func(tmp_dir) {
   )
   cd("test")
   test.stdout_equals(
-    'rsx run runs main.risor',
-    '{_rsxbin} run',
+    'rsx exec runs main.risor',
+    '{_rsxbin} exec',
     "Hello, World!\n",
   )
 })
@@ -112,8 +112,8 @@ test.with_temp_dir(func(tmp_dir) {
   f.write("import test; test.main()")
 
   test.stdout_equals(
-    'rsx eval main.risor includes lib/',
-    '{_rsxbin} eval main.risor',
+    'rsx run main.risor includes lib/',
+    '{_rsxbin} run main.risor',
     "Hello, World!\n",
   )
 })
@@ -125,8 +125,8 @@ test.with_temp_dir(func(tmp_dir) {
   f.write("import rsx")
 
   test.stdout_equals(
-    'rsx eval main.risor imports built-in rsx',
-    '{_rsxbin} eval main.risor',
+    'rsx run main.risor imports built-in rsx',
+    '{_rsxbin} run main.risor',
     '',
   )
 })