feat(random): add random-integer and random-uuid (#440)

* feat(randome): add random-integer

* feat(random): add random-uuid
This commit is contained in:
Jae-Heon Ji 2021-12-06 02:22:50 +09:00 committed by GitHub
parent 29efbee285
commit 9548e5ef5b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 191 additions and 0 deletions

10
Cargo.lock generated
View File

@ -1495,6 +1495,7 @@ dependencies = [
"toml",
"trash",
"unicode-segmentation",
"uuid",
]
[[package]]
@ -2780,6 +2781,15 @@ version = "0.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "936e4b492acfd135421d8dca4b1aa80a7bfc26e702ef3af710e0752684df5372"
[[package]]
name = "uuid"
version = "0.8.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "bc5cf98d8186244414c848017f0e2676b3fcb46807f6668a97dfe67359a3c4b7"
dependencies = [
"getrandom 0.2.3",
]
[[package]]
name = "version_check"
version = "0.1.5"

View File

@ -47,6 +47,7 @@ roxmltree = "0.14.0"
rand = "0.8"
trash = { version = "1.3.0", optional = true }
unicode-segmentation = "1.8.0"
uuid = { version = "0.8.2", features = ["v4"] }
lazy_static = "1.4.0"
strip-ansi-escapes = "0.1.1"
crossterm = "0.22.1"

View File

@ -0,0 +1,104 @@
use nu_engine::CallExt;
use nu_protocol::ast::Call;
use nu_protocol::engine::{Command, EngineState, Stack};
use nu_protocol::{
Category, Example, PipelineData, Range, ShellError, Signature, SyntaxShape, Value,
};
use rand::prelude::{thread_rng, Rng};
use std::cmp::Ordering;
#[derive(Clone)]
pub struct SubCommand;
impl Command for SubCommand {
fn name(&self) -> &str {
"random integer"
}
fn signature(&self) -> Signature {
Signature::build("random integer")
.optional("range", SyntaxShape::Range, "Range of values")
.category(Category::Random)
}
fn usage(&self) -> &str {
"Generate a random integer [min..max]"
}
fn run(
&self,
engine_state: &EngineState,
stack: &mut Stack,
call: &Call,
_input: PipelineData,
) -> Result<nu_protocol::PipelineData, nu_protocol::ShellError> {
integer(engine_state, stack, call)
}
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 ..500",
result: None,
},
Example {
description: "Generate a random integer greater than or equal to 100000",
example: "random integer 100000..",
result: None,
},
Example {
description: "Generate a random integer between 1 and 10",
example: "random integer 1..10",
result: None,
},
]
}
}
fn integer(
engine_state: &EngineState,
stack: &mut Stack,
call: &Call,
) -> Result<PipelineData, ShellError> {
let span = call.head;
let range: Option<Range> = call.opt(engine_state, stack, 0)?;
let (min, max) = if let Some(r) = range {
(r.from.as_integer()?, r.to.as_integer()?)
} else {
(0, i64::MAX)
};
match min.partial_cmp(&max) {
Some(Ordering::Greater) => Err(ShellError::InvalidRange(
min.to_string(),
max.to_string(),
span,
)),
Some(Ordering::Equal) => Ok(PipelineData::Value(Value::Int { val: min, span }, None)),
_ => {
let mut thread_rng = thread_rng();
let result: i64 = thread_rng.gen_range(min..max);
Ok(PipelineData::Value(Value::Int { val: result, span }, None))
}
}
}
#[cfg(test)]
mod test {
use super::*;
#[test]
fn test_examples() {
use crate::test_examples;
test_examples(SubCommand {})
}
}

View File

@ -3,9 +3,13 @@ mod chars;
mod command;
mod decimal;
mod dice;
mod integer;
mod uuid;
pub use self::bool::SubCommand as Bool;
pub use self::chars::SubCommand as Chars;
pub use self::decimal::SubCommand as Decimal;
pub use self::dice::SubCommand as Dice;
pub use self::integer::SubCommand as Integer;
pub use self::uuid::SubCommand as Uuid;
pub use command::RandomCommand as Random;

View File

@ -0,0 +1,61 @@
use nu_protocol::ast::Call;
use nu_protocol::engine::{Command, EngineState, Stack};
use nu_protocol::{Category, Example, PipelineData, ShellError, Signature, Value};
use uuid::Uuid;
#[derive(Clone)]
pub struct SubCommand;
impl Command for SubCommand {
fn name(&self) -> &str {
"random uuid"
}
fn signature(&self) -> Signature {
Signature::build("random uuid").category(Category::Random)
}
fn usage(&self) -> &str {
"Generate a random uuid4 string"
}
fn run(
&self,
_engine_state: &EngineState,
_stack: &mut Stack,
call: &Call,
_input: PipelineData,
) -> Result<nu_protocol::PipelineData, nu_protocol::ShellError> {
uuid(call)
}
fn examples(&self) -> Vec<Example> {
vec![Example {
description: "Generate a random uuid4 string",
example: "random uuid",
result: None,
}]
}
}
fn uuid(call: &Call) -> Result<PipelineData, ShellError> {
let span = call.head;
let uuid_4 = Uuid::new_v4().to_hyphenated().to_string();
Ok(PipelineData::Value(
Value::String { val: uuid_4, span },
None,
))
}
#[cfg(test)]
mod test {
use super::*;
#[test]
fn test_examples() {
use crate::test_examples;
test_examples(SubCommand {})
}
}

View File

@ -214,6 +214,17 @@ impl Value {
}
}
pub fn as_integer(&self) -> Result<i64, ShellError> {
match self {
Value::Int { val, .. } => Ok(*val),
x => Err(ShellError::CantConvert(
"float".into(),
x.get_type().to_string(),
self.span()?,
)),
}
}
/// Get the span for the current value
pub fn span(&self) -> Result<Span, ShellError> {
match self {