Skip to content

Commit

Permalink
command: produce help output from flags (#39)
Browse files Browse the repository at this point in the history
  • Loading branch information
shoenig authored Dec 18, 2022
1 parent 4763c38 commit c30ef18
Show file tree
Hide file tree
Showing 3 changed files with 35 additions and 17 deletions.
22 changes: 22 additions & 0 deletions internal/command/cmd.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
package command

import (
"errors"

"github.com/shoenig/ssh-key-sync/internal/config"
"github.com/shoenig/ssh-key-sync/internal/netapi"
"github.com/shoenig/ssh-key-sync/internal/ssh"
)

func Start(args []string) error {
arguments := config.ParseArguments(args[0], args[1:])
if arguments.GitHubUser == "" {
arguments.Usage()
return errors.New("missing required argument(s)")
}

reader := ssh.NewKeysReader()
githubClient := netapi.NewGithubClient(arguments)
exe := NewExec(arguments.Verbose, reader, githubClient)
return exe.Execute(arguments)
}
9 changes: 8 additions & 1 deletion internal/config/arguments.go
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,12 @@ type Arguments struct {

GitHubUser string
GitHubAPI string

usage func()
}

func (a Arguments) Usage() {
a.usage()
}

func defaultUser() string {
Expand All @@ -37,7 +43,7 @@ func defaultUser() string {
}

func ParseArguments(program string, args []string) Arguments {
flags := flag.NewFlagSet(program, flag.PanicOnError)
flags := flag.NewFlagSet(program, flag.ContinueOnError)
var arguments Arguments

flags.BoolVar(
Expand Down Expand Up @@ -69,5 +75,6 @@ func ParseArguments(program string, args []string) Arguments {
)

_ = flags.Parse(args)
arguments.usage = flags.Usage
return arguments
}
21 changes: 5 additions & 16 deletions main.go
Original file line number Diff line number Diff line change
@@ -1,26 +1,15 @@
package main

import (
"fmt"
"os"

"github.com/shoenig/ssh-key-sync/internal/command"
"github.com/shoenig/ssh-key-sync/internal/config"
"github.com/shoenig/ssh-key-sync/internal/logs"
"github.com/shoenig/ssh-key-sync/internal/netapi"
"github.com/shoenig/ssh-key-sync/internal/ssh"
)

func main() {
logger := logs.New(true)
args := config.ParseArguments(os.Args[0], os.Args[1:])
if args.GitHubUser == "" {
logger.Fatal("ssh-key-sync requires --github-user")
if err := command.Start(os.Args); err != nil {
fmt.Println("[fatal]", err)
os.Exit(1)
}

reader := ssh.NewKeysReader()
githubClient := netapi.NewGithubClient(args)
exec := command.NewExec(args.Verbose, reader, githubClient)
if err := exec.Execute(args); err != nil {
logger.Fatalf("ssh-key-sync failed with error: %s", err)
}
}
}

0 comments on commit c30ef18

Please sign in to comment.