replaced git-standup with gitlog

README.md

@@ -50,9 +50,6 @@ lists the environment variables that you can copy in your `rc` files:
   - `TTC_SAY_BOX = parrot | bunny | llama | cat`, to party with a different parrot (or,
     more specifically: to have a different animal say a message in the big box)
   - `TTC_REPOS`, a comma separated list of repos to look at for `git` commits.
-  This is using [`git-standup`](https://github.com/kamranahmedse/git-standup) under
-  the hood, and looks one subdirectory deep (so if you have all your code
-  directories in a `~/Code`, you only need to list that one)
   - `TTC_REPOS_DEPTH` is the max directory-depth to look for git repositories in
   the directories defined with `TTC_REPOS` (by default 1). Note that the deeper
   the directory depth, the slower the results will be fetched.

care.js

@@ -1,9 +1,10 @@
 #!/usr/bin/env node
 var config = require(__dirname + '/config.js');
 var twitterbot = require(__dirname + '/twitterbot.js');
-var notifier = require('node-notifier');
+var gitbot = require(__dirname + '/gitbot.js');
 var pomodoro = require(__dirname + '/pomodoro.js');
 
+var notifier = require('node-notifier');
 var spawn = require('child_process').spawn;
 var blessed = require('blessed');
 var contrib = require('blessed-contrib');
@@ -170,21 +171,57 @@ function doTheCodes() {
   var todayCommits = 0;
   var weekCommits = 0;
 
-  var today = spawn('sh ' + __dirname + '/standup-helper.sh', ['-m ' + config.depth, config.repos], {shell:true});
-  todayBox.content = '';
-  today.stdout.on('data', data => {
-    todayCommits = getCommits(`${data}`, todayBox);
-    updateCommitsGraph(todayCommits, weekCommits);
-    screen.render();
-  });
+  function getCommits(data, box) {
+    var content = colorizeLog(data || '');
+    box.content += content;
+    var commitRegex = /(.......) (- .*)/g;
+    return (box && box.content) ? (box.content.match(commitRegex) || []).length : '0';
+  }
 
-  var week = spawn('sh ' + __dirname + '/standup-helper.sh', ['-m ' + config.depth + ' -d 7', config.repos], {shell:true});
-  weekBox.content = '';
-  week.stdout.on('data', data => {
-    weekCommits = getCommits(`${data}`, weekBox);
-    updateCommitsGraph(todayCommits, weekCommits);
-    screen.render();
-  });
+  if (config.gitbot.toLowerCase() === 'gitstandup') {
+    var today = spawn('sh ' + __dirname + '/standup-helper.sh', ['-m ' + config.depth, config.repos], {shell:true});
+    todayBox.content = '';
+    today.stdout.on('data', data => {
+      todayCommits = getCommits(`${data}`, todayBox);
+      updateCommitsGraph(todayCommits, weekCommits);
+      screen.render();
+    });
+
+    var week = spawn('sh ' + __dirname + '/standup-helper.sh', ['-m ' + config.depth + ' -d 7', config.repos], {shell:true});
+    weekBox.content = '';
+    week.stdout.on('data', data => {
+      weekCommits = getCommits(`${data}`, weekBox);
+      updateCommitsGraph(todayCommits, weekCommits);
+      screen.render();
+    });
+  } else {
+    gitbot.findGitRepos(config.repos, config.depth-1, (err, allRepos) => {
+      if (err) {
+        return todayBox.content = err;
+        screen.render();
+      }
+      gitbot.getCommitsFromRepos(allRepos, 1, (err, data) => {
+        if (err) {
+          return todayBox.content = err;
+          screen.render();
+        }
+        todayBox.content = '';
+        todayCommits = getCommits(`${data}`, todayBox);
+        updateCommitsGraph(todayCommits, weekCommits);
+        screen.render();
+      });
+      gitbot.getCommitsFromRepos(allRepos, 7, (err, data) => {
+        if (err) {
+          return weekBox.content = err;
+          screen.render();
+        }
+        weekBox.content = '';
+        weekCommits = getCommits(`${data}`, weekBox);
+        updateCommitsGraph(todayCommits, weekCommits);
+        screen.render();
+      });
+    });
+  }
 }
 
 function makeBox(label) {
@@ -223,13 +260,6 @@ function makeGraphBox(label) {
   return options;
 }
 
-var commitRegex = /(.......) (- .*)/g;
-function getCommits(data, box) {
-  var content = colorizeLog(data);
-  box.content += content;
-  return (box.content.match(commitRegex) || []).length;
-}
-
 function updateCommitsGraph(today, week) {
   commits.setData({titles: ['today', 'week'], data: [today, week]})
 }

config.js

@@ -11,11 +11,14 @@ var config = {
   apiKeys: (process.env.TTC_APIKEYS || 'true') === 'true',
 
   // Directories in which to run git-standup on for a list of your recent commits.
-  repos: (process.env.TTC_REPOS || '~/Code').replace(/,/g, ' '),
+  repos: (process.env.TTC_REPOS || '~/Code').split(','),
 
   // Directory-depth to look for git repositories.
   depth: (process.env.TTC_REPOS_DEPTH || 1),
 
+  // Which method is to be used to read the git commits ('gitstandup' | 'gitlog').
+  gitbot: (process.env.TTC_GITBOT || 'gitstandup'),
+
   // Where to check the weather for.
   // It's using weather.service.msn.com behind the curtains.
   weather: process.env.TTC_WEATHER || 'San Francisco',

gitbot.js

@@ -0,0 +1,86 @@
+const gitUsername = require('git-user-name')();
+const resolve = require('resolve-dir');
+const subdirs = require('subdirs');
+const isGit = require('is-git');
+const gitlog = require('gitlog');
+const path = require('path');
+const async = require("async");
+
+/**
+ * Go through all `repos` and look for subdirectories up to a given `depth`
+ * and look for repositories.
+ * Calls `callback` with array of repositories.
+ */
+function findGitRepos(repos, depth, callback) {
+  let allRepos = [];
+  async.each(repos, (repo, repoDone) => {
+    repo = resolve(repo);
+    subdirs(repo, depth, (err, dirs) => {
+      if (err) {
+        switch (err.code) {
+          case 'ENOENT':
+            return callback(`Could not open directory directory: ${err.path}\n`, null);
+          case 'EACCES':
+            return; //ignore if no access
+          default:
+            return callback(`Error "${err.code}" doing "${err.syscall}" on directory: ${err.path}\n`, null);
+        }
+      }
+      if (dirs) dirs.push(repo);
+      async.each(dirs, (dir, dirDone) => {
+        isGit(dir, (err, isGit) => {
+          if (err) {
+            return callback(err, null);
+          }
+          if (!dir.includes('.git') && isGit) {
+            allRepos.push(dir);
+          }
+          dirDone();
+        });
+      }, repoDone);
+    });
+  }, err => {
+    callback(err, allRepos.sort().reverse());
+  });
+}
+
+/**
+ * returns all commits of the last given `days`.
+ * Calls `callback` with line-seperated-strings of the formatted commits.
+ */
+function getCommitsFromRepos(repos, days, callback) {
+  let cmts = [];
+  async.each(repos, (repo, repoDone) => {
+    try {
+      gitlog({
+        repo: repo,
+        number: 100, //max commit count
+        since: `${days} days ago`,
+        fields: ['abbrevHash', 'subject', 'authorDateRel', 'authorName'],
+        author: gitUsername
+      }, (err, logs) => {
+        // Error
+        if (err)
+          return callback(err, null);
+
+        // Repo path
+        if (logs.length >= 1)
+          cmts.push(repo);
+
+        // Commit
+        logs.forEach(c => {
+          if (c.status && c.status.length)
+            cmts.push(`${c.abbrevHash} - ${c.subject} (${c.authorDateRel}) <${c.authorName.replace('@end@\n','')}>`);
+        });
+        repoDone();
+      });
+    } catch(err) {
+      callback(err, null);
+    }
+  }, err => {
+    callback(err, cmts.length > 0 ? cmts.join('\n') : "Nothing yet. Start small!");
+  });
+}
+
+module.exports.findGitRepos = findGitRepos;
+module.exports.getCommitsFromRepos = getCommitsFromRepos;

package.json

@@ -13,10 +13,16 @@
     "blessed": "^0.1.81",
     "blessed-contrib": "^4.7.5",
     "chalk": "^1.1.3",
+    "git-standup": "^2.1.8",
+    "git-user-name": "^1.2.0",
+    "gitlog": "^2.4.0",
+    "is-git": "0.0.1",
     "node-notifier": "^5.1.2",
     "parrotsay-api": "^0.1.1",
-    "sign-bunny": "^1.0.0",
+    "resolve-dir": "^1.0.0",
     "scraperjs": "^1.2.0",
+    "sign-bunny": "^1.0.0",
+    "subdirs": "^1.0.1",
     "twit": "^2.2.5",
     "weather-js": "^2.0.0"
   },

sample.env

@@ -11,7 +11,6 @@ export TTC_REPOS='~/Work/Code,~/Fun/Code'
 # The max directory-depth to look for git repositories in
 # the directories defined with `TTC_REPOS`. Note that the deeper
 # the directory depth, the slower the results will be fetched.
-
 export TTC_REPOS_DEPTH=2
 
 # Location/zip code to check the weather for. Both 90210 and "San Francisco, CA"