Basically Functional

This commit is contained in:
2020-10-14 16:59:41 -05:00
parent c253c13942
commit c1f7e8ae91
14 changed files with 571 additions and 50 deletions

View File

@@ -6,11 +6,20 @@ import (
"fmt"
"os"
"strings"
"git.bullercodeworks.com/brian/netcaptain/internal/cli"
"git.bullercodeworks.com/brian/netcaptain/internal/data"
)
const (
MODE_RUN = iota
MODE_VALIDATE_QUEST
MODE_VALIDATE_SHIP
MODE_EDIT_QUEST
MODE_EDIT_SHIP
MODE_EDIT_HOLD
MODE_LIST_QUESTS
MODE_LIST_SHIPS
)
type AppState struct {
@@ -18,14 +27,15 @@ type AppState struct {
Version int
ConfDir string
Parms []string
Ships map[string]Ship
Quests map[string]Quest
Verbose bool
Mode int
// CLI Variables
Environment string
Request string
QuestsDir string
Quest *data.Quest
ShipsDir string
Ship *data.Ship
HoldsDir string
Error error
}
@@ -38,47 +48,91 @@ func NewApp() *AppState {
func (a *AppState) initialize() error {
flag.StringVar(&a.ConfDir, "d", ".ncpt", "The configuration directory to use")
editMode := flag.Bool("e", false, "Edit the named Quest")
flag.BoolVar(&a.Verbose, "v", false, "Run in Verbose mode")
validateQuest := flag.String("c", "", "Validate the given quest is _c_orrect")
validateShip := flag.String("C", "", "Validate the given ship is _C_orrect")
editQuest := flag.String("e", "", "Edit the given quest")
editShip := flag.String("E", "", "Edit the given ship")
listQuestsMode := flag.Bool("l", false, "List all available Quests")
listShipsMode := flag.Bool("L", false, "List all available Ships")
editHold := flag.String("H", "", "Edit the hold for the given ship")
flag.Parse()
a.Parms = flag.Args()
// Figure out what 'mode' we're running in
if *editMode {
a.Mode = MODE_EDIT_QUEST
} else {
a.Mode = MODE_RUN
}
a.Ships = make(map[string]Ship)
a.Quests = make(map[string]Quest)
if err := a.validateConfDir(); err != nil {
return err
}
a.QuestsDir = a.ConfDir + "/quests"
a.ShipsDir = a.ConfDir + "/ships"
a.HoldsDir = a.ConfDir + "/holds"
// Figure out what 'mode' we're running in
if *validateQuest != "" {
a.Mode = MODE_VALIDATE_QUEST
a.Quest = data.NewQuest(a.ConfDir, *validateQuest)
} else if *validateShip != "" {
a.Mode = MODE_VALIDATE_SHIP
a.Ship = data.NewShip(a.ConfDir, *validateShip)
} else if *editQuest != "" {
a.Mode = MODE_EDIT_QUEST
a.Quest = data.NewQuest(a.ConfDir, *editQuest)
} else if *editShip != "" {
a.Mode = MODE_EDIT_SHIP
a.Ship = data.NewShip(a.ConfDir, *editShip)
} else if *listQuestsMode {
a.Mode = MODE_LIST_QUESTS
} else if *listShipsMode {
a.Mode = MODE_LIST_SHIPS
} else if *editHold != "" {
a.Mode = MODE_EDIT_HOLD
a.Ship = data.NewShip(a.ConfDir, *editHold)
} else {
a.Mode = MODE_RUN
}
// Load Global Configs
return nil
}
func (a *AppState) run() int {
if len(a.Parms) == 0 {
fmt.Fprint(os.Stderr, "No request provided ('list' to list available requests)\n")
return 1
}
switch a.Mode {
case MODE_VALIDATE_QUEST:
return a.validateQuest(a.Parms)
case MODE_VALIDATE_SHIP:
return a.validateShip(a.Parms)
case MODE_EDIT_QUEST:
return a.editQuest(a.Parms)
case MODE_EDIT_SHIP:
return a.editShip(a.Parms)
case MODE_EDIT_HOLD:
return a.editHold(a.Parms)
case MODE_LIST_QUESTS:
return a.listQuests(a.Parms)
case MODE_LIST_SHIPS:
return a.listShips(a.Parms)
default:
return a.runQuest(a.Parms)
}
}
func (a *AppState) validateConfDir() error {
if !DirExists(a.ConfDir) {
ans := PromptWDefault(fmt.Sprintf("Create configuration directory (%s)? [n]", a.ConfDir), "n")
if !cli.DirExists(a.ConfDir) {
ans := cli.PromptWDefault(fmt.Sprintf("Create configuration directories (%s)? [n]", a.ConfDir), "n")
if strings.ToLower(ans) == "y" {
if err := os.Mkdir(a.ConfDir, 0700); err != nil {
return err
}
if err := os.Mkdir(a.QuestsDir, 0700); err != nil {
return err
}
if err := os.Mkdir(a.ShipsDir, 0700); err != nil {
return err
}
if err := os.Mkdir(a.HoldsDir, 0700); err != nil {
return err
}
} else {
return errors.New("Configuration directory doesn't exist")
}

1
cmd/ncpt/app_cmds.go Normal file
View File

@@ -0,0 +1 @@
package main

View File

@@ -1,4 +0,0 @@
package main
type Command interface {
}

View File

@@ -4,23 +4,89 @@ import (
"fmt"
"os"
"os/exec"
"git.bullercodeworks.com/brian/netcaptain/internal/cli"
"git.bullercodeworks.com/brian/netcaptain/internal/data"
)
func (a *AppState) runQuest(parms []string) int {
func (a *AppState) listQuests(parms []string) int {
files := cli.ListFiles(a.QuestsDir)
for _, v := range files {
fmt.Println(v)
}
return 0
}
func (a *AppState) editQuest(parms []string) int {
if len(parms) == 0 {
fmt.Println("Quest name must be provided.")
func (a *AppState) validateQuest(parms []string) int {
if a.Quest == nil {
cli.PrintErr("No quest given")
return 1
}
cmd := exec.Command(os.Getenv("EDITOR"), fmt.Sprintf("%s/%s", a.ConfDir, parms[0]))
a.Quest.LoadArgs(parms)
if err := a.Quest.Load(); err != nil {
cli.PrintErr(fmt.Sprintf("Error loading quest: %s", err.Error()))
return 1
}
if !a.Quest.IsValid() {
cli.PrintErr("Quest is not valid")
return 1
}
return 0
}
func (a *AppState) runQuest(parms []string) int {
if len(parms) == 0 {
cli.PrintErr("No Quest Given")
return 1
}
a.Quest = data.NewQuest(a.ConfDir, parms[0])
a.Quest.Verbose = a.Verbose
parms = parms[1:]
var ships []string
if len(parms) > 1 {
ships = append(ships, parms[0])
}
ships = append(ships, "default")
for _, v := range ships {
s := data.NewShip(a.ConfDir, v)
if s.Exists() {
a.Ship = s
a.Ship.Verbose = a.Verbose
if len(parms) > 0 && parms[0] == v {
parms = parms[1:]
}
a.Ship.LoadArgs(parms)
err := a.Ship.Load()
if err != nil {
cli.PrintErr(err.Error())
return 1
}
break
}
}
if a.Ship != nil {
return a.Ship.Sail(a.Quest)
}
a.Quest.LoadArgs(parms)
err := a.Quest.Load()
if err != nil {
cli.PrintErr(err.Error())
return 1
}
return a.Quest.Complete()
}
func (a *AppState) editQuest(parms []string) int {
if a.Quest == nil {
cli.PrintErr("Quest name must be provided.")
return 1
}
cmd := exec.Command(os.Getenv("EDITOR"), a.Quest.FilePath())
cmd.Stdin = os.Stdin
cmd.Stdout = os.Stdout
err := cmd.Run()
if err != nil {
fmt.Printf("Error editing Quest (%s)", parms[0])
cli.PrintErr(fmt.Sprintf("Error editing Quest (%s)", a.Quest.Name))
}
return 0
}

67
cmd/ncpt/app_ship_cmds.go Normal file
View File

@@ -0,0 +1,67 @@
package main
import (
"fmt"
"os"
"os/exec"
"strings"
"git.bullercodeworks.com/brian/netcaptain/internal/cli"
)
func (a *AppState) listShips(parms []string) int {
files := cli.ListFiles(a.ShipsDir)
for _, v := range files {
fmt.Println(strings.TrimSuffix(v, ".json"))
}
return 0
}
func (a *AppState) validateShip(parms []string) int {
if a.Ship == nil {
cli.PrintErr("No ship given")
return 1
}
a.Ship.LoadArgs(parms)
if err := a.Ship.Load(); err != nil {
cli.PrintErr(fmt.Sprintf("Error loading ship: %s", err.Error()))
return 1
}
if !a.Ship.IsValid() {
cli.PrintErr("Ship is not valid")
return 1
}
return 0
}
func (a *AppState) editShip(parms []string) int {
if a.Ship == nil {
cli.PrintErr("Ship name must be provided.")
return 1
}
cmd := exec.Command(os.Getenv("EDITOR"), a.Ship.FilePath())
cmd.Stdin = os.Stdin
cmd.Stdout = os.Stdout
err := cmd.Run()
if err != nil {
cli.PrintErr(fmt.Sprintf("Error editing Ship (%s)", a.Ship.Name))
return 1
}
return 0
}
func (a *AppState) editHold(parms []string) int {
if a.Ship == nil {
cli.PrintErr("Ship name must be provided.")
return 1
}
cmd := exec.Command(os.Getenv("EDITOR"), a.Ship.HoldFilePath())
cmd.Stdin = os.Stdin
cmd.Stdout = os.Stdout
err := cmd.Run()
if err != nil {
cli.PrintErr(fmt.Sprintf("Error editing Hold (%s)", a.Ship.Name))
return 1
}
return 0
}

View File

@@ -1,49 +0,0 @@
package main
import (
"bufio"
"fmt"
"os"
"strings"
)
func PromptWDefault(label, def string) string {
ret := Prompt(label, false)
if ret == "" {
return def
}
return ret
}
func Prompt(label string, required bool) string {
reader := bufio.NewReader(os.Stdin)
var res string
fmt.Println(label + ": ")
res, _ = reader.ReadString('\n')
res = strings.TrimSpace(res)
if res == "" && required {
fmt.Println("Non-empty response is required")
return Prompt(label, required)
}
return res
}
func FileExists(path string) bool {
info, err := os.Stat(path)
if os.IsNotExist(err) {
return false
}
return !info.IsDir()
}
func DirExists(path string) bool {
info, err := os.Stat(path)
if os.IsNotExist(err) {
return false
}
return info.IsDir()
}
func PrintErr(o string) {
fmt.Fprint(os.Stderr, o)
}

View File

@@ -1,8 +1,9 @@
package main
import (
"fmt"
"os"
"git.bullercodeworks.com/brian/netcaptain/internal/cli"
)
const (
@@ -13,10 +14,9 @@ const (
var app *AppState
func main() {
fmt.Println("ncpt - NetCaptain")
app = NewApp()
if app.Error != nil {
PrintErr(app.Error.Error())
cli.PrintErr(app.Error.Error())
os.Exit(1)
}
os.Exit(app.run())

View File

@@ -1,7 +0,0 @@
package main
type Quest struct {
Method string
Url string
Headers map[string]string
}

View File

@@ -1,5 +0,0 @@
package main
type Ship struct {
Name string
}