Make config subcommand local-aware

Author: zurawiki

Justfile

@@ -22,7 +22,7 @@ install:
     cargo install --path .
 
 e2e: install
-    sh -eux -c 'for i in ./e2e/test_*.sh ; do sh -x $i ; done'
+    sh -eux -c 'for i in ./e2e/test_*.sh ; do sh -x "$i" ; done'
 
 test *args: e2e
     cargo test

e2e/test_config_local_list_get_set.sh

@@ -0,0 +1,19 @@
+#!/bin/sh
+set -eu
+
+gptcommit config list
+# assert is valid TOML
+
+gptcommit config get openai.model
+# assert default = text-davinci-003
+gptcommit config set --local openai.model foo
+gptcommit config set openai.model bar
+gptcommit config get openai.model
+# assert is foo
+
+gptcommit config delete openai.model
+gptcommit config get openai.model
+# assert still is foo
+gptcommit config delete --local openai.model
+gptcommit config get openai.model
+# assert is default

src/actions/config.rs

@@ -1,9 +1,9 @@
-use std::{collections::VecDeque, fs};
+use std::{collections::VecDeque, fs, path::PathBuf};
 
 use clap::{Args, Subcommand};
 use toml::Value;
 
-use crate::settings::{get_user_config_path, Settings};
+use crate::settings::{get_local_config_path, get_user_config_path, Settings};
 use anyhow::{bail, Result};
 
 #[derive(Subcommand, Debug)]
@@ -17,9 +17,20 @@ pub(crate) enum ConfigAction {
     /// Read config value
     Get { key: String },
     /// Set config value
-    Set { key: String, value: String },
+    Set {
+        key: String,
+        value: String,
+        /// if set, modifies the local config. Default behavior modifies global config
+        #[clap(long)]
+        local: bool,
+    },
     /// Clear config value
-    Delete { key: String },
+    Delete {
+        key: String,
+        /// if set, modifies the local config. Default behavior modifies global config
+        #[clap(long)]
+        local: bool,
+    },
 }
 
 #[derive(Args, Debug)]
@@ -34,28 +45,36 @@ pub(crate) async fn main(settings: Settings, args: ConfigArgs) -> Result<()> {
     match args.action {
         ConfigAction::List { save } => list(settings, save).await,
         ConfigAction::Get { key } => get(settings, key).await,
-        ConfigAction::Set { key, value } => set(settings, key, value).await,
-        ConfigAction::Delete { key } => delete(settings, key).await,
+        ConfigAction::Set { key, value, local } => set(settings, key, value, local).await,
+        ConfigAction::Delete { key, local } => delete(settings, key, local).await,
     }
 }
 
-async fn delete(_settings: Settings, full_key: String) -> Result<()> {
+async fn delete(_settings: Settings, full_key: String, local: bool) -> Result<()> {
     let settings = &Settings::from_clear(&full_key)?;
     let toml_string = toml::to_string_pretty(settings).unwrap();
-    let user_config_path = get_user_config_path().expect("Could not find user config path");
-    fs::write(&user_config_path, toml_string)?;
+    let config_path: PathBuf = if local {
+        get_local_config_path().expect("Could not find repo-local config path")
+    } else {
+        get_user_config_path().expect("Could not find user config path")
+    };
+    fs::write(&config_path, toml_string)?;
     println!("Cleared {full_key}");
-    println!("Config saved to {}", user_config_path.display());
+    println!("Config saved to {}", config_path.display());
     Ok(())
 }
 
-async fn set(_settings: Settings, full_key: String, value: String) -> Result<()> {
+async fn set(_settings: Settings, full_key: String, value: String, local: bool) -> Result<()> {
     let settings = &Settings::from_set_override(&full_key, &value)?;
     let toml_string = toml::to_string_pretty(settings).unwrap();
-    let user_config_path = get_user_config_path().expect("Could not find user config path");
-    fs::write(&user_config_path, toml_string)?;
+    let config_path: PathBuf = if local {
+        get_local_config_path().expect("Could not find repo-local config path")
+    } else {
+        get_user_config_path().expect("Could not find user config path")
+    };
+    fs::write(&config_path, toml_string)?;
     println!("{full_key} = {value}");
-    println!("Config saved to {}", user_config_path.display());
+    println!("Config saved to {}", config_path.display());
     Ok(())
 }
 

src/settings.rs

@@ -192,6 +192,21 @@ impl Settings {
     }
 }
 
+pub fn get_local_config_path() -> Option<PathBuf> {
+    if let Ok(config_dir) = get_hooks_path() {
+        if !config_dir.is_dir() {
+            fs::create_dir_all(&config_dir).ok()?;
+        }
+        let config_path = config_dir.join("../gptcommit.toml");
+        if !config_path.exists() {
+            fs::write(&config_path, "").ok()?;
+        }
+        return Some(config_path);
+    }
+
+    None
+}
+
 pub fn get_user_config_path() -> Option<PathBuf> {
     if let Some(home_dir) = dirs::home_dir() {
         let config_dir = home_dir.join(".config").join(APP_NAME);