Merge branch 'tagname-take2' into 'main'

make git tag name be configurable via a template

Closes #1

See merge request larswirzenius/bumper!19

1 files changed, 18 insertions, 3 deletions

diff --git a/src/bin/bumper.rs b/src/bin/bumper.rs
index 59443e5..9fbf898 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;
@@ -20,14 +21,25 @@ fn bumper() -> Result<(), BumperError> {
 
     let cwd = abspath(".")?;
     println!("Setting version for project in {}", cwd.display());
-    for mut kind in ProjectKind::detect(&cwd)? {
+
+    let mut kinds = ProjectKind::detect(&cwd)?;
+    if kinds.is_empty() {
+        return Err(BumperError::UnknownProjectKind(cwd));
+    }
+    let name = kinds[0].name()?;
+
+    for kind in kinds.iter_mut() {
         let version = kind.set_version(&opt.version)?;
         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(&name, &opt.version);
+    println!("release tag: {}", tag);
+    git::tag(".", &tag, &msg)?;
     debug!("Bumper ends OK");
     Ok(())
 }
@@ -41,6 +53,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,
 }