chore(release): 0.3.5

chore(release): 0.3.4

Co-authored-by: cuddle-please <bot@cuddle.sh>
Reviewed-on: https://git.front.kjuulh.io/kjuulh/gitnow/pulls/57

CHANGELOG.md

@@ -6,6 +6,33 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [0.3.5] - 2025-01-10
+
+### Other
+- *(deps)* update rust crate clap to v4.5.26
+- *(deps)* update rust crate tokio to v1.43.0
+- update example
+
+## [0.3.4] - 2025-01-08
+
+### Added
+- feat/add-post-clone-command
+
+- add ability to specify custom command
+
+### Fixed
+- use correct post clone command
+- tests for config
+
+### Other
+- add ability to specify multiple commands
+
+
+## [0.3.3] - 2025-01-07
+
+### Other
+- replace dotenv with dotenvy, a slightly more maintained version of the same library (#50)
+
 ## [0.3.2] - 2025-01-07
 
 ### Fixed

Cargo.lock

@@ -274,9 +274,9 @@ dependencies = [
 
 [[package]]
 name = "clap"
-version = "4.5.24"
+version = "4.5.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9560b07a799281c7e0958b9296854d6fafd4c5f31444a7e5bb1ad6dde5ccf1bd"
+checksum = "a8eb5e908ef3a6efbe1ed62520fb7287959888c88485abe072543190ecc66783"
 dependencies = [
  "clap_builder",
  "clap_derive",
@@ -284,9 +284,9 @@ dependencies = [
 
 [[package]]
 name = "clap_builder"
-version = "4.5.24"
+version = "4.5.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "874e0dd3eb68bf99058751ac9712f622e61e6f393a94f7128fa26e3f02f5c7cd"
+checksum = "96b01801b5fc6a0a232407abc821660c9c6d25a1cafc0d4f85f29fb8d9afc121"
 dependencies = [
  "anstream",
  "anstyle",
@@ -532,10 +532,10 @@ dependencies = [
 ]
 
 [[package]]
-name = "dotenv"
+name = "dotenvy"
-version = "0.15.0"
+version = "0.15.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "77c90badedccf4105eca100756a0b1289e191f6fcbdadd3cee1d2f614f97da8f"
+checksum = "1aaf95b3e5c8f23aa320147307562d361db0ae0d51242340f558153b4eb2439b"
 
 [[package]]
 name = "either"
@@ -565,7 +565,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "33d852cb9b869c2a9b3df2f71a3074817f01e1844f839a144f5fcef059a4eb5d"
 dependencies = [
  "libc",
- "windows-sys 0.59.0",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
@@ -786,7 +786,7 @@ dependencies = [
 
 [[package]]
 name = "gitnow"
-version = "0.3.2"
+version = "0.3.4"
 dependencies = [
  "anyhow",
  "async-trait",
@@ -794,7 +794,7 @@ dependencies = [
  "clap",
  "crossterm",
  "dirs 5.0.1",
- "dotenv",
+ "dotenvy",
  "futures",
  "gitea-client",
  "nucleo-matcher",
@@ -2051,15 +2051,15 @@ checksum = "719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f"
 
 [[package]]
 name = "rustix"
-version = "0.38.42"
+version = "0.38.43"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f93dc38ecbab2eb790ff964bb77fa94faf256fd3e73285fd7ba0903b76bedb85"
+checksum = "a78891ee6bf2340288408954ac787aa063d8e8817e9f53abb37c695c6d834ef6"
 dependencies = [
  "bitflags 2.6.0",
  "errno",
  "libc",
  "linux-raw-sys",
- "windows-sys 0.59.0",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
@@ -2537,7 +2537,7 @@ dependencies = [
  "getrandom",
  "once_cell",
  "rustix",
- "windows-sys 0.59.0",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
@@ -2699,9 +2699,9 @@ dependencies = [
 
 [[package]]
 name = "tokio"
-version = "1.42.0"
+version = "1.43.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5cec9b21b0450273377fc97bd4c33a8acffc8c996c987a7c5b319a0083707551"
+checksum = "3d61fa4ffa3de412bfea335c6ecff681de2b609ba3c77ef3e00e521813a9ed9e"
 dependencies = [
  "backtrace",
  "bytes",
@@ -2717,9 +2717,9 @@ dependencies = [
 
 [[package]]
 name = "tokio-macros"
-version = "2.4.0"
+version = "2.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "693d596312e88961bc67d7f1f97af8a70227d9f90c31bba5806eec004978d752"
+checksum = "6e06d43f1345a3bcd39f6a56dbb7dcab2ba47e68e8ac134855e7e2bdbaf8cab8"
 dependencies = [
  "proc-macro2",
  "quote",

Cargo.toml

@@ -3,7 +3,7 @@ members = ["crates/*"]
 resolver = "2"
 
 [workspace.package]
-version = "0.3.3"
+version = "0.3.5"
 
 [workspace.dependencies]
 
@@ -12,4 +12,4 @@ tokio = { version = "1", features = ["full"] }
 tracing = { version = "0.1", features = ["log"] }
 tracing-subscriber = { version = "0.3.18", features = ["env-filter"] }
 clap = { version = "4", features = ["derive", "env"] }
-dotenv = { version = "0.15" }
+dotenvy = { version = "0.15.7" }

crates/gitnow/Cargo.toml

@@ -17,7 +17,7 @@ tokio.workspace = true
 tracing.workspace = true
 tracing-subscriber.workspace = true
 clap.workspace = true
-dotenv.workspace = true
+dotenvy.workspace = true
 
 serde = { version = "1.0.197", features = ["derive"] }
 uuid = { version = "1.7.0", features = ["v4"] }

crates/gitnow/src/commands/root.rs

@@ -4,6 +4,7 @@ use crate::{
     app::App,
     cache::CacheApp,
     components::inline_command::InlineCommand,
+    custom_command::CustomCommandApp,
     fuzzy_matcher::{FuzzyMatcher, FuzzyMatcherApp},
     git_clone::GitCloneApp,
     git_provider::Repository,
@@ -110,12 +111,22 @@ impl RootCommand {
                 } else {
                     eprintln!("cloning repository...");
                     git_clone.clone_repo(&repo, force_refresh).await?;
+
+                    self.app
+                        .custom_command()
+                        .execute_post_clone_command(&project_path)
+                        .await?;
                 }
             } else {
                 tracing::info!("skipping clone for repo: {}", &repo.to_rel_path().display());
             }
         } else {
             tracing::info!("repository already exists");
+
+            self.app
+                .custom_command()
+                .execute_post_update_command(&project_path)
+                .await?;
         }
 
         if shell {

crates/gitnow/src/components/spinner.rs

@@ -23,7 +23,7 @@ impl<'a> Spinner<'a> {
     }
 }
 
-impl<'a> StatefulWidget for Spinner<'a> {
+impl StatefulWidget for Spinner<'_> {
     type State = SpinnerState;
 
     fn render(

crates/gitnow/src/config.rs

@@ -3,7 +3,7 @@ use std::path::{Path, PathBuf};
 use anyhow::Context;
 use serde::{Deserialize, Serialize};
 
-#[derive(Debug, Serialize, Deserialize, PartialEq)]
+#[derive(Debug, Serialize, Deserialize, PartialEq, Clone)]
 pub struct Config {
     #[serde(default)]
     pub settings: Settings,
@@ -12,16 +12,51 @@ pub struct Config {
     pub providers: Providers,
 }
 
-#[derive(Debug, Default, Serialize, Deserialize, PartialEq)]
+#[derive(Debug, Default, Serialize, Deserialize, PartialEq, Clone)]
 pub struct Settings {
     #[serde(default)]
     pub projects: Projects,
 
     #[serde(default)]
     pub cache: Cache,
+
+    pub post_clone_command: Option<PostCloneCommand>,
+    pub post_update_command: Option<PostUpdateCommand>,
 }
 
-#[derive(Debug, Default, Serialize, Deserialize, PartialEq)]
+#[derive(Debug, Serialize, Deserialize, PartialEq, Clone)]
+#[serde(untagged)]
+pub enum PostUpdateCommand {
+    Single(String),
+    Multiple(Vec<String>),
+}
+
+impl PostUpdateCommand {
+    pub fn get_commands(&self) -> Vec<String> {
+        match self.clone() {
+            PostUpdateCommand::Single(item) => vec![item],
+            PostUpdateCommand::Multiple(items) => items,
+        }
+    }
+}
+
+#[derive(Debug, Serialize, Deserialize, PartialEq, Clone)]
+#[serde(untagged)]
+pub enum PostCloneCommand {
+    Single(String),
+    Multiple(Vec<String>),
+}
+
+impl PostCloneCommand {
+    pub fn get_commands(&self) -> Vec<String> {
+        match self.clone() {
+            PostCloneCommand::Single(item) => vec![item],
+            PostCloneCommand::Multiple(items) => items,
+        }
+    }
+}
+
+#[derive(Debug, Default, Serialize, Deserialize, PartialEq, Clone)]
 pub struct Projects {
     pub directory: ProjectLocation,
 }
@@ -57,7 +92,7 @@ impl std::ops::Deref for ProjectLocation {
     }
 }
 
-#[derive(Debug, Default, Serialize, Deserialize, PartialEq)]
+#[derive(Debug, Default, Serialize, Deserialize, PartialEq, Clone)]
 pub struct Cache {
     #[serde(default)]
     pub location: CacheLocation,
@@ -89,7 +124,7 @@ impl Default for CacheLocation {
     }
 }
 
-#[derive(Debug, Serialize, Deserialize, PartialEq)]
+#[derive(Debug, Serialize, Deserialize, PartialEq, Clone)]
 #[serde(untagged)]
 pub enum CacheDuration {
     Enabled(bool),
@@ -131,7 +166,7 @@ impl Default for CacheDuration {
     }
 }
 
-#[derive(Debug, Default, Serialize, Deserialize, PartialEq)]
+#[derive(Debug, Default, Serialize, Deserialize, PartialEq, Clone)]
 pub struct Providers {
     #[serde(default)]
     pub github: Vec<GitHub>,
@@ -139,7 +174,7 @@ pub struct Providers {
     pub gitea: Vec<Gitea>,
 }
 
-#[derive(Debug, Serialize, Deserialize, PartialEq)]
+#[derive(Debug, Serialize, Deserialize, PartialEq, Clone)]
 pub struct GitHub {
     #[serde(default)]
     pub url: Option<String>,
@@ -155,7 +190,7 @@ pub struct GitHub {
     pub organisations: Vec<GitHubOrganisation>,
 }
 
-#[derive(Debug, Serialize, Deserialize, PartialEq)]
+#[derive(Debug, Serialize, Deserialize, PartialEq, Clone)]
 pub struct GitHubUser(String);
 
 impl From<GitHubUser> for String {
@@ -170,7 +205,7 @@ impl<'a> From<&'a GitHubUser> for &'a str {
     }
 }
 
-#[derive(Debug, Serialize, Deserialize, PartialEq)]
+#[derive(Debug, Serialize, Deserialize, PartialEq, Clone)]
 pub struct GitHubOrganisation(String);
 
 impl From<GitHubOrganisation> for String {
@@ -185,7 +220,7 @@ impl<'a> From<&'a GitHubOrganisation> for &'a str {
     }
 }
 
-#[derive(Debug, Serialize, Deserialize, PartialEq)]
+#[derive(Debug, Serialize, Deserialize, PartialEq, Clone)]
 pub struct Gitea {
     pub url: String,
 
@@ -201,21 +236,21 @@ pub struct Gitea {
     pub organisations: Vec<GiteaOrganisation>,
 }
 
-#[derive(Debug, Serialize, Deserialize, PartialEq)]
+#[derive(Debug, Serialize, Deserialize, PartialEq, Clone)]
 #[serde(untagged)]
 pub enum GiteaAccessToken {
     Direct(String),
     Env { env: String },
 }
 
-#[derive(Debug, Serialize, Deserialize, PartialEq)]
+#[derive(Debug, Serialize, Deserialize, PartialEq, Clone)]
 #[serde(untagged)]
 pub enum GitHubAccessToken {
     Direct(String),
     Env { env: String },
 }
 
-#[derive(Debug, Serialize, Deserialize, PartialEq)]
+#[derive(Debug, Serialize, Deserialize, PartialEq, Clone)]
 pub struct GiteaUser(String);
 
 impl From<GiteaUser> for String {
@@ -230,7 +265,7 @@ impl<'a> From<&'a GiteaUser> for &'a str {
     }
 }
 
-#[derive(Debug, Serialize, Deserialize, PartialEq)]
+#[derive(Debug, Serialize, Deserialize, PartialEq, Clone)]
 pub struct GiteaOrganisation(String);
 impl From<GiteaOrganisation> for String {
     fn from(value: GiteaOrganisation) -> Self {
@@ -361,7 +396,9 @@ mod test {
                     },
                     projects: Projects {
                         directory: PathBuf::from("git").into()
-                    }
+                    },
+                    post_update_command: None,
+                    post_clone_command: None
                 }
             },
             config
@@ -386,7 +423,9 @@ mod test {
                 },
                 settings: Settings {
                     cache: Cache::default(),
-                    projects: Projects::default()
+                    projects: Projects::default(),
+                    post_update_command: None,
+                    post_clone_command: None
                 }
             },
             config

crates/gitnow/src/custom_command.rs

@@ -0,0 +1,83 @@
+use std::path::Path;
+
+use crate::{app::App, config::Config};
+
+pub struct CustomCommand {
+    config: Config,
+}
+
+impl CustomCommand {
+    pub fn new(config: Config) -> Self {
+        Self { config }
+    }
+
+    pub async fn execute_post_clone_command(&self, path: &Path) -> anyhow::Result<()> {
+        if let Some(post_clone_command) = &self.config.settings.post_clone_command {
+            for command in post_clone_command.get_commands() {
+                let command_parts = command.split(' ').collect::<Vec<_>>();
+                let Some((first, rest)) = command_parts.split_first() else {
+                    return Ok(());
+                };
+
+                let mut cmd = tokio::process::Command::new(first);
+                cmd.args(rest).current_dir(path);
+
+                eprintln!("running command: {}", command);
+
+                tracing::info!(
+                    path = path.display().to_string(),
+                    cmd = command,
+                    "running custom post clone command"
+                );
+                let output = cmd.output().await?;
+                let stdout = std::str::from_utf8(&output.stdout)?;
+                tracing::info!(
+                    stdout = stdout,
+                    "finished running custom post clone command"
+                );
+            }
+        }
+
+        Ok(())
+    }
+
+    pub async fn execute_post_update_command(&self, path: &Path) -> anyhow::Result<()> {
+        if let Some(post_update_command) = &self.config.settings.post_update_command {
+            for command in post_update_command.get_commands() {
+                let command_parts = command.split(' ').collect::<Vec<_>>();
+                let Some((first, rest)) = command_parts.split_first() else {
+                    return Ok(());
+                };
+
+                let mut cmd = tokio::process::Command::new(first);
+                cmd.args(rest).current_dir(path);
+
+                eprintln!("running command: {}", command);
+
+                tracing::info!(
+                    path = path.display().to_string(),
+                    cmd = command,
+                    "running custom post update command"
+                );
+                let output = cmd.output().await?;
+                let stdout = std::str::from_utf8(&output.stdout)?;
+                tracing::info!(
+                    stdout = stdout,
+                    "finished running custom post update command"
+                );
+            }
+        }
+
+        Ok(())
+    }
+}
+
+pub trait CustomCommandApp {
+    fn custom_command(&self) -> CustomCommand;
+}
+
+impl CustomCommandApp for App {
+    fn custom_command(&self) -> CustomCommand {
+        CustomCommand::new(self.config.clone())
+    }
+}

crates/gitnow/src/main.rs

@@ -15,6 +15,7 @@ mod cache_codec;
 mod commands;
 mod components;
 mod config;
+mod custom_command;
 mod fuzzy_matcher;
 mod git_clone;
 mod git_provider;
@@ -57,7 +58,7 @@ const DEFAULT_CONFIG_PATH: &str = ".config/gitnow/gitnow.toml";
 
 #[tokio::main]
 async fn main() -> anyhow::Result<()> {
-    dotenv::dotenv().ok();
+    dotenvy::dotenv().ok();
     tracing_subscriber::fmt()
         .with_env_filter(
             EnvFilter::builder()

examples/config/gitnow.toml

@@ -1,7 +1,31 @@
+[settings]
+# Runs after a project is fetched for the first time, either a single string, or multiple in an array
+post_clone_command = "jj git init --colocate"
+# Runs after a project is jumped to if it already exists.
+post_update_command = ["git pull", "jj git fetch"]
+
 [[providers.github]]
+# Who is the user running the clone command
+current_user = "kjuulh"
+# How to authenticate to github
+access_token = { env = "GITHUB_ACCESS_TOKEN" }
+
+# Which users to index
 users = ["kjuulh"]
+# Which organisations to index
 organisations = ["lunarway"]
 
 [[providers.gitea]]
+# WHich gitea instance to authenticate against
+url = "https://git.front.kjuulh.io/api/v1"
+
+# How to authenticate to gitea
+current_user = "kjuulh"
+
+# WHich token to use to authenticate
+access_token = { env = "GITEA_ACCESS_TOKEN" }
+
+# Which users to index
 users = ["kjuulh"]
+# Which organisations to index
 organisation = ["noorgplease"]