Skip to content

Commit 8d7aefe

Browse files
helmesjohenryiii
authored andcommitted
Added option description setter (#199)
* Added posibility to modify option description: Option::description(const std::string&). Related: #193 * Return Option* from Option::description(...). Format-fix to make clang-format happy. * Fixing format * Added posibility to modify app description: App::description(const std::string&). * Fixing Style * Update readme and changelog
1 parent 72c384c commit 8d7aefe

File tree

5 files changed

+55
-9
lines changed

5 files changed

+55
-9
lines changed

CHANGELOG.md

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,8 @@ Passing the same subcommand multiple times is better supported. Several new feat
77
* Added `parse(string)` to split up and parse a command-line style string directly. [#186]
88
* Added `ignore_underscore` and related functions, to ignore underscores when matching names. [#185]
99
* The default INI Config will now add quotes to strings with spaces [#195]
10-
* The default message now will mention the help--all flag also if present [#197]
10+
* The default message now will mention the help-all flag also if present [#197]
11+
* Added `->description` to set Option descriptions [#199]
1112
* Subcommands now track how many times they were parsed in a parsing process. `count()` with no arguments will return the number of times a subcommand was encountered. [#179]
1213
* Parsing is now done in phases: `shortcurcuits`, `ini`, `env`, `callbacks`, and `requirements`; all subcommands complete a phase before moving on. [#179]
1314
* Calling parse multiple times is now officially supported without `clear` (automatic). [#179]
@@ -26,6 +27,7 @@ Passing the same subcommand multiple times is better supported. Several new feat
2627
[#192]: https://github.com/CLIUtils/CLI11/pull/192
2728
[#197]: https://github.com/CLIUtils/CLI11/pull/197
2829
[#195]: https://github.com/CLIUtils/CLI11/issues/195
30+
[#199]: https://github.com/CLIUtils/CLI11/pull/199
2931

3032
## Version 1.6.2: Help-all
3133

@@ -125,7 +127,7 @@ Other changes:
125127

126128
Backend and testing changes:
127129

128-
* Internally, `type_name` is now a lambda function; for sets, this reads the set live. [#116]
130+
* Internally, `type_name` is now a lambda function; for sets, this reads the set live. [#116]
129131
* Cleaner tests without `app.reset()` (and `reset` is now `clear`). [#141]
130132
* Better CMake policy handling. [#110]
131133
* Includes are properly sorted. [#120]
@@ -221,7 +223,7 @@ This version adds lots of smaller fixes and additions after the refactor in vers
221223
* Added `ExistingPath` validator [#73]
222224
* `app.allow_ini_extras()` added to allow extras in INI files [#70]
223225
* Multiline INI comments now supported
224-
* Descriptions can now be written with `config_to_str` [#66]
226+
* Descriptions can now be written with `config_to_str` [#66]
225227
* Double printing of error message fixed [#77]
226228
* Renamed `requires` to `needs` to avoid C++20 keyword [#75], [#82]
227229
* MakeSingleHeader now works if outside of git [#78]
@@ -260,7 +262,7 @@ favorite CLI programs. Error messages and help messages are better and more flex
260262
* Footers can be added to help [#42](https://github.com/CLIUtils/CLI11/pull/42)
261263
* Help flags are easier to customize [#43](https://github.com/CLIUtils/CLI11/pull/43)
262264
* Subcommand now support groups [#46](https://github.com/CLIUtils/CLI11/pull/46)
263-
* `CLI::RuntimeError` added, for easy exit with error codes [#45](https://github.com/CLIUtils/CLI11/pull/45)
265+
* `CLI::RuntimeError` added, for easy exit with error codes [#45](https://github.com/CLIUtils/CLI11/pull/45)
264266
* The clang-format script is now no longer "hidden" [#48](https://github.com/CLIUtils/CLI11/pull/48)
265267
* The order is now preserved for subcommands (list and callbacks) [#49](https://github.com/CLIUtils/CLI11/pull/49)
266268
* Tests now run individually, utilizing CMake 3.10 additions if possible [#50](https://github.com/CLIUtils/CLI11/pull/50)
@@ -277,7 +279,7 @@ favorite CLI programs. Error messages and help messages are better and more flex
277279
* Allow options to be disabled from INI file, rename `add_config` to `set_config` [#60](https://github.com/CLIUtils/CLI11/pull/60)
278280

279281
> ### Converting from CLI11 1.2:
280-
>
282+
>
281283
> * `app.parse` no longer returns a vector. Instead, use `app.remaining(true)`.
282284
> * `"hidden"` is no longer a special group name, instead use `""`
283285
> * Validators API has changed to return an error string; use `.empty()` to get the old bool back
@@ -302,8 +304,8 @@ This release focuses on making CLI11 behave properly in corner cases, and with c
302304
This release incorporates feedback from the release announcement. The examples are slowly being expanded, some corner cases improved, and some new functionality for tricky parsing situations.
303305

304306
* Added simple support for enumerations, allow non-printable objects [#12](https://github.com/CLIUtils/CLI11/issues/12)
305-
* Added `app.parse_order()` with original parse order ([#13](https://github.com/CLIUtils/CLI11/issues/13), [#16](https://github.com/CLIUtils/CLI11/pull/16))
306-
* Added `prefix_command()`, which is like `allow_extras` but instantly stops and returns. ([#8](https://github.com/CLIUtils/CLI11/issues/8), [#17](https://github.com/CLIUtils/CLI11/pull/17))
307+
* Added `app.parse_order()` with original parse order ([#13](https://github.com/CLIUtils/CLI11/issues/13), [#16](https://github.com/CLIUtils/CLI11/pull/16))
308+
* Added `prefix_command()`, which is like `allow_extras` but instantly stops and returns. ([#8](https://github.com/CLIUtils/CLI11/issues/8), [#17](https://github.com/CLIUtils/CLI11/pull/17))
307309
* Removed Windows warning ([#10](https://github.com/CLIUtils/CLI11/issues/10), [#20](https://github.com/CLIUtils/CLI11/pull/20))
308310
* Some improvements to CMake, detect Python and no dependencies on Python 2 (like Python 3) ([#18](https://github.com/CLIUtils/CLI11/issues/18), [#21](https://github.com/CLIUtils/CLI11/pull/21))
309311

README.md

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -232,6 +232,7 @@ Before parsing, you can set the following options:
232232
- `->group(name)`: The help group to put the option in. No effect for positional options. Defaults to `"Options"`. `""` will not show up in the help print (hidden).
233233
- `->ignore_case()`: Ignore the case on the command line (also works on subcommands, does not affect arguments).
234234
- `->ignore_underscore()`: Ignore any underscores in the options names (also works on subcommands, does not affect arguments). For example "option_one" will match with optionone. This does not apply to short form options since they only have one character
235+
- `.description(str)`: Set/change the description.
235236
- `->multi_option_policy(CLI::MultiOptionPolicy::Throw)`: Set the multi-option policy. Shortcuts available: `->take_last()`, `->take_first()`, and `->join()`. This will only affect options expecting 1 argument or bool flags (which always default to take last).
236237
- `->check(CLI::ExistingFile)`: Requires that the file exists if given.
237238
- `->check(CLI::ExistingDirectory)`: Requires that the directory exists.
@@ -306,6 +307,7 @@ There are several options that are supported on the main app and subcommands. Th
306307
- `.get_options(filter)`: Get the list of all defined option pointers (useful for processing the app for custom output formats).
307308
- `.parse_order()`: Get the list of option pointers in the order they were parsed (including duplicates).
308309
- `.formatter(fmt)`: Set a formatter, with signature `std::string(const App*, std::string, AppFormatMode)`. See Formatting for more details.
310+
- `.description(str)`: Set/change the description.
309311
- `.get_description()`: Access the description.
310312
- `.parsed()`: True if this subcommand was given on the command line.
311313
- `.name(name)`: Add or change the name.
@@ -478,8 +480,9 @@ Significant features and/or improvements to the code were contributed by:
478480
- [Paweł Bylica](https://github.com/chfast)
479481
- [Philip Top](https://github.com/phlptp)
480482
- [almikhayl](https://github.com/almikhayl)
481-
- [nurelin](https://github.com/nurelin)
482-
- [ncihneg](https://github.com/ncihneg)
483+
- [nurelin](https://github.com/nurelin) <!-- help_all in message -->
484+
- [ncihneg](https://github.com/ncihneg) <!-- Quoting strings in INI generation -->
485+
- [Fred Helmesjö](https://github.com/helmesjo) <!-- `->description()` -->
483486
484487
485488
## License

include/CLI/App.hpp

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1374,6 +1374,12 @@ class App {
13741374
/// Get the app or subcommand description
13751375
std::string get_description() const { return description_; }
13761376

1377+
/// Set the description
1378+
App *description(const std::string &description) {
1379+
description_ = description;
1380+
return this;
1381+
}
1382+
13771383
/// Get the list of options (user facing function, so returns raw pointers), has optional filter function
13781384
std::vector<const Option *> get_options(const std::function<bool(const Option *)> filter = {}) const {
13791385
std::vector<const Option *> options(options_.size());

include/CLI/Option.hpp

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -517,6 +517,12 @@ class Option : public OptionBase<Option> {
517517
/// Get the description
518518
const std::string &get_description() const { return description_; }
519519

520+
/// Set the description
521+
Option *description(const std::string &description) {
522+
description_ = description;
523+
return this;
524+
}
525+
520526
///@}
521527
/// @name Help tools
522528
///@{

tests/HelpTest.cpp

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -645,6 +645,35 @@ TEST(THelp, AccessDescription) {
645645
EXPECT_EQ(app.get_description(), "My description goes here");
646646
}
647647

648+
TEST(THelp, SetDescriptionAfterCreation) {
649+
CLI::App app{""};
650+
651+
app.description("My description goes here");
652+
653+
EXPECT_EQ(app.get_description(), "My description goes here");
654+
EXPECT_THAT(app.help(), HasSubstr("My description goes here"));
655+
}
656+
657+
TEST(THelp, AccessOptionDescription) {
658+
CLI::App app{};
659+
660+
int x;
661+
auto opt = app.add_option("-a,--alpha", x, "My description goes here");
662+
663+
EXPECT_EQ(opt->get_description(), "My description goes here");
664+
}
665+
666+
TEST(THelp, SetOptionDescriptionAfterCreation) {
667+
CLI::App app{};
668+
669+
int x;
670+
auto opt = app.add_option("-a,--alpha", x);
671+
opt->description("My description goes here");
672+
673+
EXPECT_EQ(opt->get_description(), "My description goes here");
674+
EXPECT_THAT(app.help(), HasSubstr("My description goes here"));
675+
}
676+
648677
TEST(THelp, CleanNeeds) {
649678
CLI::App app;
650679

0 commit comments

Comments
 (0)