Refactor horust to its own crate

.github/workflows/CI.yml

@@ -126,7 +126,8 @@ jobs:
         with:
           use-cross: true
           command: build
-          args: --release --all --target ${{ matrix.target }}
+          # TODO:   There should be a step to build horustctl.
+          args: --release --package horust --bin horust --target ${{ matrix.target }}
 
       - name: Package
         shell: bash

Cargo.toml

@@ -1,47 +1,2 @@
-[package]
-name = "horust"
-version = "0.1.8"
-authors = ["Federico Ponzi <[email protected]>"]
-description = "A complete supervisor and init system, designed for running in containers."
-edition = "2021"
-license = "MIT"
-repository = "https://github.com/FedericoPonzi/horust"
-homepage = "https://github.com/FedericoPonzi/horust"
-readme = "README.md"
-keywords = ["init", "container", "supervisor"]
-categories = ["command-line-utilities"]
-include = ["src/**/*", "Cargo.*", "LICENSE.txt", "README.md", "/example_services/**/*"]
-
-[dependencies]
-clap = { version = "~4.5", features = ["derive"] }
-crossbeam = "~0.8"
-env_logger = "~0.11"
-humantime-serde = "~1.1"
-libc = "~0.2"
-log = "~0.4"
-nix = { version = "~0.29", features = ["process", "user", "signal", "fs"] }
-reqwest = { version = "~0.12", features = ["blocking", "json"], optional = true, default-features = false }
-serde = { version = "~1.0", features = ["derive"] }
-shlex = "~1.3"
-toml = "~0.8"
-maplit = "~1.0"
-shellexpand = "~3.1"
-anyhow = "~1.0"
-thiserror = "~1.0"
-bytefmt = "0.1.7"
-
-[features]
-default = ["http-healthcheck"]
-http-healthcheck = ["reqwest"]
-
-[dev-dependencies]
-assert_cmd = "~2.0"
-predicates = "~3.1"
-tempdir = "~0.3"
-rand = "~0.8"
-
-[profile.release]
-strip = "symbols"
-
 [workspace]
-members = ["horustctl", "commands"]
+members = ["commands", "horust", "horustctl"]

commands/src/lib.rs

@@ -1,7 +1,6 @@
 mod proto;
 
 use anyhow::{bail, Context, Result};
-use proto::tutorial::*;
 use std::path::{Path, PathBuf};
 use tokio::io::{AsyncReadExt, AsyncWriteExt};
 use tokio::net::{UnixListener, UnixStream};
@@ -11,7 +10,7 @@
     socket: UnixStream,
 }
 impl CommandsUdsConnectionHandler {
     fn get_path(socket_folder: &Path, socket_name: u32) -> PathBuf {
         socket_folder.join(format!("hourst-{socket_name}.sock"))
     }
     fn new(socket: UnixStream) -> Self {
@@ -79,7 +78,7 @@
         loop {
             self.accept().await?;
         }
         Ok(())
     }
     pub async fn accept(&mut self) -> Result<()> {
         match self.unix_listener.accept().await {
@@ -100,9 +99,9 @@
     }
 }
 
 fn create_uds() {}
 
 fn listen_uds() {}
 
 fn send_message() {}
 fn receive_message() {}

commands/src/proto/mod.rs

@@ -1 +1 @@
-pub mod tutorial;
+

commands/src/proto/tutorial.rs

@@ -20,7 +20,17 @@ pub mod person {
         #[prost(enumeration = "PhoneType", tag = "2")]
         pub r#type: i32,
     }
-    #[derive(Clone, Copy, Debug, PartialEq, Eq, Hash, PartialOrd, Ord, ::prost::Enumeration)]
+    #[derive(
+        Clone,
+        Copy,
+        Debug,
+        PartialEq,
+        Eq,
+        Hash,
+        PartialOrd,
+        Ord,
+        ::prost::Enumeration
+    )]
     #[repr(i32)]
     pub enum PhoneType {
         Mobile = 0,

horust/Cargo.toml

@@ -0,0 +1,44 @@
+[package]
+name = "horust"
+version = "0.1.8"
+authors = ["Federico Ponzi <[email protected]>"]
+description = "A complete supervisor and init system, designed for running in containers."
+edition = "2021"
+license = "MIT"
+repository = "https://github.com/FedericoPonzi/horust"
+homepage = "https://github.com/FedericoPonzi/horust"
+readme = "README.md"
+keywords = ["init", "container", "supervisor"]
+categories = ["command-line-utilities"]
+include = ["src/**/*", "Cargo.*", "LICENSE.txt", "README.md", "/example_services/**/*"]
+
+[dependencies]
+clap = { version = "~4.5", features = ["derive"] }
+crossbeam = "~0.8"
+env_logger = "~0.11"
+humantime-serde = "~1.1"
+libc = "~0.2"
+log = "~0.4"
+nix = { version = "~0.29", features = ["process", "user", "signal", "fs"] }
+reqwest = { version = "~0.12", features = ["blocking", "json"], optional = true, default-features = false }
+serde = { version = "~1.0", features = ["derive"] }
+shlex = "~1.3"
+toml = "~0.8"
+maplit = "~1.0"
+shellexpand = "~3.1"
+anyhow = "~1.0"
+thiserror = "~1.0"
+bytefmt = "0.1.7"
+
+[features]
+default = ["http-healthcheck"]
+http-healthcheck = ["reqwest"]
+
+[dev-dependencies]
+assert_cmd = "~2.0"
+predicates = "~3.1"
+tempdir = "~0.3"
+rand = "~0.8"
+
+[profile.release]
+strip = "symbols"

src/horust/formats/service.rs → horust/src/horust/formats/service.rs

@@ -14,7 +14,7 @@ use std::{env, os::fd::RawFd};
 use crate::horust::error::{ValidationError, ValidationErrors};
 
 pub fn get_sample_service() -> &'static str {
-    include_str!("../../../example_services/sample_service.toml")
+    include_str!("../../../../example_services/sample_service.toml")
 }
 
 pub type ServiceName = String;

tests/service_deserialization.rs → horust/tests/service_deserialization.rs

@@ -22,8 +22,10 @@ mod tests {
     #[test]
     fn should_deserialize() {
         // TODO: this shouldn't be an integration test, but rather a unit test.
+        // CARGO_MANIFEST_DIR points to the position of the innermost Cargo.toml
         let base = PathBuf::from(env!("CARGO_MANIFEST_DIR"));
-        let services_path = base.join("example_services");
+        let services_path = base.join("../example_services");
+        println!("base: {base:?}");
         let services = list_files(&services_path).unwrap().len();
         let horust = Horust::from_services_dirs(&[services_path]).unwrap();
         assert_eq!(horust.get_services().len(), services);