Use yaml.

.editorconfig

@@ -9,7 +9,7 @@ trim_trailing_whitespace=true
 max_line_length=120
 insert_final_newline=true
 
-[.travis.yml]
+[*.yml]
 indent_style=space
 indent_size=2
 tab_width=8

cli/Cargo.toml

@@ -1,9 +1,10 @@
 [package]
 name = "polkadot-cli"
 version = "0.1.0"
-authors = ["Tomasz Drwięga <[email protected]>"]
+authors = ["Parity Team <[email protected]>"]
+description = "Polkadot node implementation in Rust."
 
 [dependencies]
-clap = "2.27"
+clap = { version = "2.27", features = ["yaml"] }
 env_logger = "0.4"
 log = "0.3"

cli/src/cli.yml

@@ -0,0 +1,15 @@
+name: polkadot
+version: "1.0.0"
+author: "Parity Team <[email protected]>"
+about: Polkadot Node Rust Implementation
+args:
+  - log:
+      short: l
+      value_name: LOG_PATTERN
+      help: Sets a custom logging
+      takes_value: true
+subcommands:
+  - collator:
+      about: Run collator node
+  - validator:
+      about: Run validator node

cli/src/lib.rs

@@ -14,35 +14,32 @@
 // You should have received a copy of the GNU General Public License
 // along with Polkadot.  If not, see <http://www.gnu.org/licenses/>.
 
-extern crate clap;
 extern crate env_logger;
-extern crate log;
 
-use clap::{Arg, App, SubCommand};
+#[macro_use]
+extern crate clap;
+#[macro_use]
+extern crate log;
 
 pub fn main() {
-	let matches = App::new("Polkadot")
-		.arg(Arg::with_name("log")
-			.short("l")
-			.value_name("LOG")
-			.help("Sets logging.")
-			.takes_value(true))
-		.subcommand(SubCommand::with_name("collator"))
-		.subcommand(SubCommand::with_name("validator"))
-		.get_matches();
+	let yaml = load_yaml!("./cli.yml");
+	let matches = clap::App::from_yaml(yaml).get_matches();
 
 	let log_pattern = matches.value_of("log").unwrap_or("");
 	init_logger(log_pattern);
 
 	if let Some(_) = matches.subcommand_matches("collator") {
-		println!("Running collator.");
+		info!("Starting collator.");
 		return;
 	}
 
 	if let Some(_) = matches.subcommand_matches("validator") {
-		println!("Running collator.");
+		info!("Starting validator.");
 		return;
 	}
+
+	println!("No command given.\n");
+	let _ = clap::App::from_yaml(yaml).print_long_help();
 }