Power levels keep increasing widly -- to be expected

Signed-off-by: Izuru Yakumo <yakumo.izuru@chaotic.ninja>

git-svn-id: file:///srv/svn/repo/yuuka/trunk@2 10373541-e681-4840-9083-43024fea98c9

Makefile

@@ -0,0 +1,19 @@
+PREFIX ?= /usr/local
+GOFLAGS ?= -v -ldflags "-w -X `go list`.Version=${VERSION} -X `go list`.Commit=${COMMIT} -X `go list`.Build=${BUILD}" -tags "static_build"
+
+VERSION ?= `git describe --abbrev=0 --tags || echo $VERSION`
+COMMIT ?= `git rev-parse --short HEAD || echo $COMMIT`
+BUILD ?= `git show -s --pretty=format:%cI`
+
+all: yuuka
+
+yuuka:
+	go build ${GOFLAGS}
+	strip -s yuuka
+clean:
+	rm -f yuuka
+install:
+	install -Dm0755 yuuka ${DESTDIR}${PREFIX}/bin/yuuka
+uninstall:
+	rm -f ${DESTDIR}${PREFIX}/bin/yuuka
+

go.mod

@@ -1,3 +1,5 @@
 module marisa.chaotic.ninja/yuuka
 
 go 1.20
+
+require github.com/integrii/flaggy v1.5.2

go.sum

@@ -0,0 +1,5 @@
+github.com/google/go-cmp v0.5.6 h1:BKbKCqvP6I+rmFHt06ZmyQtvB8xAkWdhFyr0ZUNZcxQ=
+github.com/google/go-cmp v0.5.6/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
+github.com/integrii/flaggy v1.5.2 h1:bWV20MQEngo4hWhno3i5Z9ISPxLPKj9NOGNwTWb/8IQ=
+github.com/integrii/flaggy v1.5.2/go.mod h1:dO13u7SYuhk910nayCJ+s1DeAAGC1THCMj1uSFmwtQ8=
+golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=

main.go

@@ -1,4 +1,4 @@
-// $TheSupernovaDuo: yuuka,v master 2023/5/29 17:54:15 yakumo_izuru Exp $
+// $TheSupernovaDuo: yuuka,v 0.1.1 2023/5/29 18:19:14 yakumo_izuru Exp $
 package main
 
 import (
@@ -6,34 +6,43 @@ import (
 	"io"
 	"log"
 	"net/http"
-	"os"
+
+	"github.com/integrii/flaggy"
 )
 var (
-	format = "?AT"
+	format string = "AT"
-	url = "https://wttr.in"
+	region string
 )
 func main() {
-	if len(os.Args) == 1 {
+	flaggy.SetDescription("Yuuka is a wttr.in client")
-		PrintUsage()
+	flaggy.SetVersion(FullVersion())
-	}
 	
-	cmd := os.Args[1]
+	forecastCmd := flaggy.NewSubcommand("forecast")
+	forecastCmd.String(&format, "f", "format", "View options")
+	forecastCmd.String(&region, "r", "region", "Where to look at")
+	forecastCmd.Description = "Check the forecast for a specified location"
 
-	switch cmd {
+	flaggy.AttachSubcommand(forecastCmd, 1)
-	case "forecast":
-		ShowForecast()
-	case "moon":
-		ShowMoonPhases()
-	}
-}
-func PrintUsage() {
-	fmt.Println("Yuuka is a wttr.in client")
-	fmt.Printf("\tforecast\tShow the current weather report according to your region\n")
-	fmt.Printf("\tmoon\tShow the current phase of the Moon\n")
-}
 
-func ShowForecast() {
+	moonCmd := flaggy.NewSubcommand("moon")
-	query := url + format
+	moonCmd.String(&format, "f", "format", "View options")
+	moonCmd.Description = "Check the Moon's phases"
+
+	flaggy.AttachSubcommand(moonCmd, 1)
+
+	flaggy.ShowHelpOnUnexpectedDisable()
+	flaggy.Parse()
+
+	if forecastCmd.Used {
+		ShowForecast(region, format)
+	} else if moonCmd.Used {
+		ShowMoonPhases(format)
+	} else {
+		flaggy.ShowHelpAndExit("A subcommand is required")
+	}
+}
+func ShowForecast(region string, format string) {
+	query := "https://wttr.in/" + region + "?" + format
 	resp, err := http.Get(query)
 	sanityCheck(err)
 	defer resp.Body.Close()
@@ -41,8 +50,8 @@ func ShowForecast() {
 	sanityCheck(err)
 	fmt.Printf("%s", body)
 }
-func ShowMoonPhases() {
+func ShowMoonPhases(format string) {
-	query := url + "/Moon" + format
+	query := "https://wttr.in/" + "moon" + "?" + format
 	resp, err := http.Get(query)
 	sanityCheck(err)
 	defer resp.Body.Close()

version.go

@@ -0,0 +1,19 @@
+// $TheSupernovaDuo: yuuka,v 0.1.1 2023/5/29 18:19:14 yakumo_izuru Exp $
+package main
+
+import (
+	"fmt"
+)
+
+var (
+	// Version release version
+	Version = "0.0.1"
+
+	// Commit will be overwritten automatically by the build system
+	Commit = "HEAD"
+)
+
+// FullVersion display the full version and build
+func FullVersion() string {
+	return fmt.Sprintf("%s@%s", Version, Commit)
+}