Merge pull request #43 from moonbitlang/fix_moon_new

fix: moon new should generate hello_test.mbt
moonbitlang · Jul 23, 2024 · eaf4847 · eaf4847
2 parents 2c8c62f + ff75ecb
commit eaf4847
Show file tree

Hide file tree

Showing 7 changed files with 51 additions and 36 deletions.
diff --git a/crates/moon/tests/mod.rs b/crates/moon/tests/mod.rs
@@ -97,9 +97,7 @@ pub fn replace_dir(s: &str, dir: &impl AsRef<std::path::Path>) -> String {
         .to_str()
         .unwrap()
         .to_string();
-    println!("path_str1: {:?}", path_str1);
     let s = s.replace("\\\\", "\\");
-    println!("s: {:?}", s);
     let s = s.replace(&path_str1, "$ROOT");
     let s = s.replace(
         dunce::canonicalize(moonutil::moon_dir::home())

diff --git a/crates/moon/tests/test_cases/mod.rs b/crates/moon/tests/test_cases/mod.rs
@@ -562,7 +562,7 @@ fn test_moon_new_new() {
     check(
         &get_stdout_with_args(&hello3, ["test", "-v"]),
         expect![[r#"
-            test moonbitlang/hello/lib/hello_wbtest.mbt::hello ok
+            test moonbitlang/hello/lib/hello_test.mbt::hello ok
             Total tests: 1, passed: 1, failed: 0.
         "#]],
     );
@@ -603,7 +603,7 @@ fn test_moon_new_new() {
     check(
         &get_stdout_with_args(&hello4, ["test", "-v"]),
         expect![[r#"
-            test moonbitlang/hello/lib/hello_wbtest.mbt::hello ok
+            test moonbitlang/hello/lib/hello_test.mbt::hello ok
             Total tests: 1, passed: 1, failed: 0.
         "#]],
     );
@@ -670,7 +670,7 @@ fn test_moon_new_snapshot() {
         .assert()
         .success();
     check(
-        &std::fs::read_to_string(hello.join("lib").join("hello.mbt")).unwrap(),
+        &replace_crlf_to_lf(&std::fs::read_to_string(hello.join("lib").join("hello.mbt")).unwrap()),
         expect![[r#"
             pub fn hello() -> String {
               "Hello, world!"
@@ -697,19 +697,21 @@ fn test_moon_new_snapshot() {
         .assert()
         .success();
     check(
-        &std::fs::read_to_string(hello.join("lib").join("hello.mbt")).unwrap(),
+        &replace_crlf_to_lf(&std::fs::read_to_string(hello.join("lib").join("hello.mbt")).unwrap()),
         expect![[r#"
             pub fn hello() -> String {
               "Hello, world!"
             }
         "#]],
     );
     check(
-        &std::fs::read_to_string(hello.join("lib").join("hello_wbtest.mbt")).unwrap(),
+        &replace_crlf_to_lf(
+            &std::fs::read_to_string(hello.join("lib").join("hello_test.mbt")).unwrap(),
+        ),
         expect![[r#"
             test "hello" {
-              if hello() != "Hello, world!" {
-                raise "hello() != \"Hello, world!\""
+              if @lib.hello() != "Hello, world!" {
+                raise "@lib.hello() != \"Hello, world!\""
               }
             }
         "#]],
@@ -719,7 +721,7 @@ fn test_moon_new_snapshot() {
         expect!["{}"],
     );
     check(
-        &std::fs::read_to_string(hello.join("main").join("main.mbt")).unwrap(),
+        &replace_crlf_to_lf(&std::fs::read_to_string(hello.join("main").join("main.mbt")).unwrap()),
         expect![[r#"
             fn main {
               println(@lib.hello())
@@ -771,7 +773,7 @@ fn test_moon_new_snapshot_lib() {
         .assert()
         .success();
     check(
-        &std::fs::read_to_string(hello.join("lib").join("hello.mbt")).unwrap(),
+        &replace_crlf_to_lf(&std::fs::read_to_string(hello.join("lib").join("hello.mbt")).unwrap()),
         expect![[r#"
             pub fn hello() -> String {
               "Hello, world!"
@@ -799,19 +801,21 @@ fn test_moon_new_snapshot_lib() {
         .assert()
         .success();
     check(
-        &std::fs::read_to_string(hello.join("lib").join("hello.mbt")).unwrap(),
+        &replace_crlf_to_lf(&std::fs::read_to_string(hello.join("lib").join("hello.mbt")).unwrap()),
         expect![[r#"
             pub fn hello() -> String {
               "Hello, world!"
             }
         "#]],
     );
     check(
-        &std::fs::read_to_string(hello.join("lib").join("hello_wbtest.mbt")).unwrap(),
+        &replace_crlf_to_lf(
+            &std::fs::read_to_string(hello.join("lib").join("hello_test.mbt")).unwrap(),
+        ),
         expect![[r#"
             test "hello" {
-              if hello() != "Hello, world!" {
-                raise "hello() != \"Hello, world!\""
+              if @lib.hello() != "Hello, world!" {
+                raise "@lib.hello() != \"Hello, world!\""
               }
             }
         "#]],
@@ -844,7 +848,7 @@ fn test_moon_new_snapshot_lib() {
             }"#]],
     );
     check(
-        &std::fs::read_to_string(hello.join("top.mbt")).unwrap(),
+        &replace_crlf_to_lf(&std::fs::read_to_string(hello.join("top.mbt")).unwrap()),
         expect![[r#"
             pub fn greeting() -> Unit {
               println(@lib.hello())

diff --git a/crates/moonbuild/src/new.rs b/crates/moonbuild/src/new.rs
@@ -55,10 +55,11 @@ pub fn moon_new_exec(
     // main/main.mbt
     {
         let main_moon = main_dir.join("main.mbt");
-        let content = r#"fn main {
-  println(@lib.hello())
-}
-"#;
+        let content = include_str!(concat!(
+            env!("CARGO_MANIFEST_DIR"),
+            "/../moonbuild/template/moon_new_template/main.mbt"
+        ));
+
         let mut file = std::fs::File::create(main_moon).unwrap();
         file.write_all(content.as_bytes()).unwrap();
     }
@@ -93,10 +94,10 @@ pub fn moon_new_lib(
     // top.mbt
     {
         let top_mbt = target_dir.join("top.mbt");
-        let content = r#"pub fn greeting() -> Unit {
-  println(@lib.hello())
-}
-"#;
+        let content = include_str!(concat!(
+            env!("CARGO_MANIFEST_DIR"),
+            "/../moonbuild/template/moon_new_template/top.mbt"
+        ));
         let mut file = std::fs::File::create(top_mbt).unwrap();
         file.write_all(content.as_bytes()).unwrap();
     }
@@ -171,22 +172,20 @@ fn common(target_dir: &Path, cake_full_name: &str, license: Option<&str>) -> any
     // lib/hello.mbt
     {
         let hello_mbt = lib_dir.join("hello.mbt");
-        let content = r#"pub fn hello() -> String {
-  "Hello, world!"
-}
-"#;
+        let content = include_str!(concat!(
+            env!("CARGO_MANIFEST_DIR"),
+            "/../moonbuild/template/moon_new_template/hello.mbt"
+        ));
         let mut file = std::fs::File::create(hello_mbt).unwrap();
         file.write_all(content.as_bytes()).unwrap();
     }
-    // lib/hello_wbtest.mbt
+    // lib/hello_test.mbt
     {
-        let hello_mbt = lib_dir.join("hello_wbtest.mbt");
-        let content = r#"test "hello" {
-  if hello() != "Hello, world!" {
-    raise "hello() != \"Hello, world!\""
-  }
-}
-"#;
+        let hello_mbt = lib_dir.join("hello_test.mbt");
+        let content = include_str!(concat!(
+            env!("CARGO_MANIFEST_DIR"),
+            "/../moonbuild/template/moon_new_template/hello_test.mbt"
+        ));
 
         let mut file = std::fs::File::create(hello_mbt).unwrap();
         file.write_all(content.as_bytes()).unwrap();

diff --git a/crates/moonbuild/template/moon_new_template/hello.mbt b/crates/moonbuild/template/moon_new_template/hello.mbt
@@ -0,0 +1,3 @@
+pub fn hello() -> String {
+  "Hello, world!"
+}
diff --git a/crates/moonbuild/template/moon_new_template/hello_test.mbt b/crates/moonbuild/template/moon_new_template/hello_test.mbt
@@ -0,0 +1,5 @@
+test "hello" {
+  if @lib.hello() != "Hello, world!" {
+    raise "@lib.hello() != \"Hello, world!\""
+  }
+}
diff --git a/crates/moonbuild/template/moon_new_template/main.mbt b/crates/moonbuild/template/moon_new_template/main.mbt
@@ -0,0 +1,3 @@
+fn main {
+  println(@lib.hello())
+}
diff --git a/crates/moonbuild/template/moon_new_template/top.mbt b/crates/moonbuild/template/moon_new_template/top.mbt
@@ -0,0 +1,3 @@
+pub fn greeting() -> Unit {
+  println(@lib.hello())
+}