Fix Windows path compatibility

Author: blaise-io

Makefile

@@ -1,7 +1,7 @@
 VERSION := $(shell cat VERSION)
 
-
-.PHONY: release # Create releases for popular systems.
+# Create releases for popular systems.
+.PHONY: release
 release:
 	env GOARCH=amd64 GOOS=darwin go build -ldflags="-s -w" \
 		-o release/contribution-$(VERSION)-x64-macos .
@@ -10,14 +10,15 @@ release:
 	env GOARCH=amd64 GOOS=windows go build -ldflags="-s -w" \
 		-o release/contribution-$(VERSION)-x64.exe .
 
-
-.PHONY: release-tag # Create and push a release tag.
+# Create and push a release tag.
+.PHONY: release-tag
 release-tag:
 	git tag $(VERSION)
 	git push origin --tags
 
 
-.PHONY: README.md # Append help command to documentation.
+# Append help command to documentation.
+.PHONY: README.md
 README.md:
 	@sed '/<!-- .* -->/q' README.md > README.md.tmp
 	@mv README.md.tmp README.md  # -i does not work on macOS

README.md

@@ -55,7 +55,7 @@ Contribution is provided as a binary with a command line interface.
 ### `contribution -help`
 ```
 Draw an image on your GitHub contribution history.
-By Blaise Kal, 2020
+By Blaise Kal, 2021
 
 Preview contribution history graph without pushing
   contribution preview -img /path/to/image.png

VERSION

@@ -1 +1 @@
-1.0.1
+1.0.2

args.go

@@ -4,7 +4,8 @@ import (
 	"flag"
 	"fmt"
 	"os"
-	"path"
+	"path/filepath"
+	"time"
 )
 
 // Args contains represents CLI arguments for this program.
@@ -26,7 +27,7 @@ func GetArgs() Args {
 	}
 
 	push := flag.NewFlagSet("push", flag.ExitOnError)
-	push.StringVar(&args.githubBranch, "branch", path.Base(os.Args[0]), "Git branch to push to.")
+	push.StringVar(&args.githubBranch, "branch", "contribution", "Git branch to push to.")
 	push.IntVar(&args.weeksAgo, "w", 0, "Weeks ago of all activity. A value of 2 will move activity two pixels to the left.")
 	push.StringVar(&args.githubProject, "project", "", "GitHub username/project to push to. (required)")
 	push.Usage = func() {
@@ -62,23 +63,23 @@ func GetArgs() Args {
 // exitWithHelp exits with global help
 func exitWithHelp(preview *flag.FlagSet, push *flag.FlagSet) {
 	fmt.Fprintf(os.Stderr, "Draw an image on your GitHub contribution history.\n")
-	fmt.Fprintf(os.Stderr, "By Blaise Kal, 2020\n\n")
+	fmt.Fprintf(os.Stderr, "By Blaise Kal, %d\n\n", time.Now().Year())
 	fmt.Fprintf(os.Stderr, "Preview contribution history graph without pushing\n")
-	fmt.Fprintf(os.Stderr, "  %s %s -img /path/to/image.png\n", path.Base(os.Args[0]), preview.Name())
+	fmt.Fprintf(os.Stderr, "  %s %s -img /path/to/image.png\n", filepath.Base(os.Args[0]), preview.Name())
 	fmt.Fprintf(os.Stderr, "Preview usage and options\n")
-	fmt.Fprintf(os.Stderr, "  %s %s -help\n\n", path.Base(os.Args[0]), preview.Name())
+	fmt.Fprintf(os.Stderr, "  %s %s -help\n\n", filepath.Base(os.Args[0]), preview.Name())
 	fmt.Fprintf(os.Stderr, "Push contribution history graph to GitHub\n")
-	fmt.Fprintf(os.Stderr, "  %s %s -img /path/to/image.png -project username/project\n", path.Base(os.Args[0]), push.Name())
+	fmt.Fprintf(os.Stderr, "  %s %s -img /path/to/image.png -project username/project\n", filepath.Base(os.Args[0]), push.Name())
 	fmt.Fprintf(os.Stderr, "Push usage and options\n")
-	fmt.Fprintf(os.Stderr, "  %s %s -help\n", path.Base(os.Args[0]), push.Name())
+	fmt.Fprintf(os.Stderr, "  %s %s -help\n", filepath.Base(os.Args[0]), push.Name())
 	os.Exit(0)
 }
 
 // helpPreview exits with help on the preview subcommand
 func exitWithPreviewHelp(flagset *flag.FlagSet) {
 	fmt.Fprintf(os.Stderr, "Preview contribution history graph without pushing.\n")
 	fmt.Fprintf(os.Stderr, "Example usage:\n")
-	fmt.Fprintf(os.Stderr, "  %s %s -img image.png\n\n", path.Base(os.Args[0]), os.Args[1])
+	fmt.Fprintf(os.Stderr, "  %s %s -img image.png\n\n", filepath.Base(os.Args[0]), os.Args[1])
 	flag.PrintDefaults()
 	flagset.PrintDefaults()
 	os.Exit(0)
@@ -88,7 +89,7 @@ func exitWithPreviewHelp(flagset *flag.FlagSet) {
 func exitWithPushHelp(flagset *flag.FlagSet) {
 	fmt.Fprintf(os.Stderr, "Push contribution history graph to GitHub\n")
 	fmt.Fprintf(os.Stderr, "Example usage:\n")
-	fmt.Fprintf(os.Stderr, "  %s %s -project username/project\n\n", path.Base(os.Args[0]), os.Args[1])
+	fmt.Fprintf(os.Stderr, "  %s %s -project username/project\n\n", filepath.Base(os.Args[0]), os.Args[1])
 	flag.PrintDefaults()
 	flagset.PrintDefaults()
 	os.Exit(0)

main.go

@@ -5,7 +5,7 @@ import (
 	"image"
 	"io/ioutil"
 	"os"
-	"path"
+	"path/filepath"
 )
 
 func preview(img image.Image) error {
@@ -23,7 +23,7 @@ func push(img image.Image, args Args) error {
 	colorMapped := getColorMappedImage(img)
 	commits := ImageToGraphPixels(colorMapped, args)
 
-	dir, err := ioutil.TempDir("", path.Base(os.Args[0]))
+	dir, err := ioutil.TempDir("", filepath.Base(os.Args[0]))
 	if err != nil {
 		return err
 	}