noah.knegt/repo-utils
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity

Create libs for common code

Browse Source
This commit is contained in:
Noah Knegt
2025-05-08 14:09:29 +02:00
parent 5d372f87cb
commit a2f2e303a0
13 changed files with 126 additions and 102 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
Cargo.lock generated
View File

@@ -131,6 +131,16 @@ dependencies = [
"windows-sys",
]
[[package]]
name = "command-with-spinner"
version = "0.1.0"
dependencies = [
"anyhow",
"colored",
"git",
"indicatif",
]
[[package]]
name = "console"
version = "0.15.11"
@@ -151,6 +161,7 @@ dependencies = [
"anyhow",
"clap",
"colored",
"command-with-spinner",
"dirs",
"indicatif",
"thiserror",
@@ -194,6 +205,17 @@ dependencies = [
"wasi",
]
[[package]]
name = "git"
version = "0.1.0"
dependencies = [
"thiserror",
]
[[package]]
name = "git-ssh-bitwarden"
version = "0.1.0"
[[package]]
name = "heck"
version = "0.5.0"
@@ -311,8 +333,8 @@ dependencies = [
"anyhow",
"clap",
"colored",
"command-with-spinner",
"indicatif",
"thiserror",
]
[[package]]

6
Cargo.toml
View File

@@ -1,7 +1,9 @@
[workspace]
resolver = "3"
members = [
"create-worktree",
members = [
"command-with-spinner",
"create-worktree", "git",
"git-ssh-bitwarden",
"setup-repo",
]

13
command-with-spinner/Cargo.toml Normal file
View File

@@ -0,0 +1,13 @@
[package]
name = "command-with-spinner"
version = "0.1.0"
edition.workspace = true
authors.workspace = true
license-file.workspace = true
repository.workspace = true
[dependencies]
anyhow = "1.0.98"
colored = "3.0.0"
git = { version = "0.1.0", path = "../git" }
indicatif = "0.17.11"

41
command-with-spinner/src/lib.rs Normal file
View File

@@ -0,0 +1,41 @@
use std::process::{Command, Stdio};
use anyhow::{Context, Result};
use colored::*;
use indicatif::{ProgressBar, ProgressStyle};
use git::error::GitError;
/// Runs a git command with a progress spinner
pub fn run_command(command: &mut Command, message: &str) -> Result<()> {
let spinner = ProgressBar::new_spinner();
spinner.set_style(
ProgressStyle::default_spinner()
.tick_chars("⣾⣽⣻⢿⡿⣟⣯⣷")
.template("{spinner:.green} {msg}")
.expect("Invalid template format"),
);
spinner.set_message(message.to_string());
// Configure the command to not show output
command.stdout(Stdio::null()).stderr(Stdio::null());
// Execute the command and wait for it to complete
spinner.enable_steady_tick(std::time::Duration::from_millis(100));
let status = command.status().context("Failed to execute command")?;
spinner.finish_and_clear();
if status.success() {
println!("{message} {}", "Done.".green());
Ok(())
} else {
println!("{message} {}", "FAILED.".red());
let code = status.code();
match code {
Some(code) => Err(GitError::Failed(code).into()),
None => Err(GitError::FailedNoCode.into()),
}
}
}

1
create-worktree/Cargo.toml
View File

@@ -15,3 +15,4 @@ colored = "3.0"
indicatif = "0.17"
dirs = "6.0"
thiserror = { version = "2.0" }
command-with-spinner = { version = "0.1.0", path = "../command-with-spinner" }

52
create-worktree/src/main.rs
View File

@@ -1,11 +1,12 @@
use std::env;
use std::path::Path;
use std::process::{Command, Stdio};
use std::process::Command;
use anyhow::{Context, Result};
use clap::{ArgAction, Parser};
use colored::*;
use indicatif::{ProgressBar, ProgressStyle};
use command_with_spinner::run_command;
/// Tool to create git worktrees with convenient branch management
#[derive(Parser, Debug)]
@@ -39,53 +40,6 @@ struct Args {
no_color: bool,
}
/// Git operations error type
#[derive(Debug, thiserror::Error)]
enum GitError {
#[error("Command failed with exit code: {0}")]
Failed(i32),
#[error("Command failed without exit code")]
FailedNoCode,
#[error("Failed to execute command: {0}")]
ExecutionError(#[from] std::io::Error),
}
/// Runs a git command with a progress spinner
fn run_command(command: &mut Command, message: &str) -> Result<()> {
let spinner = ProgressBar::new_spinner();
spinner.set_style(
ProgressStyle::default_spinner()
.tick_chars("⣾⣽⣻⢿⡿⣟⣯⣷")
.template("{spinner:.green} {msg}")
.expect("Invalid template format"),
);
spinner.set_message(message.to_string());
// Configure the command to not show output
command.stdout(Stdio::null()).stderr(Stdio::null());
// Execute the command and wait for it to complete
spinner.enable_steady_tick(std::time::Duration::from_millis(100));
let status = command.status().context("Failed to execute command")?;
spinner.finish_and_clear();
if status.success() {
println!("{message} {}", "Done.".green());
Ok(())
} else {
println!("{message} {}", "FAILED.".red());
let code = status.code();
match code {
Some(code) => Err(GitError::Failed(code).into()),
None => Err(GitError::FailedNoCode.into()),
}
}
}
/// Git command wrapper
struct Git;

10
git-ssh-bitwarden/Cargo.toml Normal file
View File

@@ -0,0 +1,10 @@
[package]
name = "git-ssh-bitwarden"
version = "0.1.0"
edition.workspace = true
authors.workspace = true
license-file.workspace = true
repository.workspace = true
[dependencies]

3
git-ssh-bitwarden/src/main.rs Normal file
View File

@@ -0,0 +1,3 @@
fn main() {
println!("Hello, world!");
}

11
git/Cargo.toml Normal file
View File

@@ -0,0 +1,11 @@
[package]
name = "git"
version = "0.1.0"
edition.workspace = true
authors.workspace = true
license-file.workspace = true
repository.workspace = true
[dependencies]
thiserror = "2.0"

12
git/src/error.rs Normal file
View File

@@ -0,0 +1,12 @@
/// Git operations error type
#[derive(Debug, thiserror::Error)]
pub enum GitError {
#[error("Command failed with exit code: {0}")]
Failed(i32),
#[error("Command failed without exit code")]
FailedNoCode,
#[error("Failed to execute command: {0}")]
ExecutionError(#[from] std::io::Error),
}

1
git/src/lib.rs Normal file
View File

@@ -0,0 +1 @@
pub mod error;

2
setup-repo/Cargo.toml
View File

@@ -12,5 +12,5 @@ repository.workspace = true
anyhow = "1.0"
clap = { version = "4.5", features = ["derive"] }
colored = "3.0"
command-with-spinner = { version = "0.1.0", path = "../command-with-spinner" }
indicatif = "0.17"
thiserror = "2.0"

52
setup-repo/src/main.rs
View File

@@ -1,10 +1,11 @@
use std::path::Path;
use std::process::{Command, Stdio};
use std::process::Command;
use anyhow::{Context, Result};
use clap::Parser;
use colored::*;
use indicatif::{ProgressBar, ProgressStyle};
use command_with_spinner::run_command;
/// Tool to set up Git repositories for worktree development
#[derive(Parser, Debug)]
@@ -27,53 +28,6 @@ struct Args {
no_color: bool,
}
/// Git operations error type
#[derive(Debug, thiserror::Error)]
enum GitError {
#[error("Command failed with exit code: {0}")]
Failed(i32),
#[error("Command failed without exit code")]
FailedNoCode,
#[error("Failed to execute command: {0}")]
ExecutionError(#[from] std::io::Error),
}
/// Runs a command with a progress spinner
fn run_command(command: &mut Command, message: &str) -> Result<()> {
let spinner = ProgressBar::new_spinner();
spinner.set_style(
ProgressStyle::default_spinner()
.tick_chars("⣾⣽⣻⢿⡿⣟⣯⣷")
.template("{spinner:.green} {msg}")
.expect("Invalid template format"),
);
spinner.set_message(message.to_string());
// Configure the command to not show output
command.stdout(Stdio::null()).stderr(Stdio::null());
// Execute the command and wait for it to complete
spinner.enable_steady_tick(std::time::Duration::from_millis(100));
let status = command.status().context("Failed to execute command")?;
spinner.finish_and_clear();
if status.success() {
println!("{message} {}", "Done.".green());
Ok(())
} else {
println!("{message} {}", "FAILED.".red());
let code = status.code();
match code {
Some(code) => Err(GitError::Failed(code).into()),
None => Err(GitError::FailedNoCode.into()),
}
}
}
/// Git command wrapper
struct Git;