Merge branch 'main' into feat/hook-shell

CHANGELOG.md

@@ -2,6 +2,19 @@
 All notable changes to this project will be documented in this file. See [conventional commits](https://www.conventionalcommits.org/) for commit guidelines.
 
 - - -
+## [5.6.0](https://github.com/cocogitto/cocogitto/compare/5.5.0..5.6.0) - 2023-09-27
+#### Bug Fixes
+- **(bump)** option to disable untracked changes error - ([da459de](https://github.com/cocogitto/cocogitto/commit/da459decff9a84bb5bde471f5d64f577df28df11)) - [@Wassim-AB](https://github.com/Wassim-AB)
+#### Documentation
+- fix discord invite link - ([5d11d5a](https://github.com/cocogitto/cocogitto/commit/5d11d5aec58b4d88b2606c3f8b2ca4e7688590c2)) - [@oknozor](https://github.com/oknozor)
+#### Features
+- **(bump)** added skip untracked as cli argument - ([fb6a7e6](https://github.com/cocogitto/cocogitto/commit/fb6a7e667cdcddc185e02894b03b3b623610ca77)) - [@Wassim-AB](https://github.com/Wassim-AB)
+#### Miscellaneous Chores
+- edited contributors list - ([eca20b8](https://github.com/cocogitto/cocogitto/commit/eca20b8a4cd602225e5a386a06e1f22c39e4fddd)) - [@Wassim-AB](https://github.com/Wassim-AB)
+- bump yanked crates - ([89149ad](https://github.com/cocogitto/cocogitto/commit/89149adfb9e45fc3b236fb2bf44d92843be30047)) - [@tranzystorek-io](https://github.com/tranzystorek-io)
+
+- - -
+
 ## [5.5.0](https://github.com/cocogitto/cocogitto/compare/5.4.0..5.5.0) - 2023-08-17
 #### Documentation
 - **(README)** fix links to cocogitto docs - ([d62a83c](https://github.com/cocogitto/cocogitto/commit/d62a83c5613dc51a5b8201a0d2747493f148a758)) - [@lukehsiao](https://github.com/lukehsiao)

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "cocogitto"
-version = "5.5.0"
+version = "5.6.0"
 authors = ["Paul Delafosse <paul.delafosse@protonmail.com>"]
 edition = "2021"
 readme = "README.md"

cog.toml

@@ -87,5 +87,6 @@ authors = [
     { signature = "Racci", username = "DaRacci" },
     { signature = "Conrad Hoffmann", username = "bitfehler" },
     { signature = "andre161292", username = "andre161292" },
-    { signature = "Sanchith Hegde", username = "SanchithHegde" }
+    { signature = "Sanchith Hegde", username = "SanchithHegde" },
+    { signature = "Wassim Ahmed-Belkacem", username = "Wassim-AB" },
 ]

src/bin/cog/main.rs

@@ -285,6 +285,10 @@ enum Command {
         /// Specify a "Skip CI" string to append to the end of the commit
         #[arg(long = "skip-ci")]
         skip_ci: Option<String>,
+
+        /// Don't fail if there are untracked or uncommited files
+        #[arg(long = "skip-untracked")]
+        skip_untracked: bool,
     },
 
     /// Install cog config files
@@ -363,6 +367,7 @@ fn main() -> Result<()> {
             annotated,
             dry_run,
             skip_ci,
+            skip_untracked,
         } => {
             let mut cocogitto = CocoGitto::get()?;
             let is_monorepo = !SETTINGS.packages.is_empty();
@@ -398,6 +403,7 @@ fn main() -> Result<()> {
                             annotated,
                             dry_run,
                             skip_ci,
+                            skip_untracked,
                         )?
                     }
                     None => cocogitto.create_monorepo_version(
@@ -407,6 +413,7 @@ fn main() -> Result<()> {
                         annotated,
                         dry_run,
                         skip_ci,
+                        skip_untracked,
                     )?,
                 }
             } else {
@@ -417,6 +424,7 @@ fn main() -> Result<()> {
                     annotated,
                     dry_run,
                     skip_ci,
+                    skip_untracked,
                 )?
             }
         }

src/command/bump/mod.rs

@@ -130,7 +130,7 @@ impl CocoGitto {
         }
     }
 
-    fn pre_bump_checks(&mut self) -> Result<()> {
+    fn pre_bump_checks(&mut self, skip_untracked: bool) -> Result<()> {
         if *SETTINGS == Settings::default() {
             let part1 = "Warning: using".yellow();
             let part2 = "with the default configuration. \n".yellow();
@@ -143,8 +143,11 @@ impl CocoGitto {
         }
         let statuses = self.repository.get_statuses()?;
 
-        // Fail if repo contains un-staged or un-committed changes
-        ensure!(statuses.0.is_empty(), "{}", self.repository.get_statuses()?);
+        if skip_untracked || SETTINGS.skip_untracked {
+            eprintln!("{}", self.repository.get_statuses()?);
+        } else {
+            ensure!(statuses.0.is_empty(), "{}", self.repository.get_statuses()?);
+        }
 
         if !SETTINGS.branch_whitelist.is_empty() {
             if let Some(branch) = self.repository.get_branch_shorthand() {

src/command/bump/monorepo.rs

@@ -38,6 +38,7 @@ struct PackageData {
 }
 
 impl CocoGitto {
+    #[allow(clippy::too_many_arguments)]
     pub fn create_monorepo_version(
         &mut self,
         increment: IncrementCommand,
@@ -46,6 +47,7 @@ impl CocoGitto {
         annotated: Option<String>,
         dry_run: bool,
         skip_ci: Option<String>,
+        skip_untracked: bool,
     ) -> Result<()> {
         match increment {
             IncrementCommand::Auto => {
@@ -56,6 +58,7 @@ impl CocoGitto {
                         annotated,
                         dry_run,
                         skip_ci,
+                        skip_untracked,
                     )
                 } else {
                     if annotated.is_some() {
@@ -66,6 +69,7 @@ impl CocoGitto {
                         hooks_config,
                         dry_run,
                         skip_ci,
+                        skip_untracked,
                     )
                 }
             }
@@ -76,6 +80,7 @@ impl CocoGitto {
                 annotated,
                 dry_run,
                 skip_ci,
+                skip_untracked,
             ),
         }
     }
@@ -86,8 +91,9 @@ impl CocoGitto {
         hooks_config: Option<&str>,
         dry_run: bool,
         skip_ci: Option<String>,
+        skip_untracked: bool,
     ) -> Result<()> {
-        self.pre_bump_checks()?;
+        self.pre_bump_checks(skip_untracked)?;
         // Get package bumps
         let bumps = self.get_packages_bumps(pre_release)?;
 
@@ -151,8 +157,9 @@ impl CocoGitto {
         annotated: Option<String>,
         dry_run: bool,
         skip_ci: Option<String>,
+        skip_untracked: bool,
     ) -> Result<()> {
-        self.pre_bump_checks()?;
+        self.pre_bump_checks(skip_untracked)?;
         // Get package bumps
         let bumps = self.get_packages_bumps(pre_release)?;
 
@@ -298,6 +305,7 @@ impl CocoGitto {
         Ok(())
     }
 
+    #[allow(clippy::too_many_arguments)]
     fn create_monorepo_version_manual(
         &mut self,
         increment: IncrementCommand,
@@ -306,8 +314,9 @@ impl CocoGitto {
         annotated: Option<String>,
         dry_run: bool,
         skip_ci: Option<String>,
+        skip_untracked: bool,
     ) -> Result<()> {
-        self.pre_bump_checks()?;
+        self.pre_bump_checks(skip_untracked)?;
         // Get package bumps
         let bumps = self.get_current_packages()?;
 

src/command/bump/package.rs

@@ -25,8 +25,9 @@ impl CocoGitto {
         annotated: Option<String>,
         dry_run: bool,
         skip_ci: Option<String>,
+        skip_untracked: bool,
     ) -> Result<()> {
-        self.pre_bump_checks()?;
+        self.pre_bump_checks(skip_untracked)?;
 
         let current_tag = self.repository.get_latest_package_tag(package_name);
         let current_tag = tag_or_fallback_to_zero(current_tag)?;

src/command/bump/standard.rs

@@ -14,6 +14,7 @@ use semver::Prerelease;
 use tera::Tera;
 
 impl CocoGitto {
+    #[allow(clippy::too_many_arguments)]
     pub fn create_version(
         &mut self,
         increment: IncrementCommand,
@@ -22,8 +23,9 @@ impl CocoGitto {
         annotated: Option<String>,
         dry_run: bool,
         skip_ci: Option<String>,
+        skip_untracked: bool,
     ) -> Result<()> {
-        self.pre_bump_checks()?;
+        self.pre_bump_checks(skip_untracked)?;
 
         let current_tag = self.repository.get_latest_tag();
         let current_tag = tag_or_fallback_to_zero(current_tag)?;

src/settings/mod.rs

@@ -38,6 +38,7 @@ pub struct Settings {
     pub tag_prefix: Option<String>,
     pub skip_ci: Option<String>,
     pub shell: Option<HookShell>,
+    pub skip_untracked: bool,
     pub pre_bump_hooks: Vec<String>,
     pub post_bump_hooks: Vec<String>,
     pub pre_package_bump_hooks: Vec<String>,
@@ -60,6 +61,7 @@ impl Default for Settings {
             tag_prefix: None,
             skip_ci: None,
             shell: None,
+            skip_untracked: false,
             pre_bump_hooks: vec![],
             post_bump_hooks: vec![],
             pre_package_bump_hooks: vec![],

tests/cog_tests/bump.rs

@@ -4,6 +4,7 @@ use crate::helpers::*;
 
 use anyhow::Result;
 use assert_cmd::prelude::*;
+use cmd_lib::run_cmd;
 use cocogitto::settings::Settings;
 use indoc::indoc;
 use sealed_test::prelude::*;
@@ -333,3 +334,49 @@ fn package_dry_run() -> Result<()> {
     assert_tag_does_not_exist("1.1.0")?;
     Ok(())
 }
+
+#[sealed_test]
+fn uncommited_changes_should_throw_error_by_default() -> Result<()> {
+    init_monorepo(&mut Settings::default())?;
+
+    run_cmd!(
+        echo two > two;
+    )?;
+
+    Command::cargo_bin("cog")?
+        .arg("bump")
+        .arg("--auto")
+        .arg("--dry-run")
+        .assert()
+        .failure();
+
+    Ok(())
+}
+
+#[sealed_test]
+fn uncommited_changes_should_not_throw_error_with_option() -> Result<()> {
+    let mut settings = Settings {
+        skip_untracked: true,
+        ..Default::default()
+    };
+
+    init_monorepo(&mut settings)?;
+
+    run_cmd!(
+        echo two > two;
+        echo "other changes" > one/file;
+    )?;
+
+    Command::cargo_bin("cog")?
+        .arg("bump")
+        .arg("--auto")
+        .arg("--dry-run")
+        .assert()
+        .success()
+        .stderr(indoc!("Untracked files :\n\tmodified: one/file\n\tnew: two\n\nnothing added to commit but untracked files present (use \"git add\" to track)\n\n"))
+        .stdout(indoc!("one-0.1.0\n0.1.0\n"));
+
+    assert_that!(Path::new("CHANGELOG.md")).does_not_exist();
+    assert_tag_does_not_exist("1.1.0")?;
+    Ok(())
+}