refactor: ♻️ RESTRUCTURE project

Cargo.toml

@@ -3,7 +3,9 @@ name = "git-commit-messenger"
 version = "0.1.0"
 edition = "2021"
 
-# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+[lib]
+name = "gcm"
+path = "src/lib/lib.rs"
 
 [dependencies]
 duct = "0.13.5"
@@ -15,3 +17,4 @@ serde_yaml = "0.9.13"
 termination = "0.1.2"
 thiserror = "1.0.37"
 yaml-rust = "0.4.5"
+

src/lib/config/generate.rs

@@ -0,0 +1,63 @@
+use std::{fs, path::PathBuf};
+
+use super::{ConfigOptions, Part, Variant};
+
+pub fn read_from_path(path: PathBuf) -> Option<ConfigOptions> {
+    let config_yml = fs::read_to_string(path).ok()?;
+
+    serde_yaml::from_str(&config_yml).ok()?
+}
+
+pub fn default_config() -> ConfigOptions {
+    ConfigOptions {
+        variants: vec![
+            Variant {
+                name: String::from("Conventional Commits"),
+                parts: vec![
+                    Part::ConventionalType,
+                    Part::TextInput {
+                        prompt: String::from("Scope"),
+                        pattern: Some(String::from("({0})")),
+                    },
+                    Part::Literal {
+                        value: String::from(": "),
+                    },
+                    Part::TextInput {
+                        prompt: String::from("Description"),
+                        pattern: None,
+                    },
+                ],
+            },
+            Variant {
+                name: String::from("Gitmoji"),
+                parts: vec![
+                    Part::Gitmoji,
+                    Part::Space,
+                    Part::TextInput {
+                        prompt: String::from("Description"),
+                        pattern: None,
+                    },
+                ],
+            },
+            Variant {
+                name: String::from("CC + Gitmoji"),
+                parts: vec![
+                    Part::ConventionalType,
+                    Part::TextInput {
+                        prompt: String::from("Scope"),
+                        pattern: Some(String::from(" ({0})")),
+                    },
+                    Part::Literal {
+                        value: String::from(": "),
+                    },
+                    Part::Gitmoji,
+                    Part::Space,
+                    Part::TextInput {
+                        prompt: String::from("Description"),
+                        pattern: None,
+                    },
+                ],
+            },
+        ],
+    }
+}

src/config.rs → src/lib/config/mod.rs

@@ -1,8 +1,10 @@
-use std::{fmt::Display, fs, path::PathBuf};
-
 use home::home_dir;
-
 use serde::Deserialize;
+use std::fmt::Display;
+
+use self::generate::{default_config, read_from_path};
+
+mod generate;
 
 #[derive(Deserialize)]
 pub struct ConfigOptions {
@@ -47,38 +49,31 @@ pub struct SelectOption {
     pub description: Option<String>,
 }
 
-const _TEST_YML: &str = "\
-- type: ConventionalType
-- type: Literal
-  value: ' ('
-- type: Select
-  prompt: 'Scope: '
-  options:
-    - key: fileui5
-    - key: listui5
-- type: Literal
-  value: '): '
-- type: Gitmoji
-- type: Space
-- type: TextInput
-  prompt: 'Description: '
-";
-
 pub struct Config {
     config: ConfigOptions,
 }
 
 impl Config {
     pub fn new() -> Self {
-        let mut config_path = PathBuf::from(home_dir().unwrap());
+        let mut config_path = home_dir().unwrap();
         config_path.push(".config/gcm/config.yml");
-        let config_yml = fs::read_to_string(config_path).unwrap();
-        let config = serde_yaml::from_str(&config_yml).unwrap();
 
-        Config { config }
+        if let Some(config) = read_from_path(config_path) {
+            Config { config }
+        } else {
+            Default::default()
+        }
     }
 
     pub fn variants(&self) -> &Vec<Variant> {
         &self.config.variants
     }
 }
+
+impl Default for Config {
+    fn default() -> Self {
+        Config {
+            config: default_config(),
+        }
+    }
+}

src/lib/lib.rs

@@ -0,0 +1,4 @@
+pub mod config;
+pub mod error;
+pub mod git;
+pub mod prompt;

src/prompt/conventional_type.rs → src/lib/prompt/conventional_type.rs

@@ -2,7 +2,7 @@ use inquire::Select;
 
 use crate::config::SelectOption;
 
-const CONVENTIONAL_TYPE_JSON: &str = include_str!("../data/conventional_types.json");
+const CONVENTIONAL_TYPE_JSON: &str = include_str!("../../data/conventional_types.json");
 
 pub fn select_conventional_type() -> String {
     let conventional_types: Vec<SelectOption> =

src/prompt/gitmoji.rs → src/lib/prompt/gitmoji.rs

@@ -9,7 +9,7 @@ struct Gitmoji {
     description: String,
 }
 
-const GITMOJI_JSON: &str = include_str!("../data/gitmojis.json");
+const GITMOJI_JSON: &str = include_str!("../../data/gitmojis.json");
 
 impl Display for Gitmoji {
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {

src/prompt/message_builder.rs → src/lib/prompt/message_builder.rs

@@ -19,12 +19,18 @@ pub struct MessageBuilder {
     message: String,
 }
 
-impl MessageBuilder {
-    pub fn new() -> Self {
+impl Default for MessageBuilder {
+    fn default() -> Self {
         MessageBuilder {
             message: String::from(""),
         }
     }
+}
+
+impl MessageBuilder {
+    pub fn new() -> Self {
+        Default::default()
+    }
 
     pub fn consume(self) -> String {
         self.message
@@ -68,7 +74,7 @@ impl MessageBuilder {
     }
 
     pub fn add_literal(&mut self, literal: &str) -> &Self {
-        self.add_text(&literal)
+        self.add_text(literal)
     }
 
     pub fn select_conventional_type(&mut self) -> &Self {
@@ -78,7 +84,7 @@ impl MessageBuilder {
     }
 
     fn add_text(&mut self, text: &str) -> &Self {
-        self.message.push_str(&text);
+        self.message.push_str(text);
 
         self
     }

src/main.rs

@@ -1,11 +1,11 @@
-mod config;
-mod prompt;
-use config::{Config, Part};
+use gcm::{
+    config::{Config, Part},
+    error::Error,
+    git,
+    prompt::message_builder::MessageBuilder,
+};
 use inquire::{Confirm, Select};
 
-use crate::prompt::message_builder::MessageBuilder;
-use git_commit_messenger::utils::{error::Error, git};
-
 #[termination::display]
 fn main() -> Result<(), Error> {
     git::check_ready()?;
@@ -29,7 +29,7 @@ fn main() -> Result<(), Error> {
         git::commit(message);
     }
 
-    return Ok(());
+    Ok(())
 }
 
 fn prompt_user(parts: &[Part]) -> String {
@@ -41,11 +41,11 @@ fn prompt_user(parts: &[Part]) -> String {
                 prompt,
                 options,
                 pattern,
-            } => message_builder.select_prompt(&prompt, options, pattern),
+            } => message_builder.select_prompt(prompt, options, pattern),
             Part::Space => message_builder.add_literal(" "),
             Part::Gitmoji => message_builder.select_gitmoji(),
-            Part::Literal { value } => message_builder.add_literal(&value),
-            Part::TextInput { prompt, pattern } => message_builder.text_input(&prompt, &pattern),
+            Part::Literal { value } => message_builder.add_literal(value),
+            Part::TextInput { prompt, pattern } => message_builder.text_input(prompt, pattern),
             Part::ConventionalType => message_builder.select_conventional_type(),
         };
     }