Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ tokio = { version = "1.50.0", features = ["full"] }
serde = { version = "1.0.228", features = ["derive"] }
serde_json = { version = "1.0", features = ["preserve_order"] }
serde_bytes = "0.11"
clap = { version = "4.6", features = ["derive"] }
clap = { version = "4.6", features = ["derive", "env"] }
anyhow = "1.0"
walkdir = "2.5"
indicatif = "0.18.4"
Expand Down
46 changes: 45 additions & 1 deletion src/bin/query.rs
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ struct Args {
database: Option<String>,

/// Path to the git repository for git-aware queries
#[arg(long, default_value = ".")]
#[arg(long, env = "SEMCODE_GIT_REPO", default_value = ".")]
git_repo: String,

/// Path to local model directory (for semantic search)
Expand Down Expand Up @@ -82,6 +82,50 @@ struct Args {
git_only: bool,
}

#[cfg(test)]
mod tests {
use super::*;
use clap::Parser;
use std::env;

#[test]
fn test_git_repo_env_var() {
let key = "SEMCODE_GIT_REPO";
let value = "/tmp/test_repo";
env::set_var(key, value);

// No arguments provided, should use env var
let args = Args::try_parse_from(&["query"]).unwrap();
assert_eq!(args.git_repo, value);

env::remove_var(key);
}

#[test]
fn test_git_repo_priority() {
let key = "SEMCODE_GIT_REPO";
let env_value = "/tmp/env_repo";
let arg_value = "/tmp/arg_repo";
env::set_var(key, env_value);

// Argument should take priority over env var
let args = Args::try_parse_from(&["query", "--git-repo", arg_value]).unwrap();
assert_eq!(args.git_repo, arg_value);

env::remove_var(key);
}

#[test]
fn test_git_repo_default() {
let key = "SEMCODE_GIT_REPO";
env::remove_var(key);

// No arguments and no env var, should use default
let args = Args::try_parse_from(&["query"]).unwrap();
assert_eq!(args.git_repo, ".");
}
}

/// Check if the current commit needs indexing and perform incremental indexing if needed
async fn index_current_commit_if_needed(
db_manager: Arc<DatabaseManager>,
Expand Down
41 changes: 40 additions & 1 deletion src/bin/semcode-mcp.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1814,7 +1814,7 @@ struct Args {
database: Option<String>,

/// Path to the git repository for git-aware queries
#[arg(long, default_value = ".")]
#[arg(long, env = "SEMCODE_GIT_REPO", default_value = ".")]
git_repo: String,

/// Path to custom model directory (defaults to ~/.cache/semcode/models/)
Expand Down Expand Up @@ -5680,6 +5680,45 @@ async fn main() -> Result<()> {
#[cfg(test)]
mod tests {
use super::*;
use clap::Parser;
use std::env;

#[test]
fn test_git_repo_env_var() {
let key = "SEMCODE_GIT_REPO";
let value = "/tmp/test_repo_mcp";
env::set_var(key, value);

// No arguments provided, should use env var
let args = Args::try_parse_from(&["semcode-mcp"]).unwrap();
assert_eq!(args.git_repo, value);

env::remove_var(key);
}

#[test]
fn test_git_repo_priority() {
let key = "SEMCODE_GIT_REPO";
let env_value = "/tmp/env_repo_mcp";
let arg_value = "/tmp/arg_repo_mcp";
env::set_var(key, env_value);

// Argument should take priority over env var
let args = Args::try_parse_from(&["semcode-mcp", "--git-repo", arg_value]).unwrap();
assert_eq!(args.git_repo, arg_value);

env::remove_var(key);
}

#[test]
fn test_git_repo_default() {
let key = "SEMCODE_GIT_REPO";
env::remove_var(key);

// No arguments and no env var, should use default
let args = Args::try_parse_from(&["semcode-mcp"]).unwrap();
assert_eq!(args.git_repo, ".");
}

#[test]
fn test_indexing_state_new() {
Expand Down