Changeset 3 in code for trunk

Timestamp:

May 4, 2025, 5:13:05 PM (5 weeks ago)

Author:

Izuru Yakumo

Message:

You humans are so full of yourselves. If you want to live a long life, then you should be a little more quiet.

Location:

trunk

Files:

• .gitignore (modified) (1 diff)
• COPYING (modified) (1 diff)
• Makefile (modified) (2 diffs)
• cmd (added)
• cmd/forecast.go (added)
• cmd/moon.go (added)
• cmd/root.go (added)
• go.mod (modified) (1 diff)
• go.sum (modified) (1 diff)
• main.go (modified) (1 diff)
• version.go (deleted)
• yuuka.1 (added)

trunk/.gitignore

@@ -1 @@
-yuuka
+/yuuka

trunk/COPYING

@@ -1 @@
-Copyright (c) 2023-present Izuru Yakumo <yakumo.izuru@chaotic.ninja>
+Copyright (c) 2023-present Izuru Yakumo <eternal-servant@yakumo.dev>
 
 Permission to use, copy, modify, and distribute this software for any

trunk/Makefile

@@ +1 @@
+GO ?= go
 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"
+GOFLAGS ?= -v -ldflags "-w -X `${GO} list`.Version=${VERSION} -X `${GO} list`.Commit=${REV} -X `${GO} list`.Date=${DATE} -X `${GO} list`.Vendor=${VENDOR}"
 
-VERSION ?= `git describe --abbrev=0 --tags || echo $VERSION`
-COMMIT ?= `git rev-parse --short HEAD || echo $COMMIT`
-BUILD ?= `git show -s --pretty=format:%cI`
+VENDOR ?= `uname -s`
+VERSION ?= 0.1.2
+REV ?= `svn info --show-item revision || git rev-list --all | wc -l`
 
 all: yuuka
 
 yuuka:
-        go build ${GOFLAGS}
+        ${GO} build ${GOFLAGS}
         strip -s yuuka
 clean:
@@ -15 +16 @@
 install:
         install -Dm0755 yuuka ${DESTDIR}${PREFIX}/bin/yuuka
+        install -Dm0644 yuuka.1 ${DESTDIR}${PREFIX}/man/man1/yuuka.1
 uninstall:
-        rm -f ${DESTDIR}${PREFIX}/bin/yuuka
-
+        rm -f ${DESTDIR}${PREFIX}/bin/yuuka ${DESTDIR}${PREFIX}/man/man1/yuuka.1

trunk/go.mod

@@ -1 @@
-module marisa.chaotic.ninja/yuuka
+module mahou-no-mori.yakumo.dev/yuuka
 
 go 1.20
 
 require github.com/integrii/flaggy v1.5.2
+
+require (
+        github.com/inconshreveable/mousetrap v1.1.0 // indirect
+        github.com/spf13/cobra v1.9.1 // indirect
+        github.com/spf13/pflag v1.0.6 // indirect
+)

trunk/go.sum

@@ +1 @@
+github.com/cpuguy83/go-md2man/v2 v2.0.6/go.mod h1:oOW0eioCTA6cOiMLiUPZOpcVxMig6NIQQ7OS05n1F4g=
 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/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2s0bqwp9tc8=
+github.com/inconshreveable/mousetrap v1.1.0/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw=
 github.com/integrii/flaggy v1.5.2 h1:bWV20MQEngo4hWhno3i5Z9ISPxLPKj9NOGNwTWb/8IQ=
 github.com/integrii/flaggy v1.5.2/go.mod h1:dO13u7SYuhk910nayCJ+s1DeAAGC1THCMj1uSFmwtQ8=
+github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
+github.com/spf13/cobra v1.9.1 h1:CXSaggrXdbHK9CF+8ywj8Amf7PBRmPCOJugH954Nnlo=
+github.com/spf13/cobra v1.9.1/go.mod h1:nDyEzZ8ogv936Cinf6g1RU9MRY64Ir93oCnqb9wxYW0=
+github.com/spf13/pflag v1.0.6 h1:jFzHGLGAlb3ruxLB8MhbI6A8+AQX/2eW4qeyNZXNp2o=
+github.com/spf13/pflag v1.0.6/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
+gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=

trunk/main.go

@@ -1 @@
-// $TheSupernovaDuo: yuuka,v 0.1.1 2023/5/29 18:19:14 yakumo_izuru Exp $
 package main
 
-import (
-        "fmt"
-        "io"
-        "log"
-        "net/http"
+import "mahou-no-mori.yakumo.dev/yuuka/cmd"
 
-        "github.com/integrii/flaggy"
-)
-var (
-        format string = "AT"
-        region string
-)
 func main() {
-        flaggy.SetDescription("Yuuka is a wttr.in client")
-        flaggy.SetVersion(FullVersion())
-        
-        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"
-
-        flaggy.AttachSubcommand(forecastCmd, 1)
-
-        moonCmd := flaggy.NewSubcommand("moon")
-        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")
-        }
+        cmd.Execute()
 }
-func ShowForecast(region string, format string) {
-        query := "https://wttr.in/" + region + "?" + format
-        resp, err := http.Get(query)
-        sanityCheck(err)
-        defer resp.Body.Close()
-        body, err := io.ReadAll(resp.Body)
-        sanityCheck(err)
-        fmt.Printf("%s", body)
-}
-func ShowMoonPhases(format string) {
-        query := "https://wttr.in/" + "moon" + "?" + format
-        resp, err := http.Get(query)
-        sanityCheck(err)
-        defer resp.Body.Close()
-        body, err := io.ReadAll(resp.Body)
-        sanityCheck(err)
-        fmt.Printf("%s\n", body)
-}
-func sanityCheck(err error) {
-        if err != nil {
-                log.Fatal(err)
-        }
-}