ci: dev

Author: wislertt

src/pipeline/vcs_data_to_zerv_vars.rs

@@ -32,7 +32,6 @@ mod tests {
     use crate::test_utils::{get_real_pep440_vcs_data, get_real_semver_vcs_data};
 
     #[test]
-    #[ignore = "docker"]
     fn test_vcs_data_to_zerv_vars_real_semver() {
         let vcs_data = get_real_semver_vcs_data().clone();
         let vars = vcs_data_to_zerv_vars(vcs_data).unwrap();
@@ -47,7 +46,6 @@ mod tests {
     }
 
     #[test]
-    #[ignore = "docker"]
     fn test_vcs_data_to_zerv_vars_real_pep440() {
         let vcs_data = get_real_pep440_vcs_data().clone();
         let vars = vcs_data_to_zerv_vars(vcs_data).unwrap();

src/test_utils/git.rs

@@ -29,6 +29,13 @@ impl DockerGit {
     }
 
     fn run_docker_command(&self, test_dir: &TestDir, script: &str) -> io::Result<String> {
+        // Check if Docker is available
+        if Command::new("docker").arg("--version").output().is_err() {
+            return Err(io::Error::other(
+                "Docker not available - use native Git in CI",
+            ));
+        }
+
         let uid = unsafe { libc::getuid() };
         let gid = unsafe { libc::getgid() };
 

src/test_utils/mod.rs

@@ -5,3 +5,8 @@ pub mod vcs_fixtures;
 pub use dir::TestDir;
 pub use git::DockerGit;
 pub use vcs_fixtures::{get_real_pep440_vcs_data, get_real_semver_vcs_data};
+
+/// Check if we should use native Git (CI only) or Docker (local development)
+pub fn should_use_native_git() -> bool {
+    std::env::var("CI").is_ok()
+}

src/test_utils/vcs_fixtures.rs

@@ -1,26 +1,107 @@
-use super::{DockerGit, TestDir};
+use super::{DockerGit, TestDir, should_use_native_git};
 use crate::vcs::{Vcs, VcsData, git::GitVcs};
+use std::fs;
+use std::process::Command;
 use std::sync::OnceLock;
 
 static SEMVER_VCS_DATA: OnceLock<VcsData> = OnceLock::new();
 static PEP440_VCS_DATA: OnceLock<VcsData> = OnceLock::new();
 
 fn create_vcs_data_with_tag(tag: &str, filename: &str, content: &str, commit_msg: &str) -> VcsData {
     let test_dir = TestDir::new().expect("Failed to create test dir");
+
+    if should_use_native_git() {
+        create_vcs_data_with_native_git(&test_dir, tag, filename, content, commit_msg)
+    } else {
+        create_vcs_data_with_docker(&test_dir, tag, filename, content, commit_msg)
+    }
+}
+
+fn create_vcs_data_with_native_git(
+    test_dir: &TestDir,
+    tag: &str,
+    filename: &str,
+    content: &str,
+    commit_msg: &str,
+) -> VcsData {
+    let path = test_dir.path();
+
+    // Create initial file
+    fs::write(path.join("README.md"), "# Test Repository").expect("Failed to create README");
+
+    // Use isolated Git config
+    let git_cmd = |args: &[&str]| {
+        Command::new("git")
+            .env("GIT_CONFIG_GLOBAL", "/dev/null")
+            .env("GIT_CONFIG_SYSTEM", "/dev/null")
+            .args(args)
+            .current_dir(path)
+            .output()
+            .expect("should execute git command")
+    };
+
+    // Initialize repo and create initial commit
+    let commands = [
+        &["init"][..],
+        &["config", "user.name", "Test User"],
+        &["config", "user.email", "test@example.com"],
+        &["add", "."],
+        &["commit", "-m", "Initial commit"],
+        &["tag", tag],
+    ];
+
+    for args in commands {
+        let output = git_cmd(args);
+        assert!(
+            output.status.success(),
+            "Git command '{:?}' failed: {}",
+            args,
+            String::from_utf8_lossy(&output.stderr)
+        );
+    }
+
+    // Create additional file and commit
+    test_dir
+        .create_file(filename, content)
+        .expect("Failed to create file");
+
+    let output = git_cmd(&["add", "."]);
+    assert!(
+        output.status.success(),
+        "Git add failed: {}",
+        String::from_utf8_lossy(&output.stderr)
+    );
+
+    let output = git_cmd(&["commit", "-m", commit_msg]);
+    assert!(
+        output.status.success(),
+        "Git commit failed: {}",
+        String::from_utf8_lossy(&output.stderr)
+    );
+
+    let git_vcs = GitVcs::new(test_dir.path()).expect("Failed to create GitVcs");
+    git_vcs.get_vcs_data().expect("Failed to get VCS data")
+}
+
+fn create_vcs_data_with_docker(
+    test_dir: &TestDir,
+    tag: &str,
+    filename: &str,
+    content: &str,
+    commit_msg: &str,
+) -> VcsData {
     let docker_git = DockerGit::new();
 
+    docker_git.init_repo(test_dir).expect("Failed to init repo");
     docker_git
-        .init_repo(&test_dir)
-        .expect("Failed to init repo");
-    docker_git
-        .create_tag(&test_dir, tag)
+        .create_tag(test_dir, tag)
         .expect("Failed to create tag");
 
     test_dir
         .create_file(filename, content)
         .expect("Failed to create file");
     docker_git
-        .create_commit(&test_dir, commit_msg)
+        .create_commit(test_dir, commit_msg)
         .expect("Failed to create commit");
 
     let git_vcs = GitVcs::new(test_dir.path()).expect("Failed to create GitVcs");

src/vcs/git.rs

@@ -158,15 +158,10 @@ impl Vcs for GitVcs {
 #[cfg(test)]
 mod tests {
     use super::*;
-    use crate::test_utils::TestDir;
+    use crate::test_utils::{TestDir, should_use_native_git};
     use std::fs;
     use std::process::Command;
 
-    /// Check if we should use native Git (CI only) or Docker (local development)
-    fn should_use_native_git() -> bool {
-        std::env::var("CI").is_ok()
-    }
-
     /// Setup Git repo - uses native Git in CI, Docker locally
     fn setup_test_git_repo() -> TestDir {
         if should_use_native_git() {