Support using `cargo make` as library #1112

SamuelMarks · 2024-07-12T01:54:44Z

Related to and closes #1110

… useful symbols for use `cargo-make` as library

…library

…tions with `&` to avoid `clone`s ; [src/lib/**.rs] Fix build with new function definitions

… `CargoMakeError`

…hroughout

src/lib/error.rs

src/lib/types.rs

sagiegurari · 2024-07-13T14:32:04Z

@SamuelMarks amazing job thanks a lot. its actually something i wanted to do for a long time but didn't have the capacity so its great.
got few questions and also i see a test error. would love if you can take a look.

SamuelMarks · 2024-07-13T14:39:57Z

@sagiegurari Great to hear you're open to this PR!

Let me take a look at the failing test and see if I can't resolve.

…l,.lock}] Remove `either`

…ly with `#![feature(try_trait_v2)]`

…rguments` ; `parse_args` cleanup so `return` is unnecessary

codecov · 2024-07-14T17:41:08Z

Codecov Report

Attention: Patch coverage is 85.19856% with 123 lines in your changes missing coverage. Please review.

Project coverage is 92.70%. Comparing base (4dfc585) to head (4564d61).
Report is 1 commits behind head on 0.37.14.

Files	Patch %	Lines
src/lib/error.rs	29.41%	24 Missing ⚠️
src/lib/runner.rs	77.41%	14 Missing ⚠️
src/lib/scriptengine/rsscript_test.rs	50.00%	11 Missing ⚠️
src/lib/execution_plan.rs	86.00%	7 Missing ⚠️
src/lib/descriptor/descriptor_deserializer.rs	45.45%	6 Missing ⚠️
src/lib/scriptengine/generic_script_test.rs	50.00%	6 Missing ⚠️
src/lib/functions/mod.rs	72.22%	5 Missing ⚠️
...rc/lib/scriptengine/duck_script/sdk/cm_run_task.rs	16.66%	5 Missing ⚠️
src/lib/installer/mod.rs	50.00%	4 Missing ⚠️
src/lib/cli_parser_test.rs	95.23%	3 Missing ⚠️
... and 24 more

Additional details and impacted files

@@             Coverage Diff              @@
##           0.37.14    #1112       +/-   ##
============================================
+ Coverage    69.27%   92.70%   +23.42%     
============================================
  Files          118      119        +1     
  Lines        26049    26203      +154     
============================================
+ Hits         18046    24292     +6246     
+ Misses        8003     1911     -6092

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

sagiegurari · 2024-07-14T17:49:50Z

@SamuelMarks your fixes solve the CI issue but i also merged #1109 which caused some merge conflicts. any chance you can resolve it so i'll push this? thanks

# Conflicts: # src/lib/cli.rs # src/lib/cli_commands/diff_steps.rs # src/lib/cli_commands/print_steps.rs # src/lib/cli_commands/print_steps_test.rs # src/lib/execution_plan.rs # src/lib/execution_plan_test.rs # src/lib/runner.rs

SamuelMarks · 2024-07-14T21:24:35Z

@sagiegurari Resolved that merge conflict, still some weirdness going with this logic:
https://github.com/sagiegurari/cargo-make/blob/0119754/src/lib/execution_plan.rs#L491-L498

Once resolved let's try and merge this quickly before more PRs come through! - As this PR changes the whole codebase, adding error handling &etc.

sagiegurari · 2024-07-14T21:26:24Z

thanks. there are no PRs at the moment so i wouldn't worry about it.
as for the legacy task, i'm planning to remove it soon i hope.

SamuelMarks · 2024-07-14T21:27:47Z

Cool cool; no I mean 18 tests are failing because of that logic I linked. What do you want that logic to be? - Silent ignore? - Ignore but give a warning message? - Something else?

EDIT: Committed up code which comments out the return Err(CargoMakeError::NotFound lines in build of src/lib/execution_plan.rs

…eError::NotFound` on `skip_init_end_tasks` & `skip_init_end_tasks` & `end_task`

sagiegurari · 2024-07-14T21:50:33Z

I'll review the updated code tomorrow. if it makes a fuzz, drop the legacy migration task from the codebase as i want to delete it anyway.

… enable library authors to expand the spec (* might need some post-processing)

sagiegurari · 2024-07-17T08:10:53Z

@SamuelMarks merging. thanks a lot

sagiegurari · 2024-07-17T08:47:37Z

@SamuelMarks while merging it to master (and planning to release it), i saw that there is an unsafe block and its crashing in mac OS in the ci cd flow.
please take a look

https://github.com/sagiegurari/cargo-make/actions/runs/9970773762

SamuelMarks added 9 commits July 7, 2024 23:25

[src/lib/{mod,cli,cli_parser,runner,descriptor/mod}.rs] Make public…

69cbfc8

… useful symbols for use `cargo-make` as library

[src/lib/**.rs] Make public useful symbols for use cargo-make as …

6cf5942

…library

[src/lib/*.rs] Percolate exit codes around

2234422

[src/lib/*.rs] Fix tests broken by previous commit ; rustfmt

38780a3

[src/{main,makers}.rs] Percolate exit code up

a5dd7c6

[src/lib/types.rs] Implement helper either_to_result

58fd745

[src/lib/cli.rs] Change function definition of run and related func…

2a2e03f

…tions with `&` to avoid `clone`s ; [src/lib/**.rs] Fix build with new function definitions

Rewrite panic! to percolate Result throughout, including with new…

7354658

… `CargoMakeError`

Rewrite remaining panic! to percolate Result<_, CargoMakeError> t…

8bd60c7

…hroughout

sagiegurari reviewed Jul 13, 2024

View reviewed changes

src/lib/error.rs Outdated Show resolved Hide resolved

src/lib/types.rs Outdated Show resolved Hide resolved

sagiegurari changed the base branch from master to 0.37.14 July 13, 2024 14:31

SamuelMarks added 3 commits July 13, 2024 10:55

[src/lib/cli_test.rs] Fix run_valid ; [{src/lib/types.rs,Cargo{.tom…

d085444

…l,.lock}] Remove `either`

[src/lib/error.rs] Remove commented out code that only works in night…

cb11b71

…ly with `#![feature(try_trait_v2)]`

[src/lib/cli_parser.rs] Split add_argument into own function `add_a…

78e13aa

…rguments` ; `parse_args` cleanup so `return` is unnecessary

SamuelMarks added 2 commits July 14, 2024 16:52

Merge branch '0.37.14' into cargo-make-as-library

8f9fe3e

# Conflicts: # src/lib/cli.rs # src/lib/cli_commands/diff_steps.rs # src/lib/cli_commands/print_steps.rs # src/lib/cli_commands/print_steps_test.rs # src/lib/execution_plan.rs # src/lib/execution_plan_test.rs # src/lib/runner.rs

Merge branch '0.37.14' into cargo-make-as-library

0119754

[src/lib/execution_plan.rs] Comment out within build: `Err(CargoMak…

4564d61

…eError::NotFound` on `skip_init_end_tasks` & `skip_init_end_tasks` & `end_task`

[src/lib/cli_{parser,parser_test,test}.rs] Pass around a CliSpec to…

6f4f4f7

… enable library authors to expand the spec (* might need some post-processing)

sagiegurari merged commit 8b07c69 into sagiegurari:0.37.14 Jul 17, 2024
12 checks passed

sagiegurari mentioned this pull request Jul 19, 2024

Minor: Integration into conda environment #1119

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Support using `cargo make` as library #1112

Support using `cargo make` as library #1112

SamuelMarks commented Jul 12, 2024 •

edited

Loading

sagiegurari commented Jul 13, 2024

SamuelMarks commented Jul 13, 2024

codecov bot commented Jul 14, 2024 •

edited

Loading

sagiegurari commented Jul 14, 2024

SamuelMarks commented Jul 14, 2024

sagiegurari commented Jul 14, 2024

SamuelMarks commented Jul 14, 2024 •

edited

Loading

sagiegurari commented Jul 14, 2024

sagiegurari commented Jul 17, 2024

sagiegurari commented Jul 17, 2024

Support using cargo make as library #1112

Support using cargo make as library #1112

Conversation

SamuelMarks commented Jul 12, 2024 • edited Loading

sagiegurari commented Jul 13, 2024

SamuelMarks commented Jul 13, 2024

codecov bot commented Jul 14, 2024 • edited Loading

Codecov Report

sagiegurari commented Jul 14, 2024

SamuelMarks commented Jul 14, 2024

sagiegurari commented Jul 14, 2024

SamuelMarks commented Jul 14, 2024 • edited Loading

sagiegurari commented Jul 14, 2024

sagiegurari commented Jul 17, 2024

sagiegurari commented Jul 17, 2024

Support using `cargo make` as library #1112

Support using `cargo make` as library #1112

SamuelMarks commented Jul 12, 2024 •

edited

Loading

codecov bot commented Jul 14, 2024 •

edited

Loading

SamuelMarks commented Jul 14, 2024 •

edited

Loading