chore: remove config deps from changelog

cocogitto · oknozor · May 15, 2024 · May 15, 2024 · May 16, 2024 · May 16, 2024
commit 1bc266ad9a254ee6c87c464dd2d9761b5675ef92
diff --git a/crates/cocogitto-changelog/Cargo.toml b/crates/cocogitto-changelog/Cargo.toml
@@ -4,7 +4,6 @@ version = "0.1.0"
 edition = "2021"
 
 [dependencies]
-cocogitto-config.workspace = true
 cocogitto-commit.workspace = true
 cocogitto-git.workspace = true
 cocogitto-oid.workspace = true
@@ -30,4 +29,5 @@ sealed_test.workspace = true
 git2.workspace = true
 toml.workspace = true
 indoc.workspace = true
-pretty_assertions.workspace = true
+pretty_assertions.workspace = true
+cocogitto-config.workspace = true
diff --git a/crates/cocogitto-changelog/src/lib.rs b/crates/cocogitto-changelog/src/lib.rs
@@ -72,208 +72,4 @@ impl Release<'_> {
 }
 
 #[cfg(test)]
-mod test {
-    use crate::release::Release;
-    use cocogitto_git::tag::TagLookUpOptions;
-    use cocogitto_git::Repository;
-    use cocogitto_oid::OidOf;
-    use cocogitto_test_helpers::*;
-    use git2::Oid;
-    use sealed_test::prelude::sealed_test;
-    use sealed_test::prelude::*;
-    use speculoos::prelude::*;
-
-    #[sealed_test]
-    fn shoud_get_range_for_a_single_release() -> anyhow::Result<()> {
-        // Arrange
-        let repo = git_init_no_gpg()?;
-        let one = commit("chore: first commit")?;
-        let two = commit("feat: feature 1")?;
-        let three = commit("feat: feature 2")?;
-        git_tag("0.1.0")?;
-
-        let range = repo.revwalk("0.1.0");
-
-        let range = range?;
-
-        // Act
-        let release = Release::try_from(range)?;
-
-        // Assert
-        assert_that!(release.previous).is_none();
-        assert_that!(release.version.oid()).is_equal_to(&Oid::from_str(&three)?);
-        assert_that!(release.from).is_equal_to(OidOf::FirstCommit(Oid::from_str(&one)?));
-
-        let expected_commits: Vec<String> = release
-            .commits
-            .into_iter()
-            .map(|commit| commit.commit.oid)
-            .collect();
-
-        assert_that!(expected_commits).is_equal_to(vec![three, two, one]);
-
-        Ok(())
-    }
-
-    #[sealed_test]
-    fn shoud_get_range_for_a_multiple_release() -> anyhow::Result<()> {
-        // Arrange
-        let repo = git_init_no_gpg()?;
-        let one = commit("chore: first commit")?;
-        let two = commit("feat: feature 1")?;
-        let three = commit("feat: feature 2")?;
-        git_tag("0.1.0")?;
-        let four = commit("feat: feature 3")?;
-        let five = commit("feat: feature 4")?;
-        git_tag("0.2.0")?;
-
-        let range = repo.revwalk("..0.2.0")?;
-
-        // Act
-        let release = Release::try_from(range)?;
-
-        // Assert
-        assert_that!(release.previous).is_some().matches(|_child| {
-            let commits: Vec<String> = release
-                .previous
-                .as_ref()
-                .unwrap()
-                .commits
-                .iter()
-                .map(|commit| commit.commit.oid.clone())
-                .collect();
-
-            commits == [three.clone(), two.clone(), one.clone()]
-        });
-
-        assert_that!(release.version.to_string()).is_equal_to("0.2.0".to_string());
-        assert_that!(release.from.to_string()).is_equal_to("0.1.0".to_string());
-
-        let expected_commits: Vec<String> = release
-            .commits
-            .into_iter()
-            .map(|commit| commit.commit.oid)
-            .collect();
-
-        assert_that!(expected_commits).is_equal_to(vec![five, four]);
-
-        Ok(())
-    }
-
-    #[test]
-    fn get_release_range_integration_test() -> anyhow::Result<()> {
-        // Arrange
-        let repo = open_cocogitto_repo()?;
-        let range = repo.revwalk("0.32.1..0.32.3")?;
-
-        // Act
-        let release = Release::try_from(range)?;
-
-        // Assert
-        assert_that!(release.version.to_string()).is_equal_to("0.32.3".to_string());
-
-        let release = *release.previous.unwrap();
-        assert_that!(release.version.to_string()).is_equal_to("0.32.2".to_string());
-
-        assert_that!(release.previous).is_none();
-        Ok(())
-    }
-
-    #[test]
-    fn recursive_from_origin_to_head() -> anyhow::Result<()> {
-        // Arrange
-        let repo = Repository::open(&get_workspace_root())?;
-        let mut tag_count = repo.tag_names(None)?.len();
-        let head = repo.get_head_commit_oid()?;
-        let latest = repo.get_latest_tag(TagLookUpOptions::default())?;
-        let latest = latest.oid();
-        if latest == Some(&head) {
-            tag_count -= 1;
-        };
-
-        let range = repo.revwalk("..")?;
-
-        // Act
-        let mut release = Release::try_from(range)?;
-        let mut count = 0;
-
-        while let Some(previous) = release.previous {
-            release = *previous;
-            count += 1;
-        }
-
-        // Assert
-        assert_that!(count).is_equal_to(tag_count);
-
-        Ok(())
-    }
-
-    #[sealed_test]
-    fn from_commit_to_head() -> anyhow::Result<()> {
-        // Arrange
-        let repo = git_init_no_gpg()?;
-
-        commit("chore: init")?;
-        commit("feat: a commit")?;
-        let one = commit("chore: another commit")?;
-        let two = commit("feat: a feature")?;
-        let three = commit("chore: 1.0.0")?;
-        let four = commit("fix: the bug")?;
-
-        let range = repo.revwalk(&format!("{}..", &one[0..7]))?;
-
-        // Act
-        let release = Release::try_from(range)?;
-
-        // Assert
-        let actual_oids: Vec<String> = release
-            .commits
-            .iter()
-            .map(|commit| commit.commit.oid.to_string())
-            .collect();
-
-        assert_that!(actual_oids).is_equal_to(vec![four, three, two]);
-
-        Ok(())
-    }
-
-    #[sealed_test]
-    fn from_commit_to_head_with_overlapping_tag() -> anyhow::Result<()> {
-        // Arrange
-        let repo = git_init_no_gpg()?;
-
-        commit("chore: init")?;
-        commit("feat: a commit")?;
-
-        let from = commit("chore: another commit")?;
-        let one = commit("feat: a feature")?;
-        let two = commit("chore: 1.0.0")?;
-        git_tag("1.0.0")?;
-        let three = commit("fix: the bug")?;
-
-        let range = repo.revwalk(&format!("{}..", &from[0..7]))?;
-
-        // Act
-        let release = Release::try_from(range)?;
-
-        // Assert
-        let head_to_v1: Vec<String> = release
-            .commits
-            .iter()
-            .map(|commit| commit.commit.oid.to_string())
-            .collect();
-
-        let commit_before_v1: Vec<String> = release
-            .previous
-            .unwrap()
-            .commits
-            .iter()
-            .map(|commit| commit.commit.oid.to_string())
-            .collect();
-
-        assert_that!(head_to_v1).is_equal_to(vec![three]);
-        assert_that!(commit_before_v1).is_equal_to(vec![two, one]);
-
-        Ok(())
-    }
-}
+mod test {}
diff --git a/crates/cocogitto-changelog/src/release.rs b/crates/cocogitto-changelog/src/release.rs
@@ -1,14 +1,8 @@
-use chrono::{NaiveDateTime, Utc};
+use chrono::NaiveDateTime;
 use serde::Serialize;
 
 use cocogitto_commit::{Commit, Footer};
-use colored::Colorize;
-
-use crate::error::ChangelogError;
-use cocogitto_config::SETTINGS;
-use cocogitto_git::rev::CommitIter;
 use cocogitto_oid::OidOf;
-use log::warn;
 
 #[derive(Debug, Serialize)]
 pub struct Release<'a> {
@@ -19,79 +13,24 @@ pub struct Release<'a> {
     pub previous: Option<Box<Release<'a>>>,
 }
 
-impl TryFrom<CommitIter<'_>> for Release<'_> {
-    type Error = ChangelogError;
-
-    fn try_from(commits: CommitIter<'_>) -> Result<Self, Self::Error> {
-        let mut releases = vec![];
-        let mut commit_iter = commits.into_iter().rev().peekable();
-
-        while let Some((_oid, _commit)) = commit_iter.peek() {
-            let mut release_commits = vec![];
-
-            for (oid, commit) in commit_iter.by_ref() {
-                if matches!(oid, OidOf::Tag(_)) {
-                    release_commits.push((oid, commit));
-                    break;
-                }
-                release_commits.push((oid, commit));
-            }
-
-            release_commits.reverse();
-            releases.push(release_commits);
-        }
-
-        let mut current = None;
-
-        for release in releases {
-            let next = Release {
-                version: release.first().unwrap().0.clone(),
-                from: current
-                    .as_ref()
-                    .map(|current: &Release| current.version.clone())
-                    .unwrap_or(release.last().unwrap().0.clone()),
-                date: Utc::now().naive_local(),
-                commits: release
-                    .iter()
-                    .filter_map(|(_, commit)| {
-                        match Commit::from_git_commit(commit, &SETTINGS.allowed_commit_types()) {
-                            Ok(commit) => {
-                                let commit_type = &commit.conventional.commit_type;
-                                if !SETTINGS.should_omit_commit(commit_type) {
-                                    Some(ChangelogCommit::from(commit))
-                                } else {
-                                    None
-                                }
-                            }
-                            Err(err) => {
-                                let err = err.to_string().red();
-                                warn!("{}", err);
-                                None
-                            }
-                        }
-                    })
-                    .collect(),
-                previous: current.map(Box::new),
-            };
-
-            current = Some(next);
-        }
-
-        current.ok_or(ChangelogError::EmptyRelease)
-    }
-}
-
 #[derive(Debug)]
 pub struct ChangelogCommit<'a> {
+    pub changelog_title: String,
     pub author_username: Option<&'a str>,
     pub commit: Commit,
 }
 
-impl From<Commit> for ChangelogCommit<'_> {
-    fn from(commit: Commit) -> Self {
-        let author_username = cocogitto_config::commit_username(&commit.author);
-
+impl<'a, 'b> ChangelogCommit<'a>
+where
+    'b: 'a,
+{
+    pub fn from_commit(
+        commit: Commit,
+        author_username: Option<&'a str>,
+        changelog_title: String,
+    ) -> Self {
         ChangelogCommit {
+            changelog_title,
             author_username,
             commit,
         }
@@ -117,33 +56,20 @@ impl<'a> From<&'a Footer> for ChangelogFooter<'a> {
 mod test {
     use anyhow::Result;
     use chrono::NaiveDateTime;
-    use cocogitto_config::SETTINGS;
-    use cocogitto_oid::OidOf;
     use git2::Oid;
     use indoc::indoc;
     use pretty_assertions::assert_eq;
-    use speculoos::prelude::*;
+
+    use cocogitto_commit::{Commit, CommitType, ConventionalCommit, Footer};
+    use cocogitto_config::SETTINGS;
+    use cocogitto_oid::OidOf;
+    use cocogitto_tag::Tag;
 
     use crate::release::{ChangelogCommit, Release};
     use crate::renderer::Renderer;
     use crate::template::{
         MonoRepoContext, PackageBumpContext, PackageContext, RemoteContext, Template, TemplateKind,
     };
-    use cocogitto_commit::{Commit, CommitType, ConventionalCommit, Footer};
-
-    use cocogitto_tag::Tag;
-    use cocogitto_test_helpers::open_cocogitto_repo;
-
-    #[test]
-    fn should_get_a_release() -> anyhow::Result<()> {
-        let repo = open_cocogitto_repo()?;
-        let iter = repo.revwalk("..")?;
-        let release = Release::try_from(iter);
-        assert_that!(release)
-            .is_ok()
-            .matches(|r| !r.commits.is_empty());
-        Ok(())
-    }
 
     #[test]
     fn should_render_default_template() -> Result<()> {
@@ -579,6 +505,7 @@ mod test {
                 date,
                 commits: vec![
                     ChangelogCommit {
+                        changelog_title: "Bug Fixes".to_string(),
                         author_username: Some("oknozor"),
                         commit: Commit {
                             oid: a_commit_hash.to_string(),
@@ -599,6 +526,7 @@ mod test {
                         },
                     },
                     ChangelogCommit {
+                        changelog_title: "Features".to_string(),
                         author_username: None,
                         commit: Commit {
                             oid: a_commit_hash.to_string(),
@@ -619,6 +547,7 @@ mod test {
                         },
                     },
                     ChangelogCommit {
+                        changelog_title: "Features".to_string(),
                         author_username: Some("oknozor"),
                         commit: Commit {
                             oid: a_commit_hash.to_string(),