Added default config that takes a string and parses accordingly.

Author: rakshith-ravi

Cargo.toml

@@ -14,7 +14,6 @@ serde_json = "*"
 async-trait = "0.1.24"
 futures = "0.3.4"
 futures-util = "0.3.4"
-clap = "2.33.0"
 
 [profile.release]
 lto = true

README.md

@@ -19,25 +19,25 @@ use std::{time::Duration, collections::HashMap};
 
 #[async_std::main]
 async fn main() {
-    let mut module = GothamModule::default(String::from("../path/to/gotham.sock"));
+    let mut module = GothamModule::default("./path/to/gotham.sock");
+    // The hashmap below is used to mark dependencies
     module
-        .initialize("module-name".to_string(), "1.0.0".to_string(), HashMap::new())
+        .initialize("module-name", "1.0.0", HashMap::new())
         .await
         .unwrap();
-    // The hashmap is used to mark dependencies
     println!("Initialized!");
     module
-        .declare_function("print_hello".to_string(), |args| {
+        .declare_function("print_hello", |args| {
             println!("Hello");
             Value::Null
         })
         .await
         .unwrap();
+    // The HashMap::new() below marks the arguments passed to the function
     module
-        .call_function("module2.print_hello_world".to_string(), HashMap::new())
+        .call_function("module2.print_hello_world", HashMap::new())
         .await
         .unwrap();
-    // The HashMap::new() here marks the arguments passed to the function
     loop {
         task::sleep(Duration::from_millis(1000)).await;
     }

src/gotham_module.rs

@@ -1,5 +1,4 @@
 extern crate async_std;
-extern crate clap;
 extern crate futures;
 extern crate futures_util;
 extern crate serde_json;
@@ -19,13 +18,15 @@ use async_std::{
 	sync::{Arc, Mutex},
 	task,
 };
-use clap::{App, Arg};
 use futures::channel::{
 	mpsc::{UnboundedReceiver, UnboundedSender},
 	oneshot::{channel, Sender},
 };
 use futures_util::sink::SinkExt;
-use std::collections::HashMap;
+use std::{
+	collections::HashMap,
+	net::{AddrParseError, SocketAddr},
+};
 
 type ArcRequestList = Arc<Mutex<HashMap<String, Sender<Result<Value>>>>>;
 type ArcFunctionList = Arc<Mutex<HashMap<String, fn(HashMap<String, Value>) -> Value>>>;
@@ -42,90 +43,14 @@ pub struct GothamModule {
 }
 
 impl GothamModule {
-	#[allow(clippy::collapsible_if)]
-	pub fn from_cli_args() -> Self {
-		let args = App::new(utils::APP_NAME)
-			.version(utils::APP_VERSION)
-			.author(utils::APP_AUTHORS)
-			.about("Micro-services framework")
-			.arg(
-				Arg::with_name("socket-location")
-					.conflicts_with("port")
-					.conflicts_with("host")
-					.short("s")
-					.long("socket-location")
-					.takes_value(true)
-					.value_name("FILE")
-					.help("Sets the location of the socket to connect"),
-			)
-			.arg(
-				Arg::with_name("port")
-					.conflicts_with("socket-location")
-					.short("p")
-					.long("port")
-					.takes_value(true)
-					.value_name("PORT")
-					.help("Sets the port for the socket to connect to"),
-			)
-			.arg(
-				Arg::with_name("host")
-					.conflicts_with("socket-location")
-					.short("h")
-					.long("host")
-					.takes_value(true)
-					.value_name("HOST-IP")
-					.help("Sets the host address for the socket to connect"),
-			)
-			.arg(
-				Arg::with_name("V")
-					.short("V")
-					.multiple(true)
-					.help("Sets the level of verbosity (max 3)"),
-			)
-			.arg(
-				Arg::with_name("version")
-					.short("v")
-					.long("version")
-					.help("Prints version information"),
-			)
-			.get_matches();
-
-		if args.is_present("version") {
-			println!("{}", utils::APP_VERSION);
-			panic!();
-		}
-
-		let mut default_socket_location = std::env::current_dir().unwrap();
-		default_socket_location.push(args.value_of("socket-location").unwrap_or("../gotham.sock"));
-		let default_socket_location = default_socket_location.as_os_str().to_str().unwrap();
-
-		if cfg!(target_family = "windows") {
-			if args.value_of("socket-location").is_some() {
-				panic!("Listening on unix sockets are not supported on windows");
-			} else {
-				GothamModule::from_inet_socket(
-					args.value_of("host").unwrap_or("127.0.0.1"),
-					args.value_of("port")
-						.unwrap_or("2203")
-						.parse::<u16>()
-						.unwrap(),
-				)
-			}
+	pub fn default(connection_path: &str) -> Self {
+		let is_ip: std::result::Result<SocketAddr, AddrParseError> =
+			connection_path.to_string().parse();
+		if is_ip.is_ok() {
+			let ip = is_ip.unwrap();
+			Self::from_inet_socket(&format!("{}", ip.ip()), ip.port())
 		} else {
-			if args.value_of("port").is_some() {
-				GothamModule::from_inet_socket(
-					args.value_of("host").unwrap_or("127.0.0.1"),
-					args.value_of("port")
-						.unwrap_or("2203")
-						.parse::<u16>()
-						.unwrap(),
-				)
-			} else {
-				GothamModule::from_unix_socket(
-					args.value_of("socket-location")
-						.unwrap_or(default_socket_location),
-				)
-			}
+			Self::from_unix_socket(connection_path)
 		}
 	}
 

src/utils/constants.rs

@@ -1,9 +1,3 @@
-use clap::{crate_authors, crate_name, crate_version};
-
-pub const APP_NAME: &str = crate_name!();
-pub const APP_VERSION: &str = crate_version!();
-pub const APP_AUTHORS: &str = crate_authors!();
-
 pub mod request_keys {
 	pub const TYPE: &str = "type";
 	pub const REQUEST_ID: &str = "requestId";

src/utils/mod.rs

@@ -1,5 +1,5 @@
 mod constants;
 mod error;
 
-pub use constants::{errors, request_keys, request_types, APP_AUTHORS, APP_NAME, APP_VERSION};
+pub use constants::{errors, request_keys, request_types};
 pub use error::{Error, Result};