fix(cli): expose version, author and app_name to be customized (#456)

core/cli/src/lib.rs

@@ -38,15 +38,27 @@ impl<'a, Mapping> Cli<'a, Mapping>
 where
     Mapping: 'static + ServiceMapping,
 {
-    pub fn run(service_mapping: Mapping, target_commands: Option<Vec<&str>>) {
-        let cli = Self::new(service_mapping, target_commands);
+    pub fn run(
+        service_mapping: Mapping,
+        app_name: &str,
+        version: &str,
+        author: &str,
+        target_commands: Option<Vec<&str>>,
+    ) {
+        let cli = Self::new(service_mapping, app_name, version, author, target_commands);
         if let Err(e) = cli.start() {
             log::error!("{:?}", e)
         }
     }
 
-    pub fn new(service_mapping: Mapping, target_commands: Option<Vec<&str>>) -> Self {
-        let matches = Self::generate_matches(target_commands);
+    pub fn new(
+        service_mapping: Mapping,
+        app_name: &str,
+        version: &str,
+        author: &str,
+        target_commands: Option<Vec<&str>>,
+    ) -> Self {
+        let matches = Self::generate_matches(app_name, version, author, target_commands);
 
         let config_path = matches.value_of("config").expect("missing config path");
 
@@ -136,10 +148,15 @@ where
         }
     }
 
-    pub fn generate_matches(cmds: Option<Vec<&str>>) -> ArgMatches<'a> {
-        let app = clap::App::new("muta-chain")
-            .version("v0.2.0-rc.2.1")
-            .author("Muta Dev <[email protected]>")
+    pub fn generate_matches(
+        app_name: &str,
+        version: &str,
+        author: &str,
+        cmds: Option<Vec<&str>>,
+    ) -> ArgMatches<'a> {
+        let app = clap::App::new(app_name)
+            .version(version)
+            .author(author)
             .arg(
                 clap::Arg::with_name("config")
                     .short("c")

core/cli/src/tests/mod.rs

@@ -95,7 +95,14 @@ fn block_get() -> Block {
         "11",
     ];
 
-    let maintenance_cli = Cli::new(DefaultServiceMapping {}, Some(cmd)).generate_maintenance_cli();
+    let maintenance_cli = Cli::new(
+        DefaultServiceMapping {},
+        "Rodents",
+        "Big Cheek",
+        "Hamsters",
+        Some(cmd),
+    )
+    .generate_maintenance_cli();
 
     let block = if let ("block", Some(sub_cmd)) = maintenance_cli.matches.subcommand() {
         let mut rt = tokio::runtime::Runtime::new().expect("new tokio runtime");
@@ -134,7 +141,14 @@ fn block_set() {
         "#,
     ];
 
-    let maintenance_cli = Cli::new(DefaultServiceMapping {}, Some(cmd)).generate_maintenance_cli();
+    let maintenance_cli = Cli::new(
+        DefaultServiceMapping {},
+        "Rodents",
+        "Big Cheek",
+        "Hamsters",
+        Some(cmd),
+    )
+    .generate_maintenance_cli();
     let mut rt = tokio::runtime::Runtime::new().expect("new tokio runtime");
 
     rt.block_on(async move {
@@ -171,7 +185,14 @@ fn latest_get(expect: u64) -> Block {
         "get",
     ];
 
-    let maintenance_cli = Cli::new(DefaultServiceMapping {}, Some(cmd)).generate_maintenance_cli();
+    let maintenance_cli = Cli::new(
+        DefaultServiceMapping {},
+        "Rodents",
+        "Big Cheek",
+        "Hamsters",
+        Some(cmd),
+    )
+    .generate_maintenance_cli();
 
     let block = if let ("latest_block", Some(sub_cmd)) = maintenance_cli.matches.subcommand() {
         if let ("get", Some(_cmd)) = sub_cmd.subcommand() {
@@ -206,7 +227,14 @@ fn latest_set() {
         "10",
     ];
 
-    let maintenance_cli = Cli::new(DefaultServiceMapping {}, Some(cmd)).generate_maintenance_cli();
+    let maintenance_cli = Cli::new(
+        DefaultServiceMapping {},
+        "Rodents",
+        "Big Cheek",
+        "Hamsters",
+        Some(cmd),
+    )
+    .generate_maintenance_cli();
 
     if let ("latest_block", Some(sub_cmd)) = maintenance_cli.matches.subcommand() {
         if let ("set", Some(_cmd)) = sub_cmd.subcommand() {
@@ -245,7 +273,14 @@ fn prepare() {
         "get",
     ];
 
-    let maintenance_cli = Cli::new(DefaultServiceMapping {}, Some(cmd)).generate_maintenance_cli();
+    let maintenance_cli = Cli::new(
+        DefaultServiceMapping {},
+        "Rodents",
+        "Big Cheek",
+        "Hamsters",
+        Some(cmd),
+    )
+    .generate_maintenance_cli();
 
     let storage = maintenance_cli.storage;
 
@@ -321,5 +356,12 @@ fn clean() {
 }
 
 fn run(cmd: Vec<&str>) -> ProtocolResult<()> {
-    Cli::new(service_mapping::DefaultServiceMapping {}, Some(cmd)).start()
+    Cli::new(
+        service_mapping::DefaultServiceMapping {},
+        "Rodents",
+        "Big Cheek",
+        "Hamsters",
+        Some(cmd),
+    )
+    .start()
 }

examples/muta-chain.rs

@@ -52,7 +52,13 @@ impl ServiceMapping for DefaultServiceMapping {
 }
 
 pub fn main() {
-    muta::run(DefaultServiceMapping, None)
+    muta::run(
+        DefaultServiceMapping,
+        "muta-chain",
+        "v0.2.0-rc.2.1",
+        "Muta Dev <[email protected]>",
+        None,
+    )
 }
 
 #[derive(Debug, Display, From)]

src/lib.rs

@@ -7,7 +7,10 @@ use cli::Cli;
 
 pub fn run<Mapping: 'static + ServiceMapping>(
     service_mapping: Mapping,
+    app_name: &str,
+    version: &str,
+    author: &str,
     target_commands: Option<Vec<&str>>,
 ) {
-    Cli::run(service_mapping, target_commands)
+    Cli::run(service_mapping, app_name, version, author, target_commands)
 }