From c21e0c55822b83ae12c311fe0476bd9f0cc9e4f2 Mon Sep 17 00:00:00 2001
From: stephen mcquay <stephen@mcquay.me>
Date: Wed, 13 Jul 2016 19:40:41 -0600
Subject: [PATCH] Change how server address is specified

now you spell it as such:

gobot -addr wss://hackerbots.us
gobot -addr ws://localhost:8666
---
 client.go               | 7 +++----
 cmd/botspectate/main.go | 6 ++----
 cmd/gobot/main.go       | 6 ++----
 3 files changed, 7 insertions(+), 12 deletions(-)

diff --git a/client.go b/client.go
index ff8699d..53e6b7a 100644
--- a/client.go
+++ b/client.go
@@ -11,9 +11,9 @@ import (
 	"hackerbots.us/server"
 )
 
-func connect(server string, port int) (*websocket.Conn, error) {
+func connect(addr string) (*websocket.Conn, error) {
 	origin := "http://localhost/"
-	url := fmt.Sprintf("ws://%s:%d/ws/", server, port)
+	url := fmt.Sprintf("%s/ws/", addr)
 	return websocket.Dial(url, "", origin)
 }
 
@@ -24,7 +24,6 @@ type Client struct {
 	ForceJSON bool
 	GameId    string
 	Name      string
-	Port      int
 	Server    string
 	StatsReq  server.StatsRequest
 	Game      server.GameParam
@@ -53,7 +52,7 @@ type decoder interface {
 
 // Negotiate runs through the hackerbots negociation protocol.
 func (c *Client) Negotiate(clientType string, player Player) (err error) {
-	c.ws, err = connect(c.Server, c.Port)
+	c.ws, err = connect(c.Server)
 	if err != nil {
 		return errors.New(fmt.Sprintf("connection failure: %s", err))
 	}
diff --git a/cmd/botspectate/main.go b/cmd/botspectate/main.go
index 562ea00..eee8d6a 100644
--- a/cmd/botspectate/main.go
+++ b/cmd/botspectate/main.go
@@ -11,8 +11,7 @@ import (
 	"hackerbots.us/server"
 )
 
-var serverHostname = flag.String("server", "localhost", "server hostname")
-var port = flag.Int("port", 8666, "server port")
+var addr = flag.String("addr", "ws://localhost:8666", "server hostname")
 var forceJSON = flag.Bool("json", false, "force json encoding")
 
 func main() {
@@ -26,8 +25,7 @@ func main() {
 	}
 
 	c := &client.Client{
-		Server:      *serverHostname,
-		Port:        *port,
+		Server:      *addr,
 		Name:        "bspect",
 		GameId:      gameId,
 		ForceJSON:   *forceJSON,
diff --git a/cmd/gobot/main.go b/cmd/gobot/main.go
index 9539724..c85a0b4 100644
--- a/cmd/gobot/main.go
+++ b/cmd/gobot/main.go
@@ -23,8 +23,7 @@ var weaponSpeed = flag.Int("wspeed", 50, "weapons speed")
 
 // XXX: add TurnSpeed, WeaponDamage, WeaponSpeed
 
-var serverHostname = flag.String("server", "localhost", "server hostname")
-var port = flag.Int("port", 8666, "server port")
+var addr = flag.String("addr", "ws://localhost:8666", "server hostname")
 var botname = flag.String("name", "gobot", "the name that other players will see")
 var forceJSON = flag.Bool("json", false, "force json encoding")
 var botType = flag.String("bot", "simple", "which Bot")
@@ -40,8 +39,7 @@ func main() {
 	}
 
 	c := &client.Client{
-		Server: *serverHostname,
-		Port:   *port,
+		Server: *addr,
 		Name:   *botname,
 		GameId: gameId,
 		// XXX: update with missing fields