fix(semver): add bump test and fix version auto bump

src/changelog.rs

@@ -35,8 +35,8 @@ impl ChangelogWriter {
     }
 
     fn insert(&mut self) -> Result<()> {
-        let mut changelog_content = fs::read_to_string(&self.path)
-            .unwrap_or(Changelog::changelog_template());
+        let mut changelog_content =
+            fs::read_to_string(&self.path).unwrap_or_else(|_err| Changelog::changelog_template());
 
         let separator_idx = match self.mode {
             Append => changelog_content.rfind("- - -"),
@@ -90,7 +90,6 @@ impl Changelog {
                 out.push_str(&format!("\n### {}\n\n", metadata.changelog_title));
                 commits.iter().for_each(|commit| {
                     out.push_str(&commit.to_markdown(colored));
-                    out.push('\n');
                 });
             }
         };
@@ -114,7 +113,8 @@ impl Changelog {
     }
 
     pub(crate) fn default_footer() -> String {
-        "\nThis changelog was generated by [cocogitto](https://github.com/oknozor/cocogitto).".to_string()
+        "\nThis changelog was generated by [cocogitto](https://github.com/oknozor/cocogitto)."
+            .to_string()
     }
 
     fn changelog_template() -> String {

src/lib.rs

@@ -308,6 +308,7 @@ impl CocoGitto {
     pub fn create_version(&self, increment: VersionIncrement, mode: WriterMode) -> Result<()> {
         let statuses = self.repository.get_statuses()?;
 
+        // Fail if repo contains un-staged or un-committed changes
         if !statuses.is_empty() {
             let statuses = statuses
                 .iter()
@@ -326,8 +327,9 @@ impl CocoGitto {
 
         let current_version = Version::parse(&current_tag)?;
 
-        // Error on unstaged changes
-        let next_version = increment.bump(&current_version)?;
+        let next_version = increment
+            .bump(&current_version)
+            .map_err(|err| anyhow!("Cannot bump version : {}", err))?;
 
         if next_version.le(&current_version) || next_version.eq(&current_version) {
             let comparison = format!("{} <= {}", current_version, next_version).red();
@@ -362,7 +364,8 @@ impl CocoGitto {
             mode,
         };
 
-        writter.write()
+        writter
+            .write()
             .map_err(|err| anyhow!("Unable to write CHANGELOG.md : {}", err))?;
 
         self.repository.add_all()?;

src/repository.rs

@@ -153,9 +153,9 @@ impl Repository {
             ));
         }
 
-        let head = self.get_head().unwrap();
+        let head = self.get_head_commit().unwrap();
         self.0
-            .tag_lightweight(name, &head, false)
+            .tag_lightweight(name, &head.into_object(), false)
             .map(|_| ())
             .map_err(|err| {
                 let cause_key = "cause:".red();
@@ -172,8 +172,8 @@ impl Repository {
         self.0.find_commit(to)?;
 
         let mut revwalk = self.0.revwalk()?;
-        revwalk.push(to)?;
-        revwalk.push(from)?;
+
+        revwalk.push_range(&format!("{}..{}", from, to))?;
 
         let mut commits: Vec<Git2Commit> = vec![];
 

src/version.rs

@@ -107,8 +107,8 @@ impl VersionIncrement {
 #[cfg(test)]
 mod test {
     use crate::version::VersionIncrement;
-    use semver::Version;
     use anyhow::Result;
+    use semver::Version;
 
     // Auto version tests resides in test/ dir since it rely on git log
     // To generate the version
@@ -133,4 +133,4 @@ mod test {
         assert_eq!(version, Version::new(1, 0, 1));
         Ok(())
     }
-}
+}

tests/coco_commit_test.rs

@@ -1,6 +1,6 @@
 use anyhow::Result;
-use std::process::Command;
 use assert_cmd::prelude::*;
+use std::process::Command;
 use temp_testdir::TempDir;
 
 mod helper;
@@ -16,7 +16,8 @@ fn commit_ok() -> Result<()> {
     std::fs::write(temp_dir.join("test_file"), "content")?;
     helper::git_add()?;
 
-    command.arg("feat")
+    command
+        .arg("feat")
         .arg("this is a commit message")
         .arg("scope")
         .arg("this is the body")
@@ -37,7 +38,8 @@ fn unstaged_changes_commit_err() -> Result<()> {
     helper::git_init(".")?;
     std::fs::write(temp_dir.join("test_file"), "content")?;
 
-    command.arg("feat")
+    command
+        .arg("feat")
         .arg("this is a commit message")
         .arg("scope")
         .arg("this is the body")
@@ -61,7 +63,8 @@ fn untracked_changes_commit_ok() -> Result<()> {
 
     std::fs::write(temp_dir.join("untracked"), "content")?;
 
-    command.arg("feat")
+    command
+        .arg("feat")
         .arg("this is a commit message")
         .arg("scope")
         .arg("this is the body")
@@ -82,7 +85,8 @@ fn empty_commit_err() -> Result<()> {
     std::env::set_current_dir(&temp_dir.to_path_buf())?;
     helper::git_init(".")?;
 
-    command.arg("feat")
+    command
+        .arg("feat")
         .arg("this is a commit message")
         .arg("scope")
         .arg("this is the body")
@@ -91,4 +95,4 @@ fn empty_commit_err() -> Result<()> {
     command.assert().failure();
 
     Ok(std::env::set_current_dir(current_dir)?)
-}
+}

tests/cog_bump_test.rs

@@ -1,7 +1,7 @@
 use anyhow::Result;
+use assert_cmd::prelude::*;
 use std::process::Command;
 use temp_testdir::TempDir;
-use assert_cmd::prelude::*;
 
 mod helper;
 
@@ -11,7 +11,7 @@ fn auto_bump_from_start_ok() -> Result<()> {
     let current_dir = std::env::current_dir()?;
     let mut command = Command::cargo_bin("cog")?;
     command.arg("bump").arg("--auto");
-    let temp_dir = TempDir::default().permanent();
+    let temp_dir = TempDir::default();
     std::env::set_current_dir(&temp_dir)?;
     helper::git_init(".")?;
     helper::git_commit("chore: init")?;
@@ -32,7 +32,7 @@ fn auto_bump_frowm_latest_tag() -> Result<()> {
     let mut command = Command::cargo_bin("cog")?;
     command.arg("bump").arg("--auto");
 
-    let temp_dir = TempDir::default().permanent();
+    let temp_dir = TempDir::default();
     std::env::set_current_dir(&temp_dir)?;
     helper::git_init(".")?;
     helper::git_commit("chore: init")?;
@@ -57,7 +57,7 @@ fn minor_bump() -> Result<()> {
     let mut command = Command::cargo_bin("cog")?;
     command.arg("bump").arg("--minor");
 
-    let temp_dir = TempDir::default().permanent();
+    let temp_dir = TempDir::default();
     std::env::set_current_dir(&temp_dir)?;
     helper::git_init(".")?;
     helper::git_commit("chore: init")?;
@@ -78,7 +78,7 @@ fn major_bump() -> Result<()> {
     let mut command = Command::cargo_bin("cog")?;
     command.arg("bump").arg("--major");
 
-    let temp_dir = TempDir::default().permanent();
+    let temp_dir = TempDir::default();
     std::env::set_current_dir(&temp_dir)?;
     helper::git_init(".")?;
     helper::git_commit("chore: init")?;
@@ -99,7 +99,7 @@ fn patch_bump() -> Result<()> {
     let mut command = Command::cargo_bin("cog")?;
     command.arg("bump").arg("--patch");
 
-    let temp_dir = TempDir::default().permanent();
+    let temp_dir = TempDir::default();
     std::env::set_current_dir(&temp_dir)?;
     helper::git_init(".")?;
     helper::git_commit("chore: init")?;
@@ -111,4 +111,4 @@ fn patch_bump() -> Result<()> {
     helper::assert_tag("1.0.1")?;
 
     Ok(std::env::set_current_dir(current_dir)?)
-}
+}

tests/cog_changelog_test.rs

@@ -1 +1 @@
-// TODO
+// TODO

tests/cog_check_test.rs

@@ -1 +1 @@
-// TODO
+// TODO

tests/cog_init_test_it.rs

@@ -16,7 +16,7 @@ fn init_empty_repo_in_target_dir() -> Result<()> {
     command.arg("init").arg("test_repo");
 
     let temp_dir = TempDir::default();
-    std::env::set_current_dir(temp_dir.as_ref())?;
+    std::env::set_current_dir(&temp_dir)?;
 
     command.assert().success();
     Ok(std::env::set_current_dir(current_dir)?)

tests/cog_verify_test.rs

@@ -1 +1 @@
-// TODO
+// TODO

tests/helper.rs

@@ -1,6 +1,6 @@
 use anyhow::Result;
-use std::process::{Command, Stdio};
 use rand::Rng;
+use std::process::{Command, Stdio};
 
 // Why those are picked as dead code by rustc ?
 
@@ -28,7 +28,6 @@ pub fn git_add() -> Result<()> {
     Ok(())
 }
 
-
 #[allow(dead_code)]
 pub fn git_commit(message: &str) -> Result<()> {
     let mut rng = rand::thread_rng();
@@ -67,9 +66,7 @@ pub fn git_tag(tag: &str) -> Result<()> {
 
 #[allow(dead_code)]
 pub fn assert_tag(tag: &str) -> Result<()> {
-    let out = Command::new("ls")
-        .arg(".git/refs/tags")
-        .output()?.stdout;
+    let out = Command::new("ls").arg(".git/refs/tags").output()?.stdout;
 
     let out = String::from_utf8(out)?;
     let tags: Vec<&str> = out.split('\n').collect();