Modernize the logging and flag parsing a bit

.gitignore

@@ -1,3 +1,3 @@
-main.log
+*.log
 .env
-main.exe
+*.exe

go.mod

@@ -1,11 +1,12 @@
-module main
+module repo
 
-go 1.22.4
+go 1.23.6
 
 require (
 	code.gitea.io/sdk/gitea v0.18.0
+	git.site.quack-lab.dev/dave/cylogger v1.4.0
+	git.site.quack-lab.dev/dave/cyutils v1.4.0
 	github.com/go-git/go-git/v5 v5.12.0
-	github.com/joho/godotenv v1.5.1
 	golang.design/x/clipboard v0.7.0
 )
 
@@ -21,7 +22,9 @@ require (
 	github.com/go-git/gcfg v1.5.1-0.20230307220236-3a3c6141e376 // indirect
 	github.com/go-git/go-billy/v5 v5.5.0 // indirect
 	github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
+	github.com/google/go-cmp v0.6.0 // indirect
 	github.com/hashicorp/go-version v1.6.0 // indirect
+	github.com/hexops/valast v1.5.0 // indirect
 	github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 // indirect
 	github.com/kevinburke/ssh_config v1.2.0 // indirect
 	github.com/pjbgf/sha1cd v0.3.0 // indirect
@@ -35,6 +38,8 @@ require (
 	golang.org/x/mod v0.12.0 // indirect
 	golang.org/x/net v0.22.0 // indirect
 	golang.org/x/sys v0.19.0 // indirect
+	golang.org/x/time v0.12.0 // indirect
 	golang.org/x/tools v0.13.0 // indirect
 	gopkg.in/warnings.v0 v0.1.2 // indirect
+	mvdan.cc/gofumpt v0.4.0 // indirect
 )

go.sum

@@ -2,6 +2,10 @@ code.gitea.io/sdk/gitea v0.18.0 h1:+zZrwVmujIrgobt6wVBWCqITz6bn1aBjnCUHmpZrerI=
 code.gitea.io/sdk/gitea v0.18.0/go.mod h1:IG9xZJoltDNeDSW0qiF2Vqx5orMWa7OhVWrjvrd5NpI=
 dario.cat/mergo v1.0.0 h1:AGCNq9Evsj31mOgNPcLyXc+4PNABt905YmuqPYYpBWk=
 dario.cat/mergo v1.0.0/go.mod h1:uNxQE+84aUszobStD9th8a29P2fMDhsBdgRYvZOxGmk=
+git.site.quack-lab.dev/dave/cylogger v1.4.0 h1:3Ca7V5JWvruARJd5S8xDFwW9LnZ9QInqkYLRdrEFvuY=
+git.site.quack-lab.dev/dave/cylogger v1.4.0/go.mod h1:wctgZplMvroA4X6p8f4B/LaCKtiBcT1Pp+L14kcS8jk=
+git.site.quack-lab.dev/dave/cyutils v1.4.0 h1:/Xo3QfLIFNab+axHneWmUK4MyfuObl+qq8whF9vTQpk=
+git.site.quack-lab.dev/dave/cyutils v1.4.0/go.mod h1:fBjALu2Cp2u2bDr+E4zbGVMBeIgFzROg+4TCcTNAiQU=
 github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo=
 github.com/Microsoft/go-winio v0.5.2/go.mod h1:WpS1mjBmmwHBEWmogvA2mj8546UReBk4v8QkMxJ6pZY=
 github.com/Microsoft/go-winio v0.6.1 h1:9/kr64B9VUZrLm5YYwbGtUJnMgqWVOdUAXu6Migciow=
@@ -27,6 +31,8 @@ github.com/elazarl/goproxy v0.0.0-20230808193330-2592e75ae04a h1:mATvB/9r/3gvcej
 github.com/elazarl/goproxy v0.0.0-20230808193330-2592e75ae04a/go.mod h1:Ro8st/ElPeALwNFlcTpWmkr6IoMFfkjXAvTHpevnDsM=
 github.com/emirpasic/gods v1.18.1 h1:FXtiHYKDGKCW2KzwZKx0iC0PQmdlorYgdFG9jPXJ1Bc=
 github.com/emirpasic/gods v1.18.1/go.mod h1:8tpGGwCnJ5H4r6BWwaV6OrWmMoPhUl5jm/FMNAnJvWQ=
+github.com/frankban/quicktest v1.14.3 h1:FJKSZTDHjyhriyC81FLQ0LY93eSai0ZyR/ZIkd3ZUKE=
+github.com/frankban/quicktest v1.14.3/go.mod h1:mgiwOwqx65TmIk1wJ6Q7wvnVMocbUorkibMOrVTHZps=
 github.com/gliderlabs/ssh v0.3.7 h1:iV3Bqi942d9huXnzEF2Mt+CY9gLu8DNM4Obd+8bODRE=
 github.com/gliderlabs/ssh v0.3.7/go.mod h1:zpHEXBstFnQYtGnB8k8kQLol82umzn/2/snG7alWVD8=
 github.com/go-fed/httpsig v1.1.0 h1:9M+hb0jkEICD8/cAiNqEB66R87tTINszBRTjwjQzWcI=
@@ -45,10 +51,14 @@ github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
 github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
 github.com/hashicorp/go-version v1.6.0 h1:feTTfFNnjP967rlCxM/I9g701jU+RN74YKx2mOkIeek=
 github.com/hashicorp/go-version v1.6.0/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA=
+github.com/hexops/autogold v0.8.1 h1:wvyd/bAJ+Dy+DcE09BoLk6r4Fa5R5W+O+GUzmR985WM=
+github.com/hexops/autogold v0.8.1/go.mod h1:97HLDXyG23akzAoRYJh/2OBs3kd80eHyKPvZw0S5ZBY=
+github.com/hexops/gotextdiff v1.0.3 h1:gitA9+qJrrTCsiCl7+kh75nPqQt1cx4ZkudSTLoUqJM=
+github.com/hexops/gotextdiff v1.0.3/go.mod h1:pSWU5MAI3yDq+fZBTazCSJysOMbxWL1BSow5/V2vxeg=
+github.com/hexops/valast v1.5.0 h1:FBTuvVi0wjTngtXJRZXMbkN/Dn6DgsUsBwch2DUJU8Y=
+github.com/hexops/valast v1.5.0/go.mod h1:Jcy1pNH7LNraVaAZDLyv21hHg2WBv9Nf9FL6fGxU7o4=
 github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 h1:BQSFePA1RWJOlocH6Fxy8MmwDt+yVQYULKfN0RoTN8A=
 github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99/go.mod h1:1lJo3i6rXxKeerYnT8Nvf0QmHCRC1n8sfWVwXF2Frvo=
-github.com/joho/godotenv v1.5.1 h1:7eLL/+HRGLY0ldzfGMeQkb7vMd0as4CfYvUVzLqw0N0=
-github.com/joho/godotenv v1.5.1/go.mod h1:f4LDr5Voq0i2e/R5DDNOoa2zzDfwtkZa6DnEwAbqwq4=
 github.com/kevinburke/ssh_config v1.2.0 h1:x584FjTGwHzMwvHx18PXxbBVzfnxogHaAReU4gf13a4=
 github.com/kevinburke/ssh_config v1.2.0/go.mod h1:CT57kijsi8u/K/BOFA39wgDQJ9CxiF4nAY/ojJ6r6mM=
 github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
@@ -154,6 +164,8 @@ golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
 golang.org/x/text v0.8.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8=
 golang.org/x/text v0.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ=
 golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
+golang.org/x/time v0.12.0 h1:ScB/8o8olJvc+CQPWrK3fPZNfh7qgwCrY0zJmoEQLSE=
+golang.org/x/time v0.12.0/go.mod h1:CDIdPxbZBQxdj6cxyCIdrNogrJKMJ7pr37NYpMcMDSg=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20190312151545-0bb0c0a6e846/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
 golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
@@ -172,3 +184,5 @@ gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
 gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
 gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
+mvdan.cc/gofumpt v0.4.0 h1:JVf4NN1mIpHogBj7ABpgOyZc65/UUOkKQFkoURsz4MM=
+mvdan.cc/gofumpt v0.4.0/go.mod h1:PljLOHDeZqgS8opHRKLzp2It2VBuSdteAgqUfzMTxlQ=

main.go

@@ -3,158 +3,178 @@ package main
 import (
 	_ "embed"
 	"flag"
-	"fmt"
-	"io"
-	"log"
 	"os"
 	"path"
-	"strings"
 
 	"code.gitea.io/sdk/gitea"
 	"github.com/go-git/go-git/v5"
 	"github.com/go-git/go-git/v5/config"
-	"github.com/joho/godotenv"
 	"golang.design/x/clipboard"
+
+	logger "git.site.quack-lab.dev/dave/cylogger"
 )
 
-var Error *log.Logger
-
-func init() {
-	log.SetFlags(log.Lmicroseconds | log.Lshortfile)
-	logFile, err := os.Create("main.log")
-	if err != nil {
-		log.Printf("Error creating log file: %v", err)
-		os.Exit(1)
-	}
-	logger := io.MultiWriter(os.Stdout, logFile)
-	log.SetOutput(logger)
-
-	Error = log.New(io.MultiWriter(logFile, os.Stderr, os.Stdout),
-		fmt.Sprintf("%sERROR:%s ", "\033[0;101m", "\033[0m"),
-		log.Lmicroseconds|log.Lshortfile)
-}
-
-//go:embed .env
-var env string
+var Version = "1.0.0"
 
 func main() {
-	err := clipboard.Init()
-	if err != nil {
-		Error.Fatalf("Error initializing clipboard: %v", err)
-		os.Exit(1)
+	name := flag.String("name", "", "Name of the repository")
+	flag.String("n", "", "Name of the repository")
+
+	private := flag.Bool("private", false, "Make the repository private")
+	flag.Bool("p", false, "Make the repository private (shorthand)")
+
+	noinit := flag.Bool("noinit", false, "Do not add remote to the new repo")
+	flag.Bool("ni", false, "Do not add remote to the new repo (shorthand)")
+
+	forceInit := flag.Bool("f", false, "Force assignment of the remote (deletes existing origin)")
+
+	remote := flag.String("remote", "origin", "Name of the remote to create for the new repository")
+	flag.String("r", "origin", "Name of the remote to create for the new repository (shorthand)")
+
+	version := flag.Bool("v", false, "Show version")
+	flag.Bool("version", false, "Show version")
+
+	help := flag.Bool("h", false, "Show help")
+	flag.Bool("help", false, "Show help")
+
+	flag.Parse()
+	logger.InitFlag()
+	
+	logger.Info("Starting repo %s", Version)
+
+	if *version {
+		logger.Info("Version: %s", Version)
+		return
+	}
+	if *help {
+		flag.PrintDefaults()
+		return
 	}
 
-	envvar, err := godotenv.Parse(strings.NewReader(env))
+	err := clipboard.Init()
 	if err != nil {
-		Error.Fatalf("Error parsing .env file: %v", err)
-		os.Exit(1)
+		logger.Error("Error initializing clipboard: %v", err)
+		return
 	}
-	username, ok := envvar["GITEA_USER"]
+
+	username, ok := os.LookupEnv("GITEA_USER")
 	if !ok {
-		Error.Fatalf("GITEA_USER environment variable is required")
-		os.Exit(1)
+		logger.Error("GITEA_USER environment variable is required")
+		return
 	}
-	password, ok := envvar["GITEA_PASSWORD"]
+	password, ok := os.LookupEnv("GITEA_PASSWORD")
 	if !ok {
-		Error.Fatalf("GITEA_PASSWORD environment variable is required")
-		os.Exit(1)
+		logger.Error("GITEA_PASSWORD environment variable is required")
+		return
+	}
+	url, ok := os.LookupEnv("GITEA_URL")
+	if !ok {
+		logger.Error("GITEA_URL environment variable is required")
+		return
 	}
 
 	if username == "" || password == "" {
-		Error.Fatalf("GITEA_USER and GITEA_PASSWORD environment variables are required")
-		os.Exit(1)
+		logger.Error("GITEA_USER and GITEA_PASSWORD environment variables are required")
+		return
 	}
 
-	var name string
-	var private, noinit, forceInit bool
-	flag.StringVar(&name, "name", "", "Name of the repository")
-	flag.StringVar(&name, "n", "", "Name of the repository (shorthand)")
-	flag.BoolVar(&private, "private", false, "Make the repository private")
-	flag.BoolVar(&private, "p", false, "Make the repository private (shorthand)")
-	flag.BoolVar(&noinit, "noinit", false, "Do not add remote to the new repo")
-	flag.BoolVar(&noinit, "ni", false, "Do not add remote to the new repo (shorthand)")
-	flag.BoolVar(&forceInit, "f", false, "Force assignment of the remote (deletes existing origin)")
-	flag.Parse()
-
-	if len(flag.Args()) > 0 {
-		name = flag.Args()[0]
+	if flag.NArg() > 0 {
+		*name = flag.Arg(0)
 	}
 
-	if name == "" {
-		Error.Fatalf("Repository name is required")
-		os.Exit(1)
+	if *name == "" {
+		logger.Error("Repository name is required")
+		return
 	}
 
-	client, err := gitea.NewClient("https://git.site.quack-lab.dev/")
+	logger.Info("Username: %s", username)
+	logger.Info("URL: %s", url)
+	logger.Info("Name: %s", *name)
+	logger.Info("Private: %t", *private)
+	logger.Info("Noinit: %t", *noinit)
+	logger.Info("ForceInit: %t", *forceInit)
+	logger.Info("Remote: %s", *remote)
+
+	client, err := gitea.NewClient(url)
 	if err != nil {
-		Error.Fatalf("Error creating client: %v", err)
-		os.Exit(1)
+		logger.Error("Error creating client: %v", err)
+		return
 	}
-	client.SetBasicAuth("dave", "D7u@NHh^9d33ue!xVAEu")
+	client.SetBasicAuth(username, password)
 
-	repo, _, err := client.GetRepo("dave", name)
+	logger.Info("Getting repository...")
+	repo, _, err := client.GetRepo(username, *name)
 	if err == nil {
-		log.Printf("Repository already exists at:\n%s", repo.CloneURL)
+		logger.Info("Repository already exists at:\n%s", repo.CloneURL)
 		clipboard.Write(clipboard.FmtText, []byte(repo.CloneURL))
 	} else {
+		logger.Info("Repository does not exist, creating...")
 		repo, _, err = client.CreateRepo(gitea.CreateRepoOption{
-			Name:          name,
-			Private:       private,
+			Name:          *name,
+			Private:       *private,
 			DefaultBranch: "master",
 		})
 		if err != nil {
-			Error.Fatalf("Error creating repository: %v", err)
-			os.Exit(1)
+			logger.Error("Error creating repository: %v", err)
+			return
 		}
-		log.Printf("Repository created at:\n%s", repo.CloneURL)
+		logger.Info("Repository created at: %s", repo.CloneURL)
 		clipboard.Write(clipboard.FmtText, []byte(repo.CloneURL))
 	}
 
-	if !noinit {
+	if !*noinit {
+		logger.Info("Adding remote to local repository...")
 		cwd, err := os.Getwd()
 		if err != nil {
-			Error.Fatalf("Error getting current working directory: %v", err)
-			os.Exit(1)
+			logger.Error("Error getting current working directory: %v", err)
+			return
 		}
 		cwd = path.Clean(cwd)
 
 		var localRepo *git.Repository
+		logger.Info("Checking if local repository exists at %s/.git...", cwd)
 		_, err = os.Stat(path.Join(cwd, ".git"))
 		if err == nil {
 			localRepo, err = git.PlainOpen(cwd)
 			if err != nil {
-				Error.Fatalf("Error opening git repository: %v", err)
-				os.Exit(1)
+				logger.Error("Error opening git repository: %v", err)
+				return
 			}
 		} else {
 			localRepo, err = git.PlainInit(cwd, false)
 			if err != nil {
-				Error.Fatalf("Error initializing git repository: %v", err)
-				os.Exit(1)
+				logger.Error("Error initializing git repository: %v", err)
+				return
 			}
 		}
-		_, err = localRepo.Remote("origin")
+		logger.Info("Checking if remote %s exists in local repository...", *remote)
+		_, err = localRepo.Remote(*remote)
 		if err == nil {
-			if forceInit {
-				err = localRepo.DeleteRemote("origin")
+			logger.Info("Remote %s exists in local repository", *remote)
+			if *forceInit {
+				logger.Info("Deleting remote %s from local repository...", *remote)
+				err = localRepo.DeleteRemote(*remote)
 				if err != nil {
-					Error.Fatalf("Error deleting remote from local repository: %v", err)
-					os.Exit(1)
+					logger.Error("Error deleting remote %s from local repository: %v", *remote, err)
+					return
 				}
+				logger.Info("Remote %s deleted from local repository", *remote)
 			} else {
-				Error.Fatalf("Remote origin already exists in local repository")
-				os.Exit(1)
+				logger.Error("Remote %s already exists in local repository", *remote)
+				return
 			}
 		}
 
+		logger.Info("Adding remote %s to local repository...", *remote)
 		_, err = localRepo.CreateRemote(&config.RemoteConfig{
-			Name: "origin",
+			Name: *remote,
 			URLs: []string{repo.CloneURL},
 		})
 		if err != nil {
-			Error.Fatalf("Error adding remote to local repository: %v", err)
-			os.Exit(1)
+			logger.Error("Error adding remote %s to local repository: %v", *remote, err)
+			return
 		}
-		log.Printf("Remote added to local repository")
+		logger.Info("Remote added to local repository")
 	}
+	logger.Info("Done")
 }

sync

@@ -1 +0,0 @@
-main.exe,"C:\Program Files\Git\usr\bin\repo.exe"