Initial implementation of the random decimal subcommand. (#2762)

Co-authored-by: Stacy Maydew <stacy.maydew@starlab.io>
This commit is contained in:
smaydew 2020-11-24 02:19:48 -07:00 committed by GitHub
parent 8b597187fc
commit 5fb3df4054
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 153 additions and 1 deletions

View File

@ -263,6 +263,7 @@ pub fn create_default_context(interactive: bool) -> Result<EvaluationContext, Bo
#[cfg(feature = "uuid_crate")]
whole_stream_command(RandomUUID),
whole_stream_command(RandomInteger),
whole_stream_command(RandomDecimal),
// Path
whole_stream_command(PathBasename),
whole_stream_command(PathCommand),

View File

@ -230,7 +230,7 @@ pub(crate) use prev::Previous;
pub(crate) use pwd::Pwd;
#[cfg(feature = "uuid_crate")]
pub(crate) use random::RandomUUID;
pub(crate) use random::{Random, RandomBool, RandomDice, RandomInteger};
pub(crate) use random::{Random, RandomBool, RandomDecimal, RandomDice, RandomInteger};
pub(crate) use range::Range;
pub(crate) use reduce::Reduce;
pub(crate) use reject::Reject;

View File

@ -0,0 +1,111 @@
use crate::commands::WholeStreamCommand;
use crate::deserializer::NumericRange;
use crate::prelude::*;
use nu_errors::ShellError;
use nu_protocol::{ReturnSuccess, Signature, SyntaxShape, UntaggedValue};
use nu_source::Tagged;
use rand::prelude::{thread_rng, Rng};
use std::cmp::Ordering;
pub struct SubCommand;
#[derive(Deserialize)]
pub struct DecimalArgs {
range: Option<Tagged<NumericRange>>,
}
#[async_trait]
impl WholeStreamCommand for SubCommand {
fn name(&self) -> &str {
"random decimal"
}
fn signature(&self) -> Signature {
Signature::build("random decimal").optional("range", SyntaxShape::Range, "Range of values")
}
fn usage(&self) -> &str {
"Generate a random decimal within a range [min..max]"
}
async fn run(
&self,
args: CommandArgs,
registry: &CommandRegistry,
) -> Result<OutputStream, ShellError> {
decimal(args, registry).await
}
fn examples(&self) -> Vec<Example> {
vec![
Example {
description: "Generate a default decimal value between 0 and 1",
example: "random decimal",
result: None,
},
Example {
description: "Generate a random decimal less than or equal to 500",
example: "random decimal ..500",
result: None,
},
Example {
description: "Generate a random decimal greater than or equal to 100000",
example: "random decimal 100000..",
result: None,
},
Example {
description: "Generate a random decimal between 1 and 10",
example: "random decimal 1..10",
result: None,
},
]
}
}
pub async fn decimal(
args: CommandArgs,
registry: &CommandRegistry,
) -> Result<OutputStream, ShellError> {
let (DecimalArgs { range }, _) = args.process(&registry).await?;
let (min, max) = if let Some(range) = &range {
(range.item.min() as f64, range.item.max() as f64)
} else {
(0.0, 1.0)
};
match min.partial_cmp(&max) {
Some(Ordering::Greater) => Err(ShellError::labeled_error(
format!("Invalid range {}..{}", min, max),
"expected a valid range",
range
.expect("Unexpected ordering error in random decimal")
.span(),
)),
Some(Ordering::Equal) => {
let untagged_result = UntaggedValue::decimal_from_float(min, Span::new(64, 64));
Ok(OutputStream::one(ReturnSuccess::value(untagged_result)))
}
_ => {
let mut thread_rng = thread_rng();
let result: f64 = thread_rng.gen_range(min, max);
let untagged_result = UntaggedValue::decimal_from_float(result, Span::new(64, 64));
Ok(OutputStream::one(ReturnSuccess::value(untagged_result)))
}
}
}
#[cfg(test)]
mod tests {
use super::ShellError;
use super::SubCommand;
#[test]
fn examples_work_as_expected() -> Result<(), ShellError> {
use crate::examples::test as test_examples;
Ok(test_examples(SubCommand {})?)
}
}

View File

@ -1,6 +1,7 @@
pub mod command;
pub mod bool;
pub mod decimal;
pub mod dice;
pub mod integer;
#[cfg(feature = "uuid_crate")]
@ -9,6 +10,7 @@ pub mod uuid;
pub use command::Command as Random;
pub use self::bool::SubCommand as RandomBool;
pub use decimal::SubCommand as RandomDecimal;
pub use dice::SubCommand as RandomDice;
pub use integer::SubCommand as RandomInteger;
#[cfg(feature = "uuid_crate")]

View File

@ -0,0 +1,37 @@
use nu_test_support::{nu, pipeline};
#[test]
fn generates_an_decimal() {
let actual = nu!(
cwd: ".", pipeline(
r#"
random decimal 42..43
"#
));
assert!(actual.out.contains("42") || actual.out.contains("43"));
}
#[test]
fn generates_55() {
let actual = nu!(
cwd: ".", pipeline(
r#"
random decimal 55..55
"#
));
assert!(actual.out.contains("55"));
}
#[test]
fn generates_0() {
let actual = nu!(
cwd: ".", pipeline(
r#"
random decimal ..<1
"#
));
assert!(actual.out.contains('0'));
}

View File

@ -1,4 +1,5 @@
mod bool;
mod decimal;
mod dice;
mod integer;
#[cfg(feature = "uuid_crate")]