fix: stop - only stop running containers; add: list - improve display; fix: always store absolute path for local configs; chore: deps

Author: queil

Cargo.lock

@@ -1,6 +1,6 @@
 [package]
 name = "rooz"
-version = "0.98.0"
+version = "0.99.0"
 edition = "2021"
 
 [dependencies]
@@ -24,6 +24,7 @@ regex = "1.10.6"
 serde = "1.0.209"
 serde_yaml = "0.9.34"
 shellexpand = "3.1.0"
+tabled = "0.16.0"
 termion = "4.0.2"
 tokio = { version = "1.39.3", features = ["rt-multi-thread", "macros"] }
 toml = "0.8.19"

Cargo.toml

@@ -52,6 +52,16 @@ impl<'a> ContainerApi<'a> {
         Ok(self.client.list_containers(Some(list_options)).await?)
     }
 
+    pub async fn get_running(&self, labels: &Labels) -> Result<Vec<ContainerSummary>, AnyError> {
+        let list_options = ListContainersOptions {
+            filters: labels.into(),
+            all: false,
+            ..Default::default()
+        };
+
+        Ok(self.client.list_containers(Some(list_options)).await?)
+    }
+
     pub async fn get_single(&self, labels: &Labels) -> Result<Option<ContainerSummary>, AnyError> {
         match self.get_all(&labels).await?.as_slice() {
             [] => Ok(None),

src/api/container.rs

@@ -5,7 +5,7 @@ use crate::{api::WorkspaceApi, model::types::AnyError, util::labels::Labels};
 impl<'a> WorkspaceApi<'a> {
     pub async fn stop(&self, workspace_key: &str) -> Result<(), AnyError> {
         let labels = Labels::new(Some(workspace_key), None);
-        for c in self.api.container.get_all(&labels).await? {
+        for c in self.api.container.get_running(&labels).await? {
             print!("Stopping container: {} ... ", c.names.unwrap().join(", "));
             self.api.container.stop(&c.id.unwrap()).await?;
             println!("{}", format!("OK").green())
@@ -15,8 +15,10 @@ impl<'a> WorkspaceApi<'a> {
 
     pub async fn stop_all(&self) -> Result<(), AnyError> {
         let labels = Labels::default();
-        for c in self.api.container.get_all(&labels).await? {
+        for c in self.api.container.get_running(&labels).await? {
+            print!("Stopping container: {} ... ", c.names.unwrap().join(", "));
             self.api.container.stop(&c.id.unwrap()).await?;
+            println!("{}", format!("OK").green())
         }
         Ok(())
     }

src/api/workspace/stop.rs

@@ -1,10 +1,22 @@
 use crate::{
     model::types::AnyError,
-    util::labels::{self, Labels},
+    util::labels::{self, Labels, CONFIG_ORIGIN},
 };
 
 use bollard::{container::ListContainersOptions, service::ContainerSummary, Docker};
 
+use tabled::{settings::Style, Table, Tabled};
+
+#[derive(Debug, Tabled)]
+struct WorkspaceView {
+    #[tabled(rename = "WORKSPACE")]
+    name: String,
+    #[tabled(rename = "RUNNING", format("{}", if self.running {"true"} else {""}))]
+    running: bool,
+    #[tabled(rename = "CONFIG")]
+    origin: String,
+}
+
 pub async fn list(docker: &Docker) -> Result<(), AnyError> {
     let labels = Labels::new(None, Some(labels::ROLE_WORK));
     let list_options = ListContainersOptions {
@@ -14,7 +26,8 @@ pub async fn list(docker: &Docker) -> Result<(), AnyError> {
     };
 
     let container_summary = docker.list_containers(Some(list_options)).await?;
-    println!("WORKSPACE");
+
+    let mut views = Vec::<WorkspaceView>::new();
 
     for c in container_summary {
         if let ContainerSummary {
@@ -23,12 +36,25 @@ pub async fn list(docker: &Docker) -> Result<(), AnyError> {
             ..
         } = c
         {
-            let state_icon = match state.as_str() {
-                "running" => "✱",
-                _ => "",
+            let is_running = match state.as_str() {
+                "running" => true,
+                _ => false,
             };
-            println!("{} {}", labels[labels::WORKSPACE_KEY], state_icon);
+            views.push(WorkspaceView {
+                name: c.names.unwrap().join(", ")[1..].to_string(),
+                running: is_running,
+                origin: labels
+                    .get(CONFIG_ORIGIN)
+                    .unwrap_or(&"cli".to_string())
+                    .to_string(),
+            });
         }
     }
+
+    views.sort_by(|a, b| a.name.cmp(&b.name));
+
+    let table = Table::new(views).with(Style::blank()).to_string();
+
+    println!("{}", table);
     Ok(())
 }

src/cmd/list.rs

@@ -154,8 +154,10 @@ impl<'a> WorkspaceApi<'a> {
                 ConfigSource::Path { value: path } => match path {
                     ConfigPath::File { path } => {
                         let body = fs::read_to_string(&path)?;
+                        let absolute_path =
+                            std::path::absolute(path)?.to_string_lossy().into_owned();
                         labels = Labels {
-                            config_source: Labels::config_origin(&path),
+                            config_source: Labels::config_origin(&absolute_path),
                             config_body: Labels::config_body(&body),
                             ..labels
                         };