cocogitto · oknozor · Jan 19, 2023 · Oct 28, 2022 · Oct 31, 2022 · Oct 31, 2022
diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml
@@ -46,7 +46,7 @@ jobs:
           args: --all-features --workspace --lcov --output-path lcov.info
 
       - name: Upload coverage to Codecov
-        uses: codecov/codecov-action@v2
+        uses: codecov/codecov-action@v3
         with:
           files: lcov.info
           fail_ci_if_error: true

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/README.md b/README.md
@@ -46,14 +46,15 @@
 
 **The Conventional Commits toolbox**
 
-- **Verified commits️:** create conventional compliant commits with ease.
+- **Verified commits:** create conventional compliant commits with ease.
    - **Automatic Version bump and changelog:** automatically bump versions and generate changelogs with your own custom steps
   and workflows.
 - **Release profiles:** your branching model requires different steps for releases, pre-release, hotfixes ? We got you
   covered !
 - **Depends only on libgit2:** cocogitto has one standalone binary, the only system dependency is libgit2.
 - **Conventional git log:** search your commit history matching Conventional Commits items such as scope and commit type.
 - **GitHub integration:** enforce the conventional commits specification with our GitHub action and bot.
+- **Monorepo support:** Automatic versioning for mono-repositories is supported out of the box.
 
 <p align="center">
 <a href="https://docs.cocogitto.io/"><strong>Explore Cocogitto's docs&nbsp;&nbsp;▶</strong></a>

diff --git a/docs/assets/cocogitto-bot-example.png b/docs/assets/cocogitto-bot-example.png
diff --git a/docs/assets/cog-bot-example.png b/docs/assets/cog-bot-example.png
diff --git a/docs/assets/cog-bump-example.png b/docs/assets/cog-bump-example.png
diff --git a/src/bin/cog/commit.rs b/src/bin/cog/commit.rs
@@ -23,7 +23,7 @@ pub fn edit_message(
 ) -> Result<(Option<String>, Option<String>, bool)> {
     let template = prepare_edit_template(typ, message, scope, breaking);
 
-    let edited = edit::edit(&template)?;
+    let edited = edit::edit(template)?;
 
     if edited.lines().all(|line| {
         let trimmed = line.trim_start();

diff --git a/src/bin/cog/main.rs b/src/bin/cog/main.rs
@@ -4,7 +4,7 @@ use std::path::PathBuf;
 
 use cocogitto::conventional::changelog::template::{RemoteContext, Template};
 use cocogitto::conventional::commit as conv_commit;
-use cocogitto::conventional::version::VersionIncrement;
+use cocogitto::conventional::version::IncrementCommand;
 use cocogitto::git::hook::HookKind;
 use cocogitto::git::revspec::RevspecPattern;
 use cocogitto::log::filter::{CommitFilter, CommitFilters};
@@ -26,6 +26,12 @@ fn hook_profiles() -> PossibleValuesParser {
     profiles.into()
 }
 
+fn packages() -> PossibleValuesParser {
+    let profiles = SETTINGS.packages.keys().map(|profile| -> &str { profile });
+
+    profiles.into()
+}
+
 /// Shell with auto-generated completion script available.
 #[derive(Clone, Copy, Debug, Eq, Hash, PartialEq)]
 #[non_exhaustive]
@@ -230,6 +236,10 @@ enum Command {
         #[arg(short = 'H', long, value_parser = hook_profiles())]
         hook_profile: Option<String>,
 
+        /// Specify which package to bump for monorepo
+        #[arg(long, value_parser = packages())]
+        package: Option<String>,
+
         /// Dry-run: print the target version. No action taken
         #[arg(short, long)]
         dry_run: bool,
@@ -300,20 +310,50 @@ fn main() -> Result<()> {
             patch,
             pre,
             hook_profile,
+            package,
             dry_run,
         } => {
             let mut cocogitto = CocoGitto::get()?;
 
             let increment = match version {
-                Some(version) => VersionIncrement::Manual(version),
-                None if auto => VersionIncrement::Auto,
-                None if major => VersionIncrement::Major,
-                None if minor => VersionIncrement::Minor,
-                None if patch => VersionIncrement::Patch,
+                Some(version) => IncrementCommand::Manual(version),
+                None if auto => IncrementCommand::Auto,
+                None if major => IncrementCommand::Major,
+                None if minor => IncrementCommand::Minor,
+                None if patch => IncrementCommand::Patch,
                 _ => unreachable!(),
             };
 
-            cocogitto.create_version(increment, pre.as_deref(), hook_profile.as_deref(), dry_run)?
+            let is_monorepo = !SETTINGS.packages.is_empty();
+
+            if is_monorepo {
+                match package {
+                    Some(package_name) => {
+                        // Safe unwrap here, package name is validated by clap
+                        let package = SETTINGS.packages.get(&package_name).unwrap();
+                        cocogitto.create_package_version(
+                            (&package_name, package),
+                            increment,
+                            pre.as_deref(),
+                            hook_profile.as_deref(),
+                            dry_run,
+                        )?
+                    }
+                    None => cocogitto.create_monorepo_version(
+                        increment,
+                        pre.as_deref(),
+                        hook_profile.as_deref(),
+                        dry_run,
+                    )?,
+                }
+            } else {
+                cocogitto.create_version(
+                    increment,
+                    pre.as_deref(),
+                    hook_profile.as_deref(),
+                    dry_run,
+                )?
+            }
         }
         Command::Verify {
             message,
@@ -421,7 +461,7 @@ fn main() -> Result<()> {
             println!("{}", result);
         }
         Command::Init { path } => {
-            cocogitto::init(&path)?;
+            cocogitto::command::init::init(&path)?;
         }
         Command::InstallHook { hook_type } => {
             let cocogitto = CocoGitto::get()?;
@@ -466,6 +506,7 @@ fn main() -> Result<()> {
         }
     }
 
+    println!();
     Ok(())
 }