Merge pull request #27 from perryrh0dan/dev

feat(config): add command to display config

src/action/default/config.rs

@@ -0,0 +1,8 @@
+use crate::config;
+use crate::out;
+
+pub fn config(config: &config::Config) {
+    let config_path = config::config_location();
+
+    out::info::display_config(config, &config_path.to_str().unwrap());
+}

src/action/default/mod.rs

@@ -1,4 +1,3 @@
+pub mod config;
 pub mod init;
-pub mod list;
-pub mod update;
-pub mod view;
+pub mod update;

src/action/repository/list.rs

@@ -0,0 +1,8 @@
+use crate::config::Config;
+use crate::out;
+
+pub fn list(config: &Config) {
+    let repositories = config.get_repositories();
+
+    out::info::list_repositories(&repositories);
+}

src/action/repository/mod.rs

@@ -1,2 +1,3 @@
 pub mod add;
+pub mod list;
 pub mod remove;

src/action/template/mod.rs

@@ -1,2 +1,4 @@
 pub mod create;
-pub mod test;
+pub mod list;
+pub mod test;
+pub mod view;

src/config/mod.rs

@@ -150,7 +150,7 @@ fn get_default_config() -> Config {
   return config;
 }
 
-fn config_location() -> PathBuf {
+pub fn config_location() -> PathBuf {
   let mut dir = match dirs::home_dir() {
     Some(path) => PathBuf::from(path),
     None => PathBuf::from(""),

src/git/mod.rs

@@ -104,7 +104,7 @@ fn do_fetch<'a>(
   let auth = opts.auth.clone().unwrap();
 
   if auth == "ssh" {
-    log::debug!("[git]: authentication using ssh");
+    log::info!("[git]: authentication using ssh");
   // callbacks.credentials(|_url, username_from_url, _allowed_types| {
   //     git2::Cred::ssh_key(
   //     username_from_url.unwrap(),
@@ -124,7 +124,7 @@ fn do_fetch<'a>(
       git2::Cred::userpass_plaintext(&token, "")
     });
   } else if auth == "basic" {
-    log::debug!("[git]: authentication using token");
+    log::info!("[git]: authentication using token");
     if opts.username.is_none() || opts.password.is_none() {
       log::error!("Username or Password is missing");
       return Err(git2::Error::from_str("missing credentials"));
@@ -133,7 +133,7 @@ fn do_fetch<'a>(
       git2::Cred::userpass_plaintext(&opts.username.clone().unwrap(), &opts.password.clone().unwrap())
     });
   } else {
-    log::debug!("[git]: no authentication");
+    log::info!("[git]: no authentication");
   }
 
   // Always fetch all tags.

src/main.rs

@@ -2,12 +2,12 @@ mod action;
 mod cli;
 mod config;
 mod git;
-mod out;
+mod logger;
 mod meta;
+mod out;
 mod repository;
 mod template;
 mod utils;
-mod logger;
 
 use clap::{crate_version, App, AppSettings, Arg};
 
@@ -70,7 +70,7 @@ fn main() {
             .long("remote")
             .takes_value(true)
             .help("Remote URL")
-            .required(false)
+            .required(false),
         )
         .arg(
           Arg::with_name("replace")
@@ -80,70 +80,82 @@ fn main() {
         ),
     )
     .subcommand(
-      App::new("list")
-        .about("List all available templates")
-        .visible_alias("ls"),
+      App::new("config")
+        .about("View configuration"),
     )
     .subcommand(App::new("update").about("Update to the latest release"))
-    .subcommand(
-      App::new("view")
-        .about("View template details")
-        .visible_alias("v")
-        .arg(
-          Arg::with_name("repository")
-            .short('r')
-            .long("repository")
-            .takes_value(true)
-            .help("The repository to use")
-            .required(false),
-        )
-        .arg(
-          Arg::with_name("template")
-            .help("The name of the template to use for generation")
-            .required(false)
-            .index(1),
-        ),
-    )
     .subcommand(
       App::new("repository")
         .about("Maintain repositories")
         .setting(AppSettings::ArgRequiredElseHelp)
         .subcommand(App::new("add").about("Add new repository"))
+        .subcommand(App::new("list").about("List all available repository"))
         .subcommand(App::new("remove").about("Remove a repository")),
     )
     .subcommand(
       App::new("template")
         .about("Maintain templates")
         .setting(AppSettings::ArgRequiredElseHelp)
         .subcommand(App::new("create").about("Create new template"))
+        .subcommand(App::new("list").about("List all available templates"))
+        .subcommand(
+          App::new("view")
+            .about("View template details")
+            .arg(
+              Arg::with_name("repository")
+                .short('r')
+                .long("repository")
+                .takes_value(true)
+                .help("Name of the repository")
+                .required(false),
+            )
+            .arg(
+              Arg::with_name("template")
+                .short('t')
+                .long("template")
+                .takes_value(true)
+                .help("Name of the template")
+                .required(false)
+            ),
+        ),
     )
     .get_matches();
 
   match matches.subcommand() {
+    ("config", Some(_config_matches)) => {
+      action::default::config::config(&config);
+    }
     ("init", Some(init_matches)) => {
       action::default::init::init(&config, init_matches);
     }
-    ("list", Some(list_matches)) => {
-      action::default::list::list(&config, list_matches);
-    }
     ("update", Some(_update_matches)) => {
       action::default::update::update(true);
     }
-    ("view", Some(view_matches)) => {
-      action::default::view::view(&config, view_matches);
-    }
     ("repository", Some(repository_matches)) => {
       match repository_matches.subcommand() {
-        ("add", Some(repo_add_matches)) => action::repository::add::add(&mut config, repo_add_matches),
+        ("add", Some(repo_add_matches)) => {
+          action::repository::add::add(&mut config, repo_add_matches)
+        }
         ("remove", Some(repo_delete_matches)) => {
           action::repository::remove::remove(&mut config, repo_delete_matches)
         }
+        ("list", Some(_list_matches)) => {
+          action::repository::list::list(&config);
+        }
         _ => unreachable!(), // If all subcommands are defined above, anything else is unreachabe!()
       }
     }
     ("template", Some(repository_matches)) => {
       match repository_matches.subcommand() {
-        ("create", Some(template_create_matches)) => action::template::create::create(&mut config, template_create_matches),
+        ("create", Some(template_create_matches)) => {
+          action::template::create::create(&mut config, template_create_matches)
+        }
+        ("view", Some(view_matches)) => {
+          action::template::view::view(&config, view_matches);
+        }
+        ("list", Some(list_matches)) => {
+          action::template::list::list(&config, list_matches);
+        }
         _ => unreachable!(), // If all subcommands are defined above, anything else is unreachabe!()
       }
     }

src/out/error.rs

@@ -56,11 +56,6 @@ pub fn copy_template() {
   println!("{}", text);
 }
 
-pub fn missing_token() {
-  let text = format!("Error fetching templates: authentication token is missing").red();
-  println!("{}", text);
-}
-
 pub fn unknown() {
   let text = format!("Unknown error. See the logs for more details").red();
   println!("{}", text);

src/out/info.rs

@@ -1,3 +1,4 @@
+use crate::config::Config;
 use crate::template;
 use crate::utils;
 
@@ -14,6 +15,12 @@ pub fn list_templates(templates: &Vec<String>) {
     }
 }
 
+pub fn list_repositories(repositories: &Vec<String>) {
+    for repository in repositories {
+        println!("{}", &utils::capitalize(repository));
+    }
+}
+
 pub fn display_template(template: &template::Template) {
     println!("name: {}", template.name);
     println!("path: {}", template.path);
@@ -28,6 +35,11 @@ pub fn display_template(template: &template::Template) {
     }
 }
 
+pub fn display_config(config: &Config, config_path: &str) {
+    let text = format!("Config loaded from: {}", config_path).green();
+    println!("{}", text);
+}
+
 pub fn no_app_update() {
     let text = format!("tmpo is already up to date").green();
     println!("{}", text);

src/repository/mod.rs

@@ -131,6 +131,7 @@ impl Repository {
           git::GitError::AddRemoteError => println!("Add Remote Error"),
         },
       };
+
       match git::update(&directory, &self.config.git_options) {
         Ok(()) => (),
         Err(_e) => out::error::update_templates(),

src/template/mod.rs

@@ -1,6 +1,7 @@
 use std::fs;
 use std::fs::File;
 use std::io::{Error, ErrorKind, Read, Write};
+use log;
 use std::path::{Path, PathBuf};
 use std::process::{Command, Stdio};
 
@@ -234,6 +235,8 @@ fn run_script(script: &String, target: &Path) {
     return;
   }
 
+  log::info!("Run script: {}", script);
+
   // Run before script if exists
   let mut cmd = if cfg!(target_os = "windows") {
     Command::new("cmd")
@@ -254,7 +257,15 @@ fn run_script(script: &String, target: &Path) {
       .expect("failed to execute process")
   };
 
-  let status = cmd.wait();
+  let status = match cmd.wait() {
+    Ok(status) => status,
+    Err(error) => { 
+      log::error!("Script exited with error: {}", error);
+      return;
+    },
+  };
+
+  log::info!("Script exit status: {}", status);
 }