fix preRelease basing release on the next release version

Author: joostvdg

src/lib.rs

@@ -48,39 +48,34 @@ pub fn determine_nex_tag(
         }
         VersionType::PreRelease => {
             let suffix = next_tag_request.suffix.unwrap();
-            let completed_base_tag = format!("{}.*-{}-*", next_tag_request.base_tag, suffix);
-            let mut tags = query_git_tags(&completed_base_tag, next_tag_request.path.as_str())
-                .expect("Could not list git tags");
-            let mut found_suffix_tag = false;
-            // if no tags are found for base tag + suffix, find the latest tag for base tag
-            if tags.is_empty() {
-                let completed_base_tag = format!("{}.*", next_tag_request.base_tag);
-                tags = query_git_tags(&completed_base_tag, next_tag_request.path.as_str())
-                    .expect("Could not list git tags");
-                if tags.is_empty() {
-                    debug!("Could not find tags, returning .0");
-                    return Ok(format!("{}.0-{}-0", next_tag_request.base_tag, suffix));
-                }
+
+            // 1. Find the latest stable tag for the base.
+            let stable_tags_pattern = format!("{}.*", next_tag_request.base_tag);
+            let stable_tags = query_git_tags(&stable_tags_pattern, next_tag_request.path.as_str())?
+                .into_iter()
+                .filter(|t| !t.contains('-'))
+                .collect::<Vec<String>>();
+
+            let next_stable_tag = if stable_tags.is_empty() {
+                format!("{}.0", next_tag_request.base_tag)
             } else {
-                found_suffix_tag = true;
-            }
+                increment_tag(stable_tags.last().unwrap())?
+            };
 
-            let last_tag = tags.last().unwrap();
+            // 2. Find pre-release tags for the *next* stable version.
+            let pre_release_pattern = format!("{}-{}-*", next_stable_tag, suffix);
+            let pre_release_tags =
+                query_git_tags(&pre_release_pattern, next_tag_request.path.as_str())?;
 
-            if found_suffix_tag {
-                // If the suffix is found, only increment the suffix
-                // We split the tag at the last hyphen to separate the base from the number.
-                let (base, number_str) = last_tag.rsplit_once('-').unwrap();
+            if pre_release_tags.is_empty() {
+                // No pre-releases for the next version, start with -0.
+                Ok(format!("{}-{}-0", next_stable_tag, suffix))
+            } else {
+                // Increment the existing pre-release number.
+                let last_pre_release_tag = pre_release_tags.last().unwrap();
+                let (base, number_str) = last_pre_release_tag.rsplit_once('-').unwrap();
                 let number = number_str.parse::<i32>().unwrap();
                 Ok(format!("{}-{}", base, number + 1))
-            } else {
-                // increment the patch version, and add the suffix with 0
-                let incremented_tag_result = increment_tag(last_tag);
-                if incremented_tag_result.is_err() {
-                    return Err(incremented_tag_result.err().unwrap());
-                }
-                let incremented_tag = incremented_tag_result?;
-                Ok(format!("{}-{}-0", incremented_tag, suffix))
             }
         }
         VersionType::PreReleaseCommit => {

src/tests/integration_test.rs

@@ -111,7 +111,7 @@ fn verify_prerelease_rc_suffix_scenarios() -> Result<(), Box<dyn std::error::Err
     // Scenario 1: New base tag, should get .0-rc-0
     let mut cmd = Command::cargo_bin("git-next-tag")?;
     cmd.arg("--baseTag")
-        .arg("v0.3") // v0.1.0, and various v0.2.*-rc-* exist, but no v0.3.*-rc-* exists
+        .arg("v0.100") // v0.1.0, and various v0.2.*-rc-* exist, but no v0.3.*-rc-* exists
         .arg("--path")
         .arg(&project_root_dir)
         .arg("--preRelease")
@@ -121,7 +121,7 @@ fn verify_prerelease_rc_suffix_scenarios() -> Result<(), Box<dyn std::error::Err
 
     cmd.assert()
         .success()
-        .stdout(predicate::str::contains("v0.3.0-rc-0"));
+        .stdout(predicate::str::contains("v0.100.0-rc-0"));
 
     // Scenario 2: Existing base tag without rc, should get .z+1-rc-0
     let mut cmd = Command::cargo_bin("git-next-tag")?;
@@ -136,12 +136,12 @@ fn verify_prerelease_rc_suffix_scenarios() -> Result<(), Box<dyn std::error::Err
 
     cmd.assert()
         .success()
-        .stdout(predicate::str::contains("v0.1.1-rc-0"));
+        .stdout(predicate::str::contains("v0.1.1-rc-1"));
 
     // Scenario 3: Existing tag with rc, should increment rc number
     let mut cmd = Command::cargo_bin("git-next-tag")?;
     cmd.arg("--baseTag")
-        .arg("v0.2") // v0.2.0-rc-0, v0.2.0-rc-1, v0.2.1-rc-0 exist
+        .arg("v0.2") // v0.2.3, v0.2.3 v0.2.0-rc-0, v0.2.0-rc-1, v0.2.1-rc-0 exist
         .arg("--path")
         .arg(&project_root_dir)
         .arg("--preRelease")
@@ -151,7 +151,7 @@ fn verify_prerelease_rc_suffix_scenarios() -> Result<(), Box<dyn std::error::Err
 
     cmd.assert()
         .success()
-        .stdout(predicate::str::contains("v0.2.1-rc-1")); // Should increment only the rc number
+        .stdout(predicate::str::contains("v0.2.5-rc-0")); // Should increment only the rc number
 
     Ok(())
 }