qwjyh/xdbm
1
1
Fork 0
mirror of https://github.com/qwjyh/xdbm synced 2025-04-20 03:35:55 +09:00
Code Issues Projects Releases 1 Packages Wiki Activity

Merge c1ba761ddb into 90cebed15f

Browse source
This commit is contained in:
qwjyh 2025-02-04 15:32:12 +09:00 • committed by GitHub
commit dfb6694248
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 21 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/main.rs
View file

@ -156,7 +156,7 @@ fn add_and_commit(repo: &Repository, path: &Path, message: &str) -> Result<Oid,
index.write()?; index.write()?;
let oid = index.write_tree()?; let oid = index.write_tree()?;
let tree = repo.find_tree(oid)?; let tree = repo.find_tree(oid)?;
let config = git2::Config::open_default()?; let config = repo.config()?;
let signature = git2::Signature::now( let signature = git2::Signature::now(
config.get_entry("user.name")?.value().unwrap(), config.get_entry("user.name")?.value().unwrap(),
config.get_entry("user.email")?.value().unwrap(), config.get_entry("user.email")?.value().unwrap(),

35
tests/cli.rs
View file

@ -1,12 +1,11 @@
mod integrated_test { mod integrated_test {
use std::{ use std::{
fs::{DirBuilder, File}, fs::{self, DirBuilder, File},
io::{self, BufWriter, Write}, io::{self, BufWriter, Write},
}; };
use anyhow::{Context, Ok, Result}; use anyhow::{Ok, Result};
use assert_cmd::{assert::OutputAssertExt, Command}; use assert_cmd::{assert::OutputAssertExt, Command};
use dirs::home_dir;
use git2::Repository; use git2::Repository;
use log::trace; use log::trace;
use predicates::{boolean::PredicateBooleanExt, prelude::predicate}; use predicates::{boolean::PredicateBooleanExt, prelude::predicate};
@ -16,12 +15,12 @@ mod integrated_test {
/// # Errors /// # Errors
/// ///
/// This function will return an error if it failed to get home directory. /// This function will return an error if it failed to get home directory.
fn setup_gitconfig() -> Result<()> { fn setup_gitconfig(path: &std::path::Path) -> Result<()> {
let f = match File::create_new( let git_dir = path.join(".git");
home_dir() if !git_dir.exists() {
.context("Failed to find home directory")? fs::DirBuilder::new().create(git_dir.clone())?
.join(".gitconfig"), }
) { let f = match File::create_new(git_dir.join("config")) {
io::Result::Ok(f) => f, io::Result::Ok(f) => f,
io::Result::Err(_err) => return Ok(()), io::Result::Err(_err) => return Ok(()),
}; };
@ -35,20 +34,25 @@ mod integrated_test {
.as_bytes(), .as_bytes(),
)?; )?;
eprintln!("{:?}", fs::read_dir(path)?.collect::<Vec<_>>());
eprintln!("{:?}", fs::read_dir(git_dir)?.collect::<Vec<_>>());
Ok(()) Ok(())
} }
#[test] #[test]
fn single_device() -> Result<()> { fn single_device() -> Result<()> {
let config_dir = assert_fs::TempDir::new()?; let config_dir = assert_fs::TempDir::new()?;
setup_gitconfig()?; setup_gitconfig(&config_dir)?;
// init // init
let mut cmd = Command::cargo_bin("xdbm")?; let mut cmd = Command::cargo_bin("xdbm")?;
cmd.arg("-c") cmd.arg("-c")
.arg(config_dir.path()) .arg(config_dir.path())
.arg("init") .arg("init")
.arg("testdev"); .arg("testdev")
.arg("-vvvv");
cmd.assert().success().stdout(predicate::str::contains("")); cmd.assert().success().stdout(predicate::str::contains(""));
eprintln!("{:?}", fs::read_dir(config_dir.path())?.collect::<Vec<_>>());
assert_eq!( assert_eq!(
std::fs::read_to_string(config_dir.path().join("devname"))?, std::fs::read_to_string(config_dir.path().join("devname"))?,
"testdev\n" "testdev\n"
@ -135,7 +139,7 @@ mod integrated_test {
fn two_devices_with_same_name() -> Result<()> { fn two_devices_with_same_name() -> Result<()> {
// 1st device // 1st device
let config_dir_1 = assert_fs::TempDir::new()?; let config_dir_1 = assert_fs::TempDir::new()?;
setup_gitconfig()?; setup_gitconfig(&config_dir_1)?;
let mut cmd1 = Command::cargo_bin("xdbm")?; let mut cmd1 = Command::cargo_bin("xdbm")?;
cmd1.arg("-c") cmd1.arg("-c")
.arg(config_dir_1.path()) .arg(config_dir_1.path())
@ -168,7 +172,7 @@ mod integrated_test {
// 2nd device // 2nd device
let config_dir_2 = assert_fs::TempDir::new()?; let config_dir_2 = assert_fs::TempDir::new()?;
setup_gitconfig()?; setup_gitconfig(&config_dir_2)?;
let mut cmd2 = Command::cargo_bin("xdbm")?; let mut cmd2 = Command::cargo_bin("xdbm")?;
cmd2.arg("-c") cmd2.arg("-c")
.arg(config_dir_2.path()) .arg(config_dir_2.path())
@ -184,7 +188,7 @@ mod integrated_test {
fn directory_without_parent() -> Result<()> { fn directory_without_parent() -> Result<()> {
// 1st device // 1st device
let config_dir_1 = assert_fs::TempDir::new()?; let config_dir_1 = assert_fs::TempDir::new()?;
setup_gitconfig()?; setup_gitconfig(&config_dir_1)?;
let mut cmd1 = Command::cargo_bin("xdbm")?; let mut cmd1 = Command::cargo_bin("xdbm")?;
cmd1.arg("-c") cmd1.arg("-c")
.arg(config_dir_1.path()) .arg(config_dir_1.path())
@ -219,7 +223,7 @@ mod integrated_test {
// //
// devices: first // devices: first
let config_dir_1 = assert_fs::TempDir::new()?; let config_dir_1 = assert_fs::TempDir::new()?;
setup_gitconfig()?; setup_gitconfig(&config_dir_1)?;
let mut cmd1 = Command::cargo_bin("xdbm")?; let mut cmd1 = Command::cargo_bin("xdbm")?;
cmd1.arg("-c") cmd1.arg("-c")
.arg(config_dir_1.path()) .arg(config_dir_1.path())
@ -253,6 +257,7 @@ mod integrated_test {
// //
// devices: first, second // devices: first, second
let config_dir_2 = assert_fs::TempDir::new()?; let config_dir_2 = assert_fs::TempDir::new()?;
setup_gitconfig(&config_dir_2)?;
let mut cmd2 = Command::cargo_bin("xdbm")?; let mut cmd2 = Command::cargo_bin("xdbm")?;
cmd2.arg("-c") cmd2.arg("-c")
.arg(config_dir_2.path()) .arg(config_dir_2.path())