Bundle the RSX test library

Author: rubiojr

tests/lib/test.risor renamed to lib/test.risor

@@ -2,6 +2,7 @@ import color
 import exec
 import regexp
 import os
+import uuid
 
 __fatal := false
 __raises := false
@@ -156,17 +157,19 @@ func stdout_equals(desc, cmd, expected) {
 func stdout_matches(desc, cmd, reg) {
   tokens := cmd.split(" ")
   bin := tokens[0]
-  args := []
+  args := [bin]
   if len(tokens) > 1 {
     args.extend(tokens[1:])
   }
 
+  cmd := exec.command(args)
   try(func() {
-    out := exec(bin, args)
-    if regexp.match(reg, out.stdout) {
+    out := cmd.combined_output()
+    out = string(out)
+    if regexp.match(reg, out) {
       print_ok(desc)
     } else {
-      errors.new(desc + '(output {out} does not match {reg})')
+      error(desc + ' (output {out} does not match {reg})')
     }
   }, func(e) {
     print_fail(desc + ' (error: {e})')
@@ -191,7 +194,7 @@ func is_dir(desc, path) {
 // desc: the test description
 // path: the path to check
 func is_file(desc, path) {
-  ok := try(func() { f := os.stat(path); !f.is_dir }, false)
+  ok := try(func() { f := os.stat(path); f.mode.is_regular }, false)
   if ok {
     print_ok(desc)
   } else {

main.risor

@@ -149,6 +149,10 @@ cli.app({
             aliases: ["n"],
             usage: "Create a new RSX project directory",
             action: func(ctx) {
+              if len(ctx.args()) != 1 {
+                os.write_file("/dev/stderr", "Missing directory argument.")
+                return
+              }
               name := ctx.args()[0]
               os.mkdir(name)
               os.write_file(filepath.join(name, "main.risor"), "import rsx\n"+`rsx.log("Hello, World!")`)

script/test

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

tests/tests.risor

@@ -17,6 +17,15 @@ test.with_temp_dir(func(tmp_dir) {
   test.is_dir('{dir} was created', dir)
 })
 
+test.with_temp_dir(func(tmp_dir) {
+  dir := filepath.join(tmp_dir, "rsx-new")
+  test.stdout_matches(
+    'rsx new without arguments fails',
+    '{_rsxbin} new',
+    'Missing directory argument.',
+  )
+})
+
 test.with_temp_dir(func(tmp_dir) {
   cd(tmp_dir)
   test.stdout_matches(