Merge branch 'master' of https://github.com/theowenyoung/git-stats into new-version

Author: IonicaBizau

README.md

@@ -99,6 +99,8 @@ Options:
   -d, --data <path>      Sets a custom data store file.
   -l, --light            Enables the light theme.
   -n, --disable-ansi     Forces the tool not to use ANSI styles.
+  -A, --author           Filter author related contributions in the current
+                         repository.
   -a, --authors          Shows a pie chart with the author related
                          contributions in the current repository.
   -u, --until <date>     Optional end date.

bin/git-stats

@@ -56,6 +56,10 @@ new Tilda(`${__dirname}/../package.json`, {
             opts: ["a", "authors"]
           , desc: "Shows a pie chart with the author related contributions in the current repository."
         }
+      ,{
+            opts: ["A", "author"]
+          , desc: "Filter author related contributions in the current repository."
+        }
       , {
             opts: ["n", "disable-ansi"]
           , desc: "Forces the tool not to use ANSI styles."
@@ -96,7 +100,8 @@ new Tilda(`${__dirname}/../package.json`, {
       , lightOpt = action.options.light
       , dataPathOpt = action.options.data
       , globalActivityOpt = action.options.globalActivity
-      , rawOpt = action.options.raw
+      , rawOpt = action.options.raw,
+        authorOpt = action.options.author
       ;
 
     let options = {};
@@ -163,6 +168,11 @@ new Tilda(`${__dirname}/../package.json`, {
         options.repo = process.cwd();
     }
 
+    // Add the author opt
+    if(authorOpt.is_provided){
+      options.author = authorOpt.value
+    }
+
     // Handle authors
     if (authorsOpt.is_provided) {
         options.no_ansi = noAnsiOpt.is_provided;

lib/index.js

@@ -632,6 +632,8 @@ GitStats.prototype.globalActivity = function (options, callback) {
             repo: options
         };
     }
+    console.log('options',options);
+    
 
     options.repo = Abs(options.repo);
 
@@ -643,8 +645,12 @@ GitStats.prototype.globalActivity = function (options, callback) {
       , today = null
       , cal = []
       ;
+    var logArgs = ["log","--since", options.start.format(DATE_FORMAT), "--until", options.end.format(DATE_FORMAT)]
+    if(options.author){
+        logArgs = logArgs.concat(["--author",options.author])
+    }
 
-    GitLogParser(Spawn("git", ["log", "--since", options.start.format(DATE_FORMAT), "--until", options.end.format(DATE_FORMAT)], { cwd: options.repo }).stdout).on("commit", function(commit) {
+    GitLogParser(Spawn("git",logArgs , { cwd: options.repo }).stdout).on("commit", function(commit) {
         if (!commit) { return; }
         today = Moment(commit.date).format(DATE_FORMAT);
         commits[today] = commits[today] || 0;