fix test, improved build file

CHANGELOG.md

@@ -18,6 +18,8 @@ All notable changes to this project will be documented in this file.
 -   `stop` can now send a custom stop command if provided in a profile.
 -   `stop` now has a `--force`/`-f` flag to bypass a user defined stop command and send a SIGTERM signal.
 -   Moved `test_utils` to a separate crate.
+-   Refactored some tests.
+-   Improved a bit error handling on `build.rs`.
 
 ### Removed
 

Cargo.toml

@@ -46,6 +46,9 @@ serial_test.workspace = true
 predicates.workspace = true
 test_utils = { path = "test_utils" }
 
+[build-dependencies]
+anyhow.workspace = true
+
 [profile.release]
 strip = true
 lto = true

README.md

@@ -1,14 +1,14 @@
 <div align="center">
 	<h1>🌙crescent</h1>
-    <p>A process manager for game servers and services.</p>
+	<p>A process manager for game servers and services.</p>
 	<p>
 		<a href="https://crates.io/crates/crescent-cli">
 			<img src="https://img.shields.io/crates/v/crescent-cli?style=flat-square"/>
 		</a>
 		<a href="https://github.com/Kyagara/crescent/actions?query=workflow">
 			<img src="https://img.shields.io/github/actions/workflow/status/Kyagara/crescent/ci.yaml?label=CI&style=flat-square"/>
 		</a>
-        <a href="https://codecov.io/gh/Kyagara/crescent">
+		<a href="https://codecov.io/gh/Kyagara/crescent">
 			<img src="https://img.shields.io/codecov/c/github/Kyagara/crescent?style=flat-square"/>
 		</a>
 	</p>

build.rs

@@ -1,39 +1,50 @@
+use anyhow::{anyhow, Result};
 use std::{env, fs, path::PathBuf};
 
-fn main() {
-    let home = env::var("HOME").expect("Error getting HOME env.");
-
-    let mut crescent_dir = PathBuf::from(home);
+// This build file creates the ~/.crescent/profiles directories and
+// copies the default profiles in ./profiles to ~/.crescent/profiles.
+fn main() -> Result<()> {
+    let home_dir = match env::var("HOME") {
+        Ok(dir) => dir,
+        Err(err) => return Err(anyhow!("Error retrieving HOME directory: {err}")),
+    };
 
+    let mut crescent_dir = PathBuf::from(home_dir);
     crescent_dir.push(".crescent/profiles");
 
     if !crescent_dir.exists() {
-        fs::create_dir_all(&crescent_dir).expect("Error creating crescent and profiles directory.");
+        if let Err(err) = fs::create_dir_all(&crescent_dir) {
+            return Err(anyhow!(
+                "Error creating crescent and profiles directory: {err}"
+            ));
+        }
     }
 
-    let base_profiles_dir = PathBuf::from("./profiles");
-
-    let base_profiles = base_profiles_dir
-        .read_dir()
-        .expect("Error reading base profiles directory.")
-        .flatten();
+    let default_profiles_dir = PathBuf::from("./profiles");
+    let default_profiles = match default_profiles_dir.read_dir() {
+        Ok(dir) => dir.flatten(),
+        Err(err) => return Err(anyhow!("Error reading default profiles directory: {err}")),
+    };
 
-    'base_loop: for base_profile in base_profiles {
-        let user_profiles = crescent_dir
-            .read_dir()
-            .expect("Error reading user profiles directory.")
-            .flatten();
+    'base_loop: for default_profile in default_profiles {
+        let user_profiles = match crescent_dir.read_dir() {
+            Ok(dir) => dir.flatten(),
+            Err(err) => return Err(anyhow!("Error reading default user directory: {err}")),
+        };
 
         for user_profile in user_profiles {
-            if user_profile.file_name() == base_profile.file_name() {
+            if user_profile.file_name() == default_profile.file_name() {
                 continue 'base_loop;
             }
         }
 
-        fs::copy(
-            base_profile.path(),
-            crescent_dir.join(base_profile.file_name()),
-        )
-        .expect("Error copying profile.");
+        if let Err(err) = fs::copy(
+            default_profile.path(),
+            crescent_dir.join(default_profile.file_name()),
+        ) {
+            return Err(anyhow!("Error copying profile: {err}"));
+        }
     }
+
+    Ok(())
 }

tests/long_running.rs

@@ -27,6 +27,9 @@ fn stop_long_running_service() -> Result<()> {
     cmd.args(["start", "-n", name, "-p", "example"]);
     cmd.assert().success();
 
+    // Sleeping to make sure the process started
+    thread::sleep(std::time::Duration::from_secs(1));
+
     assert!(test_utils::check_app_is_running(name)?);
 
     let mut cmd = test_utils::get_base_command();