hashsum: add --no-names option from official b3sum tool #3361
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
Looks good but please add tests in tests/by-util/test_hashsum.rs |
pothos
force-pushed
the
hashsum-no-names
branch
2 times, most recently
from
4f43fab to
aae056a
Compare
sylvestre
reviewed
Apr 3, 2022
tests/by-util/test_hashsum.rs
Outdated
| let ts = TestScenario::new("hashsum"); | ||
| // EXPECTED_FILE has no newline character but the tool output has a newline character | ||
| assert_eq!(ts.fixtures.read(EXPECTED_FILE), | ||
| ts.ucmd().arg(DIGEST_ARG).arg(BITS_ARG).arg("--no-names").arg("input.txt").succeeds().no_stderr().stdout_str() |
There was a problem hiding this comment.
I am pretty sure that rustfmt is going to complain :)
There was a problem hiding this comment.
I'm trying to make it complain but it's quite liberal about linebreaks and indention in this case, or?
There was a problem hiding this comment.
rustfmt tests/by-util/test_hashsum.rs passes without any changes (rustfmt 1.4.38-stable (9d1b210 2022-02-23))
There was a problem hiding this comment.
I'll check the next CI results for details, not sure if I should move the ); up to the end of the line and so on. Maybe because we are in a macro rustfmt can't operate as usual in my case?
| @@ -29,6 +29,15 @@ macro_rules! test_digest { | |||
| get_hash!(ts.ucmd().arg(DIGEST_ARG).arg(BITS_ARG).pipe_in_fixture("input.txt").succeeds().no_stderr().stdout_str())); | |||
| } | |||
|
|
|||
| #[test] | |||
| fn test_nonames() { | |||
There was a problem hiding this comment.
Could you also add a test with different files at the same time ?
ex
hashsum --no-names input1.txt input2.txt
There was a problem hiding this comment.
Yes, how about covering the special - at the same time, i.e., hashsum --no-names input.txt - with input.txt also piped through stdin? I've pushed this now.
|
Sylvestre, before you merge this, you might want to consider that this change is not in GNU coreutils. This is compatibility with a separate b3sum utility which GNU does not include. However, I think we should merge it anyway. |
sylvestre
reviewed
Apr 4, 2022
The official b3sum tool has a --no-names option for only printing the hashes, omitting the filenames. This is quite handy when used from scripts because it spares the postprocessing with "cut" or "awk". Since the installed b3sum symlink would also serve as a drop-in for the official tool, the --no-names option is expected to exist for compatibility. Add a --no-names option not only for b3sum but for hashsum in general (and maybe GNU coreutils will also feel inspired to add this option). Closes uutils#3360
str4d
added a commit
to str4d/coreutils
that referenced
this pull request
Jun 4, 2022
Several binaries have been added to `hashsum` that have never been part of GNU Coreutils: - `sha3*sum` (uutils#869) - `shake*sum` (uutils#987) - `b3sum` (uutils#3108 and uutils#3164) In particular, the `--bits` option, and the `--no-names` option added in uutils#3361, are not valid for any GNU Coreutils `*sum` binary (as of Coreutils 9.0). This commit refactors the argument parsing so that `--bits` and `--no-names` become invalid options for the binaries intended to match the GNU Coreutils API, instead of being ignored options. It also refactors the custom binary name handling to distinguish between binaries intended to match the GNU Coreutils API, and binaries that don't have that constraint. Part of uutils#2930.
str4d
added a commit
to str4d/coreutils
that referenced
this pull request
Jun 4, 2022
Several binaries have been added to `hashsum` that have never been part of GNU Coreutils: - `sha3*sum` (uutils#869) - `shake*sum` (uutils#987) - `b3sum` (uutils#3108 and uutils#3164) In particular, the `--bits` option, and the `--no-names` option added in uutils#3361, are not valid for any GNU Coreutils `*sum` binary (as of Coreutils 9.0). This commit refactors the argument parsing so that `--bits` and `--no-names` become invalid options for the binaries intended to match the GNU Coreutils API, instead of being ignored options. It also refactors the custom binary name handling to distinguish between binaries intended to match the GNU Coreutils API, and binaries that don't have that constraint. Part of uutils#2930.
str4d
added a commit
to str4d/coreutils
that referenced
this pull request
Jun 5, 2022
Several binaries have been added to `hashsum` that have never been part of GNU Coreutils: - `sha3*sum` (uutils#869) - `shake*sum` (uutils#987) - `b3sum` (uutils#3108 and uutils#3164) In particular, the `--bits` option, and the `--no-names` option added in uutils#3361, are not valid for any GNU Coreutils `*sum` binary (as of Coreutils 9.0). This commit refactors the argument parsing so that `--bits` and `--no-names` become invalid options for the binaries intended to match the GNU Coreutils API, instead of being ignored options. It also refactors the custom binary name handling to distinguish between binaries intended to match the GNU Coreutils API, and binaries that don't have that constraint. Part of uutils#2930.
sylvestre
pushed a commit
to str4d/coreutils
that referenced
this pull request
Jun 10, 2022
Several binaries have been added to `hashsum` that have never been part of GNU Coreutils: - `sha3*sum` (uutils#869) - `shake*sum` (uutils#987) - `b3sum` (uutils#3108 and uutils#3164) In particular, the `--bits` option, and the `--no-names` option added in uutils#3361, are not valid for any GNU Coreutils `*sum` binary (as of Coreutils 9.0). This commit refactors the argument parsing so that `--bits` and `--no-names` become invalid options for the binaries intended to match the GNU Coreutils API, instead of being ignored options. It also refactors the custom binary name handling to distinguish between binaries intended to match the GNU Coreutils API, and binaries that don't have that constraint. Part of uutils#2930.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
The official b3sum tool has a --no-names option for only printing the
hashes, omitting the filenames. This is quite handy when used from
scripts because it spares the postprocessing with "cut" or "awk".
Since the installed b3sum symlink would also serve as a drop-in for the
official tool, the --no-names option is expected to exist for
compatibility.
Add a --no-names option not only for b3sum but for hashsum in general
(and maybe GNU coreutils will also feel inspired to add this option).
Closes #3360