Merge pull request #199 from git-quick-stats/task/issues-3

Enhance daily statistics tracking

README.md

@@ -120,6 +120,8 @@ LIST OPTIONS
         see a list of everyone who contributed to the repo
     -n, --new-contributors
         list everyone who made their first contribution since a specified date
+    -N, --new-contributors-since-tag
+        list everyone who made their first contribution since a specified git tag
     -a, --commits-per-author
         displays a list of commits per author
     -d, --commits-per-day
@@ -173,6 +175,14 @@ You can set variable `_GIT_LIMIT` for limited output. It will affect the "change
 export _GIT_LIMIT=20
 ```
 
+### Git tag
+
+You can set `_GIT_TAG` to define the default tag used by the "new contributors since tag" option.
+
+```bash
+export _GIT_TAG="foo"
+```
+
 ### Git log options
 
 You can set `_GIT_LOG_OPTIONS` for [git log options](https://git-scm.com/docs/git-log#_options):

git-quick-stats

@@ -119,6 +119,9 @@ if ! [[ "$_commit_days" =~ ^[0-9]+$ ]] || (( _commit_days <= 0 )); then
     _commit_days=30
 fi
 
+# Specific git tag 
+_tag="${_GIT_TAG:-}"
+
 # Default menu theme
 # Set the legacy theme by typing "export _MENU_THEME=legacy"
 _theme="${_MENU_THEME:=default}"
@@ -354,6 +357,8 @@ LIST OPTIONS
         see a list of everyone who contributed to the repo
     -n, --new-contributors
         list everyone who made their first contribution since a specified date
+    -N, --new-contributors-since-tag
+        list everyone who made their first contribution since a specified tag
     -a, --commits-per-author
         displays a list of commits per author
     -d, --commits-per-day
@@ -464,21 +469,22 @@ function showMenu() {
     printf %b "${NUMS}    9)${TEXT} All branches (sorted by most recent commit)\\n"
     printf %b "${NUMS}   10)${TEXT} All contributors (sorted by name)\\n"
     printf %b "${NUMS}   11)${TEXT} New contributors (sorted by email)\\n"
-    printf %b "${NUMS}   12)${TEXT} Git commits per author\\n"
-    printf %b "${NUMS}   13)${TEXT} Git commits per date\\n"
-    printf %b "${NUMS}   14)${TEXT} Git commits per month\\n"
-    printf %b "${NUMS}   15)${TEXT} Git commits per year\\n"
-    printf %b "${NUMS}   16)${TEXT} Git commits per weekday\\n"
-    printf %b "${NUMS}   17)${TEXT} Git commits per weekday by author\\n"
-    printf %b "${NUMS}   18)${TEXT} Git commits per hour\\n"
-    printf %b "${NUMS}   19)${TEXT} Git commits per hour by author\\n"
-    printf %b "${NUMS}   20)${TEXT} Git commits per timezone\\n"
-    printf %b "${NUMS}   21)${TEXT} Git commits per timezone by author\\n"
+    printf %b "${NUMS}   12)${TEXT} New contributors since a tag\\n"
+    printf %b "${NUMS}   13)${TEXT} Git commits per author\\n"
+    printf %b "${NUMS}   14)${TEXT} Git commits per date\\n"
+    printf %b "${NUMS}   15)${TEXT} Git commits per month\\n"
+    printf %b "${NUMS}   16)${TEXT} Git commits per year\\n"
+    printf %b "${NUMS}   17)${TEXT} Git commits per weekday\\n"
+    printf %b "${NUMS}   18)${TEXT} Git commits per weekday by author\\n"
+    printf %b "${NUMS}   19)${TEXT} Git commits per hour\\n"
+    printf %b "${NUMS}   20)${TEXT} Git commits per hour by author\\n"
+    printf %b "${NUMS}   21)${TEXT} Git commits per timezone\\n"
+    printf %b "${NUMS}   22)${TEXT} Git commits per timezone by author\\n"
     printf %b "\\n${TITLES} Suggest:\\n"
-    printf %b "${NUMS}   22)${TEXT} Code reviewers (based on git history)\\n"
+    printf %b "${NUMS}   23)${TEXT} Code reviewers (based on git history)\\n"
     printf %b "\\n${TITLES} Calendar:\\n"
-    printf %b "${NUMS}   23)${TEXT} Activity calendar by author\\n"
-    printf %b "${NUMS}   24)${TEXT} Activity heatmap for the last $_commit_days days\\n"
+    printf %b "${NUMS}   24)${TEXT} Activity calendar by author\\n"
+    printf %b "${NUMS}   25)${TEXT} Activity heatmap for the last $_commit_days days\\n"
     printf %b "\\n${HELP_TXT}Please enter a menu option or ${EXIT_TXT}press Enter to exit.\\n"
     printf %b "${TEXT}> ${COLOR_NORMAL}"
     read -r opt
@@ -748,19 +754,162 @@ function changelogs() {
 ################################################################################
 function myDailyStats() {
     optionPicked "My daily status:"
-    git diff --shortstat '@{0 day ago}' | sort -nr | tr ',' '\n' | LC_ALL=C awk '
-    { args[NR] = $0; }
-    END {
-      for (i = 1; i <= NR; ++i) {
-        printf "\t%s\n", args[i]
-      }
-    }'
 
-    echo -e "\t" $(git -c log.showSignature=false log --use-mailmap \
-                       --author="$(git config user.name)" $_merges \
-                       --since=$(date "+%Y-%m-%dT00:00:00") \
-                       --until=$(date "+%Y-%m-%dT23:59:59") --reverse $_log_options \
-                       | grep -cE "commit [a-f0-9]{40}") "commits"
+    local -r my_name="$(git config user.name)"
+    local -r my_email="$(git config user.email)"
+    local -r today_start="$(date "+%Y-%m-%dT00:00:00")"
+    local -r today_end="$(date "+%Y-%m-%dT23:59:59")"
+    local -r yesterday_start="$(date -d "yesterday 00:00:00" "+%Y-%m-%dT%H:%M:%S")"
+    local -r yesterday_end="$(date -d "yesterday 23:59:59" "+%Y-%m-%dT%H:%M:%S")"
+    local -r today_date="$(date "+%Y-%m-%d")"
+    local -r yesterday_date="$(date -d "yesterday" "+%Y-%m-%d")"
+
+    # Current user's totals for today
+    local -r my_commits_today="$(git rev-list --count --author="$my_name" $_merges \
+        --since="$today_start" --until="$today_end" HEAD)"
+
+    local -r my_today_stats="$(git -c log.showSignature=false log --use-mailmap $_merges \
+        --author="$my_name" --numstat --format='' \
+        --since="$today_start" --until="$today_end" $_log_options $_pathspec \
+        | LC_ALL=C awk -F'\t' '
+            $1 ~ /^[0-9]+$/ && $2 ~ /^[0-9]+$/ {
+                ins += $1;
+                del += $2;
+                files[$3] = 1;
+            }
+            END {
+                for (f in files) {
+                    file_count++;
+                }
+                printf "%d|%d|%d", file_count + 0, ins + 0, del + 0;
+            }
+        ')"
+
+    local -r my_files_today="$(echo "$my_today_stats" | awk -F'|' '{print $1}')"
+    local -r my_insertions_today="$(echo "$my_today_stats" | awk -F'|' '{print $2}')"
+    local -r my_deletions_today="$(echo "$my_today_stats" | awk -F'|' '{print $3}')"
+
+    echo -e "\tfor ${my_name} (${today_date}):"
+    echo -e "\t  commits:        ${my_commits_today}"
+    echo -e "\t  files modified: ${my_files_today}"
+    echo -e "\t  insertions:     ${my_insertions_today}"
+    echo -e "\t  deletions:      ${my_deletions_today}"
+
+    # Compare repository totals between yesterday and today
+    local -r today_stats="$(git -c log.showSignature=false log --use-mailmap $_merges \
+        --numstat --format='%H' --since="$today_start" --until="$today_end" \
+        $_log_options $_pathspec | LC_ALL=C awk -F'\t' '
+            /^[0-9a-f]{40}$/ { commits++; next }
+            $1 ~ /^[0-9]+$/ && $2 ~ /^[0-9]+$/ {
+                ins += $1;
+                del += $2;
+                files[$3] = 1;
+            }
+            END {
+                for (f in files) {
+                    file_count++;
+                }
+                printf "%d|%d|%d|%d", commits + 0, file_count + 0, ins + 0, del + 0;
+            }
+        ')"
+
+    local -r yday_stats="$(git -c log.showSignature=false log --use-mailmap $_merges \
+        --numstat --format='%H' --since="$yesterday_start" --until="$yesterday_end" \
+        $_log_options $_pathspec | LC_ALL=C awk -F'\t' '
+            /^[0-9a-f]{40}$/ { commits++; next }
+            $1 ~ /^[0-9]+$/ && $2 ~ /^[0-9]+$/ {
+                ins += $1;
+                del += $2;
+                files[$3] = 1;
+            }
+            END {
+                for (f in files) {
+                    file_count++;
+                }
+                printf "%d|%d|%d|%d", commits + 0, file_count + 0, ins + 0, del + 0;
+            }
+        ')"
+
+    local -r today_commits="$(echo "$today_stats" | awk -F'|' '{print $1}')"
+    local -r today_files="$(echo "$today_stats" | awk -F'|' '{print $2}')"
+    local -r today_insertions="$(echo "$today_stats" | awk -F'|' '{print $3}')"
+    local -r today_deletions="$(echo "$today_stats" | awk -F'|' '{print $4}')"
+
+    local -r yday_commits="$(echo "$yday_stats" | awk -F'|' '{print $1}')"
+    local -r yday_files="$(echo "$yday_stats" | awk -F'|' '{print $2}')"
+    local -r yday_insertions="$(echo "$yday_stats" | awk -F'|' '{print $3}')"
+    local -r yday_deletions="$(echo "$yday_stats" | awk -F'|' '{print $4}')"
+
+    echo -e "\n\trepo comparison (${yesterday_date} -> ${today_date}):"
+    echo -e "\t  commits:        ${yday_commits} -> ${today_commits} (delta: $((today_commits - yday_commits)))"
+    echo -e "\t  files modified: ${yday_files} -> ${today_files} (delta: $((today_files - yday_files)))"
+    echo -e "\t  insertions:     ${yday_insertions} -> ${today_insertions} (delta: $((today_insertions - yday_insertions)))"
+    echo -e "\t  deletions:      ${yday_deletions} -> ${today_deletions} (delta: $((today_deletions - yday_deletions)))"
+
+    # Most changed files today (all authors)
+    echo -e "\n\tmost changed files today:"
+    local -r top_changed_files="$(git -c log.showSignature=false log --use-mailmap $_merges \
+        --numstat --format='' --since="$today_start" --until="$today_end" \
+        $_log_options $_pathspec | LC_ALL=C awk -F'\t' '
+            $1 ~ /^[0-9]+$/ && $2 ~ /^[0-9]+$/ {
+                files[$3] += ($1 + $2);
+                ins[$3] += $1;
+                del[$3] += $2;
+            }
+            END {
+                for (f in files) {
+                    printf "%d\t%d\t%d\t%s\n", files[f], ins[f], del[f], f;
+                }
+            }
+        ' | sort -nr | head -n 5)"
+
+    if [[ -n "$top_changed_files" ]]; then
+        echo "$top_changed_files" | LC_ALL=C awk -F'\t' '{
+            printf "\t  %s (total: %d, +%d, -%d)\n", $4, $1, $2, $3;
+        }'
+    else
+        echo -e "\t  no changed files found for today"
+    fi
+
+    # First and last commit of today
+    local -r first_today_commit="$(git -c log.showSignature=false log --use-mailmap $_merges \
+        --reverse --since="$today_start" --until="$today_end" \
+        --date=iso --format='%ad | %aN | %s' $_log_options $_pathspec | head -n 1)"
+    local -r last_today_commit="$(git -c log.showSignature=false log --use-mailmap $_merges \
+        --since="$today_start" --until="$today_end" \
+        --date=iso --format='%ad | %aN | %s' $_log_options $_pathspec | head -n 1)"
+
+    echo -e "\n\ttoday commit window:"
+    if [[ -n "$first_today_commit" ]]; then
+        echo -e "\t  first commit: ${first_today_commit}"
+        echo -e "\t  last commit:  ${last_today_commit}"
+    else
+        echo -e "\t  no commits found for today"
+    fi
+
+    # Most active users today (excluding current user)
+    echo -e "\n\tmost active users today (excluding you):"
+    local -r active_users="$(git -c log.showSignature=false log --use-mailmap $_merges \
+        --since="$today_start" --until="$today_end" --format='%aN|%aE' \
+        $_log_options $_pathspec | LC_ALL=C awk -F'|' -v git_name="$my_name" -v git_email="$my_email" '
+            $1 != git_name && $2 != git_email {
+                key = $1 " <" $2 ">";
+                count[key]++;
+            }
+            END {
+                for (k in count) {
+                    printf "%d\t%s\n", count[k], k;
+                }
+            }
+        ' | sort -nr | head -n 5)"
+
+    if [[ -n "$active_users" ]]; then
+        echo "$active_users" | LC_ALL=C awk -F'\t' '{
+            printf "\t  %s commits - %s\n", $1, $2;
+        }'
+    else
+        echo -e "\t  no additional active users today"
+    fi
 }
 
 ################################################################################
@@ -1033,6 +1182,41 @@ function newContributors() {
     done
 }
 
+################################################################################
+# DESC: Lists all new contributors to a repo since a specified git tag
+# ARGS: $tag (required): Git tag to use as the cutoff
+# OUTS: None
+################################################################################
+function newContributorsSinceTag() {
+    local tag="${1:-}"
+    [[ -z "$tag" ]] && { echo "Usage: newContributorsSinceTag <tag>"; return 1; }
+
+    if ! git rev-parse "$tag" >/dev/null 2>&1; then
+        echo "Error: Tag '$tag' does not exist."
+        return 1
+    fi
+
+    local tagDate=$(git log -n 1 --format='%ai' "$tag" | cut -d' ' -f1)
+    
+    if [[ -z "$tagDate" ]]; then
+        echo "Error: Could not determine date for tag '$tag'."
+        return 1
+    fi
+
+    optionPicked "New contributors since tag '$tag' ($tagDate):"
+    local contributors=$(git -c log.showSignature=false log --use-mailmap $_merges \
+                             "$_since" "$_until" --format='%aE' $_log_options \
+                             $_pathspec | sort -u)
+    for c in $contributors; do
+        local firstCommit=$(git -c log.showSignature=false log --author="$c" \
+                         --reverse --use-mailmap $_merges "$_since" "$_until" \
+                         --format='%at' $_log_options $_pathspec | filter_ignored_authors | head -n 1)
+        if [[ $firstCommit -ge $($_DATE_CMD -d "$tagDate" +%s) ]]; then
+           echo "$c"
+        fi
+    done
+}
+
 ################################################################################
 # DESC: Displays the number of commits and percentage contributed to the repo
 #       per author and sorts them by contribution percentage
@@ -1414,6 +1598,15 @@ if [[ "$#" -eq 1 ]]; then
                 fi
             done
             newContributors "${newDate}";;
+        -N|--new-contributors-since-tag)
+            while [[ -z "${_tag}" ]]; do
+                read -r -p "Which tag? " _tag
+                if ! git rev-parse "${_tag}" >/dev/null 2>&1; then
+                    echo "Error: Tag '${_tag}' does not exist."
+                    _tag=""
+                fi
+            done
+            newContributorsSinceTag "${_tag}";;
         -a|--commits-per-author) commitsPerAuthor;;
         -d|--commits-per-day) commitsPerDay;;
         -Y|--commits-by-year ) commitsByYear;;
@@ -1511,35 +1704,43 @@ if [[ "$#" -eq 0 ]]; then
                    fi
                done
                newContributors "${newDate}"; showMenu;;
-           12) commitsPerAuthor; showMenu;;
-           13) commitsPerDay; showMenu;;
-           14) commitsByMonth; showMenu;;
-           15) commitsByYear; showMenu;;
-           16) commitsByWeekday; showMenu;;
-           17) author=""
+           12) while [[ -z "${_tag}" ]]; do
+                   read -r -p "Which tag? " _tag
+                   if ! git rev-parse "${_tag}" >/dev/null 2>&1; then
+                       echo "Error: Tag '${_tag}' does not exist."
+                       _tag=""
+                   fi
+               done
+               newContributorsSinceTag "${_tag}"; showMenu;;
+           13) commitsPerAuthor; showMenu;;
+           14) commitsPerDay; showMenu;;
+           15) commitsByMonth; showMenu;;
+           16) commitsByYear; showMenu;;
+           17) commitsByWeekday; showMenu;;
+           18) author=""
                while [[ -z "${author}" ]]; do
                    read -r -p "Which author? " author
                done
                commitsByWeekday "${author}"; showMenu;;
-           18) commitsByHour; showMenu;;
-           19) author=""
+           19) commitsByHour; showMenu;;
+           20) author=""
                while [[ -z "${author}" ]]; do
                    read -r -p "Which author? " author
                done
                commitsByHour "${author}"; showMenu;;
-           20) commitsByTimezone; showMenu;;
-           21) author=""
+           21) commitsByTimezone; showMenu;;
+           22) author=""
                while [[ -z "${author}" ]]; do
                    read -r -p "Which author? " author
                done
                commitsByTimezone "${author}"; showMenu;;
-           22) suggestReviewers; showMenu;;
-           23) author=""
+           23) suggestReviewers; showMenu;;
+           24) author=""
                 while [[ -z "${author}" ]]; do
                     read -r -p "Which author? " author
                 done
                 commitsCalendarByAuthor "${author}"; showMenu;;
-           24) commitsHeatmap; showMenu;;
+           25) commitsHeatmap; showMenu;;
            q|"\n") exit;;
            *) clear; optionPicked "Pick an option from the menu"; showMenu;;
         esac

git-quick-stats.1

@@ -97,6 +97,11 @@ see a list of everyone who contributed to the repo
 list everyone who made their first contribution since a specified date
 .HP
 .PP
+\fB\-N\fR, \fB\-\-new\-contributors\-since\-tag\fR
+.IP
+list everyone who made their first contribution since a specified git tag
+.HP
+.PP
 \fB\-a\fR, \fB\-\-commits\-per\-author\fR
 .IP
 displays a list of commits per author
@@ -174,6 +179,10 @@ You can set _GIT_LIMIT for limited output log, example:
 .PP
 .B  export _GIT_LIMIT=20
 .PP
+You can set _GIT_TAG to define the default tag used by the "new contributors since tag" option, example:
+.PP
+.B  export _GIT_TAG="foo"
+.PP
 You can set _GIT_LOG_OPTIONS for git log options, example:
 .PP
 .B  export _GIT_LOG_OPTIONS="--ignore-all-space --ignore-blank-lines"

tests/commands_test.sh

@@ -52,6 +52,8 @@ LIST OPTIONS
         see a list of everyone who contributed to the repo
     -n, --new-contributors
         list everyone who made their first contribution since a specified date
+    -N, --new-contributors-since-tag
+        list everyone who made their first contribution since a specified tag
     -a, --commits-per-author
         displays a list of commits per author
     -d, --commits-per-day
@@ -121,6 +123,11 @@ assert_success "$src --detailed-git-stats"
 assert_contains "$src --commits-per-day" "Git commits per date"
 assert_success "$src --commits-per-day"
 
+assert_contains "$src --my-daily-stats" "My daily status"
+assert_contains "$src --my-daily-stats" "most changed files today"
+assert_contains "$src --my-daily-stats" "most active users today (excluding you)"
+assert_success "$src --my-daily-stats"
+
 assert_startswith "$src --commits-by-year" "Git commits by year"
 assert_success "$src --commits-by-year"