Refactor out the OBS interaction code into a new obs-commander crate

This is largely just a rename, as well as the slightly-silly
`obs-commander-test-support` crate that exists to avoid making the
primary `obs-commander` crate depend on testing dependencies.

Author: refi64

Cargo.lock

@@ -1,50 +1,30 @@
-[package]
-name = "obs-gitlab-runner"
-version = "0.1.8"
-edition = "2024"
-license = "MIT OR Apache-2.0"
+[workspace]
+resolver = "3"
+members = [
+  "obs-commander",
+  "obs-commander-test-support",
+  "obs-gitlab-runner"
+]
 
-# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
-
-[dependencies]
+[workspace.dependencies]
 async-trait = "0.1"
-base16ct = { version = "0.2", features = ["std"] }
-bytes = "1.10"
 camino = "1.1"
+claims = "0.8"
 clap = { version = "4.5", features = ["default", "derive", "env"] }
 color-eyre = "0.6"
 derivative = "2.2"
 futures-util = "0.3"
-md-5 = "0.10"
-reqwest = "0.12"
-rfc822-like = "0.2"
+open-build-service-api = { git = "https://github.com/collabora/open-build-service-rs" }
+# open-build-service-api = { path = "../open-build-service-rs/open-build-service-api" }
+open-build-service-mock = { git = "https://github.com/collabora/open-build-service-rs" }
+# open-build-service-mock = { path = "../open-build-service-rs/open-build-service-api" }
+rstest = "0.26"
 serde = "1.0"
 serde_yaml = "0.9"
-shellexpand = "3.1"
 shell-words = "1.1"
-strum = { version = "0.27", features = ["derive"] }
 tempfile = "3.20"
+thiserror = "2.0"
 tokio = { version = "1.45", features = ["full"] }
-tokio-retry2 = { version = "0.5.7", features = ["jitter"] }
 tokio-util = { version = "0.7", features = ["full"] }
 tracing = "0.1"
-tracing-error = "0.2"
-tracing-subscriber = { version = "0.3", features = ["default", "json"] }
-url = "2.5"
-
-gitlab-runner = "0.3.0-rc1"
-# gitlab-runner = { path = "../gitlab-runner-rs/gitlab-runner" }
-open-build-service-api = { git = "https://github.com/collabora/open-build-service-rs" }
-thiserror = "2.0.12"
-# open-build-service-api = { path = "../open-build-service-rs/open-build-service-api" }
-
-[dev-dependencies]
-claims = "0.8"
-rstest = "0.26"
 wiremock = "0.6"
-zip = "4.1"
-
-gitlab-runner-mock = "0.2.1"
-# gitlab-runner-mock = { path = "../gitlab-runner-rs/gitlab-runner-mock" }
-open-build-service-mock = { git = "https://github.com/collabora/open-build-service-rs" }
-# open-build-service-mock = { path = "../open-build-service-rs/open-build-service-mock" }

Cargo.toml

@@ -0,0 +1,9 @@
+[package]
+name = "obs-commander-test-support"
+version = "0.1.0"
+edition = "2024"
+license = "MIT OR Apache-2.0"
+
+[dependencies]
+open-build-service-api.workspace = true
+open-build-service-mock.workspace = true

obs-commander-test-support/Cargo.toml

@@ -0,0 +1,36 @@
+[package]
+name = "obs-commander"
+version = "0.1.0"
+edition = "2024"
+license = "MIT OR Apache-2.0"
+
+[dependencies]
+async-trait.workspace = true
+base16ct = { version = "0.2", features = ["std"] }
+bytes = "1.10"
+camino.workspace = true
+clap.workspace = true
+color-eyre.workspace = true
+derivative.workspace = true
+futures-util.workspace = true
+md-5 = "0.10"
+obs-commander-test-support = { path = "../obs-commander-test-support" }
+open-build-service-api.workspace = true
+reqwest = "0.12"
+rfc822-like = "0.2"
+serde.workspace = true
+serde_yaml.workspace = true
+shell-words.workspace = true
+tempfile.workspace = true
+thiserror.workspace = true
+tokio.workspace = true
+tokio-retry2 = { version = "0.5.7", features = ["jitter"] }
+tokio-util.workspace = true
+tracing.workspace = true
+
+[dev-dependencies]
+claims.workspace = true
+rstest.workspace = true
+open-build-service-mock.workspace = true
+wiremock.workspace = true
+

src/test_support.rs renamed to obs-commander-test-support/src/lib.rs

@@ -41,6 +41,27 @@ impl FlagSupportingExplicitValue for clap::Arg {
     }
 }
 
+#[derive(Debug)]
+struct CommandBuilder {
+    args: Vec<String>,
+}
+
+impl CommandBuilder {
+    fn new(name: String) -> Self {
+        Self { args: vec![name] }
+    }
+
+    fn add(&mut self, arg: &str, value: &str) -> &mut Self {
+        self.args
+            .push(format!("--{arg}={}", shell_words::quote(value)));
+        self
+    }
+
+    fn build(self) -> String {
+        self.args.join(" ")
+    }
+}
+
 #[derive(Parser, Debug)]
 pub struct DputAction {
     pub project: String,
@@ -73,6 +94,24 @@ pub struct MonitorAction {
     pub build_log_out: String,
 }
 
+impl MonitorAction {
+    pub fn generate_command(&self) -> String {
+        let mut builder = CommandBuilder::new("monitor".to_owned());
+        builder
+            .add("project", &self.project)
+            .add("package", &self.package)
+            .add("rev", &self.rev)
+            .add("srcmd5", &self.srcmd5)
+            .add("repository", &self.repository)
+            .add("arch", &self.arch)
+            .add("build-log-out", &self.build_log_out);
+        if let Some(endtime) = &self.prev_endtime_for_commit {
+            builder.add("prev-endtime-for-commit", &endtime.to_string());
+        }
+        builder.build()
+    }
+}
+
 #[derive(Parser, Debug)]
 pub struct DownloadBinariesAction {
     #[clap(long)]
@@ -87,6 +126,19 @@ pub struct DownloadBinariesAction {
     pub build_results_dir: Utf8PathBuf,
 }
 
+impl DownloadBinariesAction {
+    pub fn generate_command(&self) -> String {
+        let mut builder = CommandBuilder::new("download-binaries".to_owned());
+        builder
+            .add("project", &self.project)
+            .add("package", &self.package)
+            .add("repository", &self.repository)
+            .add("arch", &self.arch)
+            .add("build-results-dir", self.build_results_dir.as_str());
+        builder.build()
+    }
+}
+
 #[derive(Parser, Debug)]
 pub struct PruneAction {
     #[clap(long, default_value_t = DEFAULT_BUILD_INFO.to_owned())]

obs-commander/Cargo.toml

@@ -97,7 +97,6 @@ pub trait ArtifactDirectory: Send + Sync {
     }
 }
 
-#[cfg(test)]
 pub mod test_support {
     use std::collections::HashMap;
 

src/actions.rs renamed to obs-commander/src/actions.rs

@@ -77,9 +77,10 @@ mod tests {
     use std::time::SystemTime;
 
     use claims::*;
+    use obs_commander_test_support::*;
     use open_build_service_mock::*;
 
-    use crate::{artifacts::test_support::MockArtifactDirectory, test_support::*};
+    use crate::artifacts::test_support::MockArtifactDirectory;
 
     use super::*;
 

src/artifacts.rs renamed to obs-commander/src/artifacts.rs

@@ -265,11 +265,10 @@ mod tests {
     use std::time::{Duration, SystemTime};
 
     use claims::*;
+    use obs_commander_test_support::*;
     use open_build_service_mock::*;
     use rstest::rstest;
 
-    use crate::test_support::*;
-
     use super::*;
 
     #[tokio::test]