replaced git-standup with gitlog

README.md

@@ -26,9 +26,7 @@ lists the environment variables that you can copy in your `rc` files:
   - `TTC_BOTS` are the 3 twitter bots to check, comma separated. The first entry
   in this list will be displayed in the party parrot.
   - `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)
   - `TTC_WEATHER`, the location to check the weather for. A zipcode doesn't
     always work, so if you can, use a location first (so prefer `Paris` over
     `90210`)

care.js

@@ -8,6 +8,11 @@ var contrib = require('blessed-contrib');
 var chalk = require('chalk');
 var parrotSay = require('parrotsay-api');
 var weather = require('weather-js');
+var gitUsername = require('git-user-name')();
+var subdirs = require('subdirs');
+var isGit = require('is-git');
+var gitlog = require('gitlog');
+var async = require("async");
 
 var screen = blessed.screen(
     {fullUnicode: true, // emoji or bust
@@ -103,21 +108,83 @@ function doTheTweets() {
 function doTheCodes() {
   var todayCommits = 0;
   var weekCommits = 0;
-
-  var today = spawn('sh ' + __dirname + '/standup-helper.sh', [config.repos], {shell:true});
   todayBox.content = '';
-  today.stdout.on('data', data => {
-    todayCommits = getCommits(`${data}`, todayBox);
-    updateCommitsGraph(todayCommits, weekCommits);
+  weekBox.content = '';
+
+  var showError = function(err) {
+    getCommits("ERROR: "+err, todayBox);
     screen.render();
+  }
+
+  getGitRepos(config.repos, config.reposDepth-1, (err, allRepos) => {
+    if (err) return showError(err);
+    getGitCommits(allRepos, 1, (err, data) => {
+      if (err) return showError(err);
+      todayCommits = getCommits(`${data}`, todayBox);
+      updateCommitsGraph(todayCommits, weekCommits);
+      screen.render();
+    });
+    getGitCommits(allRepos, 7, (err, data) => {
+      if (err) return showError(err);
+      weekCommits = getCommits(`${data}`, weekBox);
+      updateCommitsGraph(todayCommits, weekCommits);
+      screen.render();
+    });
   });
+}
 
-  var week = spawn('sh ' + __dirname + '/standup-helper.sh', ['-d 7', config.repos], {shell:true});
-  weekBox.content = '';
-  week.stdout.on('data', data => {
-    weekCommits = getCommits(`${data}`, weekBox);
-    updateCommitsGraph(todayCommits, weekCommits);
-    screen.render();
+/**
+ * Go through all `repos` and look for subdirectories up to a given `depth`
+ * and look for repositories.
+ * Calls `callback` with array of repositories.
+ */
+function getGitRepos(repos, depth, callback) {
+  var allRepos = [];
+  async.each(repos, (repo, repoDone) => {
+    subdirs(repo, depth, (err, dirs) => {
+      if (err) return callback(
+        `😥 Error "${err.code}" doing "${err.syscall}" on directory: ${err.path}`, null);
+      if (dirs) dirs.push(repo);
+      async.each(dirs, (dir, dirDone) => {
+        isGit(dir, (err, isGit) => {
+          if (err) callback(err, null);
+          if (!dir.includes('.git') && isGit) {
+            allRepos.push(dir);
+          }
+          dirDone();
+        });
+      }, repoDone);
+    });
+  }, err => {
+    callback(err, allRepos.sort());
+  });
+}
+
+/**
+ * returns all commits of the last given `days`.
+ * Calls `callback` with line-seperated-strings of the formatted commits.
+ */
+function getGitCommits(repos, days, callback) {
+  var cmts = [];
+  async.each(repos, (repo, repoDone) => {
+    try {
+      gitlog({
+        repo: repo,
+        since: `${days} days ago`,
+        fields: ['abbrevHash', 'subject', 'authorDateRel', 'authorName'],
+        author: gitUsername
+      }, (err, logs) => {
+        if (err) callback(err, null);
+        logs.forEach(c => {
+          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!");
   });
 }
 

config.js

@@ -8,7 +8,10 @@ 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(','),
+
+  // The directory-depth on how to look for git-repos. Use with care!
+  reposDepth: process.env.TTC_REPOS_DEPTH || 1,
 
   // Where to check the weather for.
   // It's using weather.service.msn.com behind the curtains.

package.json

@@ -13,15 +13,15 @@
     "blessed": "^0.1.81",
     "blessed-contrib": "^4.7.5",
     "chalk": "^1.1.3",
-
+    "git-user-name": "^1.2.0",
+    "gitlog": "^2.4.0",
+    "is-git": "0.0.1",
     "parrotsay-api": "^0.1.1",
     "scraperjs": "^1.2.0",
+    "subdirs": "^1.0.1",
     "twit": "^2.2.5",
     "weather-js": "^2.0.0"
   },
-  "peerDependencies": {
-    "git-standup": "^2.1.8"
-  },
   "scripts": {
     "start": "node care.js"
   }

sample.env

@@ -5,6 +5,9 @@ export TTC_BOTS='tinycarebot,selfcare_bot,magicrealismbot'
 # List of folders to look into for `git` commits, comma separated.
 export TTC_REPOS='~/Work/Code,~/Fun/Code'
 
+// The directory-depth on how to look for git-repos. Use with care!
+export TTC_REPOS_DEPTH=2
+
 # Location/zip code to check the weather for. Both 90210 and "San Francisco, CA"
 # _should_ be ok (the zip code doesn't always work -- use a location
 # first, if you can). It's using weather.service.msn.com behind the curtains.