Add command to initialize new git repo (#115)

partially solves #114
jrmoulton · Aug 13, 2024 · a94fe14 · a94fe14
1 parent 33d5e9b
commit a94fe14
Show file tree

Hide file tree

Showing 2 changed files with 60 additions and 7 deletions.
diff --git a/flake.nix b/flake.nix
@@ -51,7 +51,10 @@
             openssl
             pkg-config
           ]
-          ++ lib.optionals stdenv.isDarwin [ libgit2 ];
+          ++ lib.optionals stdenv.isDarwin [
+            libgit2
+            darwin.Security
+           ];
         };
       };
       flake = {

diff --git a/src/cli.rs b/src/cli.rs
@@ -1,4 +1,9 @@
-use std::{collections::HashMap, env::current_dir, fs::canonicalize, path::Path};
+use std::{
+    collections::HashMap,
+    env::current_dir,
+    fs::canonicalize,
+    path::{Path, PathBuf},
+};
 
 use crate::{
     configs::{Config, SearchDirectory, SessionSortOrderConfig},
@@ -46,6 +51,8 @@ pub enum CliCommand {
     Refresh(RefreshCommand),
     /// Clone repository into the first search path and create a new session for it
     CloneRepo(CloneRepoCommand),
+    /// Initialize empty repository at the first search path
+    InitRepo(InitRepoCommand),
     /// Bookmark a directory so it is available to select along with the Git repositories
     Bookmark(BookmarkCommand),
 }
@@ -118,6 +125,12 @@ pub struct CloneRepoCommand {
     repository: String,
 }
 
+#[derive(Debug, Args)]
+pub struct InitRepoCommand {
+    /// Name of the repository to initialize
+    repository: String,
+}
+
 #[derive(Debug, Args)]
 pub struct BookmarkCommand {
     #[arg(long, short)]
@@ -188,6 +201,11 @@ impl Cli {
                 Ok(SubCommandGiven::Yes)
             }
 
+            Some(CliCommand::InitRepo(args)) => {
+                init_repo_command(args, config, tmux)?;
+                Ok(SubCommandGiven::Yes)
+            }
+
             Some(CliCommand::Bookmark(args)) => {
                 bookmark_command(args, config)?;
                 Ok(SubCommandGiven::Yes)
@@ -583,17 +601,21 @@ fn refresh_command(args: &RefreshCommand, tmux: &Tmux) -> Result<()> {
     Ok(())
 }
 
-fn clone_repo_command(args: &CloneRepoCommand, config: Config, tmux: &Tmux) -> Result<()> {
+fn get_first_search_path(config: &Config) -> Result<PathBuf> {
     let search_dirs = config
         .search_dirs
+        .as_ref()
         .ok_or(TmsError::ConfigError)
         .attach_printable("No search path configured")?;
-    let mut path = search_dirs
+    search_dirs
         .first()
         .ok_or(TmsError::ConfigError)
-        .attach_printable("No search path configured")?
-        .path
-        .clone();
+        .attach_printable("No search path configured")
+        .map(|dir| dir.path.clone())
+}
+
+fn clone_repo_command(args: &CloneRepoCommand, config: Config, tmux: &Tmux) -> Result<()> {
+    let mut path = get_first_search_path(&config)?;
 
     let (_, repo_name) = args
         .repository
@@ -651,6 +673,34 @@ fn git_credentials_callback(
     git2::Cred::ssh_key_from_agent(user)
 }
 
+fn init_repo_command(args: &InitRepoCommand, config: Config, tmux: &Tmux) -> Result<()> {
+    let mut path = get_first_search_path(&config)?;
+
+    path.push(&args.repository);
+
+    let repo = Repository::init(&path).change_context(TmsError::GitError)?;
+
+    let mut session_name = args.repository.to_string();
+
+    if tmux.session_exists(&session_name) {
+        session_name = format!(
+            "{}/{}",
+            path.parent()
+                .unwrap()
+                .file_name()
+                .expect("The file name doesn't end in `..`")
+                .to_string()?,
+            session_name
+        );
+    }
+
+    tmux.new_session(Some(&session_name), Some(&path.display().to_string()));
+    tmux.set_up_tmux_env(&repo, &session_name)?;
+    tmux.switch_to_session(&session_name);
+
+    Ok(())
+}
+
 fn bookmark_command(args: &BookmarkCommand, mut config: Config) -> Result<()> {
     let path = if let Some(path) = &args.path {
         path.to_owned()