Skip to content
Merged
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
30 changes: 30 additions & 0 deletions src/config/package.rs
Original file line number Diff line number Diff line change
Expand Up @@ -115,6 +115,20 @@ pub enum VersioningStrategy {
Zerover,
}

impl std::fmt::Display for VersioningStrategy {
fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
f.write_str(match self {
Self::Semver => "semver",
Self::Calver => "calver",
Self::CalverShort => "calver-short",
Self::CalverSeq => "calver-seq",
Self::CalverShortSeq => "calver-short-seq",
Self::Sequential => "sequential",
Self::Zerover => "zerover",
})
}
}

#[derive(Debug, Deserialize, Serialize, Clone, Copy, PartialEq)]
#[serde(rename_all = "lowercase")]
pub enum FloatingTagLevel {
Expand Down Expand Up @@ -279,6 +293,22 @@ pub enum FileFormat {

#[cfg(test)]
mod tests {
#[test]
fn strategy_display_matches_the_config_spelling() {
for strategy in [
VersioningStrategy::Semver,
VersioningStrategy::Calver,
VersioningStrategy::CalverShort,
VersioningStrategy::CalverSeq,
VersioningStrategy::CalverShortSeq,
VersioningStrategy::Sequential,
VersioningStrategy::Zerover,
] {
let serialized = serde_json::to_value(strategy).unwrap();
assert_eq!(serialized.as_str(), Some(strategy.to_string().as_str()));
}
}

fn ws(tag_template: Option<&str>, latest: Option<&str>) -> WorkspaceConfig {
WorkspaceConfig {
tag_template: tag_template.map(str::to_string),
Expand Down
5 changes: 1 addition & 4 deletions src/doctor/checks.rs
Original file line number Diff line number Diff line change
Expand Up @@ -178,10 +178,7 @@ pub(super) fn versioning_section(config: Option<&Config>, root: &Path) -> Sectio
match config.workspace.versioning {
Some(strategy) => checks.push(Check::info(
"strategy",
Some(format!(
"declared: {}",
format!("{strategy:?}").to_lowercase()
)),
Some(format!("declared: {strategy}")),
)),
None => checks.push(Check::info(
"strategy",
Expand Down
4 changes: 2 additions & 2 deletions src/doctor/tests.rs
Original file line number Diff line number Diff line change
Expand Up @@ -562,15 +562,15 @@ mod sections {
);
let config = config_from(
root,
r#"{"workspace":{"versioning":"calver"},"package":[
r#"{"workspace":{"versioning":"calver-short"},"package":[
{"name":"api","path":"api","versionedFiles":[{"path":"api/Cargo.toml","format":"toml"}]},
{"name":"web","path":"web","versionedFiles":[{"path":"web/package.json","format":"json"}]}
]}"#,
);

let section = checks::versioning_section(Some(&config), root);

assert_eq!(detail(find(&section, "strategy")), "declared: calver");
assert_eq!(detail(find(&section, "strategy")), "declared: calver-short");
assert_eq!(detail(find(&section, "api")), "v2.3.4");
assert_eq!(
detail(find(&section, "web")),
Expand Down
2 changes: 1 addition & 1 deletion src/monorepo/run/why/render.rs
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,7 @@ fn push_decision(out: &mut Vec<String>, x: &Explanation) {
let cause = match triggered_by {
Trigger::Commits => "from its own commits",
Trigger::Dependency => "from the dependency cascade",
Trigger::Forced => "forced",
Trigger::Forced => "set with --force-version",
};
let pre = if *prerelease { " (prerelease)" } else { "" };
out.push(format!(
Expand Down
2 changes: 1 addition & 1 deletion src/monorepo/run/why/render/tests.rs
Original file line number Diff line number Diff line change
Expand Up @@ -330,6 +330,6 @@ fn the_decision_names_what_triggered_the_bump() {
rendered(&forced)
.last()
.unwrap()
.starts_with("Decision: forced bump forced — ")
.starts_with("Decision: forced bump set with --force-version — ")
);
}
Loading