master << develop (#25)

Author: thanhhaudev

Dockerfile

@@ -1,9 +1,19 @@
-FROM golang:1.22
+# Build stage
+FROM golang:1.24 AS builder
 
-ENV GITHUB_TOKEN=${GITHUB_TOKEN}
+WORKDIR /build
+COPY go.mod go.sum ./
+RUN go mod download
 
-COPY . /home/src
-WORKDIR /home/src
-RUN go build -o /bin/cmd ./cmd
+COPY . .
+RUN CGO_ENABLED=0 GOOS=linux go build -a -installsuffix cgo -o cmd ./cmd
 
-ENTRYPOINT [ "/bin/cmd" ]
+# Runtime stage
+FROM alpine:latest
+
+RUN apk --no-cache add ca-certificates git
+WORKDIR /root/
+
+COPY --from=builder /build/cmd .
+
+ENTRYPOINT ["./cmd"]

README.md

@@ -11,6 +11,7 @@ Automatically update your GitHub profile README with beautiful metrics about you
 - 📅 **Commit Patterns** - Visualize when you code most (time of day, day of week)
 - 💻 **Language Statistics** - Track programming languages across your repositories
 - ⏱️ **WakaTime Integration** - Display coding time, editors, projects and OS usage
+- 📈 **Coding Streak Tracker** - Track your coding consistency and streaks with WakaTime
 - 🎨 **Customizable** - Choose metrics and customize appearance
 - 🔄 **Auto-Updating** - Runs on schedule to keep your profile fresh
 - 🚀 **Easy Setup** - Get started in 5 minutes
@@ -83,7 +84,8 @@ jobs:
         uses: thanhhaudev/github-stats@master
         env:
           GITHUB_TOKEN: ${{ secrets.GH_TOKEN }}
-          SHOW_METRICS: "COMMIT_TIMES_OF_DAY,COMMIT_DAYS_OF_WEEK,LANGUAGE_PER_REPO"
+          WAKATIME_API_KEY: ${{ secrets.WAKATIME_API_KEY }}  # Optional: for WakaTime metrics
+          SHOW_METRICS: "COMMIT_TIMES_OF_DAY,COMMIT_DAYS_OF_WEEK,LANGUAGE_PER_REPO,CODING_STREAK"
 ```
 ### Step 6: Trigger the Action
 
@@ -100,8 +102,36 @@ Choose which metrics to display by setting the `SHOW_METRICS` environment variab
 
 **Example:**
 ```yaml
-SHOW_METRICS: "COMMIT_TIMES_OF_DAY,COMMIT_DAYS_OF_WEEK,LANGUAGE_PER_REPO"
+SHOW_METRICS: "COMMIT_TIMES_OF_DAY,COMMIT_DAYS_OF_WEEK,LANGUAGE_PER_REPO,CODING_STREAK"
 ```
+### 📈 `CODING_STREAK`
+
+Shows your coding streak and consistency metrics combining GitHub commit data with WakaTime statistics.
+
+**Requirements:**
+- GitHub commit data (automatically collected) - **Required**
+- `WAKATIME_API_KEY` (optional) - Adds coding time statistics
+
+**Example output (with WakaTime):**
+
+**📈 Coding Streak**
+```
+🔥 Current Streak:        14 days
+🏆 Longest Streak:        45 days
+📊 Daily Average:         3 hrs 44 mins
+💪 Total Coding Time:     1,383 hrs 16 mins
+🎯 Coding Consistency:    87.5%
+📅 Active Days:           128 days
+```
+
+**Example output (without WakaTime):**
+```
+🔥 Current Streak:        14 days
+🏆 Longest Streak:        45 days
+```
+
+> 💡 **Note:** Streaks are calculated from your GitHub commit history (consecutive days with at least one commit). The metric respects your `TIME_ZONE` setting for accurate day boundaries. Coding time and consistency metrics are only shown when WakaTime is configured.
+
 
 ### 🕒 `COMMIT_TIMES_OF_DAY`
 
@@ -207,13 +237,13 @@ Linux                    6 hrs  3 mins       ████░░░░░░░
 
 **Time range options** (set with `WAKATIME_RANGE`):
 
-| Value           | Title Displayed                           |
-|-----------------|-------------------------------------------|
-| `last_7_days`   | What I Focused On in the Last 7 Days      |
-| `last_30_days`  | How I Spent My Time Over the Last 30 Days |
-| `last_6_months` | Where My Time Went in the Last 6 Months   |
-| `last_year`     | My Time Highlights from Last Year         |
-| `all_time`      | How I've Used My Time Across All Time     |
+| Value           | Title Displayed    |
+|-----------------|--------------------|
+| `last_7_days`   | 📅 Last 7 Days     |
+| `last_30_days`  | 📊 Last 30 Days    |
+| `last_6_months` | 📈 Last 6 Months   |
+| `last_year`     | 🗓️ Last 12 Months |
+| `all_time`      | ⏱️ All Time        |
 
 ---
 
@@ -270,7 +300,7 @@ env:
   WAKATIME_API_KEY: ${{ secrets.WAKATIME_API_KEY }}
   WAKATIME_DATA: "EDITORS,LANGUAGES,PROJECTS,OPERATING_SYSTEMS"
   WAKATIME_RANGE: "last_30_days"
-  SHOW_METRICS: "COMMIT_TIMES_OF_DAY,COMMIT_DAYS_OF_WEEK,LANGUAGE_PER_REPO,LANGUAGES_AND_TOOLS,WAKATIME_SPENT_TIME"
+  SHOW_METRICS: "COMMIT_TIMES_OF_DAY,COMMIT_DAYS_OF_WEEK,LANGUAGE_PER_REPO,LANGUAGES_AND_TOOLS,WAKATIME_SPENT_TIME,CODING_STREAK"
   SHOW_LAST_UPDATE: "true"
   ONLY_MAIN_BRANCH: "true"
   PROGRESS_BAR_VERSION: "2"

action.yml

@@ -53,6 +53,23 @@ inputs:
 runs:
   using: docker
   image: Dockerfile
+  env:
+    GITHUB_TOKEN: ${{ inputs.GITHUB_TOKEN }}
+    SHOW_METRICS: ${{ inputs.SHOW_METRICS }}
+    WAKATIME_API_KEY: ${{ inputs.WAKATIME_API_KEY }}
+    WAKATIME_DATA: ${{ inputs.WAKATIME_DATA }}
+    WAKATIME_RANGE: ${{ inputs.WAKATIME_RANGE }}
+    TIME_ZONE: ${{ inputs.TIME_ZONE }}
+    TIME_LAYOUT: ${{ inputs.TIME_LAYOUT }}
+    SHOW_LAST_UPDATE: ${{ inputs.SHOW_LAST_UPDATE }}
+    ONLY_MAIN_BRANCH: ${{ inputs.ONLY_MAIN_BRANCH }}
+    HIDE_REPO_INFO: ${{ inputs.HIDE_REPO_INFO }}
+    COMMIT_MESSAGE: ${{ inputs.COMMIT_MESSAGE }}
+    COMMIT_USER_NAME: ${{ inputs.COMMIT_USER_NAME }}
+    COMMIT_USER_EMAIL: ${{ inputs.COMMIT_USER_EMAIL }}
+    LANGUAGES_AND_TOOLS: ${{ inputs.LANGUAGES_AND_TOOLS }}
+    EXCLUDE_FORK_REPOS: ${{ inputs.EXCLUDE_FORK_REPOS }}
+    SIMPLIFY_COMMIT_TIMES_TITLE: ${{ inputs.SIMPLIFY_COMMIT_TIMES_TITLE }}
 branding:
   icon: 'star'
   color: 'orange'

cmd/git.go

@@ -1,14 +1,18 @@
 package main
 
 import (
+	"bytes"
 	"fmt"
 	"os"
 	"os/exec"
+	"regexp"
 	"strings"
 )
 
 // setupGitConfig sets up the git configuration
 func setupGitConfig(owner, token, name, email string) error {
+	hideRepoInfo := os.Getenv("HIDE_REPO_INFO") == "true"
+
 	if name == "" {
 		name = "GitHub Action"
 	}
@@ -17,21 +21,21 @@ func setupGitConfig(owner, token, name, email string) error {
 		email = "action@github.com"
 	}
 
-	if err := runGitCommand("config", "--global", "--add", "safe.directory", "/github/workspace"); err != nil {
-		return fmt.Errorf("git config safe.directory error: %v", err)
+	if err := runGitCommand(hideRepoInfo, "config", "--global", "--add", "safe.directory", "/github/workspace"); err != nil {
+		return fmt.Errorf("git config safe.directory error: %v", sanitizeError(err, token, owner))
 	}
 
-	if err := runGitCommand("config", "--global", "user.name", name); err != nil {
-		return fmt.Errorf("git config user.name error: %v", err)
+	if err := runGitCommand(hideRepoInfo, "config", "--global", "user.name", name); err != nil {
+		return fmt.Errorf("git config user.name error: %v", sanitizeError(err, token, owner))
 	}
 
-	if err := runGitCommand("config", "--global", "user.email", email); err != nil {
-		return fmt.Errorf("git config user.email error: %v", err)
+	if err := runGitCommand(hideRepoInfo, "config", "--global", "user.email", email); err != nil {
+		return fmt.Errorf("git config user.email error: %v", sanitizeError(err, token, owner))
 	}
 
 	remoteURL := fmt.Sprintf("https://%s@github.com/%s/%s.git", token, owner, owner)
-	if err := runGitCommand("remote", "set-url", "origin", remoteURL); err != nil {
-		return fmt.Errorf("git remote set-url error: %v", err)
+	if err := runGitCommand(hideRepoInfo, "remote", "set-url", "origin", remoteURL); err != nil {
+		return fmt.Errorf("git remote set-url error: %v", sanitizeError(err, token, owner))
 	}
 
 	return nil
@@ -50,6 +54,8 @@ func hasReadmeChanged() (bool, error) {
 
 // commitAndPushReadme Commit and push changes if README.md has changed
 func commitAndPushReadme(msg, branch string) error {
+	hideRepoInfo := os.Getenv("HIDE_REPO_INFO") == "true"
+
 	if branch == "" {
 		branch = "main"
 	}
@@ -58,24 +64,65 @@ func commitAndPushReadme(msg, branch string) error {
 		msg = "📝 Update README.md"
 	}
 
-	if err := runGitCommand("add", "README.md"); err != nil {
+	if err := runGitCommand(hideRepoInfo, "add", "README.md"); err != nil {
 		return err
 	}
 
-	if err := runGitCommand("commit", "-m", msg); err != nil {
+	if err := runGitCommand(hideRepoInfo, "commit", "-m", msg); err != nil {
 		return err
 	}
 
-	return runGitCommand("push", "origin", branch)
+	return runGitCommand(hideRepoInfo, "push", "origin", branch)
 }
 
-func runGitCommand(args ...string) error {
+func runGitCommand(hideRepoInfo bool, args ...string) error {
 	cmd := exec.Command("git", args...)
-	cmd.Stdout = os.Stdout
-	cmd.Stderr = os.Stderr
-	if err := cmd.Run(); err != nil {
-		return fmt.Errorf("failed to run 'git %v': %v", args, err)
+
+	if hideRepoInfo {
+		// Suppress output when HIDE_REPO_INFO is true to prevent leaking sensitive information
+		var stdout, stderr bytes.Buffer
+		cmd.Stdout = &stdout
+		cmd.Stderr = &stderr
+
+		if err := cmd.Run(); err != nil {
+			// Sanitize error output before returning
+			sanitizedErr := strings.ReplaceAll(err.Error(), stdout.String(), "[output hidden]")
+			sanitizedErr = strings.ReplaceAll(sanitizedErr, stderr.String(), "[output hidden]")
+			return fmt.Errorf("failed to run git command: %v", sanitizedErr)
+		}
+	} else {
+		cmd.Stdout = os.Stdout
+		cmd.Stderr = os.Stderr
+		if err := cmd.Run(); err != nil {
+			return fmt.Errorf("failed to run 'git %v': %v", args, err)
+		}
 	}
 
 	return nil
 }
+
+// sanitizeError removes sensitive information from error messages
+func sanitizeError(err error, token, owner string) error {
+	if err == nil {
+		return nil
+	}
+
+	errMsg := err.Error()
+
+	// Replace token with placeholder
+	if token != "" {
+		errMsg = strings.ReplaceAll(errMsg, token, "[***]")
+	}
+
+	// Replace owner/username with placeholder
+	if owner != "" {
+		errMsg = strings.ReplaceAll(errMsg, owner, "[***]")
+	}
+
+	// Replace URLs with regex to redact entire URLs (http/https)
+	// Matches: http(s)://anything until whitespace or end of string
+	urlRegex := regexp.MustCompile(`https?://[^\s]+`)
+	errMsg = urlRegex.ReplaceAllString(errMsg, "[***]")
+
+	return fmt.Errorf("%s", errMsg)
+}