chore: bump semver to v1

cocogitto · Nov 30, 2021 · 3d8db7d · 3d8db7d
1 parent 3922623
commit 3d8db7d
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 83 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -27,7 +27,7 @@ itertools = "^0"
 serde_derive = "^1"
 serde = "^1"
 tempfile = "^3"
-semver = "^0"
+semver = "^1"
 shell-words = "^1"
 which = "^4"
 lazy_static = "^1"

diff --git a/src/conventional/version.rs b/src/conventional/version.rs
@@ -4,7 +4,7 @@ use anyhow::Result;
 use colored::*;
 use conventional_commit_parser::commit::CommitType;
 use git2::Commit as Git2Commit;
-use semver::{Identifier, Version};
+use semver::Version;
 
 pub enum VersionIncrement {
     Major,
@@ -23,17 +23,17 @@ impl VersionIncrement {
             VersionIncrement::Auto => self.get_auto_version(current_version),
             VersionIncrement::Major => {
                 let mut next = current_version.clone();
-                next.increment_major();
+                next.major += 1;
                 Ok(next)
             }
             VersionIncrement::Patch => {
                 let mut next = current_version.clone();
-                next.increment_patch();
+                next.patch += 1;
                 Ok(next)
             }
             VersionIncrement::Minor => {
                 let mut next = current_version.clone();
-                next.increment_minor();
+                next.minor += 1;
                 Ok(next)
             }
         }
@@ -87,11 +87,11 @@ impl VersionIncrement {
 
         let mut next_version = current_version.clone();
         if is_major_bump() {
-            next_version.increment_major();
+            next_version.major += 1;
         } else if is_minor_bump() {
-            next_version.increment_minor();
+            next_version.minor += 1;
         } else if is_patch_bump() {
-            next_version.increment_patch();
+            next_version.patch += 1;
         } else {
             bail!("No commit found to bump current version");
         }
@@ -134,38 +134,14 @@ impl VersionIncrement {
     }
 }
 
-pub fn parse_pre_release(string: &str) -> Result<Vec<Identifier>> {
-    ensure!(
-        string
-            .chars()
-            .all(|c| c.is_ascii_alphanumeric() || ['.', '-'].contains(&c)),
-        "Pre-release string must be a dot-separated list of identifiers comprised of ASCII alphanumerics and hyphens [0-9A-Za-z-]"
-    );
-
-    ensure!(
-        !string.starts_with('.') && !string.contains("..") && !string.ends_with('.'),
-        "Dot-separated identifiers in the pre-release string must not be empty"
-    );
-
-    let idents = string
-        .split('.')
-        .map(|s| match s.parse::<u64>() {
-            Ok(n) => Identifier::Numeric(n),
-            Err(_) => Identifier::AlphaNumeric(s.to_string()),
-        })
-        .collect();
-
-    Ok(idents)
-}
-
 #[cfg(test)]
 mod test {
     use crate::conventional::commit::Commit;
-    use crate::conventional::version::{parse_pre_release, VersionIncrement};
+    use crate::conventional::version::VersionIncrement;
     use anyhow::Result;
     use chrono::Utc;
     use conventional_commit_parser::commit::{CommitType, ConventionalCommit};
-    use semver::{Identifier, Version};
+    use semver::Version;
     use speculoos::prelude::*;
 
     // Auto version tests resides in test/ dir since it rely on git log
@@ -192,17 +168,6 @@ mod test {
         Ok(())
     }
 
-    #[test]
-    fn parse_pre_release_valid() -> Result<()> {
-        let idents = parse_pre_release("alpha.0-dev.1")?;
-        assert_that!(idents).is_equal_to(&vec![
-            Identifier::AlphaNumeric("alpha".into()),
-            Identifier::AlphaNumeric("0-dev".into()),
-            Identifier::Numeric(1),
-        ]);
-        Ok(())
-    }
-
     #[test]
     fn should_get_next_auto_version_patch() {
         let patch = Commit {
@@ -346,21 +311,4 @@ mod test {
             .is_ok()
             .is_equal_to(Version::new(1, 1, 0))
     }
-
-    #[test]
-    fn parse_pre_release_non_ascii() {
-        assert_that!(parse_pre_release("РАСТ")).is_err();
-    }
-
-    #[test]
-    fn parse_pre_release_illegal_ascii() {
-        assert_that!(parse_pre_release("alpha$5")).is_err();
-    }
-
-    #[test]
-    fn parse_pre_release_empty_ident() {
-        assert_that!(parse_pre_release(".alpha.5")).is_err();
-        assert_that!(parse_pre_release("alpha..5")).is_err();
-        assert_that!(parse_pre_release("alpha.5.")).is_err();
-    }
 }
diff --git a/src/hook/parser.rs b/src/hook/parser.rs
@@ -93,7 +93,7 @@ impl HookExpr {
     fn increment_major(version: Version, amt: u32) -> Version {
         let mut version = version;
         for _ in 0..amt {
-            version.increment_major()
+            version.major += 1
         }
 
         version
@@ -102,7 +102,7 @@ impl HookExpr {
     fn increment_patch(version: Version, amt: u32) -> Version {
         let mut version = version;
         for _ in 0..amt {
-            version.increment_patch()
+            version.patch += 1
         }
 
         version
@@ -111,7 +111,7 @@ impl HookExpr {
     fn increment_minor(version: Version, amt: u32) -> Version {
         let mut version = version;
         for _ in 0..amt {
-            version.increment_minor()
+            version.minor += 1
         }
 
         version

diff --git a/src/lib.rs b/src/lib.rs
@@ -23,15 +23,15 @@ use colored::*;
 use conventional::changelog::{Changelog, ChangelogWriter};
 use conventional::commit::Commit;
 use conventional::commit::CommitConfig;
-use conventional::version::{parse_pre_release, VersionIncrement};
+use conventional::version::VersionIncrement;
 use conventional_commit_parser::commit::{CommitType, ConventionalCommit};
 use conventional_commit_parser::parse_footers;
 use git::repository::Repository;
 use git2::{Oid, RebaseOptions};
 use hook::Hook;
 use itertools::Itertools;
 use log::filter::CommitFilters;
-use semver::Version;
+use semver::{Prerelease, Version};
 use settings::AuthorSetting;
 use std::collections::HashMap;
 use std::fmt::Display;
@@ -434,7 +434,7 @@ impl CocoGitto {
         };
 
         if let Some(pre_release) = pre_release {
-            next_version.pre = parse_pre_release(pre_release)?;
+            next_version.pre = Prerelease::new(pre_release)?;
         }
 
         let version_str = next_version.to_string();

diff --git a/tests/lib_tests/log.rs b/tests/lib_tests/log.rs
@@ -4,7 +4,6 @@ use cocogitto::CocoGitto;
 use speculoos::prelude::*;
 
 use crate::helpers::*;
-use itertools::Itertools;
 
 #[test]
 fn get_unfiltered_logs() -> Result<()> {