diff --git a/.bumpversion.toml b/.bumpversion.toml index 0971522..3893965 100644 --- a/.bumpversion.toml +++ b/.bumpversion.toml @@ -1,4 +1,4 @@ -current_version = "1.1.1" +current_version = "1.1.0" commit = true tag = true message = "chore: bump {current_version} → {new_version}" diff --git a/Cargo.lock b/Cargo.lock index 63177c3..af2eacd 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -61,7 +61,7 @@ dependencies = [ [[package]] name = "bump2version" -version = "1.1.1" +version = "1.1.0" dependencies = [ "clap", "regex", diff --git a/Cargo.toml b/Cargo.toml index 5a74359..ea867a6 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "bump2version" -version = "1.1.1" +version = "1.1.0" edition = "2021" description = "⬆️ Easily manage version numbers in your projects." license = "MIT" diff --git a/src/cli.rs b/src/cli.rs index f07903f..cf8a99c 100644 --- a/src/cli.rs +++ b/src/cli.rs @@ -24,10 +24,6 @@ pub(crate) struct Cli { #[arg(short = 'n', long = "dry-run", default_value_t = false)] pub(crate) dry_run: bool, - /// Current version - #[arg(long = "current-version", value_name = "VERSION")] - pub(crate) current_version: Option, - /// New version that should be in the files. #[arg(long = "new-version", value_name = "VERSION")] pub(crate) new_version: Option, diff --git a/src/config.rs b/src/config.rs index a2e0e1d..125da3f 100644 --- a/src/config.rs +++ b/src/config.rs @@ -4,7 +4,7 @@ use serde_derive::Deserialize; #[derive(Debug, Clone, Deserialize)] pub(crate) struct Config { - pub(crate) current_version: Option, + pub(crate) current_version: String, pub(crate) message: Option, pub(crate) commit: bool, pub(crate) tag: bool, diff --git a/src/main.rs b/src/main.rs index 45903fd..04d00fd 100644 --- a/src/main.rs +++ b/src/main.rs @@ -38,23 +38,12 @@ fn main() -> Result<(), Box> { } }; - let current_version = args - .current_version + let current_version = config.current_version.clone(); + + let attempted_new_version = args + .new_version .clone() - .or(config.current_version.clone()); - - if current_version.is_none() { - error!("No current version could be determined, either set in config or pass as arg"); - exit(1); - } - - let current_version = current_version.unwrap(); - - let attempted_new_version = args.new_version.clone().or(attempt_version_bump( - args.clone(), - config.clone(), - current_version.clone(), - )); + .or(attempt_version_bump(args.clone(), config.clone())); if attempted_new_version.is_some() { let new_version = attempted_new_version.clone().unwrap(); diff --git a/src/utils.rs b/src/utils.rs index 15d0606..ddd68fb 100644 --- a/src/utils.rs +++ b/src/utils.rs @@ -6,11 +6,7 @@ use std::collections::HashMap; use std::ops::Index; use tracing::{error, trace}; -pub(crate) fn attempt_version_bump( - args: Cli, - config: Config, - current_version: String, -) -> Option { +pub(crate) fn attempt_version_bump(args: Cli, config: Config) -> Option { let parse_regex = config.parse; let regex = match Regex::new(&parse_regex) { Ok(r) => r, @@ -20,6 +16,7 @@ pub(crate) fn attempt_version_bump( } }; + let current_version = config.current_version; let mut parsed: HashMap = HashMap::new(); if let Some(captures) = regex.captures(¤t_version) {