fix: improve .git/config lookup, add getFromGitConfig method

seantrane · seantrane · commit 92b4557fac0d · 2018-11-06T16:42:51.000-05:00
diff --git a/src/finda.ts b/src/finda.ts
@@ -103,28 +103,42 @@ export class Finda {
   }
 
   /**
-   * Finda git email address
-   *
-   * Try to find git email address via;
-   * - git config --get user.email
+   * Find info from .git/config file
    *
+   * @param {string} path Path to property ('user.email')
    * @returns {string}
    * @memberof Finda
    */
-  gitEmail(): string {
-    const cacheKey = 'gitEmail_' + process.cwd();
-    let email = this.cache.get(cacheKey);
-    if (email) {
-      return email;
+  getFromGitConfig(path: string): string {
+    if (!get(path, 'length')) {
+      return undefined;
+    }
+    const cacheKey = `git_config_${path}_${process.cwd()}`;
+    let str = this.cache.get(cacheKey);
+    if (str) {
+      return str;
     }
     // let config = gitConfigSync();
     // if (typeof config === 'undefined') config = gitConfigSync({ path: '~/.gitconfig' });
-    // email = (typeof config.user !== 'undefined') ? config.user.email : null;
+    // str = get(config, path);
     if (shWhich('git')) {
-      email = shExec('git config --get user.email', { silent: true }).stdout.toString().trim();
-      this.cache.set(cacheKey, email);
+      str = shExec(`git config --get ${path}`, { silent: true }).stdout.toString().trim();
     }
-    return email;
+    this.cache.set(cacheKey, str);
+    return str;
+  }
+
+  /**
+   * Find git email address
+   *
+   * Try to find git email address via;
+   * - git config --get user.email
+   *
+   * @returns {string}
+   * @memberof Finda
+   */
+  gitEmail(): string {
+    return this.getFromGitConfig('user.email');
   }
 
   /**
@@ -174,19 +188,7 @@ export class Finda {
    * @memberof Finda
    */
   gitName(): string {
-    const cacheKey = 'gitName_' + process.cwd();
-    let name = this.cache.get(cacheKey);
-    if (name) {
-      return name;
-    }
-    // let config = gitConfigSync();
-    // if (typeof config === 'undefined') config = gitConfigSync({ path: '~/.gitconfig' });
-    // name = (typeof config.user !== 'undefined') ? config.user.name : null;
-    if (shWhich('git')) {
-      name = shExec('git config --get user.name', { silent: true }).stdout.toString().trim();
-      this.cache.set(cacheKey, name);
-    }
-    return name;
+    return this.getFromGitConfig('user.name');
   }
 
   /**
