Stub out new 'init' command

This commit is contained in:
Lucien Greathouse
2019-01-09 11:23:00 -08:00
parent b26b36da5d
commit b62d946f83
3 changed files with 62 additions and 16 deletions

View File

@@ -32,6 +32,7 @@ fn main() {
(@subcommand init =>
(about: "Creates a new Rojo project")
(@arg PATH: "Path to the place to create the project. Defaults to the current directory.")
(@arg kind: --kind +takes_value "The kind of project to create, 'place' or 'model'. Defaults to place.")
)
(@subcommand serve =>
@@ -59,10 +60,21 @@ fn main() {
match matches.subcommand() {
("init", Some(sub_matches)) => {
let project_path = Path::new(sub_matches.value_of("PATH").unwrap_or("."));
let full_path = make_path_absolute(project_path);
let fuzzy_project_path = make_path_absolute(Path::new(sub_matches.value_of("PATH").unwrap_or(".")));
let kind = sub_matches.value_of("kind");
commands::init(&full_path);
let options = commands::InitOptions {
fuzzy_project_path,
kind,
};
match commands::init(&options) {
Ok(_) => {},
Err(e) => {
error!("{}", e);
process::exit(1);
},
}
},
("serve", Some(sub_matches)) => {
let fuzzy_project_path = match sub_matches.value_of("PROJECT") {

View File

@@ -1,16 +1,46 @@
use std::path::PathBuf;
use std::process;
use std::{
path::PathBuf,
};
use crate::project::Project;
use failure::Fail;
pub fn init(project_path: &PathBuf) {
match Project::init(project_path) {
Ok(_) => {
println!("Created new empty project at {}", project_path.display());
},
Err(e) => {
error!("Failed to create new project.\n{}", e);
process::exit(1);
},
use crate::project::{Project, ProjectInitError};
#[derive(Debug, Fail)]
pub enum InitError {
#[fail(display = "Invalid project kind '{}', valid kinds are 'place' and 'model'", _0)]
InvalidKind(String),
#[fail(display = "Project init error: {}", _0)]
ProjectInitError(#[fail(cause)] ProjectInitError)
}
impl From<ProjectInitError> for InitError {
fn from(error: ProjectInitError) -> InitError {
InitError::ProjectInitError(error)
}
}
#[derive(Debug)]
pub struct InitOptions<'a> {
pub fuzzy_project_path: PathBuf,
pub kind: Option<&'a str>,
}
pub fn init(options: &InitOptions) -> Result<(), InitError> {
let (project_path, project_kind) = match options.kind {
Some("place") | None => {
let path = Project::init_place(&options.fuzzy_project_path)?;
(path, "place")
},
Some("model") => {
let path = Project::init_model(&options.fuzzy_project_path)?;
(path, "model")
},
Some(invalid) => return Err(InitError::InvalidKind(invalid.to_string())),
};
println!("Created new {} project at {}", project_kind, project_path.display());
Ok(())
}

View File

@@ -180,7 +180,11 @@ pub struct Project {
}
impl Project {
pub fn init(_project_folder_location: &Path) -> Result<(), ProjectInitError> {
pub fn init_place(_project_fuzzy_location: &Path) -> Result<PathBuf, ProjectInitError> {
unimplemented!();
}
pub fn init_model(_project_fuzzy_location: &Path) -> Result<PathBuf, ProjectInitError> {
unimplemented!();
}