initial commit for clapv3

Cargo.toml

@@ -18,7 +18,7 @@ codegen-units = 1
 
 [dependencies]
 mimalloc = { version = "0.1.27", default-features = false }
-clap = { version = "2.34.0", default-features = false }
+clap = { version = "3.2.1", features = ["derive", "suggestions"] }
 toml = { version = "0.5.8", default-features = false }
 serde = { version = "1.0.134", default-features = false }
 serde_derive = { version = "1.0.134", default-features = false }

src/args.rs

@@ -0,0 +1,67 @@
+use clap::{ArgAction, Parser, Subcommand};
+
+#[derive(Debug, Clone, Parser)]
+#[clap(name="Malachite", version=env!("CARGO_PKG_VERSION"), about=env!("CARGO_PKG_DESCRIPTION"))]
+pub struct Args {
+    #[clap(subcommand)]
+    pub subcommand: Option<Operation>,
+
+    /// Sets the level of verbosity
+    #[clap(long, short, global(true), action=ArgAction::Count)]
+    pub verbose: u8,
+
+    /// Complete operations without prompting user
+    #[clap(long="noconfirm", global(true), action=ArgAction::SetTrue)]
+    pub no_confirm: bool,
+}
+
+#[derive(Debug, Clone, Subcommand)]
+pub enum Operation {
+    /// Builds the given packages
+    #[clap(name="build", aliases=&["b"])]
+    Build {
+        /// The packages to operate on
+        #[clap(name="package(s)", action=ArgAction::Append, index=1)]
+        packages: Vec<String>,
+
+        /// Builds all packages in mlc.toml (except if -x is specified)
+        #[clap(long="all", action=ArgAction::Append, takes_value=true, conflicts_with="package(s)")]
+        all: bool,
+
+        /// Excludes packages from given operation
+        #[clap(short='x', long="exclude", action=ArgAction::Append, takes_value=true)]
+        exclude: Vec<String>,
+
+        /// Does not regenerate repository after building given package(s)
+        #[clap(short='n', long="no-regen", action=ArgAction::SetTrue)]
+        no_regen: bool,
+    },
+
+    /// Generates repository from built packages
+    #[clap(name="repo-gen", aliases=&["r"])]
+    RepoGen,
+
+    /// Prunes duplicate packages from the repository
+    #[clap(name="prune", aliases=&["p"])]
+    Prune,
+
+    /// Clones all git repositories from mlc.toml branching from current directory
+    #[clap(name="init", aliases=&["i"])]
+    Init,
+
+    /// Pulls in git repositories from mlc.toml branching from current directory
+    #[clap(name="pull", aliases=&["u"])]
+    Pull {
+        /// The packages to operate on
+        #[clap(name="package(s)", help="The packages to operate on", action=ArgAction::Append, index=1)]
+        packages: Vec<String>,
+
+        /// Pulls from all git repositories from mlc.toml branching from current directory
+        #[clap(long="all", action=ArgAction::SetTrue)]
+        all: bool,
+    },
+
+    /// Create and/or open local config file
+    #[clap(name="config", aliases=&["c"])]
+    Config,
+}

src/main.rs

@@ -2,15 +2,18 @@ use std::env;
 use std::path::Path;
 use std::process::Command;
 
+use crate::args::{Args, Operation};
 use crate::internal::{crash, info};
 use crate::repository::create_config;
-use clap::{App, AppSettings, Arg, ArgSettings, SubCommand};
+use clap::Parser;
 
 use crate::workspace::read_cfg;
 
 #[global_allocator]
 static GLOBAL: mimalloc::MiMalloc = mimalloc::MiMalloc;
 
+mod args;
+
 mod internal;
 mod operations;
 mod repository;
@@ -25,84 +28,7 @@ fn main() {
         crash("Running malachite as root is disallowed as it can lead to system breakage. Instead, malachite will prompt you when it needs superuser permissions".to_string(), 1);
     }
 
-    fn build_app() -> App<'static, 'static> {
+    let args: Args = Args::parse();
-        let app = App::new("Malachite")
-            .version(env!("CARGO_PKG_VERSION"))
-            .about(env!("CARGO_PKG_DESCRIPTION"))
-            .arg(
-                Arg::with_name("verbose")
-                    .short("v")
-                    .long("verbose")
-                    .multiple(true)
-                    .set(ArgSettings::Global)
-                    .help("Sets the level of verbosity"),
-            )
-            .subcommand(
-                SubCommand::with_name("build")
-                    .about("Builds the given packages")
-                    .arg(
-                        Arg::with_name("package(s)")
-                            .help("The packages to operate on")
-                            .multiple(true)
-                            .index(1),
-                    )
-                    .arg(
-                        Arg::with_name("all")
-                            .long("all")
-                            .help("Builds all packages in mlc.toml (except if -x is specified)")
-                            .conflicts_with("package(s)"),
-                    )
-                    .arg(
-                        Arg::with_name("exclude")
-                            .short("x")
-                            .long("exclude")
-                            .multiple(true)
-                            .takes_value(true)
-                            .help("Excludes packages from given operation"),
-                    )
-                    .arg(
-                        Arg::with_name("no-regen")
-                            .short("n")
-                            .long("no-regen")
-                            .help("Does not regenerate repository after building given package(s)"),
-                    ),
-            )
-            .subcommand(
-                SubCommand::with_name("repo-gen").about("Generates repository from built packages"),
-            )
-            .subcommand(
-                SubCommand::with_name("prune")
-                    .about("Prunes duplicate packages from the repository"),
-            )
-            .subcommand(SubCommand::with_name("init").about(
-                "Clones all git repositories from mlc.toml branching from current directory",
-            ))
-            .subcommand(
-                SubCommand::with_name("pull")
-                    .alias("update")
-                    .about(
-                        "Pulls all git repositories from mlc.toml branching from current directory",
-                    )
-                    .arg(
-                        Arg::with_name("package(s)")
-                            .help("The packages to operate on")
-                            .multiple(true)
-                            .index(1),
-                    ),
-            )
-            .subcommand(
-                SubCommand::with_name("config").about("Create and/or open local config file"),
-            )
-            .settings(&[
-                AppSettings::GlobalVersion,
-                AppSettings::VersionlessSubcommands,
-                AppSettings::ArgRequiredElseHelp,
-                AppSettings::InferSubcommands,
-            ]);
-        app
-    }
-
-    let matches = build_app().get_matches();
 
     if Path::exists("mlc.toml".as_ref()) && Path::exists(".git".as_ref()) {
         info(
@@ -130,19 +56,17 @@ fn main() {
         env::set_current_dir(dir).unwrap();
     }
 
-    if let true = matches.is_present("init") {
+    match args.subcommand.unwrap_or(Operation::Init) {
-        operations::init();
+        Operation::Init => operations::init(),
-    }
+        Operation::Build {
-
+            packages,
-    if let true = matches.is_present("build") {
+            all,
-        operations::build(&matches);
+            exclude,
-    }
+            no_regen,
-
+            ..
-    if let true = matches.is_present("pull") {
+        } => operations::build(packages, all, exclude, no_regen),
-        operations::pull(&matches);
+        Operation::Pull { packages, all, .. } => operations::pull(packages, all),
-    }
+        Operation::RepoGen => {
-
-    if let true = matches.is_present("repo-gen") {
             let config = read_cfg();
             if config.mode != "repository" {
                 panic!("Cannot build packages in workspace mode")
@@ -150,12 +74,7 @@ fn main() {
             info(format!("Generating repository: {}", config.name.unwrap()));
             repository::generate();
         }
-
+        Operation::Prune => operations::prune(),
-    if let true = matches.is_present("prune") {
+        Operation::Config => operations::config(),
-        operations::prune();
-    }
-
-    if let true = matches.is_present("config") {
-        operations::config();
     }
 }

src/operations/build.rs

@@ -1,20 +1,8 @@
 use crate::repository::generate;
 use crate::{crash, info, repository, workspace};
-use clap::ArgMatches;
 
-pub fn build(matches: &ArgMatches) {
+pub fn build(mut packages: Vec<String>, all: bool, exclude: Vec<String>, no_regen: bool) {
     let config = workspace::read_cfg();
-    let mut packages: Vec<String> = matches
-        .subcommand_matches("build")
-        .unwrap()
-        .values_of_lossy("package(s)")
-        .unwrap_or_default();
-
-    let exclude: Vec<String> = matches
-        .subcommand_matches("build")
-        .unwrap()
-        .values_of_lossy("exclude")
-        .unwrap_or_default();
 
     for pkg in &exclude {
         packages.retain(|x| x != pkg);
@@ -31,11 +19,7 @@ pub fn build(matches: &ArgMatches) {
         repos.push(a.parse().unwrap());
     }
 
-    if matches
+    if exclude.is_empty() {
-        .subcommand_matches("build")
-        .unwrap()
-        .is_present("exclude")
-    {
         for ex in exclude {
             repos.retain(|x| *x != ex);
         }
@@ -54,11 +38,7 @@ pub fn build(matches: &ArgMatches) {
         }
     }
 
-    if matches
+    if all {
-        .subcommand_matches("build")
-        .unwrap()
-        .is_present("all")
-    {
         for pkg in repos {
             let code = repository::build(&pkg);
             if code != 0 {
@@ -68,11 +48,7 @@ pub fn build(matches: &ArgMatches) {
         generate();
     }
 
-    if !matches
+    if !no_regen {
-        .subcommand_matches("build")
-        .unwrap()
-        .is_present("no-regen")
-    {
         repository::generate();
     }
 

src/operations/mod.rs

@@ -1,27 +1,11 @@
-use clap::ArgMatches;
-
 mod build;
 mod config;
 mod init;
 mod prune;
 mod pull;
 
-pub fn init() {
+pub use build::*;
-    init::init();
+pub use config::*;
-}
+pub use init::*;
-
+pub use prune::*;
-pub fn build(matches: &ArgMatches) {
+pub use pull::*;
-    build::build(matches);
-}
-
-pub fn pull(matches: &ArgMatches) {
-    pull::pull(matches);
-}
-
-pub fn config() {
-    config::config();
-}
-
-pub fn prune() {
-    prune::prune();
-}

src/operations/pull.rs

@@ -1,38 +1,10 @@
 use crate::info;
-use clap::ArgMatches;
 use std::env;
 use std::process::Command;
 
-pub fn pull(matches: &ArgMatches) {
+fn do_the_pulling(packages: Vec<String>) {
-    let packages: Vec<String> = matches
-        .subcommand_matches("pull")
-        .unwrap()
-        .values_of_lossy("package(s)")
-        .unwrap_or_default();
-
-    if packages.is_empty() {
-        let stdout = Command::new("ls").arg("-1").output().unwrap().stdout;
-        let dirs_string = String::from_utf8_lossy(&stdout);
-
-        let mut dirs = dirs_string.lines().collect::<Vec<&str>>();
-
-        dirs.retain(|x| *x != "mlc.toml");
-
-        for dir in dirs {
-            let cdir = env::current_dir().unwrap();
-            info(format!("Entering working directory: {}", dir));
-            env::set_current_dir(dir).unwrap();
-            Command::new("git")
-                .arg("pull")
-                .spawn()
-                .unwrap()
-                .wait()
-                .unwrap();
-            env::set_current_dir(cdir).unwrap();
-        }
-    } else {
     for dir in packages {
-            let cdir = env::current_dir().unwrap();
+        let current_dir = env::current_dir().unwrap();
         info(format!("Entering working directory: {}", dir));
         env::set_current_dir(dir).unwrap();
         Command::new("git")
@@ -41,7 +13,22 @@ pub fn pull(matches: &ArgMatches) {
             .unwrap()
             .wait()
             .unwrap();
-            env::set_current_dir(cdir).unwrap();
+        env::set_current_dir(current_dir).unwrap();
     }
+}
+
+pub fn pull(packages: Vec<String>, all: bool) {
+    if all {
+        let stdout = Command::new("ls").arg("-1").output().unwrap().stdout;
+        let dirs_string = String::from_utf8_lossy(&stdout);
+
+        let mut dirs = dirs_string.lines().collect::<Vec<&str>>();
+
+        dirs.retain(|x| *x != "mlc.toml");
+        let dirs_mapped = dirs.iter().map(|x| x.to_string()).collect();
+
+        do_the_pulling(dirs_mapped);
+    } else {
+        do_the_pulling(packages);
     }
 }

src/repository/config.rs

@@ -4,10 +4,23 @@ use std::fs::File;
 use std::io::Write;
 use std::path::Path;
 
-const DEFAULT_CONFIG: &str = r#"mode = ""   # either "repository" or "workspace"
+const DEFAULT_CONFIG: &str = r#"# either "repository" or "workspace"
-name = ""   # only required when in repository mode, decides what to call the repository and relevant files
+mode = ""
-repo = [""] # an array of git repos to clone from, formatted url_index::repo_name, e.g. if you had urls = [ "https://example.com/%repo%" ], 1::package would expand to https://example.com/package
+
-urls = [""] # an array of urls to clone from, in the format https://example.com/%repo% (the %repo% is NOT optional)"#;
+# only required when in repository mode, decides what to call the repository and relevant files
+name = ""
+
+# an array of git repos to clone from, formatted url_index::repo_name, e.g. if you had urls = [ "https://example.com/%repo%" ], 1::package would expand to https://example.com/package
+repo = [
+    "",
+    ""
+]
+
+# an array of urls to clone from, in the format https://example.com/%repo% (the %repo% is NOT optional)
+urls = [
+    "",
+    ""
+]"#;
 
 pub fn create_config() {
     if env::current_dir()

src/repository/mod.rs

@@ -2,14 +2,6 @@ mod config;
 mod package;
 mod repo;
 
-pub fn build(pkg: &str) -> i32 {
+pub use config::*;
-    package::build(pkg)
+pub use package::*;
-}
+pub use repo::*;
-
-pub fn generate() {
-    repo::generate();
-}
-
-pub fn create_config() {
-    config::create_config();
-}

src/workspace/mod.rs

@@ -1,7 +1,3 @@
-use crate::internal::structs::Config;
-
 mod read;
 
-pub fn read_cfg() -> Config {
+pub use read::*;
-    read::read_cfg()
-}