git-std 0.11.6

Standard git workflow — commits, versioning, hooks
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338

use std::path::Path;

use assert_cmd::Command;
use predicates::prelude::*;

/// Helper: run a git command and return stdout.
fn git(dir: &Path, args: &[&str]) -> String {
    let output = std::process::Command::new("git")
        .current_dir(dir)
        .args(args)
        .output()
        .unwrap();
    assert!(
        output.status.success(),
        "git {:?} failed: {}",
        args,
        String::from_utf8_lossy(&output.stderr)
    );
    String::from_utf8_lossy(&output.stdout).trim().to_string()
}

/// Helper: check if a tag exists.
fn tag_exists(dir: &Path, tag: &str) -> bool {
    std::process::Command::new("git")
        .current_dir(dir)
        .args(["rev-parse", "--verify", &format!("refs/tags/{tag}")])
        .output()
        .unwrap()
        .status
        .success()
}

/// Helper: check if a branch exists.
fn branch_exists(dir: &Path, branch: &str) -> bool {
    std::process::Command::new("git")
        .current_dir(dir)
        .args(["rev-parse", "--verify", &format!("refs/heads/{branch}")])
        .output()
        .unwrap()
        .status
        .success()
}

/// Helper: initialise a git repo with a Cargo.toml and one commit.
fn init_bump_repo(dir: &Path) {
    git(dir, &["init"]);
    git(dir, &["config", "user.name", "Test"]);
    git(dir, &["config", "user.email", "test@test.com"]);

    // Write a minimal Cargo.toml.
    std::fs::write(
        dir.join("Cargo.toml"),
        "[package]\nname = \"test-pkg\"\nversion = \"0.0.0\"\nedition = \"2021\"\n",
    )
    .unwrap();

    git(dir, &["add", "Cargo.toml"]);
    git(dir, &["commit", "-m", "chore: init"]);
}

/// Helper: add a commit to a repo.
fn add_commit(dir: &Path, filename: &str, message: &str) {
    std::fs::write(dir.join(filename), message).unwrap();
    git(dir, &["add", filename]);
    git(dir, &["commit", "-m", message]);
}

/// Helper: create an annotated tag.
fn create_tag(dir: &Path, name: &str) {
    git(dir, &["tag", "-a", name, "-m", name]);
}

// --- Patch scheme integration tests (#138) ---

#[test]
fn bump_patch_scheme_produces_patch_from_feat() {
    let dir = tempfile::tempdir().unwrap();
    init_bump_repo(dir.path());
    create_tag(dir.path(), "v1.0.0");

    // Write a .git-std.toml with patch scheme.
    std::fs::write(dir.path().join(".git-std.toml"), "scheme = \"patch\"\n").unwrap();

    // Add a feat commit — should still produce a patch bump.
    add_commit(dir.path(), "a.txt", "feat: add feature A");

    Command::cargo_bin("git-std")
        .unwrap()
        .args(["bump"])
        .current_dir(dir.path())
        .assert()
        .success()
        .stderr(predicate::str::contains("1.0.0 \u{2192} 1.0.1"))
        .stderr(predicate::str::contains("patch"));

    // Verify tag was created.
    assert!(tag_exists(dir.path(), "v1.0.1"), "tag v1.0.1 should exist");
}

#[test]
fn bump_patch_scheme_rejects_breaking_without_force() {
    let dir = tempfile::tempdir().unwrap();
    init_bump_repo(dir.path());
    create_tag(dir.path(), "v1.0.0");

    // Write a .git-std.toml with patch scheme.
    std::fs::write(dir.path().join(".git-std.toml"), "scheme = \"patch\"\n").unwrap();

    // Add a breaking change commit.
    add_commit(dir.path(), "a.txt", "feat!: remove old API");

    Command::cargo_bin("git-std")
        .unwrap()
        .args(["bump"])
        .current_dir(dir.path())
        .assert()
        .code(1)
        .stderr(predicate::str::contains(
            "breaking change not allowed on patch-only branch (use --force to override)",
        ));
}

#[test]
fn bump_patch_scheme_allows_breaking_with_force() {
    let dir = tempfile::tempdir().unwrap();
    init_bump_repo(dir.path());
    create_tag(dir.path(), "v1.0.0");

    // Write a .git-std.toml with patch scheme.
    std::fs::write(dir.path().join(".git-std.toml"), "scheme = \"patch\"\n").unwrap();

    // Add a breaking change commit.
    add_commit(dir.path(), "a.txt", "feat!: remove old API");

    Command::cargo_bin("git-std")
        .unwrap()
        .args(["bump", "--force"])
        .current_dir(dir.path())
        .assert()
        .success()
        .stderr(predicate::str::contains("1.0.0 \u{2192} 1.0.1"))
        .stderr(predicate::str::contains("patch"));

    // Verify tag was created.
    assert!(tag_exists(dir.path(), "v1.0.1"), "tag v1.0.1 should exist");
}

// --- Stable branch integration tests (#139) ---

#[test]
fn bump_stable_creates_branch_and_bumps_major() {
    let dir = tempfile::tempdir().unwrap();
    init_bump_repo(dir.path());
    create_tag(dir.path(), "v1.0.0");
    add_commit(dir.path(), "a.txt", "feat: new feature");

    Command::cargo_bin("git-std")
        .unwrap()
        .args(["bump", "--stable", "--skip-changelog"])
        .current_dir(dir.path())
        .assert()
        .success()
        .stderr(predicate::str::contains("Stable branch created"))
        .stderr(predicate::str::contains("stable-v1.0"))
        .stderr(predicate::str::contains("patch (patch-only bumps)"))
        .stderr(predicate::str::contains("Committed"))
        .stderr(predicate::str::contains("1.0.0 \u{2192} 2.0.0"))
        .stderr(predicate::str::contains("major"))
        .stderr(predicate::str::contains("Tagged"));

    // Verify the stable branch was created.
    assert!(
        branch_exists(dir.path(), "stable-v1.0"),
        "stable-v1.0 branch should exist"
    );

    // Verify HEAD is back on the original branch with the new tag.
    assert!(tag_exists(dir.path(), "v2.0.0"), "tag v2.0.0 should exist");

    // Verify main was bumped in Cargo.toml.
    let cargo = std::fs::read_to_string(dir.path().join("Cargo.toml")).unwrap();
    assert!(
        cargo.contains("version = \"2.0.0\""),
        "expected version 2.0.0, got: {cargo}"
    );

    // Verify the stable branch has .git-std.toml with scheme = "patch".
    let config_content = git(dir.path(), &["show", "stable-v1.0:.git-std.toml"]);
    assert!(
        config_content.contains("scheme = \"patch\""),
        "stable branch config should have scheme = \"patch\", got: {config_content}"
    );
}

#[test]
fn bump_stable_with_minor_flag() {
    let dir = tempfile::tempdir().unwrap();
    init_bump_repo(dir.path());
    create_tag(dir.path(), "v1.0.0");
    add_commit(dir.path(), "a.txt", "feat: new feature");

    Command::cargo_bin("git-std")
        .unwrap()
        .args(["bump", "--stable", "--minor", "--skip-changelog"])
        .current_dir(dir.path())
        .assert()
        .success()
        .stderr(predicate::str::contains("1.0.0 \u{2192} 1.1.0"))
        .stderr(predicate::str::contains("minor"));

    // Verify the tag.
    assert!(tag_exists(dir.path(), "v1.1.0"), "tag v1.1.0 should exist");

    // Verify Cargo.toml.
    let cargo = std::fs::read_to_string(dir.path().join("Cargo.toml")).unwrap();
    assert!(
        cargo.contains("version = \"1.1.0\""),
        "expected version 1.1.0, got: {cargo}"
    );
}

#[test]
fn bump_stable_custom_branch_name() {
    let dir = tempfile::tempdir().unwrap();
    init_bump_repo(dir.path());
    create_tag(dir.path(), "v1.0.0");
    add_commit(dir.path(), "a.txt", "feat: new feature");

    Command::cargo_bin("git-std")
        .unwrap()
        .args(["bump", "--stable", "my-release-branch", "--skip-changelog"])
        .current_dir(dir.path())
        .assert()
        .success()
        .stderr(predicate::str::contains("my-release-branch"));

    // Verify the custom branch was created.
    assert!(
        branch_exists(dir.path(), "my-release-branch"),
        "my-release-branch should exist"
    );
}

#[test]
fn bump_stable_dry_run() {
    let dir = tempfile::tempdir().unwrap();
    init_bump_repo(dir.path());
    create_tag(dir.path(), "v1.0.0");
    add_commit(dir.path(), "a.txt", "feat: new feature");

    Command::cargo_bin("git-std")
        .unwrap()
        .args(["bump", "--stable", "--dry-run"])
        .current_dir(dir.path())
        .assert()
        .success()
        .stderr(predicate::str::contains("Would create stable branch"))
        .stderr(predicate::str::contains("stable-v1.0"))
        .stderr(predicate::str::contains("Would commit"))
        .stderr(predicate::str::contains("Would tag"))
        .stderr(predicate::str::contains("Would advance"))
        .stderr(predicate::str::contains("1.0.0 \u{2192} 2.0.0"));

    // No branch should be created.
    assert!(
        !branch_exists(dir.path(), "stable-v1.0"),
        "stable-v1.0 branch should NOT exist in dry-run"
    );

    // No tag should be created.
    assert!(
        !tag_exists(dir.path(), "v2.0.0"),
        "tag v2.0.0 should NOT exist in dry-run"
    );
}

#[test]
fn bump_stable_rejects_existing_branch() {
    let dir = tempfile::tempdir().unwrap();
    init_bump_repo(dir.path());
    create_tag(dir.path(), "v1.0.0");
    add_commit(dir.path(), "a.txt", "feat: new feature");

    // Pre-create the branch that --stable would try to create.
    git(dir.path(), &["branch", "stable-v1.0"]);

    Command::cargo_bin("git-std")
        .unwrap()
        .args(["bump", "--stable", "--skip-changelog"])
        .current_dir(dir.path())
        .assert()
        .code(1)
        .stderr(predicate::str::contains(
            "branch 'stable-v1.0' already exists",
        ));
}

#[test]
fn bump_stable_rejects_calver_scheme() {
    let dir = tempfile::tempdir().unwrap();
    init_bump_repo(dir.path());

    // Write a .git-std.toml with calver scheme.
    std::fs::write(dir.path().join(".git-std.toml"), "scheme = \"calver\"\n").unwrap();

    add_commit(dir.path(), "a.txt", "feat: new feature");

    Command::cargo_bin("git-std")
        .unwrap()
        .args(["bump", "--stable"])
        .current_dir(dir.path())
        .assert()
        .code(1)
        .stderr(predicate::str::contains(
            "--stable is not supported with scheme = \"calver\"",
        ));
}

#[test]
fn bump_stable_rejects_dirty_working_tree() {
    let dir = tempfile::tempdir().unwrap();
    init_bump_repo(dir.path());
    create_tag(dir.path(), "v1.0.0");
    add_commit(dir.path(), "a.txt", "feat: new feature");

    // Create an uncommitted file to make the working tree dirty.
    std::fs::write(dir.path().join("dirty.txt"), "uncommitted").unwrap();

    Command::cargo_bin("git-std")
        .unwrap()
        .args(["bump", "--stable"])
        .current_dir(dir.path())
        .assert()
        .code(1)
        .stderr(predicate::str::contains(
            "working tree has uncommitted changes",
        ));
}