bundle-server: update commands to use arg parser

Update the 'git-bundle-server' commands to use argument parsers to parse
their flags and positional arguments (none currently use subcommands).

Signed-off-by: Victoria Dye <[email protected]>

Author: vdye

cmd/git-bundle-server/delete.go

@@ -1,9 +1,9 @@
 package main
 
 import (
-	"errors"
 	"os"
 
+	"github.com/github/git-bundle-server/internal/argparse"
 	"github.com/github/git-bundle-server/internal/core"
 )
 
@@ -20,18 +20,16 @@ data.`
 }
 
 func (Delete) Run(args []string) error {
-	if len(args) < 1 {
-		return errors.New("usage: git-bundle-server delete <route>")
-	}
-
-	route := args[0]
+	parser := argparse.NewArgParser("git-bundle-server delete <route>")
+	route := parser.PositionalString("route", "the route to delete")
+	parser.Parse(args)
 
-	repo, err := core.CreateRepository(route)
+	repo, err := core.CreateRepository(*route)
 	if err != nil {
 		return err
 	}
 
-	err = core.RemoveRoute(route)
+	err = core.RemoveRoute(*route)
 	if err != nil {
 		return err
 	}

cmd/git-bundle-server/init.go

@@ -1,9 +1,9 @@
 package main
 
 import (
-	"errors"
 	"fmt"
 
+	"github.com/github/git-bundle-server/internal/argparse"
 	"github.com/github/git-bundle-server/internal/bundles"
 	"github.com/github/git-bundle-server/internal/core"
 	"github.com/github/git-bundle-server/internal/git"
@@ -22,21 +22,19 @@ should be hosted at '<route>'.`
 }
 
 func (Init) Run(args []string) error {
-	if len(args) < 2 {
-		// TODO: allow parsing <route> out of <url>
-		return errors.New("usage: git-bundle-server init <url> <route>")
-	}
-
-	url := args[0]
-	route := args[1]
+	parser := argparse.NewArgParser("git-bundle-server init <url> <route>")
+	url := parser.PositionalString("url", "the URL of a repository to clone")
+	// TODO: allow parsing <route> out of <url>
+	route := parser.PositionalString("route", "the route to host the specified repo")
+	parser.Parse(args)
 
-	repo, err := core.CreateRepository(route)
+	repo, err := core.CreateRepository(*route)
 	if err != nil {
 		return err
 	}
 
-	fmt.Printf("Cloning repository from %s\n", url)
-	gitErr := git.GitCommand("clone", "--bare", url, repo.RepoDir)
+	fmt.Printf("Cloning repository from %s\n", *url)
+	gitErr := git.GitCommand("clone", "--bare", *url, repo.RepoDir)
 
 	if gitErr != nil {
 		return fmt.Errorf("failed to clone repository: %w", gitErr)

cmd/git-bundle-server/start.go

@@ -1,10 +1,10 @@
 package main
 
 import (
-	"errors"
 	"fmt"
 	"os"
 
+	"github.com/github/git-bundle-server/internal/argparse"
 	"github.com/github/git-bundle-server/internal/core"
 )
 
@@ -21,21 +21,19 @@ specified '<route>'.`
 }
 
 func (Start) Run(args []string) error {
-	if len(args) < 1 {
-		return errors.New("usage: git-bundle-server start <route>")
-	}
-
-	route := args[0]
+	parser := argparse.NewArgParser("git-bundle-server start <route>")
+	route := parser.PositionalString("route", "the route for which bundles should be generated")
+	parser.Parse(args)
 
 	// CreateRepository registers the route.
-	repo, err := core.CreateRepository(route)
+	repo, err := core.CreateRepository(*route)
 	if err != nil {
 		return err
 	}
 
 	_, err = os.ReadDir(repo.RepoDir)
 	if err != nil {
-		return fmt.Errorf("route '%s' appears to have been deleted; use 'init' instead", route)
+		return fmt.Errorf("route '%s' appears to have been deleted; use 'init' instead", *route)
 	}
 
 	// Make sure we have the global schedule running.

cmd/git-bundle-server/stop.go

@@ -1,8 +1,7 @@
 package main
 
 import (
-	"errors"
-
+	"github.com/github/git-bundle-server/internal/argparse"
 	"github.com/github/git-bundle-server/internal/core"
 )
 
@@ -19,11 +18,9 @@ specified '<route>'.`
 }
 
 func (Stop) Run(args []string) error {
-	if len(args) < 1 {
-		return errors.New("usage: git-bundle-server stop <route>")
-	}
-
-	route := args[0]
+	parser := argparse.NewArgParser("git-bundle-server stop <route>")
+	route := parser.PositionalString("route", "the route for which bundles should stop being generated")
+	parser.Parse(args)
 
-	return core.RemoveRoute(route)
+	return core.RemoveRoute(*route)
 }

cmd/git-bundle-server/update-all.go

@@ -5,6 +5,7 @@ import (
 	"os"
 	"os/exec"
 
+	"github.com/github/git-bundle-server/internal/argparse"
 	"github.com/github/git-bundle-server/internal/core"
 )
 
@@ -20,6 +21,9 @@ For every configured route, run 'git-bundle-server update <options> <route>'.`
 }
 
 func (UpdateAll) Run(args []string) error {
+	parser := argparse.NewArgParser("git-bundle-server update-all")
+	parser.Parse(args)
+
 	exe, err := os.Executable()
 	if err != nil {
 		return fmt.Errorf("failed to get path to execuable: %w", err)

cmd/git-bundle-server/update.go

@@ -1,9 +1,9 @@
 package main
 
 import (
-	"errors"
 	"fmt"
 
+	"github.com/github/git-bundle-server/internal/argparse"
 	"github.com/github/git-bundle-server/internal/bundles"
 	"github.com/github/git-bundle-server/internal/core"
 )
@@ -22,13 +22,11 @@ bundles, and update the bundle list.`
 }
 
 func (Update) Run(args []string) error {
-	if len(args) != 1 {
-		// TODO: allow parsing <route> out of <url>
-		return errors.New("usage: git-bundle-server update <route>")
-	}
+	parser := argparse.NewArgParser("git-bundle-server update <route>")
+	route := parser.PositionalString("route", "the route to update")
+	parser.Parse(args)
 
-	route := args[0]
-	repo, err := core.CreateRepository(route)
+	repo, err := core.CreateRepository(*route)
 	if err != nil {
 		return err
 	}