Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: Experimental subcommand-based interface (via @ok-nick) #729

Open
wants to merge 62 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
62 commits
Select commit Hold shift + click to select a range
168c5a8
Refactor with subcommand-based interface
ok-nick Jun 6, 2024
b5622b2
Remove outdated behavior w/ `env_logger`
ok-nick Jun 6, 2024
d856238
Default to displaying manifest when no commands are specified
ok-nick Jun 6, 2024
0000153
Remove ingredient search assumption
ok-nick Jun 6, 2024
37f1859
Generalize error output when resolving input source
ok-nick Jun 6, 2024
6b8a9ee
Remove snake_case args
ok-nick Jun 7, 2024
3051ffc
Add verbose flag
ok-nick Jun 7, 2024
93b29d6
Modularize + add unit tests + verbose flag + glob input
ok-nick Jun 7, 2024
c6fb8ae
Fix clippy lint temp
ok-nick Jun 7, 2024
d2a02eb
Add notice docs
ok-nick Jun 7, 2024
36b2d7a
Move trust args to subcommands + move cli args to commands/mod.rs
ok-nick Jun 7, 2024
836344e
Prepare extract subcommand
ok-nick Jun 7, 2024
86d460b
Impl extract, more validation, and clarify docs
ok-nick Jun 10, 2024
628d4b0
Refactor to keep command structs w/ impl
ok-nick Jun 10, 2024
cb8a28d
Add extract ingredient, extract manifest, and stricter validation
ok-nick Jun 10, 2024
954b0c6
Add view ingredient, command feedback, and more validation
ok-nick Jun 11, 2024
5d0a048
Fix clippy lint
ok-nick Jun 11, 2024
55c49c7
Prototype test impls w/ snapshot testing
ok-nick Jun 11, 2024
b5fe740
More thorough tests, fix snapshots
ok-nick Jun 11, 2024
fc68c84
Fix clippy lint
ok-nick Jun 11, 2024
39b0ec0
Add sign integration test
ok-nick Jun 11, 2024
9476f5f
Filter extended manifest urn and report coverage for integration tests
ok-nick Jun 11, 2024
f0eae7b
Add --binary to extract manifest as .c2pa binary and add headers to f…
ok-nick Jun 11, 2024
8111229
Validate manifest is valid when extracting manifest as binary
ok-nick Jun 11, 2024
92d523a
Force overwrite temp dir when extracting resources during test
ok-nick Jun 11, 2024
93347c1
Remove cmd output, add more insta filters
ok-nick Jun 12, 2024
294b623
More lenient regex for filtering timestamp
ok-nick Jun 12, 2024
0f142e9
Cache globs
ok-nick Jun 12, 2024
2396fd3
More comprehensive sign validation
ok-nick Jun 12, 2024
3aa459e
Fix not constructing path from glob and caching extract globs
ok-nick Jun 12, 2024
c55a827
Cleanup and canonicalize fixture path
ok-nick Jun 12, 2024
b02b0ca
Use reqwest::Url and avoid canonicalizing fixture path due to glob issue
ok-nick Jun 12, 2024
6d7d0c9
Fix formatting and cleanup
ok-nick Jun 12, 2024
c32a89b
Merge ingredient_paths and ingredients
ok-nick Jun 13, 2024
452303c
Remove extracting .c2pa binary manifest when extracting ingredient
ok-nick Jun 13, 2024
5faf8d2
Add back unit test from main.rs to signer.rs
ok-nick Jun 13, 2024
48dbd49
Add more extensive signing tests
ok-nick Jun 13, 2024
d2fe6c6
More snapshot filtering
ok-nick Jun 13, 2024
ce69e7b
Add color and upload snapshot artifacts in ci
ok-nick Jun 13, 2024
ec3c46a
Upload failed snapshots as artifacts
ok-nick Jun 13, 2024
4e35bd6
Insert glob snapshots into vector before snapshotting
ok-nick Jun 13, 2024
349cbcb
Serialize manifest store directly in tests
ok-nick Jun 14, 2024
68a4ed5
Update snapshots
ok-nick Jun 14, 2024
4cbb949
Sort manifest snapshots by title to prevent diff conflicts
ok-nick Jun 14, 2024
0bb3a87
Split --manifest and --manifest-url to prevent Windows path conflicts
ok-nick Jun 14, 2024
d539f6d
Change ingredients field in json manifest to optional
ok-nick Jun 14, 2024
b6230cc
Add trust suffixed -url args to prevent Windows url/path mixups
ok-nick Jun 14, 2024
c2b2754
Fix specifying --force and asserting sidecar output doesn't exist
ok-nick Jun 17, 2024
e9c834a
Use native shell glob expansion (+Windows support)
ok-nick Jun 17, 2024
3317328
Replace glob dep with wild
ok-nick Jun 17, 2024
2d3df5c
Changed skip and report on error when signing
ok-nick Jun 17, 2024
41e3b11
Skip on error for extracting resources
ok-nick Jun 17, 2024
6559ca6
Keep track of existing sidecar files when reporting error
ok-nick Jun 17, 2024
b5d53e9
Add --no-verify flag when extracting binary manifest
ok-nick Jun 18, 2024
7f01b6e
Fix build issue
mauricefisher64 Jun 19, 2024
d766cea
Merge branch 'main' into ok-nick/subcommands
ok-nick Jun 19, 2024
5c48d29
Merge branch 'main' into ok-nick/subcommands
ok-nick Jun 19, 2024
f247a9b
Migrate to c2pa-rs unstable API (contentauth/c2patool#187)
ok-nick Aug 14, 2024
b231d7b
Add foundation for documentation
ok-nick Aug 14, 2024
a8bb688
Merge remote-tracking branch 'origin' into ok-nick/subcommands
ok-nick Aug 14, 2024
2a01964
Merge remote-tracking branch 'origin' into ok-nick/subcommands
ok-nick Aug 15, 2024
3693da7
Update snapshots
ok-nick Aug 15, 2024
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
16 changes: 14 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,9 +37,21 @@ jobs:
uses: taiki-e/install-action@cargo-llvm-cov

- name: Generate code coverage
id: run_tests
env:
RUST_BACKTRACE: "1"
run: cargo llvm-cov --bins --all-features --lcov --output-path lcov.info
RUST_BACKTRACE: 1
CARGO_TERM_COLOR: always
CLICOLOR_FORCE: 1
INSTA_UPDATE: new
run: cargo llvm-cov --tests --bins --all-features --lcov --output-path lcov.info

# https://insta.rs/docs/patterns/
- name: Upload snapshots of failed tests
if: ${{ failure() && steps.run_tests.outcome == 'failure' }}
uses: actions/upload-artifact@v3
with:
name: failed-snapshots
path: "**/snapshots/*.snap.new"

- name: Upload code coverage results
uses: codecov/codecov-action@v3
Expand Down
Loading