Move help message and flag setup to bpm-utils-shared package

src/bpm-package/main.go

@@ -21,8 +21,9 @@ var installPackage = flag.Bool("i", false, "Install compiled BPM package after c
 var yesAll = flag.Bool("y", false, "Accept all confirmation prompts")
 
 func main() {
-	// Setup flags
+	// Setup flags and help
-	setupFlags()
+	bpmutilsshared.SetupHelp("bpm-package <options>", "Generates source BPM package from current directory")
+	bpmutilsshared.SetupFlags()
 
 	// Run checks
 	runChecks()
@@ -35,18 +36,6 @@ func main() {
 	}
 }
 
-func setupFlags() {
-	flag.Usage = help
-	flag.Parse()
-}
-
-func help() {
-	fmt.Println("Usage: bpm-package <options>")
-	fmt.Println("Description: Generates source BPM package from current directory")
-	fmt.Println("Options:")
-	flag.PrintDefaults()
-}
-
 func runChecks() {
 	// Check if pkg.info file exists
 	if stat, err := os.Stat("pkg.info"); err != nil || !stat.Mode().IsRegular() {

src/bpm-setup/go.mod

@@ -1,3 +1,8 @@
 module git.enumerated.dev/bubble-package-manager/bpm-utils/src/bpm-setup
 
 go 1.23
+
+require bpm-utils-shared v1.0.0
+require gopkg.in/yaml.v3 v3.0.1 // indirect
+
+replace bpm-utils-shared => ../bpm-utils-shared

src/bpm-setup/go.sum

@@ -0,0 +1,3 @@
+gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
+gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=

src/bpm-setup/main.go

@@ -1,6 +1,7 @@
 package main
 
 import (
+	bpmutilsshared "bpm-utils-shared"
 	"bufio"
 	"flag"
 	"fmt"
@@ -12,25 +13,31 @@ import (
 	"strings"
 )
 
-var directory = flag.String("D", "", "Path to package directory")
+var directory = flag.String("D", "", "Path to package directory (required)")
-var name = flag.String("n", "", "Set the package name (Defaults to \"package-name\")")
+var name = flag.String("n", "", "Set the package name")
-var description = flag.String("d", "Default Package Description", "Set the description (Defaults to \"package-description\")")
+var description = flag.String("d", "Default Package Description", "Set the description")
-var version = flag.String("v", "1.0", "Set the package version (Defaults to \"1.0\")")
+var version = flag.String("v", "1.0", "Set the package version")
-var url = flag.String("u", "", "Set the package URL (Optional)")
+var url = flag.String("u", "", "Set the package URL")
-var license = flag.String("l", "", "Set the package licenses (Optional)")
+var license = flag.String("l", "", "Set the package licenses")
-var template = flag.String("t", "gnu-configure", "Set the package template (Defaults to \"gnu-configure\")")
+var template = flag.String("t", "gnu-configure", "Set the package template")
-var git = flag.Bool("g", true, "Create git repository (Defaults to true)")
+var git = flag.Bool("g", true, "Create git repository")
 
 func main() {
-	// Setup flags
+	// Setup flags and help
-	setupFlags()
+	bpmutilsshared.SetupHelp("bpm-setup <options>", "Sets up files and directories for BPM source package creation")
+	bpmutilsshared.SetupFlags()
 
 	// Show command help if no directory name is given
 	if *directory == "" {
-		help()
+		bpmutilsshared.ShowHelp()
 		os.Exit(1)
 	}
 
+	// Set package name to directory name if empty
+	if *name == "" {
+		*name = filepath.Base(*directory)
+	}
+
 	// run checks
 	runChecks()
 
@@ -50,28 +57,6 @@ func main() {
 	createDirectory()
 }
 
-func setupFlags() {
-	flag.Usage = help
-	flag.Parse()
-	if *name == "" {
-		*name = *directory
-	}
-}
-
-func help() {
-	fmt.Println("Usage: bpm-setup <options>")
-	fmt.Println("Description: bpm-setup sets up directories for BPM source package creation")
-	fmt.Println("Options:")
-	fmt.Println("  -D=<directory> | Path to package directory")
-	fmt.Println("  -n=<name> | Set the package name (Defaults to \"package-name\")")
-	fmt.Println("  -d=<description> | Set the package description (Defaults to \"Default package description\")")
-	fmt.Println("  -v=<version> | Set the package version (Defaults to \"1.0\")")
-	fmt.Println("  -u=<url> | Set the package URL (Optional)")
-	fmt.Println("  -l=<licenses> | Set the package licenses (Optional)")
-	fmt.Println("  -t=<template file> | Use a template file (Defaults to gnu-configure)")
-	fmt.Println("  -g=<true/false> | Create git repository (Defaults to true)")
-}
-
 func runChecks() {
 	if strings.TrimSpace(*directory) == "" {
 		log.Fatalf("No directory was specified!")

src/bpm-utils-shared/main.go

@@ -1,10 +1,15 @@
 package bpm_utils_shared
 
 import (
+	"flag"
+	"fmt"
 	"gopkg.in/yaml.v3"
 	"os"
 )
 
+var usageMsg string
+var description string
+
 type BPMUtilsConfig struct {
 	PrivilegeEscalatorCmd string `yaml:"privilege_escalator_cmd"`
 }
@@ -23,3 +28,20 @@ func ReadBPMUtilsConfig() (*BPMUtilsConfig, error) {
 
 	return config, nil
 }
+
+func SetupFlags() {
+	flag.Usage = ShowHelp
+	flag.Parse()
+}
+
+func SetupHelp(usage, desc string) {
+	usageMsg = usage
+	description = desc
+}
+
+func ShowHelp() {
+	fmt.Println("Usage: " + usageMsg)
+	fmt.Println("Description: " + description)
+	fmt.Println("Options:")
+	flag.PrintDefaults()
+}