Fix with fork of clap-markdown

Author: jayvdb

Cargo.lock

@@ -50,11 +50,11 @@ Manages butane database migrations.
 
 ###### **Options:**
 
+* `-v`, `--verbose` — Increase logging verbosity
+* `-q`, `--quiet` — Decrease logging verbosity
 * `-p`, `--path <PATH>`
 
   Default value: `<detected project containing .butane directory>`
-* `-v`, `--verbose` — Increase logging verbosity
-* `-q`, `--quiet` — Decrease logging verbosity
 
 
 

HELP.md

@@ -31,7 +31,7 @@ butane.workspace = true
 cargo_metadata = "0.23"
 chrono = { workspace = true }
 clap = { version = "4.1", features = ["derive", "string", "wrap_help"] }
-clap-markdown = { version = "0.1.5", optional = true }
+clap-markdown = { git = "https://github.com/jayvdb/clap-markdown", branch = "allow-passing-instance", optional = true }
 clap-verbosity-flag = "3.0"
 env_logger.workspace = true
 log.workspace = true

butane_cli/Cargo.toml

@@ -8,24 +8,16 @@ use butane_cli::{
     detach_latest_migration, embed, get_migrations, handle_error, init, list_backends,
     list_migrations, make_migration, migrate, regenerate_migrations, remove_backend, unmigrate,
 };
-use clap::{ArgAction, Parser, Subcommand};
+use clap::{ArgAction, CommandFactory, Parser, Subcommand};
 
 #[derive(Parser)]
 #[command(author, version, about = "Manages butane database migrations.")]
 #[command(propagate_version = true, max_term_width = 80)]
 struct Cli {
     #[command(subcommand)]
     command: Commands,
-    #[cfg(not(feature = "clap-markdown"))]
     #[arg(short = 'p', long, default_value=butane_cli::base_dir().into_os_string())]
     path: PathBuf,
-    #[cfg(feature = "clap-markdown")]
-    #[arg(
-        short = 'p',
-        long,
-        default_value = "<detected project containing .butane directory>"
-    )]
-    path: PathBuf,
     #[command(flatten)]
     verbose: clap_verbosity_flag::Verbosity,
     #[cfg(feature = "clap-markdown")]
@@ -150,7 +142,12 @@ fn main() {
 
     #[cfg(feature = "clap-markdown")]
     if cli.markdown_help {
-        clap_markdown::print_help_markdown::<Cli>();
+        let command = Cli::command();
+
+        let command = command.mut_arg("path", |arg| {
+            arg.default_value("<detected project containing .butane directory>")
+        });
+        clap_markdown::print_help_markdown_command(&command);
         std::process::exit(0);
     }