Skip to content

Commit ff35d99

Browse files
authored
feat: 0.2.22 Check if coming from detached HEAD (#215)
## Changed - Add `--detach` to the switchback after a checkout coming from detached `HEAD` - Bump deps - Bump expected amboso version to `2.0.11`
1 parent 43a9a67 commit ff35d99

File tree

10 files changed

+101
-48
lines changed

10 files changed

+101
-48
lines changed

CHANGELOG.md

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,13 @@
11
# Changelog
22

3+
## [0.2.22] - 2025-04-11
4+
5+
## Changed
6+
7+
- Add --detach to the switchback after a checkout coming from detached HEAD
8+
- Bump deps
9+
- Bump expected amboso version to 2.0.11
10+
311
## [0.2.21] - 2025-03-31
412

513
### Changed

Cargo.lock

Lines changed: 9 additions & 9 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
[package]
22
name = "invil"
33
description = "A port of amboso to Rust"
4-
version = "0.2.21"
4+
version = "0.2.22"
55
edition = "2021"
66
license = "GPL-3.0-only"
77
homepage = "https://github.com/jgabaut/invil"
@@ -25,14 +25,14 @@ anvilCustom = []
2525
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
2626

2727
[dependencies]
28-
clap = { version = "4.5.34", features = ["derive"] }
28+
clap = { version = "4.5.35", features = ["derive"] }
2929
dirs = "5.0.1"
30-
flate2 = { version = "1.1.0", optional = true }
30+
flate2 = { version = "1.1.1", optional = true }
3131
git2 = "0.20.1"
3232
is_executable = "1.0.4"
3333
log = "0.4.27"
3434
regex = "1.11.1"
3535
simplelog = "0.12.2"
36-
tar = { version = "0.4.43", optional = true }
36+
tar = { version = "0.4.44", optional = true }
3737
toml = "0.8.20"
3838
url = { version = "2.5.4", optional = true }

README.md

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
- Generate new projects supporting the build tool using `invil init <DIR>`
2424
- Generate a basic header+impl containing project info, such as time of current commit
2525

26-
It's (\*) on par with the original implementation, as of `amboso` `2.0.10`.
26+
It's (\*) on par with the original implementation, as of `amboso` `2.0.11`.
2727
Check the [next section](#supported_amboso) for more support info.
2828
Check [this section](#extended_amboso) for info about extensions to `amboso 2.0.4`.
2929

@@ -107,26 +107,26 @@
107107
## Extensions, relative to amboso 1.9.9
108108

109109
- [x] When in `make` build mode, call `make rebuild` by default
110-
- [x] `--no-rebuild` to disable make rebuild and run just `make`
111-
- [x] `--logged` to output full log to file
110+
- [x] Add `--no-rebuild` to disable make rebuild and run just `make`
111+
- [x] Add `--logged` to output full log to file
112112
- Outputs to `./anvil.log`. Not backwards compatible with repos not ignoring the file explicitly.
113-
- [x] `-G` flag also includes:
113+
- [x] Add `-G` flag also includes:
114114
- a string for build OS (from `env::consts::OS`)
115115
- HEAD commit message
116-
- [x] `--no-color` to disable color output
117-
- [x] `--force` to overwrite ready targets
116+
- [x] Add `--no-color` to disable color output
117+
- [x] Add `--force` to overwrite ready targets
118118

119119
## Extensions to amboso 2.0
120120

121121
- [x] Turn off extensions with `-e, --strict`
122122
- [x] Ignore missing repo in current work dir
123-
- [x] `-a` to set compatibility level
124-
- [x] `-k` to set project type
125-
- [x] `-O` to set stego.lock dir (defaults to working directory)
123+
- [x] Add `-a` to set compatibility level
124+
- [x] Add `-k` to set project type
125+
- [x] Add `-O` to set stego.lock dir (defaults to working directory)
126126
- [x] Retrocompatible `stego.lock` parsing, up to `1.7.x`
127127
- [x] Init subcommand uses passed directory's basename for generated flags
128128
- [x] Read global config file from `$HOME/.anvil/anvil.toml`
129-
- [x] `-Z` to pass CFLAGS to single file build mode
129+
- [x] Add `-Z` to pass CFLAGS to single file build mode
130130

131131
## Extended amboso features <a name = "extended_amboso"></a>
132132

src/anvil_custom.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// SPDX-License-Identifier: GPL-3.0-only
22
/* Build tool with support for git tags, wrapping make.
3-
* Copyright (C) 2023-2024 jgabaut
3+
* Copyright (C) 2023-2025 jgabaut
44
* This program is free software: you can redistribute it and/or modify
55
* it under the terms of the GNU General Public License as published by
66
* the Free Software Foundation, version 3 of the License.

src/anvil_py.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// SPDX-License-Identifier: GPL-3.0-only
22
/* Build tool with support for git tags, wrapping make.
3-
* Copyright (C) 2023-2024 jgabaut
3+
* Copyright (C) 2023-2025 jgabaut
44
* This program is free software: you can redistribute it and/or modify
55
* it under the terms of the GNU General Public License as published by
66
* the Free Software Foundation, version 3 of the License.

src/core.rs

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// SPDX-License-Identifier: GPL-3.0-only
22
/* Build tool with support for git tags, wrapping make.
3-
* Copyright (C) 2023-2024 jgabaut
3+
* Copyright (C) 2023-2025 jgabaut
44
* This program is free software: you can redistribute it and/or modify
55
* it under the terms of the GNU General Public License as published by
66
* the Free Software Foundation, version 3 of the License.
@@ -51,7 +51,7 @@ pub const ANVIL_BONEDIR_KEYNAME: &str = "testsdir";
5151
pub const ANVIL_KULPODIR_KEYNAME: &str = "errortestsdir";
5252
pub const ANVIL_VERSION_KEYNAME: &str = "version";
5353
pub const ANVIL_KERN_KEYNAME: &str = "kern";
54-
pub const EXPECTED_AMBOSO_API_LEVEL: &str = "2.0.10";
54+
pub const EXPECTED_AMBOSO_API_LEVEL: &str = "2.0.11";
5555
pub const MIN_AMBOSO_V_EXTENSIONS: &str = "2.0.1";
5656
pub const MIN_AMBOSO_V_STEGO_NOFORCE: &str = "2.0.3";
5757
pub const MIN_AMBOSO_V_STEGODIR: &str = "2.0.3";
@@ -62,6 +62,7 @@ pub const MIN_AMBOSO_V_SKIPRETRYSTEGO: &str = "2.0.4";
6262
pub const MIN_AMBOSO_V_DENY_ANVILPY: &str = "2.0.5";
6363
pub const MIN_AMBOSO_V_CUSTKERN: &str = "2.1.0";
6464
pub const MIN_AMBOSO_V_DENY_ANVILCUST: &str = "2.0.9";
65+
pub const MIN_AMBOSO_V_CHECK_DETACHED: &str = "2.0.11";
6566
pub const ANVIL_INTERPRETER_TAG_REGEX: &str = "stego.lock$";
6667
pub const ANVIL_DEFAULT_CONF_PATH: &str = ".anvil/anvil.toml";
6768
pub const RULELINE_MARK_CHAR: char = '\t';
@@ -1007,7 +1008,7 @@ fn parse_invil_tomlvalue(invil_str: &str, start_time: Instant) -> Result<AmbosoC
10071008
info!("Running as <2.0.4");
10081009
anvil_conf.anvil_kern = AnvilKern::AmbosoC;
10091010
}
1010-
"2.0.4" | "2.0.5" | "2.0.6" | "2.0.7" | "2.0.8" | "2.0.9" | "2.0.10" => {
1011+
"2.0.4" | "2.0.5" | "2.0.6" | "2.0.7" | "2.0.8" | "2.0.9" | "2.0.10" | "2.0.11" => {
10111012
info!("Running as {{{}}}", anvil_v_str);
10121013
anvil_conf.anvil_kern = AnvilKern::AmbosoC;
10131014
}
@@ -1193,7 +1194,7 @@ fn parse_stego_tomlvalue(stego_str: &str, builds_path: &Path, stego_dir: PathBuf
11931194
info!("Running as <2.0.4");
11941195
anvil_env.anvil_kern = AnvilKern::AmbosoC;
11951196
}
1196-
"2.0.4" | "2.0.5" | "2.0.6" | "2.0.7" | "2.0.8" | "2.0.9" | "2.0.10" => {
1197+
"2.0.4" | "2.0.5" | "2.0.6" | "2.0.7" | "2.0.8" | "2.0.9" | "2.0.10" | "2.0.11" => {
11971198
info!("Running as {{{}}}", anvil_v_str);
11981199
anvil_env.anvil_kern = AnvilKern::AmbosoC;
11991200
}
@@ -1807,7 +1808,7 @@ pub fn check_passed_args(args: &mut Args) -> Result<AmbosoEnv,String> {
18071808
info!("Running as {}", x.as_str());
18081809
args.anvil_kern = Some(AnvilKern::AmbosoC.to_string());
18091810
}
1810-
"2.0.4" | "2.0.5" | "2.0.6" | "2.0.7" | "2.0.8" | "2.0.9" | "2.0.10" => {
1811+
"2.0.4" | "2.0.5" | "2.0.6" | "2.0.7" | "2.0.8" | "2.0.9" | "2.0.10" | "2.0.11" => {
18111812
info!("Running as {}", x.as_str());
18121813
}
18131814
_ => {

src/main.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// SPDX-License-Identifier: GPL-3.0-only
22
/* Build tool with support for git tags, wrapping make.
3-
* Copyright (C) 2023-2024 jgabaut
3+
* Copyright (C) 2023-2025 jgabaut
44
* This program is free software: you can redistribute it and/or modify
55
* it under the terms of the GNU General Public License as published by
66
* the Free Software Foundation, version 3 of the License.
@@ -143,7 +143,7 @@ fn main() -> ExitCode {
143143
trace!("Please symlink me to anvil.");
144144
}
145145

146-
let invil_splash: String = format!("{}, version {}\nCopyright (C) 2023-2024 jgabaut\n\n This program comes with ABSOLUTELY NO WARRANTY; for details type `{} -W`.\n This is free software, and you are welcome to redistribute it\n under certain conditions; see file `LICENSE` for details.\n\n Full source is available at https://github.com/jgabaut/invil\n", INVIL_NAME, INVIL_VERSION, prog_name().expect("Could not determine program name"));
146+
let invil_splash: String = format!("{}, version {}\nCopyright (C) 2023-2025 jgabaut\n\n This program comes with ABSOLUTELY NO WARRANTY; for details type `{} -W`.\n This is free software, and you are welcome to redistribute it\n under certain conditions; see file `LICENSE` for details.\n\n Full source is available at https://github.com/jgabaut/invil\n", INVIL_NAME, INVIL_VERSION, prog_name().expect("Could not determine program name"));
147147
if ! args.quiet {
148148
println!("{}", invil_splash);
149149
}

0 commit comments

Comments
 (0)