phundrak/jj-cz
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

chore(build): preparing for CI

Browse Source
This commit is contained in:
Lucien Cartier-Tilet
2026-03-08 15:44:26 +01:00
parent a45f0424f4
commit 98403152ab
7 changed files with 98 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.tarpaulin.ci.toml
View File

@@ -3,4 +3,4 @@ out = ["Xml"]
target-dir = "coverage"
output-dir = "coverage"
fail-under = 60
exclude-files = ["target/*"]
exclude-files = ["target/*", "private/*"]

7
Cargo.toml
View File

@@ -37,3 +37,10 @@ predicates = "3.1.3"
[lints.rust]
unexpected_cfgs = { level = "warn", check-cfg = ['cfg(tarpaulin_include)'] }
[profile.release]
opt-level = "z"
lto = true
codegen-units = 1
panic = "abort"
strip = true

12
nix/package.nix
View File

@@ -1,4 +1,5 @@
{
pkgs,
rustPlatform,
...
}: let
@@ -8,8 +9,17 @@
rustBuild = rustPlatform.buildRustPackage {
pname = name;
inherit version;
src = ../.;
src = pkgs.lib.cleanSource ../.;
cargoLock.lockFile = ../Cargo.lock;
buildInputs = [ pkgs.upx ];
useNextest = true;
meta = {
description = "Conventional commits for Jujutsu";
homepage = "https://labs.phundrak.com/phundrak/jj-cz";
};
postBuild = ''
${pkgs.upx}/bin/upx target/*/release/${name}
'';
};
in {
default = rustBuild;

18
nix/shell.nix
View File

@@ -19,26 +19,10 @@ inputs.devenv.lib.mkShell {
})
bacon
cargo-deny
cargo-nextest
cargo-tarpaulin
just
];
# processes.run.exec = "cargo watch -x run";
# enterShell = ''
# echo ""
# echo "Rust development environment loaded!"
# echo "Rust version: $(rustc --version)"
# echo "Cargo version: $(cargo --version)"
# echo ""
# echo "Available tools:"
# echo " - rust-analyzer (LSP)"
# echo " - clippy (linter)"
# echo " - rustfmt (formatter)"
# echo " - bacon (continuous testing/linting)"
# echo " - cargo-deny (dependency checker)"
# echo " - cargo-tarpaulin (code coverage)"
# '';
}
];
}

111
src/jj/lib_executor.rs
View File

@@ -127,44 +127,51 @@ impl JjExecutor for JjLib {
#[cfg(test)]
mod tests {
use super::*;
use std::process::Command;
/// Initialize a jj repository in the given directory using `jj git init`
fn init_jj_repo(dir: &Path) -> std::io::Result<()> {
let output = Command::new("jj")
.args(["git", "init"])
.current_dir(dir)
.output()?;
if !output.status.success() {
return Err(std::io::Error::other(format!(
"jj git init failed: {}",
String::from_utf8_lossy(&output.stderr)
)));
}
Ok(())
/// Initialize a jj repository in the given directory using jj-lib directly
async fn init_jj_repo(dir: &Path) -> Result<(), String> {
let settings = JjLib::load_settings().map_err(|e| e.to_string())?;
Workspace::init_internal_git(&settings, dir)
.await
.map(|_| ())
.map_err(|e| format!("Failed to init jj repo: {e}"))
}
/// Get the current commit description from a jj repository
fn get_commit_description(dir: &Path) -> std::io::Result<String> {
let output = Command::new("jj")
.args(["log", "-r", "@", "--no-graph", "-T", "description"])
.current_dir(dir)
.output()?;
/// Get the current commit description from a jj repository using jj-lib
async fn get_commit_description(dir: &Path) -> Result<String, String> {
let settings = JjLib::load_settings().map_err(|e| e.to_string())?;
let store_factories = StoreFactories::default();
let wc_factories = default_working_copy_factories();
if !output.status.success() {
return Err(std::io::Error::other(format!(
"jj log failed: {}",
String::from_utf8_lossy(&output.stderr)
)));
}
Ok(String::from_utf8_lossy(&output.stdout).trim().to_string())
let workspace = Workspace::load(&settings, dir, &store_factories, &wc_factories)
.map_err(|e| format!("Failed to load workspace: {e}"))?;
let repo = workspace
.repo_loader()
.load_at_head()
.await
.map_err(|e| format!("Failed to load repo: {e}"))?;
let wc_commit_id = repo
.view()
.get_wc_commit_id(WorkspaceName::DEFAULT)
.ok_or_else(|| "No working copy commit found".to_string())?
.clone();
let wc_commit = repo
.store()
.get_commit(&wc_commit_id)
.map_err(|e| format!("Failed to get commit: {e}"))?;
Ok(wc_commit.description().trim_end().to_string())
}
#[tokio::test]
async fn is_repository_returns_true_inside_jj_repo() {
let temp_dir = assert_fs::TempDir::new().unwrap();
init_jj_repo(temp_dir.path()).expect("Failed to init jj repo");
init_jj_repo(temp_dir.path())
.await
.expect("Failed to init jj repo");
let executor = JjLib::with_working_dir(temp_dir.path());
let result = executor.is_repository().await;
@@ -187,7 +194,9 @@ mod tests {
#[tokio::test]
async fn describe_updates_commit_description() {
let temp_dir = assert_fs::TempDir::new().unwrap();
init_jj_repo(temp_dir.path()).expect("Failed to init jj repo");
init_jj_repo(temp_dir.path())
.await
.expect("Failed to init jj repo");
let test_message = "test: initial commit";
let executor = JjLib::with_working_dir(temp_dir.path());
@@ -195,14 +204,18 @@ mod tests {
let result = executor.describe(test_message).await;
assert!(result.is_ok(), "describe failed: {result:?}");
let actual = get_commit_description(temp_dir.path()).expect("Failed to get description");
let actual = get_commit_description(temp_dir.path())
.await
.expect("Failed to get description");
assert_eq!(actual, test_message);
}
#[tokio::test]
async fn describe_handles_special_characters() {
let temp_dir = assert_fs::TempDir::new().unwrap();
init_jj_repo(temp_dir.path()).expect("Failed to init jj repo");
init_jj_repo(temp_dir.path())
.await
.expect("Failed to init jj repo");
let test_message = "feat: add feature with special chars !@#$%^&*()";
let executor = JjLib::with_working_dir(temp_dir.path());
@@ -210,14 +223,18 @@ mod tests {
let result = executor.describe(test_message).await;
assert!(result.is_ok());
let actual = get_commit_description(temp_dir.path()).expect("Failed to get description");
let actual = get_commit_description(temp_dir.path())
.await
.expect("Failed to get description");
assert_eq!(actual, test_message);
}
#[tokio::test]
async fn describe_handles_unicode() {
let temp_dir = assert_fs::TempDir::new().unwrap();
init_jj_repo(temp_dir.path()).expect("Failed to init jj repo");
init_jj_repo(temp_dir.path())
.await
.expect("Failed to init jj repo");
let test_message = "docs: add unicode support 🎉 🚀";
let executor = JjLib::with_working_dir(temp_dir.path());
@@ -225,14 +242,18 @@ mod tests {
let result = executor.describe(test_message).await;
assert!(result.is_ok());
let actual = get_commit_description(temp_dir.path()).expect("Failed to get description");
let actual = get_commit_description(temp_dir.path())
.await
.expect("Failed to get description");
assert_eq!(actual, test_message);
}
#[tokio::test]
async fn describe_handles_multiline_message() {
let temp_dir = assert_fs::TempDir::new().unwrap();
init_jj_repo(temp_dir.path()).expect("Failed to init jj repo");
init_jj_repo(temp_dir.path())
.await
.expect("Failed to init jj repo");
let test_message = "feat: add feature\n\nThis is a multiline\ndescription";
let executor = JjLib::with_working_dir(temp_dir.path());
@@ -240,7 +261,9 @@ mod tests {
let result = executor.describe(test_message).await;
assert!(result.is_ok());
let actual = get_commit_description(temp_dir.path()).expect("Failed to get description");
let actual = get_commit_description(temp_dir.path())
.await
.expect("Failed to get description");
assert_eq!(actual, test_message);
}
@@ -258,7 +281,9 @@ mod tests {
#[tokio::test]
async fn describe_can_be_called_multiple_times() {
let temp_dir = assert_fs::TempDir::new().unwrap();
init_jj_repo(temp_dir.path()).expect("Failed to init jj repo");
init_jj_repo(temp_dir.path())
.await
.expect("Failed to init jj repo");
let executor = JjLib::with_working_dir(temp_dir.path());
@@ -266,16 +291,18 @@ mod tests {
.describe("feat: first commit")
.await
.expect("First describe failed");
let desc1 =
get_commit_description(temp_dir.path()).expect("Failed to get first description");
let desc1 = get_commit_description(temp_dir.path())
.await
.expect("Failed to get first description");
assert_eq!(desc1, "feat: first commit");
executor
.describe("feat: updated commit")
.await
.expect("Second describe failed");
let desc2 =
get_commit_description(temp_dir.path()).expect("Failed to get second description");
let desc2 = get_commit_description(temp_dir.path())
.await
.expect("Failed to get second description");
assert_eq!(desc2, "feat: updated commit");
}

5
src/lib.rs
View File

@@ -18,7 +18,4 @@ pub use crate::{
///
/// Enable with `--features test-utils` (e.g. `cargo test --features test-utils`).
#[cfg(feature = "test-utils")]
pub use crate::{
jj::mock::MockJjExecutor,
prompts::mock::MockPrompts,
};
pub use crate::{jj::mock::MockJjExecutor, prompts::mock::MockPrompts};

20
tests/cli.rs
View File

@@ -3,17 +3,16 @@ use assert_fs::TempDir;
use jj_cz::{CommitType, Description, MockPrompts, Scope};
use jj_cz::{CommitWorkflow, Error, JjLib};
#[cfg(feature = "test-utils")]
use std::process::Command;
use jj_lib::{config::StackedConfig, settings::UserSettings, workspace::Workspace};
/// Helper to initialize a temporary jj repository
/// Helper to initialize a temporary jj repository using jj-lib directly (no CLI required)
#[cfg(feature = "test-utils")]
fn init_jj_repo(temp_dir: &TempDir) {
let status = Command::new("jj")
.args(["git", "init"])
.current_dir(temp_dir)
.status()
async fn init_jj_repo(temp_dir: &TempDir) {
let config = StackedConfig::with_defaults();
let settings = UserSettings::from_config(config).expect("Failed to create settings");
Workspace::init_internal_git(&settings, temp_dir.path())
.await
.expect("Failed to initialize jj repository");
assert!(status.success(), "jj git init failed");
}
#[cfg(feature = "test-utils")]
@@ -21,7 +20,7 @@ fn init_jj_repo(temp_dir: &TempDir) {
async fn test_happy_path_integration() {
// T037: Happy path integration test
let temp_dir = TempDir::new().unwrap();
init_jj_repo(&temp_dir);
init_jj_repo(&temp_dir).await;
// Create mock prompts that simulate a successful workflow
let mock_prompts = MockPrompts::new()
@@ -67,9 +66,6 @@ async fn test_cancellation() {
// This is tricky to test directly without a TTY
// We'll test the error handling path instead
let temp_dir = TempDir::new().unwrap();
init_jj_repo(&temp_dir);
// Create a mock executor that simulates cancellation
struct CancelMock;