From 735736807d455fdd9a1b47675cb8d2a274412268 Mon Sep 17 00:00:00 2001 From: Ayrton Chilibeck Date: Fri, 12 Jan 2024 12:35:24 -0700 Subject: [PATCH] Added runner stubs for running variations --- src/grade.rs | 5 +++++ src/main.rs | 20 ++++++++++++++------ src/run.rs | 5 +++++ src/validate.rs | 5 +++++ 4 files changed, 29 insertions(+), 6 deletions(-) create mode 100644 src/grade.rs create mode 100644 src/run.rs create mode 100644 src/validate.rs diff --git a/src/grade.rs b/src/grade.rs new file mode 100644 index 0000000..fd55e01 --- /dev/null +++ b/src/grade.rs @@ -0,0 +1,5 @@ +use std::path::{Path, PathBuf}; + +pub fn grade(verbosity: u8, config_file: PathBuf, grade_config: Option<&Path>) { + println!("Grading!"); +} diff --git a/src/main.rs b/src/main.rs index 8f755ac..ffe15dd 100644 --- a/src/main.rs +++ b/src/main.rs @@ -2,14 +2,22 @@ use std::path::PathBuf; use clap::{Parser, Subcommand}; +mod validate; +mod run; +mod grade; + fn main() { + // get cli args let cli = Cli::parse(); - let verbosity = get_verbosity(cli); + // parse the verbosity and eliminate the Option<> + let verbosity = get_verbosity(cli.verbosity); - println!("verbosity = {}", verbosity); - - println!("Hello, world!"); + match &cli.command { + Command::Validate => validate::validate(verbosity, cli.config_file), + Command::Run => run::run(verbosity, cli.config_file), + Command::Grade => grade::grade(verbosity, cli.config_file, cli.grading_conf.as_deref()), + } } // Initialize CLI arguments using clap @@ -44,10 +52,10 @@ enum Command { Grade, } -fn get_verbosity(cli: Cli) -> u8 { +fn get_verbosity(verb: Option) -> u8 { // Check the user defined verbosity, if none, set to normal let verbosity: u8; - match cli.verbosity { + match verb { Some(x) => verbosity = x, None => verbosity = 1, } diff --git a/src/run.rs b/src/run.rs new file mode 100644 index 0000000..1dcb660 --- /dev/null +++ b/src/run.rs @@ -0,0 +1,5 @@ +use std::path::PathBuf; + +pub fn run(verbosity: u8, config_file: PathBuf) { + println!("Running!"); +} diff --git a/src/validate.rs b/src/validate.rs new file mode 100644 index 0000000..2bb60d6 --- /dev/null +++ b/src/validate.rs @@ -0,0 +1,5 @@ +use std::path::PathBuf; + +pub fn validate(verbosity: u8, config_file: PathBuf) { + println!("Validating"); +}