replaced git-standup with gitlog

care.js

@@ -8,6 +8,9 @@ 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 gitlog = require('gitlog');
+var async = require("async");
 
 var screen = blessed.screen(
     {fullUnicode: true, // emoji or bust
@@ -102,23 +105,38 @@ 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 => {
+  getGitCommits(config.repos, 1, data => {
     todayCommits = getCommits(`${data}`, todayBox);
     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 => {
+  getGitCommits(config.repos, 7, data => {
     weekCommits = getCommits(`${data}`, weekBox);
     updateCommitsGraph(todayCommits, weekCommits);
     screen.render();
   });
 }
 
+function getGitCommits(repos, days, callback) {
+  var cmts = [];
+  async.each(repos, (repo, done) => {
+    gitlog({
+      repo: repo,
+      since: `${days} days ago`,
+      fields: ['abbrevHash', 'subject', 'authorDateRel', 'authorName'],
+      author: gitUsername
+    }, (err, logs) => {
+      logs.forEach(c => {
+        cmts.push(`${c.abbrevHash} - ${c.subject} (${c.authorDateRel}) <${c.authorName}>`);
+      });
+      done();
+    });
+  }, err => {
+    callback(cmts.join('\n'));
+  });
+}
+
 function makeBox(label) {
   return {
     label: label,

config.js

@@ -11,7 +11,7 @@ config.apiKeys = config.apiKeys === 'true' ? true : false;
 
 // Directories in which to run git-standup on for a list of your recent commits.
 config.repos = process.env.TTC_REPOS || '~/Code';
-config.repos = config.repos.split(',').join(' ');
+config.repos = config.repos.split(',');
 
 // Where to check the weather for. This can be a zip code or a location name
 // So both 90210 and "San Francisco, CA" should be ok.

package.json

@@ -4,6 +4,9 @@
   "description": "A terminal that tries to take care of you 💖",
   "main": "care.js",
   "author": "Monica Dinculescu <[email protected]>",
+  "contributors": [
+    "Alexander Wunschik <[email protected]> (http://wunschik.it)"
+  ],
   "license": "MIT",
   "bin": {
     "tiny-care-terminal": "care.js"
@@ -13,7 +16,8 @@
     "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",
     "parrotsay-api": "^0.1.1",
     "scraperjs": "^1.2.0",
     "twit": "^2.2.5",