0.37.14

CHANGELOG.md

@@ -1,5 +1,10 @@
 ## CHANGELOG
 
+### v0.37.14
+
+* Fix: fix the --skip-init-end-tasks argument #1108 (thanks @06393993)
+* Enhancement: Support using cargo make as library #1112 (thanks @SamuelMarks)
+
 ### v0.37.13 (2024-07-07)
 
 * Enhancement: New condition_script_runner_args attribute #1081

Cargo.toml

@@ -58,9 +58,9 @@ fsio = { version = "^0.4", features = ["temp-path"] }
 git_info = "^0.1.2"
 glob = "^0.3.1"
 home = "^0.5"
+ignore = "^0.4"
 indexmap = { version = "^2", features = ["serde"] }
 itertools = "^0.13"
-ignore = "^0.4"
 lenient_semver = "^0.4.2"
 log = "^0.4"
 once_cell = "^1.19.0"
@@ -76,6 +76,7 @@ serde_json = "^1"
 sha2 = "^0.10"
 shell2batch = "^0.4.5"
 strip-ansi-escapes = "^0.2"
+strum_macros = "0.26.4"
 toml = "^0.8"
 
 [dev-dependencies]

docs/api/src/cli/cli.rs.html

@@ -210,7 +210,7 @@
 <span class="kw">pub</span>(<span class="kw">crate</span>) <span class="kw">static </span>DEFAULT_TASK_NAME: <span class="kw-2">&amp;</span>str = <span class="string">"default"</span>;
 <span class="kw">pub</span>(<span class="kw">crate</span>) <span class="kw">static </span>DEFAULT_OUTPUT_FORMAT: <span class="kw-2">&amp;</span>str = <span class="string">"default"</span>;
 
-<span class="kw">fn </span>run(cli_args: CliArgs, global_config: <span class="kw-2">&amp;</span>GlobalConfig) {
+<span class="kw">fn </span>run(&cli_args: CliArgs, global_config: <span class="kw-2">&amp;</span>GlobalConfig) {
     <span class="kw">let </span>start_time = SystemTime::now();
 
     recursion_level::increment();
@@ -354,6 +354,6 @@
 
     <span class="kw">let </span>cli_args = cli_parser::parse(<span class="kw-2">&amp;</span>global_config, <span class="kw-2">&amp;</span>command_name, sub_command);
 
-    run(cli_args, <span class="kw-2">&amp;</span>global_config);
+    run(&cli_args, <span class="kw-2">&amp;</span>global_config);
 }
 </code></pre></div></section></main></body></html>

src/lib/cli.rs

@@ -12,6 +12,7 @@ use crate::cli_parser;
 use crate::config;
 use crate::descriptor;
 use crate::environment;
+use crate::error::CargoMakeError;
 use crate::logger;
 use crate::logger::LoggerOptions;
 use crate::profile;
@@ -31,7 +32,7 @@ pub(crate) static DEFAULT_LOG_LEVEL: &str = "info";
 pub(crate) static DEFAULT_TASK_NAME: &str = "default";
 pub(crate) static DEFAULT_OUTPUT_FORMAT: &str = "default";
 
-fn run(cli_args: CliArgs, global_config: &GlobalConfig) {
+pub fn run(cli_args: &CliArgs, global_config: &GlobalConfig) -> Result<(), CargoMakeError> {
     let start_time = SystemTime::now();
 
     recursion_level::increment();
@@ -95,15 +96,8 @@ fn run(cli_args: CliArgs, global_config: &GlobalConfig) {
     let env = cli_args.env.clone();
 
     let experimental = cli_args.experimental;
-    let descriptor_load_result = descriptor::load(&build_file, force_makefile, env, experimental);
-
-    let config = match descriptor_load_result {
-        Ok(config) => config,
-        Err(ref error) => {
-            error!("{}", error);
-            panic!("{}", error);
-        }
-    };
+    let config = descriptor::load(&build_file, force_makefile, env, experimental)?;
+
     let mut time_summary_vec = vec![];
     time_summary::add(
         &mut time_summary_vec,
@@ -117,7 +111,7 @@ fn run(cli_args: CliArgs, global_config: &GlobalConfig) {
         None => profile::set_additional(&vec![]),
     };
 
-    let env_info = environment::setup_env(&cli_args, &config, &task, home, &mut time_summary_vec);
+    let env_info = environment::setup_env(&cli_args, &config, &task, home, &mut time_summary_vec)?;
     time_summary::add(&mut time_summary_vec, "[Setup Env]", step_time);
 
     let crate_name = envmnt::get_or("CARGO_MAKE_CRATE_NAME", "");
@@ -136,27 +130,29 @@ fn run(cli_args: CliArgs, global_config: &GlobalConfig) {
             &config,
             &cli_args.output_format,
             &cli_args.output_file,
-            cli_args.list_category_steps,
+            &cli_args.list_category_steps,
             cli_args.hide_uninteresting,
-        );
+        )
     } else if cli_args.diff_execution_plan {
-        let default_config = descriptor::load_internal_descriptors(true, experimental, None);
+        let default_config = descriptor::load_internal_descriptors(true, experimental, None)?;
         cli_commands::diff_steps::run(
             &default_config,
             &config,
             &task,
             &cli_args,
             &env_info.crate_info,
-        );
+        )
     } else if cli_args.print_only {
         cli_commands::print_steps::print(
+            &mut std::io::stdout(),
             &config,
             &task,
             &cli_args.output_format,
             cli_args.disable_workspace,
-            cli_args.skip_tasks_pattern,
+            &cli_args.skip_tasks_pattern,
             &env_info.crate_info,
-        );
+            cli_args.skip_init_end_tasks,
+        )
     } else {
         runner::run(
             config,
@@ -165,15 +161,18 @@ fn run(cli_args: CliArgs, global_config: &GlobalConfig) {
             &cli_args,
             start_time,
             time_summary_vec,
-        );
-    }
+        )
+    }?;
+
+    Ok(())
 }
 
 /// Handles the command line arguments and executes the runner.
-pub(crate) fn run_cli(command_name: String, sub_command: bool) {
-    let global_config = config::load();
+pub fn run_cli(command_name: String, sub_command: bool) -> Result<CliArgs, CargoMakeError> {
+    let global_config = config::load()?;
 
-    let cli_args = cli_parser::parse(&global_config, &command_name, sub_command);
+    let cli_args = cli_parser::parse(&global_config, &command_name, sub_command)?;
 
-    run(cli_args, &global_config);
+    run(&cli_args, &global_config)?;
+    Ok(cli_args)
 }