fix(deps): update all dependencies

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,11 +6,45 @@ 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
 

Cargo.toml

@@ -3,7 +3,7 @@ members = ["crates/*"]
 resolver = "2"
 
 [workspace.package]
-version = "0.3.4"
+version = "0.3.5"
 
 [workspace.dependencies]
 

README.md

@@ -1,5 +1,7 @@
 # Git Now
 
+> https://gitnow.kjuulh.io/
+
 Git Now is a utility for easily navigating git projects from common upstream providers. Search, Download, and Enter projects as quickly as you can type.
 
 ![example gif](./assets/gifs/example.gif)

crates/gitnow/Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "gitnow"
 description = "Git Now is a utility for easily navigating git projects from common upstream providers. Search, Download, and Enter projects as quickly as you can type."
-edition = "2021"
+edition = "2024"
 readme = "../../README.md"
 repository = "https://github.com/kjuulh/gitnow"
 homepage = "https://gitnow-client.prod.kjuulh.app"
@@ -22,20 +22,21 @@ dotenvy.workspace = true
 serde = { version = "1.0.197", features = ["derive"] }
 uuid = { version = "1.7.0", features = ["v4"] }
 async-trait = "0.1.82"
-toml = "0.8.19"
+toml = "0.9.0"
 
 gitea-client = { version = "1.22.1" }
 url = "2.5.2"
-octocrab = "0.42.0"
+octocrab = "0.49.0"
-dirs = "5.0.1"
+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.29.0", features = ["termwiz"] }
+ratatui = { version = "0.30.0", features = ["termwiz"] }
-crossterm = { version = "0.28.0", features = ["event-stream"] }
+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/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

@@ -111,18 +111,23 @@ 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
+            self.app
-            .custom_command()
+                .custom_command()
-            .execute_post_update_command(&project_path)
+                .execute_post_update_command(&project_path)
-            .await?;
+                .await?;
+        }
 
         if shell {
             self.app.shell().spawn_shell(&repo).await?;

crates/gitnow/src/components/inline_command.rs

@@ -3,18 +3,16 @@ use std::time::Duration;
 use crossterm::event::{EventStream, KeyCode};
 use futures::{FutureExt, StreamExt};
 use ratatui::{
-    crossterm,
+    TerminalOptions, Viewport, crossterm,
     prelude::*,
     widgets::{Block, Padding},
-    TerminalOptions, Viewport,
 };
 
 use crate::components::BatchCommand;
 
 use super::{
-    create_dispatch,
+    Dispatch, IntoCommand, Msg, Receiver, create_dispatch,
     spinner::{Spinner, SpinnerState},
-    Dispatch, IntoCommand, Msg, Receiver,
 };
 
 pub struct InlineCommand {
@@ -120,7 +118,7 @@ impl InlineCommand {
                 return Ok(true);
             }
 
-            let mut cmd = self.update_state(&msg);
+            let mut cmd = self.update_state(msg);
 
             loop {
                 let msg = cmd.into_command().execute(dispatch);
@@ -128,7 +126,7 @@ impl InlineCommand {
                 match msg {
                     Some(Msg::Quit) => return Ok(true),
                     Some(msg) => {
-                        cmd = self.update_state(&msg);
+                        cmd = self.update_state(msg);
                     }
                     None => break,
                 }
@@ -163,7 +161,7 @@ impl InlineCommand {
         None
     }
 
-    fn update_state(&mut self, msg: &Msg) -> impl IntoCommand {
+    fn update_state(&mut self, msg: Msg) -> impl IntoCommand {
         tracing::debug!("handling message: {:?}", msg);
 
         let mut batch = BatchCommand::default();
@@ -178,7 +176,7 @@ impl InlineCommand {
             }
         }
 
-        batch.with(self.spinner.update(msg));
+        batch.with(self.spinner.update(&msg));
 
         batch.into_command()
     }

crates/gitnow/src/config.rs

@@ -20,6 +20,7 @@ pub struct Settings {
     #[serde(default)]
     pub cache: Cache,
 
+    pub post_clone_command: Option<PostCloneCommand>,
     pub post_update_command: Option<PostUpdateCommand>,
 }
 
@@ -39,6 +40,22 @@ impl PostUpdateCommand {
     }
 }
 
+#[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,
@@ -131,7 +148,7 @@ impl CacheDuration {
                 hours,
                 minutes,
             } => Some(
-                std::time::Duration::from_days(*days)
+                std::time::Duration::from_hours(*days * 24)
                     + std::time::Duration::from_hours(*hours)
                     + std::time::Duration::from_mins(*minutes),
             ),
@@ -381,6 +398,7 @@ mod test {
                         directory: PathBuf::from("git").into()
                     },
                     post_update_command: None,
+                    post_clone_command: None
                 }
             },
             config
@@ -407,6 +425,7 @@ mod test {
                     cache: Cache::default(),
                     projects: Projects::default(),
                     post_update_command: None,
+                    post_clone_command: None
                 }
             },
             config

crates/gitnow/src/custom_command.rs

@@ -11,6 +11,36 @@ impl CustomCommand {
         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() {

crates/gitnow/src/main.rs

@@ -1,10 +1,8 @@
-#![feature(duration_constructors)]
-
 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;
@@ -52,6 +50,7 @@ struct Command {
 enum Commands {
     Init(Shell),
     Update(Update),
+    Clone(CloneCommand),
 }
 
 const DEFAULT_CONFIG_PATH: &str = ".config/gitnow/gitnow.toml";
@@ -89,6 +88,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)

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

mise.toml

@@ -0,0 +1,6 @@
+[tools]
+rust = "1.93"
+cargo = "latest"
+
+[tasks.install]
+run = "cargo install --path ./crates/gitnow"