Commit

Message

Changed Files (6)

• modified CHANGELOG.md

  diff --git a/CHANGELOG.md b/CHANGELOG.md

  index 3656887..dd29ff2 100644

  --- a/CHANGELOG.md

  +++ b/CHANGELOG.md

  @@ -8,6 +8,10 @@

  - Enable use of $ABBAYE_BUILDING_VERSION in script builder outputs

  - Also in/exclude branches in the clonable repository according to config

  +

  +### 🚜 Refactor

  +

  +- Move `archive_dir` to utils

  ## [0.7.0] - 2026-06-08

  ### 🚀 Features

• modified abbaye.toml

  diff --git a/abbaye.toml b/abbaye.toml

  index 6370155..810250d 100644

  --- a/abbaye.toml

  +++ b/abbaye.toml

  @@ -13,7 +13,7 @@ author = "Ololduck <ololduck@vit.am>"

  [git_ui]

  default_branch = "main"

  -include = ["main", "v*"]

  +include = ["main", "develop", "v*"]

  [version_extractor]

  type = "git"

• modified codebook.toml

  diff --git a/codebook.toml b/codebook.toml

  index 2bfd94e..4d4625b 100644

  --- a/codebook.toml

  +++ b/codebook.toml

  @@ -1 +1,4 @@

  -words = ["abbaye"]

  +words = [

  + "Tera",

  + "abbaye",

  +]

• modified src/builders/mod.rs

  diff --git a/src/builders/mod.rs b/src/builders/mod.rs

  index 49f4228..69a07d2 100644

  --- a/src/builders/mod.rs

  +++ b/src/builders/mod.rs

  @@ -255,7 +255,7 @@ pub struct BuilderEntry {

  #[serde(flatten)]

  pub builder: AnyBuilder,

  - /// Optional identifier for this builder. Other builders reference this

  + /// Optional identifier for this builder. Other builders reference this

  /// string in their `depends_on` list.

  #[serde(skip_serializing_if = "Option::is_none")]

  pub id: Option<String>,

• modified src/site.rs

  diff --git a/src/site.rs b/src/site.rs

  index 68106e6..6d3002e 100644

  --- a/src/site.rs

  +++ b/src/site.rs

  @@ -8,7 +8,6 @@ use std::{

  use chrono::{DateTime, SecondsFormat, Utc};

  use sha2::{Digest, Sha256};

  -use flate2::{Compression, write::GzEncoder};

  use indicatif::{MultiProgress, ProgressBar, ProgressStyle};

  use miette::{IntoDiagnostic, Result};

  use pulldown_cmark::{Event, Options, Parser, Tag, TagEnd, html};

  @@ -19,7 +18,7 @@ use tokio::task::JoinSet;

  use tracing::warn;

  use crate::{

  - builders::LogEvent, changelog::ChangelogExtractor, config::AbbayeConfig,

  + builders::LogEvent, changelog::ChangelogExtractor, config::AbbayeConfig, utils,

  version_extractors::VersionInfo,

  };

  @@ -28,6 +27,8 @@ pub const TEMPLATE_VERSION_INDEX: &str = include_str!("templates/version_index.h

  pub const SITE_CSS: &str = include_str!("templates/site.css");

  const ATOM_FEED_FILENAME: &str = "releases.atom";

  +const SPINNER_CHARS: &str = "⠋⠙⠹⠸⠼⠴⠦⠧⠇⠏ ";

  +

  // ── Types ───────────────────────────────────────────────────────────────────

  /// A version entry as passed to Tera templates.

  @@ -238,7 +239,7 @@ pub async fn build_site(config: AbbayeConfig) -> Result<()> {

  pb.set_style(

  ProgressStyle::with_template("{spinner:.bold} {prefix} {msg}")

  .expect("valid template")

  - .tick_chars("⠋⠙⠹⠸⠼⠴⠦⠧⠇⠏ "),

  + .tick_chars(SPINNER_CHARS),

  );

  pb.set_prefix(colored_prefix);

  pb.set_message("starting…");

  @@ -272,7 +273,7 @@ pub async fn build_site(config: AbbayeConfig) -> Result<()> {

  child_pb.set_style(

  ProgressStyle::with_template(" {spinner:.bold} {prefix} {msg}")

  .expect("valid template")

  - .tick_chars("⠋⠙⠹⠸⠼⠴⠦⠧⠇⠏ "),

  + .tick_chars(SPINNER_CHARS),

  );

  child_pb.set_prefix(format!("{child_color}[{label}]{RESET}"));

  child_pb.set_message("starting…");

  @@ -461,7 +462,7 @@ pub async fn build_site(config: AbbayeConfig) -> Result<()> {

  let tarball = version_dir.join("docs.tar.gz");

  let docs_dir_c = docs_dir.clone();

  let tarball_c = tarball.clone();

  - tokio::task::spawn_blocking(move || archive_dir(&docs_dir_c, &tarball_c))

  + tokio::task::spawn_blocking(move || utils::archive_dir(&docs_dir_c, &tarball_c))

  .await

  .into_diagnostic()??;

  @@ -726,27 +727,6 @@ fn copy_dir_recursive(

  })

  }

  -/// Pack `src` directory into a `.tar.gz` archive at `dest`.

  -///

  -/// The top-level entry inside the archive is named after the source directory.

  -fn archive_dir(src: &Path, dest: &Path) -> Result<()> {

  - let dir_name = src

  - .file_name()

  - .map(|n| n.to_string_lossy().into_owned())

  - .unwrap_or_else(|| "docs".to_owned());

  -

  - let file = std::fs::File::create(dest).into_diagnostic()?;

  - let enc = GzEncoder::new(file, Compression::default());

  - let mut archive = tar::Builder::new(enc);

  - archive.append_dir_all(&dir_name, src).into_diagnostic()?;

  - archive

  - .into_inner()

  - .into_diagnostic()?

  - .finish()

  - .into_diagnostic()?;

  - Ok(())

  -}

  -

  /// Compare two version strings, preferring semver ordering and falling back

  /// to lexicographic comparison for non-semver strings (e.g. git describe output).

  fn strip_v(s: &str) -> &str {

• modified src/utils.rs

  diff --git a/src/utils.rs b/src/utils.rs

  index ab2b7a3..414062a 100644

  --- a/src/utils.rs

  +++ b/src/utils.rs

  @@ -1,6 +1,10 @@

  use std::collections::HashMap;

  use std::path::{Path, PathBuf};

  +use flate2::Compression;

  +use flate2::write::GzEncoder;

  +use miette::{IntoDiagnostic, Result};

  +

  /// Expands shell-style variables in a path string.

  ///

  /// This function takes a path containing variables in `$VAR` or `${VAR}` syntax

  @@ -64,3 +68,24 @@ where

  PathBuf::from(path_str)

  }

  +

  +/// Pack `src` directory into a `.tar.gz` archive at `dest`.

  +///

  +/// The top-level entry inside the archive is named after the source directory.

  +pub(crate) fn archive_dir(src: &Path, dest: &Path) -> Result<()> {

  + let dir_name = src

  + .file_name()

  + .map(|n| n.to_string_lossy().into_owned())

  + .unwrap_or_else(|| "docs".to_owned());

  +

  + let file = std::fs::File::create(dest).into_diagnostic()?;

  + let enc = GzEncoder::new(file, Compression::default());

  + let mut archive = tar::Builder::new(enc);

  + archive.append_dir_all(&dir_name, src).into_diagnostic()?;

  + archive

  + .into_inner()

  + .into_diagnostic()?

  + .finish()

  + .into_diagnostic()?;

  + Ok(())

  +}