drop-oss/interactive-clap
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fixed

Browse source
This commit is contained in:
FroVolod 2022-02-11 11:32:29 +02:00
parent 76ec39fd50
commit 2867c29b85
10 changed files with 87 additions and 43 deletions
Download patch file Download diff file Expand all files Collapse all files

32
Cargo.lock generated
View file

@ -96,9 +96,9 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
[[package]]
name = "clap"
version = "3.0.0-beta.4"
version = "3.0.0-beta.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "fcd70aa5597dbc42f7217a543f9ef2768b2ef823ba29036072d30e1d88e98406"
checksum = "4bd1061998a501ee7d4b6d449020df3266ca3124b941ec56cf2005c3779ca142"
dependencies = [
"atty",
"bitflags",
@ -109,14 +109,15 @@ dependencies = [
"strsim",
"termcolor",
"textwrap",
"unicode-width",
"vec_map",
]
[[package]]
name = "clap_derive"
version = "3.0.0-beta.4"
version = "3.0.0-beta.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0b5bb0d655624a0b8770d1c178fb8ffcb1f91cc722cb08f451e3dc72465421ac"
checksum = "370f715b81112975b1b69db93e0b56ea4cd4e5002ac43b2da8474106a54096a1"
dependencies = [
"heck",
"proc-macro-error",
@ -127,9 +128,9 @@ dependencies = [
[[package]]
name = "clap_generate"
version = "3.0.0-beta.4"
version = "3.0.0-beta.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2d9b1abef93569f290952eff3c4a0a92d6767bb5158db095b4dc9a512b1c3643"
checksum = "adf420f8b687b628d2915ccfd43a660c437a170432e3fbcb66944e8717a0d68f"
dependencies = [
"clap",
]
@ -474,11 +475,13 @@ name = "interactive_clap"
version = "0.1.0"
dependencies = [
"clap",
"clap_derive",
"clap_generate",
"color-eyre",
"dialoguer",
"interactive_clap_derive",
"near-ledger",
"shell-words",
"strum",
"strum_macros 0.20.1 (registry+https://github.com/rust-lang/crates.io-index)",
]
@ -487,9 +490,6 @@ dependencies = [
name = "interactive_clap_derive"
version = "0.1.0"
dependencies = [
"clap",
"clap_derive",
"clap_generate",
"proc-macro-error",
"proc-macro2",
"quote",
@ -634,9 +634,9 @@ checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5"
[[package]]
name = "os_str_bytes"
version = "3.1.0"
version = "2.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6acbef58a60fe69ab50510a55bc8cdd4d6cf2283d27ad338f54cb52747a9cf2d"
checksum = "afb2e1c3ee07430c2cf76151675e583e0f19985fa6efae47d6848a3e2c824f85"
[[package]]
name = "owo-colors"
@ -832,6 +832,12 @@ dependencies = [
"lazy_static",
]
[[package]]
name = "shell-words"
version = "1.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "24188a676b6ae68c3b2cb3a01be17fbf7240ce009799bb56d5b1409051e78fde"
[[package]]
name = "signature"
version = "1.5.0"
@ -956,9 +962,9 @@ dependencies = [
[[package]]
name = "textwrap"
version = "0.14.2"
version = "0.12.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0066c8d12af8b5acd21e00547c3797fde4e8677254a7ee429176ccebbe93dd80"
checksum = "203008d98caf094106cfaba70acfed15e18ed3ddb7d94e49baec153a2b462789"
dependencies = [
"unicode-width",
]

22
Cargo.toml
View file

@ -6,22 +6,24 @@ edition = "2018"
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
[dependencies]
# [dev-dependencies]
clap = "3.0.0-beta.4"
clap_generate = "3.0.0-beta.4"
color-eyre = "0.5"
interactive_clap_derive = { path = "./interactive_clap_derive" }
near-ledger = { version = "0.1.1", optional = true }
[features]
default = ["ledger"]
ledger = ["near-ledger"]
[dev-dependencies]
shell-words = "1.0.0"
clap = "=3.0.0-beta.2"
clap_derive = "=3.0.0-beta.2"
clap_generate = "=3.0.0-beta.2"
strum = { git = "https://github.com/frol/strum", branch = "feat/discriminants-pass-through-attributes", features = ["derive"] }
strum_macros = "0.20"
dialoguer = "0.9"
[features]
default = ["ledger"]
ledger = ["near-ledger"]
color-eyre = "0.5"

6
examples/common.rs Normal file
View file

@ -0,0 +1,6 @@
#[derive(Debug, Clone)]
pub enum ConnectionConfig {
Testnet,
Mainnet,
Betanet,
}

0
examples/enum_example.rs → examples/simple_enum.rs
View file

0
examples/struct_example.rs → examples/simple_struct.rs
View file

3
examples/struct_with_named_attrs_and_custom_type_example.rs → examples/struct_with_named_arg.rs
View file

@ -1,3 +1,4 @@
use clap::Clap;
#[derive(Debug, Clone, interactive_clap_derive::InteractiveClap)]
#[interactive_clap(context = ())]
struct OfflineArgs {
@ -19,7 +20,7 @@ impl Sender {
}
fn main() {
let cli_offline_args = CliOfflineArgs::default();
let cli_offline_args = CliOfflineArgs::parse();
println!("cli_offline_args: {:?}", cli_offline_args);
let offline_args = OfflineArgs::from_cli(Some(cli_offline_args), ());
println!("offline_args: {:?}", offline_args)

4
examples/struct_with_subcommand_example.rs
View file

@ -1,10 +1,10 @@
mod enum_example;
mod simple_enum;
#[derive(Debug, Clone, interactive_clap_derive::InteractiveClap)]
#[interactive_clap(context = ())]
pub struct OperationMode {
#[interactive_clap(subcommand)]
pub mode: enum_example::Mode,
pub mode: simple_enum::Mode,
}
fn main() {

24
examples/to_cli_args.rs
View file

@ -1,6 +1,8 @@
use dialoguer::{theme::ColorfulTheme, Select};
use strum::{EnumDiscriminants, EnumIter, EnumMessage, IntoEnumIterator};
mod common;
#[derive(Debug, Clone, interactive_clap_derive::InteractiveClap)]
#[interactive_clap(context = crate::common::ConnectionConfig)]
struct OnlineArgs {
@ -20,7 +22,7 @@ pub enum Submit {
}
impl Submit {
fn choose_variant(connection_config: crate::common::ConnectionConfig) -> color_eyre::eyre::Result<Self> {
fn choose_variant(connection_config: common::ConnectionConfig) -> color_eyre::eyre::Result<Self> {
let variants = SubmitDiscriminants::iter().collect::<Vec<_>>();
let submits = variants
.iter()
@ -40,12 +42,12 @@ impl Submit {
fn from_cli(
optional_clap_variant: Option<<Submit as interactive_clap::ToCli>::CliVariant>,
context: crate::common::ConnectionConfig,
context: common::ConnectionConfig,
) -> color_eyre::eyre::Result<Self> {
let submit: Option<Submit> = optional_clap_variant
.clone();
match submit {
Some(_) => Ok(Submit::Send),
Some(submit) => Ok(submit),
None => Ok(Submit::Display)
}
@ -57,8 +59,16 @@ impl interactive_clap::ToCli for Submit {
}
fn main() {
let cli_online_args = CliOnlineArgs::default();
println!("cli_online_args: {:?}", cli_online_args);
let online_args = OnlineArgs::from_cli(Some(cli_online_args), crate::common::ConnectionConfig::Testnet);
println!("online_args: {:?}", online_args)
let mut cli_online_args = OnlineArgs::parse();
println!("cli_online_args: {:?}", &cli_online_args);
let online_args = OnlineArgs::from_cli(Some(cli_online_args.clone()), common::ConnectionConfig::Testnet).unwrap();
println!("online_args: {:?}", online_args);
// cli_online_args = CliOnlineArgs::from(online_args);
cli_online_args = online_args.into();
println!("cli_online_args: {:?}", &cli_online_args);
let completed_cli = cli_online_args.to_cli_args();
println!(
"Your console command:\n./near-cli {}",
shell_words::join(&completed_cli)
);
}

7
interactive_clap_derive/Cargo.toml
View file

@ -13,10 +13,3 @@ proc-macro2 = "1.0.24"
proc-macro-error = "1"
quote = "1.0"
syn = "1.0"
clap = "=3.0.0-beta.4"
clap_derive = "=3.0.0-beta.4"
clap_generate = "=3.0.0-beta.4"
# interactive_clap = { path = "../" }
# interactive_clap = { git = "https://github.com/FroVolod/interactive-clap" }

32
interactive_clap_derive/src/derives/interactive_clap/methods/choose_variant.rs
View file

@ -105,11 +105,37 @@ pub fn fn_choose_variant(ast: &syn::DeriveInput, variants: &syn::punctuated::Pun
});
cli_variant = quote! {
let cli_variant = match crate::common::prompt_variant(#literal.to_string().as_str()) {
use dialoguer::{theme::ColorfulTheme, Select};
use strum::{EnumMessage, IntoEnumIterator};
fn prompt_variant<T>(prompt: &str) -> T
where
T: IntoEnumIterator + EnumMessage,
T: Copy + Clone,
{
let variants = T::iter().collect::<Vec<_>>();
let actions = variants
.iter()
.map(|p| {
p.get_message()
.unwrap_or_else(|| "error[This entry does not have an option message!!]")
.to_owned()
})
.collect::<Vec<_>>();
let selected = Select::with_theme(&ColorfulTheme::default())
.with_prompt(prompt)
.items(&actions)
.default(0)
.interact()
.unwrap();
variants[selected]
}
let cli_variant = match prompt_variant(#literal.to_string().as_str()) {
#( #enum_variants, )*
};
};
};
};
}