Merge branch 'main' into update-linter-ci

Author: MalteHerrmann

CHANGELOG.md

@@ -10,6 +10,10 @@ This changelog was created using the `clu` binary
 
 - (ci) [#60](https://github.com/MalteHerrmann/changelog-utils/pull/60) Bump changelog linter to v0.2.0.
 
+### Bug Fixes
+
+- (lint) [#61](https://github.com/MalteHerrmann/changelog-utils/pull/61) Fix version comparison.
+
 ## [v1.2.0](https://github.com/MalteHerrmann/changelog-utils/releases/tag/v1.2.0) - 2024-08-03
 
 ### Features

README.md

@@ -30,13 +30,14 @@ The available subcommands can be listed when running `clu help`:
 Usage: clu <COMMAND>
 
 Commands:
-  add      Adds a new entry to the unreleased section of the changelog
-  fix      Applies all possible auto-fixes to the changelog
-  lint     Checks if the changelog contents adhere to the defined rules
-  init     Initializes the changelog configuration in the current directory
-  config   Adjust the changelog configuration like allowed categories, change types or other
-  release  Turns the Unreleased section into a new release with the given version
-  help     Print this message or the help of the given subcommand(s)
+  add        Adds a new entry to the unreleased section of the changelog
+  create-pr  Creates a PR in the configured target repository and adds the corresponding changelog entry
+  fix        Applies all possible auto-fixes to the changelog
+  lint       Checks if the changelog contents adhere to the defined rules
+  init       Initializes the changelog configuration in the current directory
+  config     Adjust the changelog configuration like allowed categories, change types or other
+  release    Turns the Unreleased section into a new release with the given version
+  help       Print this message or the help of the given subcommand(s)
 
 Options:
   -h, --help  Print help

src/version.rs

@@ -16,19 +16,32 @@ impl Version {
             return true;
         }
 
-        if self.minor > other.major {
+        if self.major < other.major {
+            return false;
+        }
+
+        if self.minor > other.minor {
             return true;
         }
 
-        if self.patch > other.major {
+        if self.minor < other.minor {
+            return false;
+        }
+
+        if self.patch > other.patch {
             return true;
         }
 
+        if self.patch < other.patch {
+            return false;
+        }
+
         match self.rc_version {
             Some(v) => match other.rc_version {
                 Some(v_other) => v > v_other,
                 None => false,
             },
+            // NOTE: if self is not an rc, but other is -> self is greater
             None => other.rc_version.is_some(),
         }
     }
@@ -69,6 +82,28 @@ pub fn parse(version: &str) -> Result<Version, VersionError> {
 mod version_tests {
     use super::*;
 
+    #[test]
+    fn test_greater() {
+        let a = parse("v1.1.1-rc1").expect("failed to parse version");
+
+        assert!(a.gt(&parse("v0.2.0").unwrap()));
+        assert!(a.gt(&parse("v0.0.2").unwrap()));
+        assert!(a.gt(&parse("v0.0.2-rc2").unwrap()));
+        assert!(a.gt(&parse("v1.0.1-rc1").unwrap()));
+        assert!(a.gt(&parse("v1.0.2-rc2").unwrap()));
+        assert!(a.gt(&parse("v1.0.1-rc2").unwrap()));
+        assert!(a.gt(&parse("v1.1.0-rc1").unwrap()));
+        assert!(a.gt(&parse("v1.1.1-rc0").unwrap()));
+
+        assert!(!a.gt(&parse("v1.1.1").unwrap()));
+        assert!(!a.gt(&parse("v1.1.1-rc2").unwrap()));
+        assert!(!a.gt(&parse("v1.1.2-rc1").unwrap()));
+        assert!(!a.gt(&parse("v1.2.0").unwrap()));
+        assert!(!a.gt(&parse("v1.2.0-rc1").unwrap()));
+        assert!(!a.gt(&parse("v2.0.0").unwrap()));
+        assert!(!a.gt(&parse("v2.0.0-rc1").unwrap()));
+    }
+
     #[test]
     fn test_is_valid_version_pass() {
         let version = parse("v10.0.2").expect("failed to parse version");