summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeff Carr <[email protected]>2025-08-28 12:38:42 -0500
committerJeff Carr <[email protected]>2025-08-28 19:30:59 -0500
commit6b6b31eef6f6a636db0750fcd0d59e3e0758013e (patch)
tree86eef1ff8c9fcc2f3842688d7c0e02402421d64f
parent81885f44834b0f3a20999d8031ed0fc3bf6a0fa5 (diff)
stub in code to start the process of processing patches
-rw-r--r--Makefile6
-rw-r--r--argv.go10
-rw-r--r--argvAutoshell.go102
-rw-r--r--main.go24
-rw-r--r--structs.go16
5 files changed, 150 insertions, 8 deletions
diff --git a/Makefile b/Makefile
index 546d081..c0a9114 100644
--- a/Makefile
+++ b/Makefile
@@ -3,10 +3,10 @@
VERSION = $(shell git describe --tags)
BUILDTIME = $(shell date +%Y.%m.%d_%H%M)
-all: build
- # ./forged pull
+all: install
+ forged pull
# ./forged list
- ./forged list
+ forged list
build: goimports
GO111MODULE=off go build \
diff --git a/argv.go b/argv.go
index 23bf4cb..1848cd3 100644
--- a/argv.go
+++ b/argv.go
@@ -12,18 +12,22 @@ import (
var argv args
type args struct {
- Pull *EmptyCmd `arg:"subcommand:pull" help:"list the repos"`
+ Pull *EmptyCmd `arg:"subcommand:pull" help:"'git pull' on the repos"`
List *EmptyCmd `arg:"subcommand:list" help:"list the repos"`
- Init *EmptyCmd `arg:"subcommand:init" help:"list the repos"`
+ Init *EmptyCmd `arg:"subcommand:init" help:"init the repo list"`
Port int `arg:"--port" default:"2520" help:"port to run on"`
Hostname string `arg:"--hostname" default:"forge.wit.com" help:"hostname to use"`
+ Force bool `arg:"--force" help:"try to strong arm things"`
+ Verbose bool `arg:"--verbose" help:"show more output"`
+ Bash bool `arg:"--bash" help:"generate bash completion"`
+ BashAuto []string `arg:"--auto-complete" help:"todo: move this to go-arg"`
}
type EmptyCmd struct {
}
func (args) Version() string {
- return "forged " + VERSION + " Built on " + BUILDTIME
+ return ARGNAME + " " + VERSION + " Built on " + BUILDTIME
}
func init() {
diff --git a/argvAutoshell.go b/argvAutoshell.go
new file mode 100644
index 0000000..908c63b
--- /dev/null
+++ b/argvAutoshell.go
@@ -0,0 +1,102 @@
+// Copyright 2017-2025 WIT.COM Inc. All rights reserved.
+// Use of this source code is governed by the GPL 3.0
+
+package main
+
+import (
+ "fmt"
+ "os"
+ "path/filepath"
+
+ "go.wit.com/lib/gui/shell"
+)
+
+/*
+ handles shell autocomplete
+*/
+
+// used for shell auto completion
+
+func (args) doBashAuto() {
+ argv.doBashHelp()
+ switch argv.BashAuto[0] {
+ case "list":
+ fmt.Println("--terminals")
+ default:
+ if argv.BashAuto[0] == ARGNAME {
+ // list the subcommands here
+ fmt.Println("--pull list")
+ }
+ }
+ os.Exit(0)
+}
+
+// prints help to STDERR // TODO: move everything below this to go-args
+func (args) doBashHelp() {
+ if len(argv.BashAuto) < 2 {
+ fmt.Fprintf(os.Stderr, "something went wrong with the GO args autocomplete in %s\n", ARGNAME)
+ return
+ }
+ if argv.BashAuto[1] != "''" {
+ // if this is not blank, then the user has typed something
+ return
+ }
+ if argv.BashAuto[0] != ARGNAME {
+ // if this is not the name of the command, the user already started doing something
+ return
+ }
+ if argv.BashAuto[0] == ARGNAME {
+ me.pp.WriteHelp(os.Stderr)
+ return
+ }
+ fmt.Fprintln(os.Stderr, "")
+ fmt.Fprintln(os.Stderr, "something went wrong with the GO args package")
+ fmt.Fprintln(os.Stderr, "")
+}
+
+func (args) doBash() {
+ if homeDir, err := os.UserHomeDir(); err == nil {
+ filename := filepath.Join(homeDir, ".local/share/bash-completion/completions", ARGNAME)
+ if !shell.Exists(filename) {
+ if f, err := os.OpenFile(filename, os.O_APPEND|os.O_CREATE|os.O_WRONLY, 0644); err == nil {
+ f.Write([]byte(makeBashCompletionText(ARGNAME)))
+ f.Close()
+ }
+ }
+ }
+ fmt.Println(makeBashCompletionText(ARGNAME))
+}
+
+func makeBashCompletionText(argname string) string {
+ var out string
+
+ out += fmt.Sprintf("# add this in your bashrc:\n")
+ out += fmt.Sprintf("\n")
+ out += fmt.Sprintf("# todo: add this to go-arg as a 'hidden' go-arg option --bash\n")
+ out += fmt.Sprintf("#\n")
+ out += fmt.Sprintf("# Put the below in the file: ~/.local/share/bash-completion/completions/%s\n", argname)
+ out += fmt.Sprintf("#\n")
+ out += fmt.Sprintf("# todo: make this output work/parse with:\n")
+ out += fmt.Sprintf("# complete -C " + argname + " --bash go\n")
+ out += fmt.Sprintf("\n")
+ out += fmt.Sprintf("_" + argname + "_complete()\n")
+ out += fmt.Sprintf("{\n")
+ out += fmt.Sprintf(" # sets local to this func vars\n")
+ out += fmt.Sprintf(" local cur prev all\n")
+ out += fmt.Sprintf(" cur=${COMP_WORDS[COMP_CWORD]}\n")
+ out += fmt.Sprintf(" prev=${COMP_WORDS[COMP_CWORD-1]}\n")
+ out += fmt.Sprintf(" all=${COMP_WORDS[@]}\n")
+ out += fmt.Sprintf("\n")
+ out += fmt.Sprintf(" # this is where we generate the go-arg output\n")
+ out += fmt.Sprintf(" GOARGS=$(" + argname + " --auto-complete $prev \\'$cur\\' $all)\n")
+ out += fmt.Sprintf("\n")
+ out += fmt.Sprintf(" # this compares the command line input from the user\n")
+ out += fmt.Sprintf(" # to whatever strings we output\n")
+ out += fmt.Sprintf(" COMPREPLY=( $(compgen -W \"$GOARGS\" -- $cur) ) # THIS WORKS\n")
+ out += fmt.Sprintf(" return 0\n")
+ out += fmt.Sprintf("}\n")
+ out += fmt.Sprintf("complete -F _%s_complete %s\n", argname, argname)
+ out += fmt.Sprintf("\n")
+ out += fmt.Sprintf("# copy and paste the above into your bash shell should work\n")
+ return out
+}
diff --git a/main.go b/main.go
index 4e45f57..c82397a 100644
--- a/main.go
+++ b/main.go
@@ -7,26 +7,41 @@ import (
"os"
"time"
+ "go.wit.com/dev/alexflint/arg"
+ "go.wit.com/gui"
"go.wit.com/log"
)
// are sent via -ldflags at buildtime
var VERSION string
var BUILDTIME string
+var ARGNAME string = "forged"
//go:embed resources/*
var resources embed.FS
-// var forge *forgepb.Forge
-
var HOSTNAME string = "forge.wit.com"
var LIBDIR string = "/var/lib/forged/"
var FORGEDIR string = "/home/forge"
func main() {
+ me = new(mainType)
+ gui.InitArg()
+ me.pp = arg.MustParse(&argv)
+
+ if argv.Bash {
+ argv.doBash()
+ os.Exit(0)
+ }
+ if len(argv.BashAuto) != 0 {
+ argv.doBashAuto()
+ os.Exit(0)
+ }
+
if argv.Hostname != "" {
HOSTNAME = argv.Hostname
}
+
// the default forged dir is /home/forge
if os.Getenv("FORGE_GOSRC") == "" {
os.Setenv("FORGE_GOSRC", "/home/forge")
@@ -37,6 +52,11 @@ func main() {
okExit("")
}
+ if argv.Pull != nil {
+ log.Info("pull here")
+ okExit("")
+ }
+
http.HandleFunc("/", okHandler)
// go https() // use caddy instead
p := fmt.Sprintf(":%d", argv.Port)
diff --git a/structs.go b/structs.go
new file mode 100644
index 0000000..6f7efa0
--- /dev/null
+++ b/structs.go
@@ -0,0 +1,16 @@
+// Copyright 2017-2025 WIT.COM Inc. All rights reserved.
+// Use of this source code is governed by the GPL 3.0
+
+package main
+
+import (
+ "go.wit.com/dev/alexflint/arg"
+)
+
+var me *mainType
+
+// this app's variables
+type mainType struct {
+ pp *arg.Parser // for parsing the command line args. Yay to alexf lint!
+ // myGui *gui.Node // the gui toolkit handle
+}