mirror of
https://github.com/nushell/nushell
synced 2024-12-27 21:43:09 +00:00
mkdir.
This commit is contained in:
parent
1b7dd52713
commit
c8b5329c5c
5 changed files with 125 additions and 6 deletions
|
@ -182,6 +182,7 @@ pub async fn cli() -> Result<(), Box<dyn Error>> {
|
||||||
Arc::new(Remove),
|
Arc::new(Remove),
|
||||||
Arc::new(Copycp),
|
Arc::new(Copycp),
|
||||||
Arc::new(Open),
|
Arc::new(Open),
|
||||||
|
Arc::new(Mkdir),
|
||||||
Arc::new(Date),
|
Arc::new(Date),
|
||||||
Arc::new(Where),
|
Arc::new(Where),
|
||||||
Arc::new(Config),
|
Arc::new(Config),
|
||||||
|
|
|
@ -23,6 +23,7 @@ crate mod get;
|
||||||
crate mod lines;
|
crate mod lines;
|
||||||
crate mod ls;
|
crate mod ls;
|
||||||
crate mod next;
|
crate mod next;
|
||||||
|
crate mod mkdir;
|
||||||
crate mod open;
|
crate mod open;
|
||||||
crate mod pick;
|
crate mod pick;
|
||||||
crate mod plugin;
|
crate mod plugin;
|
||||||
|
@ -54,6 +55,7 @@ crate use cp::Copycp;
|
||||||
crate use date::Date;
|
crate use date::Date;
|
||||||
crate use exit::Exit;
|
crate use exit::Exit;
|
||||||
crate use open::Open;
|
crate use open::Open;
|
||||||
|
crate use mkdir::Mkdir;
|
||||||
crate use rm::Remove;
|
crate use rm::Remove;
|
||||||
crate use save::Save;
|
crate use save::Save;
|
||||||
crate use skip_while::SkipWhile;
|
crate use skip_while::SkipWhile;
|
||||||
|
|
64
src/commands/mkdir.rs
Normal file
64
src/commands/mkdir.rs
Normal file
|
@ -0,0 +1,64 @@
|
||||||
|
use crate::errors::ShellError;
|
||||||
|
use crate::parser::hir::SyntaxType;
|
||||||
|
use crate::parser::registry::{CommandConfig, NamedType, PositionalType};
|
||||||
|
use crate::prelude::*;
|
||||||
|
use indexmap::IndexMap;
|
||||||
|
use std::path::{Path, PathBuf};
|
||||||
|
|
||||||
|
pub struct Mkdir;
|
||||||
|
|
||||||
|
impl Command for Mkdir {
|
||||||
|
fn run(&self, args: CommandArgs) -> Result<OutputStream, ShellError> {
|
||||||
|
mkdir(args)
|
||||||
|
}
|
||||||
|
|
||||||
|
fn name(&self) -> &str {
|
||||||
|
"mkdir"
|
||||||
|
}
|
||||||
|
|
||||||
|
fn config(&self) -> CommandConfig {
|
||||||
|
let mut named: IndexMap<String, NamedType> = IndexMap::new();
|
||||||
|
named.insert("p".to_string(), NamedType::Switch);
|
||||||
|
|
||||||
|
CommandConfig {
|
||||||
|
name: self.name().to_string(),
|
||||||
|
positional: vec![PositionalType::mandatory("file", SyntaxType::Path)],
|
||||||
|
rest_positional: false,
|
||||||
|
named,
|
||||||
|
is_sink: false,
|
||||||
|
is_filter: false,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn mkdir(args: CommandArgs) -> Result<OutputStream, ShellError> {
|
||||||
|
let env = args.env.lock().unwrap();
|
||||||
|
let path = env.path.to_path_buf();
|
||||||
|
let cwd = path.clone();
|
||||||
|
let mut full_path = PathBuf::from(path);
|
||||||
|
|
||||||
|
match &args.nth(0) {
|
||||||
|
Some(Tagged { item: value, .. }) => full_path.push(Path::new(&value.as_string()?)),
|
||||||
|
_ => {}
|
||||||
|
}
|
||||||
|
|
||||||
|
if !args.has("p") {
|
||||||
|
match std::fs::create_dir(full_path) {
|
||||||
|
Err(_) => Err(ShellError::labeled_error(
|
||||||
|
"No such file or directory",
|
||||||
|
"No such file or directory",
|
||||||
|
args.nth(0).unwrap().span(),
|
||||||
|
)),
|
||||||
|
Ok(_) => Ok(OutputStream::empty()),
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
match std::fs::create_dir_all(full_path) {
|
||||||
|
Err(reason) => Err(ShellError::labeled_error(
|
||||||
|
reason.to_string(),
|
||||||
|
reason.to_string(),
|
||||||
|
args.nth(0).unwrap().span(),
|
||||||
|
)),
|
||||||
|
Ok(_) => Ok(OutputStream::empty()),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
53
tests/command_mkdir_tests.rs
Normal file
53
tests/command_mkdir_tests.rs
Normal file
|
@ -0,0 +1,53 @@
|
||||||
|
mod helpers;
|
||||||
|
|
||||||
|
use h::{in_directory as cwd, Playground};
|
||||||
|
use helpers as h;
|
||||||
|
use std::path::PathBuf;
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn creates_directory() {
|
||||||
|
let sandbox = Playground::setup_for("mkdir_test").test_dir_name();
|
||||||
|
|
||||||
|
let full_path = format!("{}/{}", Playground::root(), sandbox);
|
||||||
|
|
||||||
|
nu!(_output, cwd(&full_path), "mkdir my_new_directory");
|
||||||
|
|
||||||
|
let mut expected = PathBuf::from(full_path);
|
||||||
|
expected.push("my_new_directory");
|
||||||
|
|
||||||
|
assert!(h::dir_exists_at(expected));
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn error_if_intermediary_directory_doesnt_exist() {
|
||||||
|
let sandbox = Playground::setup_for("mkdir_test_2").test_dir_name();
|
||||||
|
|
||||||
|
let full_path = format!("{}/{}", Playground::root(), sandbox);
|
||||||
|
|
||||||
|
nu_error!(
|
||||||
|
output,
|
||||||
|
cwd(&full_path),
|
||||||
|
"mkdir some_folder/another/deeper_one"
|
||||||
|
);
|
||||||
|
|
||||||
|
assert!(output.contains("some_folder/another/deeper_one"));
|
||||||
|
assert!(output.contains("No such file or directory"));
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn creates_intermediary_directories_with_p_flag() {
|
||||||
|
let sandbox = Playground::setup_for("mkdir_test_3").test_dir_name();
|
||||||
|
|
||||||
|
let full_path = format!("{}/{}", Playground::root(), sandbox);
|
||||||
|
|
||||||
|
nu!(
|
||||||
|
_output,
|
||||||
|
cwd(&full_path),
|
||||||
|
"mkdir some_folder/another/deeper_one --p"
|
||||||
|
);
|
||||||
|
|
||||||
|
let mut expected = PathBuf::from(full_path);
|
||||||
|
expected.push("some_folder/another/deeper_one");
|
||||||
|
|
||||||
|
assert!(h::dir_exists_at(expected));
|
||||||
|
}
|
|
@ -182,12 +182,11 @@ pub fn copy_file_to(source: &str, destination: &str) {
|
||||||
}
|
}
|
||||||
|
|
||||||
pub fn files_exist_at(files: Vec<&Path>, path: PathBuf) -> bool {
|
pub fn files_exist_at(files: Vec<&Path>, path: PathBuf) -> bool {
|
||||||
files.iter()
|
files.iter().all(|f| {
|
||||||
.all(|f| {
|
let mut loc = path.clone();
|
||||||
let mut loc = path.clone();
|
loc.push(f);
|
||||||
loc.push(f);
|
loc.exists()
|
||||||
loc.exists()
|
})
|
||||||
})
|
|
||||||
}
|
}
|
||||||
|
|
||||||
pub fn file_exists_at(path: PathBuf) -> bool {
|
pub fn file_exists_at(path: PathBuf) -> bool {
|
||||||
|
|
Loading…
Reference in a new issue