fix(deps): update all dependencies

chore(release): 0.3.4

Co-authored-by: cuddle-please <bot@cuddle.sh>
Reviewed-on: #57

CHANGELOG.md

@@ -6,6 +6,102 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [0.3.5] - 2025-03-04
+
+### Added
+- allow clone all
+
+### Fixed
+- *(deps)* update rust crate serde to v1.0.218
+- *(deps)* update tokio-prost monorepo to v0.13.5
+- *(deps)* update rust crate termwiz to 0.23.0
+- *(deps)* update all dependencies
+- *(deps)* update rust crate uuid to v1.13.0
+- *(deps)* update all dependencies
+- *(deps)* update rust crate async-trait to v0.1.86
+- *(deps)* update rust crate uuid to v1.12.1
+- *(deps)* update rust crate octocrab to 0.43.0
+- *(deps)* update rust crate uuid to v1.12.0
+- *(deps)* update rust crate dirs to v6
+- *(deps)* update rust crate uuid to v1.11.1
+
+### Other
+- *(deps)* update all dependencies
+- *(deps)* update all dependencies
+- *(deps)* update rust crate clap to v4.5.29
+- *(deps)* update rust crate clap to v4.5.27
+- *(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
+- *(deps)* update rust crate async-trait to v0.1.85
+
+## [0.3.1] - 2025-01-02
+
+### Other
+- enable publish
+
+## [0.3.0] - 2025-01-01
+
+### Added
+- add small help to see how much time is left in cache
+
+### Fixed
+- *(deps)* update rust crate serde to v1.0.217
+- *(deps)* update rust crate serde to v1.0.216
+- *(deps)* update tokio-prost monorepo to v0.13.4
+- *(deps)* update rust crate bytes to v1.9.0
+- *(deps)* update all dependencies
+- *(deps)* update rust crate octocrab to 0.42.0
+- *(deps)* update rust crate serde to v1.0.215
+- *(deps)* update rust crate url to v2.5.3
+- *(deps)* update rust crate serde to v1.0.214
+- *(deps)* update rust crate serde to v1.0.213
+- *(deps)* update all dependencies
+- *(deps)* update all dependencies
+- *(deps)* update rust crate octocrab to v0.41.1
+- *(deps)* update rust crate futures to v0.3.31
+- *(deps)* update rust crate octocrab to 0.41.0
+
+### Other
+- bump default cache duration to 7 days
+- *(deps)* update rust crate anyhow to v1.0.95
+- *(deps)* update rust crate clap to v4.5.23
+- *(deps)* update all dependencies
+- *(deps)* update rust crate tracing-subscriber to v0.3.19
+- *(deps)* update rust crate tracing to v0.1.41
+- *(deps)* update rust crate clap to v4.5.21
+- *(deps)* update rust crate tokio to v1.41.1
+- *(deps)* update rust crate anyhow to v1.0.93
+- *(deps)* update rust crate anyhow to v1.0.92
+- *(deps)* update all dependencies to v1.0.91
+- *(deps)* update rust crate anyhow to v1.0.90
+- *(deps)* update rust crate clap to v4.5.20
+- *(deps)* update rust crate clap to v4.5.19
+
 ## [0.2.3] - 2024-09-26
 
 ### Added

Cargo.toml

@@ -3,7 +3,7 @@ members = ["crates/*"]
 resolver = "2"
 
 [workspace.package]
-version = "0.2.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"] }
@@ -26,16 +26,17 @@ toml = "0.8.19"
 
 gitea-client = { version = "1.22.1" }
 url = "2.5.2"
-octocrab = "0.40.0"
-dirs = "5.0.1"
+octocrab = "0.44.0"
+dirs = "6.0.0"
 prost = "0.13.2"
 prost-types = "0.13.2"
 bytes = "1.7.1"
 nucleo-matcher = "0.3.1"
-ratatui = { version = "0.28.1", features = ["termwiz"] }
-crossterm = { version = "0.28.0", features = ["event-stream"] }
+ratatui = { version = "0.29.0", features = ["termwiz"] }
+crossterm = { version = "0.29.0", features = ["event-stream"] }
 futures = "0.3.30"
-termwiz = "0.22.0"
+termwiz = "0.23.0"
+regex = "1.11.1"
 
 [dev-dependencies]
 pretty_assertions = "1.4.0"

crates/gitnow/src/cache.rs

@@ -79,6 +79,11 @@ impl Cache {
                     tracing::debug!("cache has expired");
                     return Ok(None);
                 }
+
+                tracing::debug!(
+                    "cache is valid for: {} mins",
+                    cache_duration.saturating_sub(file_modified_last).as_secs() / 60
+                );
             }
         }
 

crates/gitnow/src/commands.rs

@@ -1,3 +1,83 @@
 pub mod root;
 pub mod shell;
 pub mod update;
+pub mod clone {
+
+    use std::sync::Arc;
+
+    use futures::future::join_all;
+    use regex::Regex;
+
+    use crate::{
+        app::App, cache::CacheApp, custom_command::CustomCommandApp, git_clone::GitCloneApp,
+    };
+
+    #[derive(clap::Parser)]
+    pub struct CloneCommand {
+        #[arg(long = "search")]
+        search: String,
+    }
+
+    impl CloneCommand {
+        pub async fn execute(&mut self, app: &'static App) -> anyhow::Result<()> {
+            let repos = app.cache().get().await?.ok_or(anyhow::anyhow!(
+                "failed to get cache, do a gitnow update first"
+            ))?;
+
+            let search = Regex::new(&self.search)?;
+
+            let filtered_repos = repos
+                .iter()
+                .filter(|r| search.is_match(&r.to_rel_path().display().to_string()))
+                .collect::<Vec<_>>();
+
+            let concurrency_limit = Arc::new(tokio::sync::Semaphore::new(5));
+            let mut handles = Vec::default();
+            for repo in filtered_repos {
+                let config = app.config.clone();
+                let custom_command = app.custom_command();
+                let git_clone = app.git_clone();
+                let repo = repo.clone();
+                let concurrency = Arc::clone(&concurrency_limit);
+
+                let handle = tokio::spawn(async move {
+                    let permit = concurrency.acquire().await?;
+
+                    let project_path = config.settings.projects.directory.join(repo.to_rel_path());
+                    if !project_path.exists() {
+                        eprintln!("cloning repository: {}", repo.to_rel_path().display());
+                        git_clone.clone_repo(&repo, false).await?;
+
+                        custom_command
+                            .execute_post_clone_command(&project_path)
+                            .await?;
+                    }
+
+                    drop(permit);
+
+                    Ok::<(), anyhow::Error>(())
+                });
+
+                handles.push(handle);
+            }
+
+            let res = join_all(handles).await;
+
+            for res in res {
+                match res {
+                    Ok(Ok(())) => {}
+                    Ok(Err(e)) => {
+                        tracing::error!("failed to clone repo: {}", e);
+                        anyhow::bail!(e)
+                    }
+                    Err(e) => {
+                        tracing::error!("failed to clone repo: {}", e);
+                        anyhow::bail!(e)
+                    }
+                }
+            }
+
+            Ok(())
+        }
+    }
+}

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),
@@ -124,14 +159,14 @@ impl CacheDuration {
 impl Default for CacheDuration {
     fn default() -> Self {
         Self::Precise {
-            days: 1,
+            days: 7,
             hours: 0,
             minutes: 0,
         }
     }
 }
 
-#[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/interactive.rs

@@ -36,6 +36,7 @@ impl InteractiveApp for &'static crate::app::App {
 }
 
 mod app {
+    use crossterm::event::KeyModifiers;
     use ratatui::{
         crossterm::event::{self, Event, KeyCode},
         layout::{Constraint, Layout},
@@ -92,6 +93,12 @@ mod app {
                 terminal.draw(|frame| self.draw(frame))?;
 
                 if let Event::Key(key) = event::read()? {
+                    if let KeyCode::Char('c') = key.code {
+                        if key.modifiers.contains(KeyModifiers::CONTROL) {
+                            return Ok(None);
+                        }
+                    }
+
                     match key.code {
                         KeyCode::Char(letter) => {
                             self.current_search.push(letter);

crates/gitnow/src/main.rs

@@ -4,7 +4,7 @@ use std::path::PathBuf;
 
 use anyhow::Context;
 use clap::{Parser, Subcommand};
-use commands::{root::RootCommand, shell::Shell, update::Update};
+use commands::{clone::CloneCommand, root::RootCommand, shell::Shell, update::Update};
 use config::Config;
 use tracing::level_filters::LevelFilter;
 use tracing_subscriber::EnvFilter;
@@ -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;
@@ -51,13 +52,14 @@ struct Command {
 enum Commands {
     Init(Shell),
     Update(Update),
+    Clone(CloneCommand),
 }
 
 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()
@@ -88,6 +90,9 @@ async fn main() -> anyhow::Result<()> {
             Commands::Update(mut update) => {
                 update.execute(app).await?;
             }
+            Commands::Clone(mut clone) => {
+                clone.execute(app).await?;
+            }
         },
         None => {
             RootCommand::new(app)

cuddle.yaml

@@ -6,6 +6,9 @@ vars:
   service: "gitnow"
   registry: kasperhermansen
 
+  rust:
+    publish: {}
+
 please:
   project:
     owner: kjuulh

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"]