Skip to content

Commit

Permalink
Add support for generating a bash completion script
Browse files Browse the repository at this point in the history
This change adds support for generating a bash completion script. If
sourced, the shell will provide tab completions for the program's
arguments.
There are two possible approaches provided by clap for going about
generating shell completion functionality: either at build time by
separately generating the clap parsers out-of-band or at run time, as an
option to the main program itself. We are generally not too much in
favor of a run time approach, as it means less inspectability at
installation time and more overhead in the form of code crammed into the
main binary.
Hence, with this change we take the "build time" approach. Clap
recommends hooking the generation up in build.rs, but this seems like an
inflexible choice. For one, that is because it would mean
unconditionally generating this file or some user-unfriendly environment
variable based approach to making the process conditional. But also
because specifying the command for which to generate the script should
likely be configurable. That is a limitation of the completion script
that clap generates (see clap-rs/clap#1764).
Instead, we provide a utility program that emits the completion script
to standard output, accepting regular command line options itself. In
so doing we allow for installation time generation of the completion
script or installation of the utility itself, the output of which could
be sourced on demand -- depending on the user's preference.
  • Loading branch information
d-e-s-o committed Apr 1, 2020
1 parent 9b43260 commit a3b9a16
Show file tree
Hide file tree
Showing 3 changed files with 46 additions and 0 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ Unreleased
- Replaced `argparse` with `structopt`
- Removed `argparse` dependency
- Made the --verbose and --model options global
- Added bash completion support via `shell-complete` utility program
- Removed vendored dependencies and moved source code into repository
root
- Bumped `nitrokey` dependency to `0.6.0`
Expand Down
4 changes: 4 additions & 0 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,10 @@ exclude = ["ci/*", "rustfmt.toml"]
[badges]
gitlab = { repository = "d-e-s-o/nitrocli", branch = "master" }

[[bin]]
name = "shell-complete"
path = "var/shell-complete.rs"

[profile.release]
opt-level = "z"
lto = true
Expand Down
41 changes: 41 additions & 0 deletions var/shell-complete.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
// Copyright (C) 2020 Daniel Mueller <[email protected]>
// SPDX-License-Identifier: GPL-3.0-or-later

use std::io;

use structopt::clap;
use structopt::StructOpt as _;

#[allow(unused)]
mod nitrocli {
include!("../src/arg_util.rs");

// We only need a stripped down version of the `Command` macro.
macro_rules! Command {
( $name:ident, [ $( $(#[$doc:meta])* $var:ident$(($inner:ty))? => $exec:expr, ) *] ) => {
#[derive(Debug, PartialEq, structopt::StructOpt)]
pub enum $name {
$(
$(#[$doc])*
$var$(($inner))?,
)*
}
};
}

include!("../src/arg_defs.rs");
}

/// Generate a bash completion script for nitrocli.
#[derive(Debug, structopt::StructOpt)]
pub struct Args {
/// The command for which to generate the bash completion script.
#[structopt(default_value = "nitrocli")]
pub command: String,
}

fn main() {
let args = Args::from_args();
let mut app = nitrocli::Args::clap();
app.gen_completions_to(&args.command, clap::Shell::Bash, &mut io::stdout());
}

0 comments on commit a3b9a16

Please sign in to comment.