Merge pull request #417 from CPSSD/release-0.5.0

Release 0.5.0

cli/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "cli"
-version = "0.3.0"
+version = "0.5.0"
 authors = ["Cerberus Authors <[email protected]>"]
 
 [dependencies]
@@ -11,3 +11,4 @@ error-chain = "0.11.0"
 grpc = "0.2.1"
 prettytable-rs = "^0.6"
 uuid = { version = "0.5", features = ["v4"] }
+util = { path = "../util" }

cli/src/main.rs

@@ -7,6 +7,7 @@ extern crate grpc;
 #[macro_use]
 extern crate prettytable;
 extern crate uuid;
+extern crate util;
 
 extern crate cerberus_proto;
 
@@ -51,7 +52,10 @@ fn run() -> Result<()> {
             println!("Getting Cluster Status...");
             runner::cluster_status(&client)
         }
+        ("cancel", sub) => runner::cancel(&client, sub),
         ("status", Some(sub)) => runner::status(&client, sub),
+        ("upload", Some(sub)) => runner::upload(&master_addr, sub),
+        ("download", Some(sub)) => runner::download(&master_addr, sub),
         _ => Err(matches.usage().into()),
     }
 }

cli/src/parser.rs

@@ -40,6 +40,65 @@ pub fn parse_command_line<'a>() -> ArgMatches<'a> {
                         .takes_value(true)
                         .default_value("")
                         .required(false),
+                )
+                .arg(
+                    Arg::with_name("priority")
+                        .long("priority")
+                        .short("p")
+                        .help("Priority of the MapReduce. Valid values are 1 to 10")
+                        .takes_value(true)
+                        .required(false),
+                )
+        )
+        .subcommand(
+            SubCommand::with_name("cancel")
+                .about("Cancels a running or queued MapReduce. If no id is provided it will cancel the most recently schceduled job")
+                .arg(
+                    Arg::with_name("id")
+                        .short("i")
+                        .help("ID of the MapReduce to cancel")
+                        .required(false)
+                        .takes_value(true),
+                ),
+        )
+        .subcommand(
+            SubCommand::with_name("upload")
+                .about("Uploads a file or directory to the cluster distributed filesystem")
+                .arg(
+                    Arg::with_name("local_path")
+                        .short("l")
+                        .long("local_path")
+                        .help("Path of the file or directory on the local machine")
+                        .required(true)
+                        .takes_value(true),
+                )
+                .arg(
+                    Arg::with_name("remote_path")
+                        .short("r")
+                        .long("remote_path")
+                        .help("Path of the file or directory on the cluster. The local file path will be used if this is not provided")
+                        .required(false)
+                        .takes_value(true),
+                ),
+        )
+        .subcommand(
+            SubCommand::with_name("download")
+                .about("Downloads a file or directory from the cluster distributed filesystem")
+                .arg(
+                    Arg::with_name("remote_path")
+                        .short("r")
+                        .long("remote_path")
+                        .help("Path of the file or directory on the distributed filesystem")
+                        .required(true)
+                        .takes_value(true),
+                )
+                .arg(
+                    Arg::with_name("local_path")
+                        .short("l")
+                        .long("local_path")
+                        .help("Directory or file to store the file or directory")
+                        .required(true)
+                        .takes_value(true),
                 ),
         )
         .subcommand(SubCommand::with_name("cluster_status").about(