move to an internal packge for now

Author: syntaqx

.goreleaser.yml

@@ -1,5 +1,5 @@
 builds:
-- main: cmd/serve/*.go
+- main: cmd/serve/main.go
   binary: serve
   goos:
     - windows

cmd/serve/main.go

@@ -5,18 +5,14 @@ import (
 	"flag"
 	"log"
 	"os"
+
+	"github.com/syntaqx/serve/internal"
 )
 
 var version = "0.0.0-develop"
 
-type flags struct {
-	Host string
-	Port int
-	Dir  string
-}
-
 func main() {
-	var opt flags
+	var opt internal.Flags
 	flag.StringVar(&opt.Host, "host", "", "host address to bind to")
 	flag.IntVar(&opt.Port, "port", 8080, "listening port")
 	flag.StringVar(&opt.Dir, "dir", "", "directory to serve")
@@ -27,10 +23,10 @@ func main() {
 	var err error
 	switch cmd := flag.Arg(0); cmd {
 	case "version":
-		err = VersionCommand(os.Stderr)
+		err = internal.VersionCommand(version, os.Stderr)
 	default:
 		opt.Dir = sanitizeDirFlagArg(opt.Dir, cmd)
-		err = ServerCommand(log, opt)
+		err = internal.ServerCommand(log, opt)
 	}
 
 	if err != nil {

cmd/serve/commands.go renamed to internal/commands.go

@@ -1,4 +1,4 @@
-package main
+package internal
 
 import (
 	"fmt"
@@ -13,13 +13,13 @@ import (
 
 // VersionCommand implements the command `version` which outputs the current
 // binary release version, if any.
-func VersionCommand(w io.Writer) error {
+func VersionCommand(version string, w io.Writer) error {
 	fmt.Fprintf(w, fmt.Sprintf("serve version %s %s/%s\n", version, runtime.GOOS, runtime.GOARCH))
 	return nil
 }
 
 // ServerCommand implements the static http server command.
-func ServerCommand(log *log.Logger, opt flags) error {
+func ServerCommand(log *log.Logger, opt Flags) error {
 	r := NewRouter(log, opt)
 
 	server := &http.Server{

cmd/serve/commands_test.go renamed to internal/commands_test.go

@@ -1,8 +1,7 @@
-package main
+package internal
 
 import (
 	"bytes"
-	"fmt"
 	"log"
 	"net/http"
 	"testing"
@@ -16,10 +15,10 @@ func TestVersionCommand(t *testing.T) {
 	assert := assert.New(t)
 
 	var b bytes.Buffer
-	err := VersionCommand(&b)
+	err := VersionCommand("mock", &b)
 
 	assert.NoError(err)
-	assert.Contains(b.String(), fmt.Sprintf("version %s", version))
+	assert.Contains(b.String(), "version mock")
 }
 
 func TestServerCommand(t *testing.T) {
@@ -28,7 +27,7 @@ func TestServerCommand(t *testing.T) {
 
 	var b bytes.Buffer
 	log := log.New(&b, "[test] ", 0)
-	opt := flags{Port: 0}
+	opt := Flags{Port: 0}
 
 	go func() {
 		assert.NoError(ServerCommand(log, opt))
@@ -43,7 +42,7 @@ func TestServerCommandErr(t *testing.T) {
 
 	var b bytes.Buffer
 	log := log.New(&b, "[test] ", 8888)
-	opt := flags{Port: 8888}
+	opt := Flags{Port: 8888}
 
 	go func() {
 		_ = http.ListenAndServe(":8888", nil)

internal/flags.go

@@ -0,0 +1,8 @@
+package internal
+
+// Flags are the expose configuration flags available to the serve binary.
+type Flags struct {
+	Host string
+	Port int
+	Dir  string
+}

cmd/serve/middleware.go renamed to internal/middleware.go

@@ -1,4 +1,4 @@
-package main
+package internal
 
 import (
 	"log"

cmd/serve/middleware_test.go renamed to internal/middleware_test.go

@@ -1,4 +1,4 @@
-package main
+package internal
 
 import (
 	"bytes"

cmd/serve/router.go renamed to internal/router.go

@@ -1,12 +1,12 @@
-package main
+package internal
 
 import (
 	"log"
 	"net/http"
 )
 
 // NewRouter returns a new http.Handler for routing
-func NewRouter(log *log.Logger, opt flags) http.Handler {
+func NewRouter(log *log.Logger, opt Flags) http.Handler {
 	r := http.NewServeMux()
 
 	// Handler, wrapped with middleware

cmd/serve/router_test.go renamed to internal/router_test.go

@@ -1,4 +1,4 @@
-package main
+package internal
 
 import (
 	"bytes"
@@ -12,7 +12,7 @@ func TestNewRouter(t *testing.T) {
 
 	var b bytes.Buffer
 	log := log.New(&b, "[test] ", 0)
-	opt := flags{Port: 0}
+	opt := Flags{Port: 0}
 
 	r := NewRouter(log, opt)