From 3f68ce4a8e9b295a4b9fc288174f166e229da8b0 Mon Sep 17 00:00:00 2001
From: Lars Wirzenius <liw@liw.fi>
Date: Thu, 22 Apr 2021 08:09:21 +0300
Subject: feat: allow setting git tag name template

---
 src/bin/bumper.rs | 12 ++++++++++--
 src/git.rs        |  4 +---
 2 files changed, 11 insertions(+), 5 deletions(-)

(limited to 'src')

diff --git a/src/bin/bumper.rs b/src/bin/bumper.rs
index 59443e5..fb5194a 100644
--- a/src/bin/bumper.rs
+++ b/src/bin/bumper.rs
@@ -1,6 +1,7 @@
 use bumper::errors::BumperError;
 use bumper::git;
 use bumper::project::ProjectKind;
+use bumper::tag::Tag;
 use log::{debug, error};
 use std::path::{Path, PathBuf};
 use std::process::exit;
@@ -25,9 +26,13 @@ fn bumper() -> Result<(), BumperError> {
         println!("{} project set to {}", kind.desc(), version);
     }
 
-    let msg = format!("Set version to {}", opt.version);
+    let msg = format!("Release version {}", opt.version);
     git::commit(".", &msg)?;
-    git::tag(".", &opt.version)?;
+
+    let tag = Tag::new(&opt.tag)?;
+    let tag = tag.apply("", &opt.version);
+    println!("release tag: {}", tag);
+    git::tag(".", &tag, &msg)?;
     debug!("Bumper ends OK");
     Ok(())
 }
@@ -41,6 +46,9 @@ fn abspath<P: AsRef<Path>>(path: P) -> Result<PathBuf, BumperError> {
 
 #[derive(Debug, StructOpt)]
 struct Opt {
+    #[structopt(long, default_value = "v%v")]
+    tag: String,
+
     #[structopt(help = "version number of new release")]
     version: String,
 }
diff --git a/src/git.rs b/src/git.rs
index ea640d6..061ed61 100644
--- a/src/git.rs
+++ b/src/git.rs
@@ -3,9 +3,7 @@ use log::debug;
 use std::path::Path;
 use std::process::Command;
 
-pub fn tag<P: AsRef<Path>>(dirname: P, version: &str) -> Result<(), BumperError> {
-    let msg = format!("release version {}", version);
-    let tag_name = format!("v{}", version);
+pub fn tag<P: AsRef<Path>>(dirname: P, tag_name: &str, msg: &str) -> Result<(), BumperError> {
     git(dirname.as_ref(), &["tag", "-am", &msg, &tag_name])?;
     Ok(())
 }
-- 
cgit v1.2.1