mirror of
https://github.com/nushell/nushell.git
synced 2025-04-24 05:08:29 +02:00
Initial implementation of random integer subcommand. (#2489)
* Initial implementation of random integer subcommand. * Added additional examples. Co-authored-by: Stacy Maydew <stacy.maydew@starlab.io>
This commit is contained in:
parent
8dc7b8a7cd
commit
1ffbb66e64
@ -265,6 +265,7 @@ pub fn create_default_context(
|
|||||||
whole_stream_command(RandomDice),
|
whole_stream_command(RandomDice),
|
||||||
#[cfg(feature = "uuid_crate")]
|
#[cfg(feature = "uuid_crate")]
|
||||||
whole_stream_command(RandomUUID),
|
whole_stream_command(RandomUUID),
|
||||||
|
whole_stream_command(RandomInteger),
|
||||||
// Path
|
// Path
|
||||||
whole_stream_command(PathBasename),
|
whole_stream_command(PathBasename),
|
||||||
whole_stream_command(PathCommand),
|
whole_stream_command(PathCommand),
|
||||||
|
@ -218,7 +218,7 @@ pub(crate) use prev::Previous;
|
|||||||
pub(crate) use pwd::Pwd;
|
pub(crate) use pwd::Pwd;
|
||||||
#[cfg(feature = "uuid_crate")]
|
#[cfg(feature = "uuid_crate")]
|
||||||
pub(crate) use random::RandomUUID;
|
pub(crate) use random::RandomUUID;
|
||||||
pub(crate) use random::{Random, RandomBool, RandomDice};
|
pub(crate) use random::{Random, RandomBool, RandomDice, RandomInteger};
|
||||||
pub(crate) use range::Range;
|
pub(crate) use range::Range;
|
||||||
pub(crate) use reduce::Reduce;
|
pub(crate) use reduce::Reduce;
|
||||||
pub(crate) use reject::Reject;
|
pub(crate) use reject::Reject;
|
||||||
|
102
crates/nu-cli/src/commands/random/integer.rs
Normal file
102
crates/nu-cli/src/commands/random/integer.rs
Normal file
@ -0,0 +1,102 @@
|
|||||||
|
use crate::commands::WholeStreamCommand;
|
||||||
|
use crate::prelude::*;
|
||||||
|
use nu_errors::ShellError;
|
||||||
|
use nu_protocol::{ReturnSuccess, Signature, SyntaxShape, UntaggedValue};
|
||||||
|
use nu_source::Tagged;
|
||||||
|
use rand::prelude::{thread_rng, Rng};
|
||||||
|
|
||||||
|
pub struct SubCommand;
|
||||||
|
|
||||||
|
#[derive(Deserialize)]
|
||||||
|
pub struct IntegerArgs {
|
||||||
|
min: Option<Tagged<u64>>,
|
||||||
|
max: Option<Tagged<u64>>,
|
||||||
|
}
|
||||||
|
|
||||||
|
#[async_trait]
|
||||||
|
impl WholeStreamCommand for SubCommand {
|
||||||
|
fn name(&self) -> &str {
|
||||||
|
"random integer"
|
||||||
|
}
|
||||||
|
|
||||||
|
fn signature(&self) -> Signature {
|
||||||
|
Signature::build("random integer")
|
||||||
|
.named("min", SyntaxShape::Int, "Minimum value", Some('m'))
|
||||||
|
.named("max", SyntaxShape::Int, "Maximum value", Some('x'))
|
||||||
|
}
|
||||||
|
|
||||||
|
fn usage(&self) -> &str {
|
||||||
|
"Generate a random integer [--min <m>] [--max <x>]"
|
||||||
|
}
|
||||||
|
|
||||||
|
async fn run(
|
||||||
|
&self,
|
||||||
|
args: CommandArgs,
|
||||||
|
registry: &CommandRegistry,
|
||||||
|
) -> Result<OutputStream, ShellError> {
|
||||||
|
integer(args, registry).await
|
||||||
|
}
|
||||||
|
|
||||||
|
fn examples(&self) -> Vec<Example> {
|
||||||
|
vec![
|
||||||
|
Example {
|
||||||
|
description: "Generate an unconstrained random integer",
|
||||||
|
example: "random integer",
|
||||||
|
result: None,
|
||||||
|
},
|
||||||
|
Example {
|
||||||
|
description: "Generate a random integer less than or equal to 500",
|
||||||
|
example: "random integer --max 500",
|
||||||
|
result: None,
|
||||||
|
},
|
||||||
|
Example {
|
||||||
|
description: "Generate a random integer greater than or equal to 100000",
|
||||||
|
example: "random integer --min 100000",
|
||||||
|
result: None,
|
||||||
|
},
|
||||||
|
Example {
|
||||||
|
description: "Generate a random integer between 1 and 10",
|
||||||
|
example: "random integer --min 1 --max 10",
|
||||||
|
result: None,
|
||||||
|
},
|
||||||
|
]
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
pub async fn integer(
|
||||||
|
args: CommandArgs,
|
||||||
|
registry: &CommandRegistry,
|
||||||
|
) -> Result<OutputStream, ShellError> {
|
||||||
|
let (IntegerArgs { min, max }, _) = args.process(®istry).await?;
|
||||||
|
|
||||||
|
let min = if let Some(min_tagged) = min {
|
||||||
|
*min_tagged
|
||||||
|
} else {
|
||||||
|
0
|
||||||
|
};
|
||||||
|
|
||||||
|
let max = if let Some(max_tagged) = max {
|
||||||
|
*max_tagged
|
||||||
|
} else {
|
||||||
|
u64::MAX
|
||||||
|
};
|
||||||
|
|
||||||
|
let mut thread_rng = thread_rng();
|
||||||
|
let result: u64 = thread_rng.gen_range(min, max);
|
||||||
|
|
||||||
|
let untagged_result = UntaggedValue::int(result).into_value(Tag::unknown());
|
||||||
|
|
||||||
|
Ok(OutputStream::one(ReturnSuccess::value(untagged_result)))
|
||||||
|
}
|
||||||
|
|
||||||
|
#[cfg(test)]
|
||||||
|
mod tests {
|
||||||
|
use super::SubCommand;
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn examples_work_as_expected() {
|
||||||
|
use crate::examples::test as test_examples;
|
||||||
|
|
||||||
|
test_examples(SubCommand {})
|
||||||
|
}
|
||||||
|
}
|
@ -2,6 +2,7 @@ pub mod command;
|
|||||||
|
|
||||||
pub mod bool;
|
pub mod bool;
|
||||||
pub mod dice;
|
pub mod dice;
|
||||||
|
pub mod integer;
|
||||||
#[cfg(feature = "uuid_crate")]
|
#[cfg(feature = "uuid_crate")]
|
||||||
pub mod uuid;
|
pub mod uuid;
|
||||||
|
|
||||||
@ -9,5 +10,6 @@ pub use command::Command as Random;
|
|||||||
|
|
||||||
pub use self::bool::SubCommand as RandomBool;
|
pub use self::bool::SubCommand as RandomBool;
|
||||||
pub use dice::SubCommand as RandomDice;
|
pub use dice::SubCommand as RandomDice;
|
||||||
|
pub use integer::SubCommand as RandomInteger;
|
||||||
#[cfg(feature = "uuid_crate")]
|
#[cfg(feature = "uuid_crate")]
|
||||||
pub use uuid::SubCommand as RandomUUID;
|
pub use uuid::SubCommand as RandomUUID;
|
||||||
|
13
crates/nu-cli/tests/commands/random/integer.rs
Normal file
13
crates/nu-cli/tests/commands/random/integer.rs
Normal file
@ -0,0 +1,13 @@
|
|||||||
|
use nu_test_support::{nu, pipeline};
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn generates_an_integer() {
|
||||||
|
let actual = nu!(
|
||||||
|
cwd: ".", pipeline(
|
||||||
|
r#"
|
||||||
|
random integer --min 42 --max 43
|
||||||
|
"#
|
||||||
|
));
|
||||||
|
|
||||||
|
assert!(actual.out.contains("42") || actual.out.contains("43"));
|
||||||
|
}
|
@ -1,4 +1,5 @@
|
|||||||
mod bool;
|
mod bool;
|
||||||
mod dice;
|
mod dice;
|
||||||
|
mod integer;
|
||||||
#[cfg(feature = "uuid_crate")]
|
#[cfg(feature = "uuid_crate")]
|
||||||
mod uuid;
|
mod uuid;
|
||||||
|
@ -88,3 +88,34 @@ true
|
|||||||
> random uuid
|
> random uuid
|
||||||
8af4de39-acbc-42f0-94d1-7cfad6c01f8b
|
8af4de39-acbc-42f0-94d1-7cfad6c01f8b
|
||||||
```
|
```
|
||||||
|
|
||||||
|
## integer
|
||||||
|
|
||||||
|
* `random integer`: Generate a random integer
|
||||||
|
|
||||||
|
### integer Flags
|
||||||
|
|
||||||
|
* `m`, `--min` \<integer>: The minimum value to generate
|
||||||
|
* `x`, `--max` \<integer>: The maximum value to generate
|
||||||
|
|
||||||
|
### integer Examples
|
||||||
|
|
||||||
|
```shell
|
||||||
|
> random integer
|
||||||
|
42
|
||||||
|
```
|
||||||
|
|
||||||
|
```shell
|
||||||
|
> random integer --min 5000
|
||||||
|
8700890823
|
||||||
|
```
|
||||||
|
|
||||||
|
```shell
|
||||||
|
> random integer --max 100
|
||||||
|
73
|
||||||
|
```
|
||||||
|
|
||||||
|
```shell
|
||||||
|
> random integer --min 100000 --max 200000
|
||||||
|
173400
|
||||||
|
```
|
||||||
|
Loading…
Reference in New Issue
Block a user