Merge pull request #145 from s-okita/master

Add stats by author per weekday functionality

.gitignore

@@ -7,4 +7,7 @@
 .Spotlight*
 .Trash*
 **/*~
-nbproject/*
+nbproject/*
+/tests/test-git/.git/
+#/tests/test-git/*
+!/tests/test-git/resetgit

README.md

@@ -126,6 +126,8 @@ LIST OPTIONS
         displays a list of commits per month
     -w, --commits-by-weekday
         displays a list of commits per weekday
+    -W, --commits-by-author-by-weekday
+        displays a list of commits per weekday by author
     -o, --commits-by-hour
         displays a list of commits per hour
     -A, --commits-by-author-by-hour

git-quick-stats

@@ -158,6 +158,8 @@ LIST OPTIONS
         displays a list of commits per year
     -w, --commits-by-weekday
         displays a list of commits per weekday
+    -W, --commits-by-author-by-weekday
+        displays a list of commits per weekday by author
     -o, --commits-by-hour
         displays a list of commits per hour
     -A, --commits-by-author-by-hour
@@ -243,12 +245,13 @@ function showMenu() {
     printf %b "${NUMS}   13)${TEXT} Git commits per month\\n"
     printf %b "${NUMS}   14)${TEXT} Git commits per year\\n"
     printf %b "${NUMS}   15)${TEXT} Git commits per weekday\\n"
-    printf %b "${NUMS}   16)${TEXT} Git commits per hour\\n"
-    printf %b "${NUMS}   17)${TEXT} Git commits per hour by author\\n"
-    printf %b "${NUMS}   18)${TEXT} Git commits per timezone\\n"
-    printf %b "${NUMS}   19)${TEXT} Git commits per timezone by author\\n"
+    printf %b "${NUMS}   16)${TEXT} Git commits per weekday by author\\n"
+    printf %b "${NUMS}   17)${TEXT} Git commits per hour\\n"
+    printf %b "${NUMS}   18)${TEXT} Git commits per hour by author\\n"
+    printf %b "${NUMS}   19)${TEXT} Git commits per timezone\\n"
+    printf %b "${NUMS}   20)${TEXT} Git commits per timezone by author\\n"
     printf %b "\\n${TITLES} Suggest:\\n"
-    printf %b "${NUMS}   20)${TEXT} Code reviewers (based on git history)\\n"
+    printf %b "${NUMS}   21)${TEXT} Code reviewers (based on git history)\\n"
     printf %b "\\n${HELP_TXT}Please enter a menu option or ${EXIT_TXT}press Enter to exit.\\n"
     printf %b "${TEXT}> ${NORMAL}"
     read -r opt
@@ -391,7 +394,8 @@ function changelogs() {
         --date=short "${_author}" "$_since" "$_until" $_log_options $_pathspec \
         | sort -u -r | head -n $_limit \
         | while read DATE; do
-              echo -e "\n[$DATE]"
+              day=$(date -u -j -f "%Y-%m-%d" "$DATE" "+%A")
+              echo -e "\n[$DATE - $day]"
               GIT_PAGER=cat git -c log.showSignature=false log \
                                 --use-mailmap $_merges \
                                 --format=" * %s (%aN)" "${_author}" \
@@ -519,6 +523,67 @@ function csvOutput() {
         }'
 }
 
+################################################################################
+# DESC: Transforms special multiline string sequence to a JSON string property.
+#       {propTag}{optional white space indentation}{property}
+#       {line1}
+#       {line2}
+#       ...
+#       {propTag}, (the final comma is optional)
+#       Generates: "{property}": "{line1}\n{line2}\n...",
+#       The final comma is added if present after the ending tag.
+#       Caveat: the content should not contain {propTag} at the
+#       beginning of a line.
+# ARGS: $propTag (optional) : tag at the beginning of the line to mark the
+#       beginning and the end of a special sequence. It must not contain
+#       regular expression special characters, i.e. use [a-zA-Z0-9_]+.
+#       This tag should be sufficiently random to avoid collision with
+#       the actual content. Defaults to __JSONPROP__.
+# OUTS: content with JSON string properties
+################################################################################
+function toJsonProp() {
+    local propTag="${1:-__JSONPROP__}"
+    sed -n -E '
+# transforms the special sequence.
+/^'"$propTag"'[^\r]/ {
+    # remove the special prefix, keep the property name followed by :
+    s/^'"$propTag"'([^\r]+)\r?$/\1:/g;
+    # hold in buffer, get the next line.
+    h;n
+    # loop
+    b eos
+    :eos {
+        # add in hold buffer and loop while the string is not finished.
+        /^'"$propTag"',?\r?$/ ! { H; n; b eos; }
+        # end of the string, flip buffer to current pattern.
+		# keeps the comma if any, or a space as an empty placeholder.
+		/,\r?$/ ! { x; s/\r?$/ / }
+		/,\r?$/   { x; s/\r?$/,/ }
+    }
+    # replace special JSON string chars.
+    s/["\\]/\\&/g;
+    # replace control chars, carriage returns, line feeds, tabulations, etc.
+    s/\x00/\\u0000/g; s/\x01/\\u0001/g; s/\x02/\\u0002/g; s/\x03/\\u0003/g;
+    s/\x04/\\u0004/g; s/\x05/\\u0005/g; s/\x06/\\u0006/g; s/\x07/\\u0007/g;
+    s/\x08/\\b/g;     s/\x09/\\t/g;     s/\x0a/\\n/g;     s/\x0b/\\u000b/g;
+    s/\x0c/\\f/g;     s/\x0d/\\r/g;     s/\x0e/\\u000e/g; s/\x0f/\\u000f/g;
+    s/\x10/\\u0010/g; s/\x11/\\u0011/g; s/\x12/\\u0012/g; s/\x13/\\u0013/g;
+    s/\x14/\\u0014/g; s/\x15/\\u0015/g; s/\x16/\\u0016/g; s/\x17/\\u0017/g;
+    s/\x18/\\u0018/g; s/\x19/\\u0019/g; s/\x1a/\\u001a/g; s/\x1b/\\u001b/g;
+    s/\x1c/\\u001c/g; s/\x1d/\\u001d/g; s/\x1e/\\u001e/g; s/\x1f/\\u001f/g;
+    s/\x7f/\\u007f/g;
+
+    # format the JSON property name, optionally indented, open quote for value.
+    s/^(\s*)([^:]+):\\n/\1"\2": "/g;
+    # handle the final comma if present, and close the quote for value.
+    /,$/ { s/,$/",/g; }
+    # otherwise remove final space placeholder and close the quote for value.
+    /,$/ ! { s/ $/"/g; }
+}
+# print lines.
+p'
+}
+
 ################################################################################
 # DESC: Saves the git log output in a JSON format
 # ARGS: $json_path (required): Path to where the file is saved
@@ -526,10 +591,20 @@ function csvOutput() {
 ################################################################################
 function jsonOutput() {
     optionPicked "Output log saved to file at: ${json_path}/output.json"
-    # TODO: Can we shorten this pretty format line? Quick experiment shows that
-    #       it does not properly respect \ and interprets them literally.
+    local propTag="__JSONPROP${RANDOM}__"
     git -c log.showSignature=false log --use-mailmap $_merges "$_since" "$_until" $_log_options \
-        --pretty=format:'{%n  "commit": "%H",%n  "abbreviated_commit": "%h",%n  "tree": "%T",%n  "abbreviated_tree": "%t",%n  "parent": "%P",%n  "abbreviated_parent": "%p",%n  "refs": "%D",%n  "encoding": "%e",%n  "subject": "%s",%n  "sanitized_subject_line": "%f",%n  "body": "%b",%n  "commit_notes": "%N",%n  "author": {%n    "name": "%aN",%n    "email": "%aE",%n    "date": "%aD"%n  },%n  "commiter": {%n    "name": "%cN",%n    "email": "%cE",%n    "date": "%cD"%n  }%n},' \
+        --pretty=format:'{%n  "commit": "%H",%n  "abbreviated_commit": "%h",%n  "tree": "%T",%n'\
+'  "abbreviated_tree": "%t",%n  "parent": "%P",%n  "abbreviated_parent": "%p",%n  "refs": "%D",%n  "encoding": "%e",%n'\
+"$propTag"'  subject%n%s%n'"$propTag"',%n  "sanitized_subject_line": "%f",%n'\
+"$propTag"'  body%n%b%n'"$propTag"',%n'\
+"$propTag"'  commit_notes%n%N%n'"$propTag"',%n  "author": {%n'\
+"$propTag"'    name%n%aN%n'"$propTag"',%n'\
+"$propTag"'    email%n%aE%n'"$propTag"',%n'\
+'    "date": "%aD"%n  },%n  "commiter": {%n'\
+"$propTag"'    name%n%cN%n'"$propTag"',%n'\
+"$propTag"'    email%n%cE%n'"$propTag"',%n'\
+'    "date": "%cD"%n  }%n},' \
+        | toJsonProp "$propTag" \
         | sed "$ s/,$//" \
         | sed ':a;N;$!ba;s/\r\n\([^{]\)/\\n\1/g' \
         | awk 'BEGIN { print("[") } { print($0) } END { print("]") }' \
@@ -710,14 +785,24 @@ function commitsByMonth() {
 # OUTS: None
 ################################################################################
 function commitsByWeekday() {
-    optionPicked "Git commits by weekday:"
+    local author="${1:-}"
+    local _author=""
+
+    if [[ -z "${author}" ]]; then
+        optionPicked "Git commits by weekday:"
+        _author="--author=**"
+    else
+        optionPicked "Git commits by weekday for author '${author}':"
+        _author="--author=${author}"
+    fi
+
     echo -e "\tday\tsum"
     local i counter=1
     for i in Mon Tue Wed Thu Fri Sat Sun
     do
         echo -en "\t$counter\t$i\t"
         git -c log.showSignature=false shortlog -n $_merges --format='%ad %s' \
-            "$_since" "$_until" $_log_options |
+            "${_author}" "$_since" "$_until" $_log_options |
             grep -cE "^ * $i \w\w\w [0-9]{1,2} " || continue
         counter=$((counter+1))
     done | awk '{
@@ -890,6 +975,12 @@ if [[ "$#" -eq 1 ]]; then
         -Y|--commits-by-year ) commitsByYear;;
         -m|--commits-by-month) commitsByMonth;;
         -w|--commits-by-weekday) commitsByWeekday;;
+        -W|--commits-by-author-by-weekday)
+            author="${_GIT_AUTHOR:-}"
+            while [[ -z "${author}" ]]; do
+                read -r -p "Which author? " author
+            done
+            commitsByWeekday "${author}";;
         -o|--commits-by-hour) commitsByHour;;
         -A|--commits-by-author-by-hour)
             author="${_GIT_AUTHOR:-}"
@@ -898,7 +989,7 @@ if [[ "$#" -eq 1 ]]; then
             done
             commitsByHour "${author}";;
         -z|--commits-by-timezone) commitsByTimezone;;
-        -Z|--commits-by-author-by-timezone) 
+        -Z|--commits-by-author-by-timezone)
             author="${_GIT_AUTHOR:-}"
             while [[ -z "${author}" ]]; do
                 read -r -p "Which author? " author
@@ -963,19 +1054,24 @@ while [[ "${opt}" != "" ]]; do
        13) commitsByMonth; showMenu;;
        14) commitsByYear; showMenu;;
        15) commitsByWeekday; showMenu;;
-       16) commitsByHour; showMenu;;
-       17) author=""
+       16) author=""
+           while [[ -z "${author}" ]]; do
+               read -r -p "Which author? " author
+           done
+           commitsByWeekday "${author}"; showMenu;;
+       17) commitsByHour; showMenu;;
+       18) author=""
            while [[ -z "${author}" ]]; do
                read -r -p "Which author? " author
            done
            commitsByHour "${author}"; showMenu;;
-       18) commitsByTimezone; showMenu;;
-       19) author=""
+       19) commitsByTimezone; showMenu;;
+       20) author=""
            while [[ -z "${author}" ]]; do
                read -r -p "Which author? " author
            done
            commitsByTimezone "${author}"; showMenu;;
-       20) suggestReviewers; showMenu;;
+       21) suggestReviewers; showMenu;;
        q|"\n") exit;;
        *) clear; optionPicked "Pick an option from the menu"; showMenu;;
     esac

git-quick-stats.1

@@ -95,6 +95,11 @@ displays a list of commits per year
 displays a list of commits per weekday
 .HP
 .PP
+\fB\-W\fR, \fB\-\-commits\-by\author\-by\-weekday\fR
+.IP
+displays a list of commits per weekday by author
+.HP
+.PP
 \fB\-o\fR, \fB\-\-commits\-by\-hour\fR
 .IP
 displays a list of commits per hour

tests/commands_test.sh

@@ -52,6 +52,8 @@ LIST OPTIONS
         displays a list of commits per year
     -w, --commits-by-weekday
         displays a list of commits per weekday
+    -W, --commits-by-author-by-weekday
+        displays a list of commits per weekday by athor
     -o, --commits-by-hour
         displays a list of commits per hour
     -A, --commits-by-author-by-hour

tests/test-git/resetgit

@@ -0,0 +1,17 @@
+#!/bin/sh
+# Initialises a new local Git repo for test purpose.
+if test -d ../test-git/.git; then rm -Rf ../test-git/.git; fi
+#mkdir test-git
+cd ../test-git
+git init
+git config user.name "$(printf %s 'Test Git,\nfor test purpose')"
+git config user.email "TestGit\o/@example.org"
+
+#printf '\n[user]\nname = test-git\nemail = test-git@example.org\n'> .git/config
+printf 'test-git\n========\n' > README.md
+git add README.md
+git commit -m 'added readme (o\w/o)' -m 'in markdown, no \r\n, only \n' -m 'a very "simple" readme'
+testChars="$(printf 'tab [%b] form feed [%b] line feed [%b] carriage return [%b]' '\x09' '\x0C' '\x0A' '\x0D')"
+#printf '# testChars [%s]\n' "$testChars">&2
+git notes add -m 'Some notes' -m 'out of ascii: été au cœur' -m "$testChars"
+git log