restructure repo

* move router source to toplevel, which is more standard
* move config package into router package
* take vendored dependencies out; this moves to cf-release
* simplify travis.yml accordingly

.travis.yml

@@ -9,7 +9,4 @@ matrix:
 
 install:
   - gem install nats
-  - export GOPATH=$TRAVIS_BUILD_DIR
   - go build ./...
-
-script: bin/test router

src/router/common/component.go → common/component.go

@@ -6,7 +6,7 @@ import (
 	mbus "github.com/cloudfoundry/go_cfmessagebus"
 	steno "github.com/cloudfoundry/gosteno"
 	"net/http"
-	. "router/common/http"
+	. "github.com/cloudfoundry/gorouter/common/http"
 	"runtime"
 	"time"
 )

src/router/config/config.go → config.go

@@ -1,9 +1,9 @@
-package config
+package router
 
 import (
 	"io/ioutil"
 	"launchpad.net/goyaml"
-	vcap "router/common"
+	vcap "github.com/cloudfoundry/gorouter/common"
 	"time"
 )
 

src/router/config/config_test.go → config_test.go

@@ -1,4 +1,4 @@
-package config
+package router
 
 import (
 	. "launchpad.net/gocheck"

src/router/common/spec/config.go → helper_test.go

@@ -1,12 +1,28 @@
-package spec
+package router
 
 import (
-	"router/config"
+	steno "github.com/cloudfoundry/gosteno"
+	. "launchpad.net/gocheck"
+	"testing"
 	"time"
 )
 
-func SpecConfig(natsPort, statusPort, proxyPort uint16) *config.Config {
-	c := config.DefaultConfig()
+func Test(t *testing.T) {
+	config := &steno.Config{
+		Sinks: []steno.Sink{},
+		Codec: steno.NewJsonCodec(),
+		Level: steno.LOG_INFO,
+	}
+
+	steno.Init(config)
+
+	log = steno.NewLogger("test")
+
+	TestingT(t)
+}
+
+func SpecConfig(natsPort, statusPort, proxyPort uint16) *Config {
+	c := DefaultConfig()
 	c.Port = proxyPort
 	c.Index = 2
 	c.TraceKey = "my_trace_key"
@@ -20,20 +36,20 @@ func SpecConfig(natsPort, statusPort, proxyPort uint16) *config.Config {
 	c.DropletStaleThreshold = 0
 	c.PublishActiveAppsInterval = 0
 
-	c.Status = config.StatusConfig{
+	c.Status = StatusConfig{
 		Port: statusPort,
 		User: "user",
 		Pass: "pass",
 	}
 
-	c.Nats = config.NatsConfig{
+	c.Nats = NatsConfig{
 		Host: "localhost",
 		Port: natsPort,
 		User: "nats",
 		Pass: "nats",
 	}
 
-	c.Logging = config.LoggingConfig{
+	c.Logging = LoggingConfig{
 		File:  "/dev/null",
 		Level: "info",
 	}

src/router/integration_test.go → integration_test.go

@@ -3,14 +3,12 @@ package router
 import (
 	mbus "github.com/cloudfoundry/go_cfmessagebus"
 	. "launchpad.net/gocheck"
-	"router/common/spec"
-	"router/config"
-	"router/test"
+	"github.com/cloudfoundry/gorouter/test"
 	"time"
 )
 
 type IntegrationSuite struct {
-	Config     *config.Config
+	Config     *Config
 	mbusClient mbus.CFMessageBus
 	router     *Router
 }
@@ -24,7 +22,7 @@ func (s *IntegrationSuite) TestNatsConnectivity(c *C) {
 	proxyPort := nextAvailPort()
 	statusPort := nextAvailPort()
 
-	s.Config = spec.SpecConfig(natsPort, statusPort, proxyPort)
+	s.Config = SpecConfig(natsPort, statusPort, proxyPort)
 	s.Config.PruneStaleDropletsInterval = 5 * time.Second
 
 	s.router = NewRouter(s.Config)

src/router/logger.go → logger.go

@@ -3,8 +3,7 @@ package router
 import (
 	steno "github.com/cloudfoundry/gosteno"
 	"os"
-	"router/common"
-	"router/config"
+	"github.com/cloudfoundry/gorouter/common"
 )
 
 var log *steno.Logger
@@ -21,7 +20,7 @@ func init() {
 	log = steno.NewLogger("router.init")
 }
 
-func SetupLoggerFromConfig(c *config.Config) {
+func SetupLoggerFromConfig(c *Config) {
 	l, err := steno.GetLogLevel(c.Logging.Level)
 	if err != nil {
 		panic(err)

src/router/logger_test.go → logger_test.go

@@ -3,15 +3,14 @@ package router
 import (
 	steno "github.com/cloudfoundry/gosteno"
 	. "launchpad.net/gocheck"
-	"router/config"
 )
 
 type LoggerSuite struct{}
 
 var _ = Suite(&LoggerSuite{})
 
 func (s *LoggerSuite) TestSetupLoggerFromConfig(c *C) {
-	cfg := config.DefaultConfig()
+	cfg := DefaultConfig()
 	cfg.Logging.File = "/tmp/gorouter.log"
 
 	SetupLoggerFromConfig(cfg)

src/router/perf_test.go → perf_test.go

@@ -2,8 +2,7 @@ package router
 
 import (
 	"code.google.com/p/gomock/gomock"
-	"router/config"
-	"router/test"
+	"github.com/cloudfoundry/gorouter/test"
 	"strconv"
 	"testing"
 )
@@ -14,7 +13,7 @@ const (
 )
 
 func BenchmarkRegister(b *testing.B) {
-	c := config.DefaultConfig()
+	c := DefaultConfig()
 	mocksController := gomock.NewController(b)
 	r := NewRegistry(c, test.NewMockCFMessageBus(mocksController))
 	p := NewProxy(c, r, NewVarz(r))

src/router/proxy.go → proxy.go

@@ -8,7 +8,6 @@ import (
 	"net"
 	"net/http"
 	"os"
-	"router/config"
 	"strings"
 	"sync"
 	"time"
@@ -26,7 +25,7 @@ const (
 type Proxy struct {
 	sync.RWMutex
 	*steno.Logger
-	*config.Config
+	*Config
 	*Registry
 	Varz
 	*AccessLogger
@@ -65,7 +64,7 @@ func (rw *responseWriter) CopyFrom(src io.Reader) (int64, error) {
 	return io.Copy(dst, src)
 }
 
-func NewProxy(c *config.Config, r *Registry, v Varz) *Proxy {
+func NewProxy(c *Config, r *Registry, v Varz) *Proxy {
 	p := &Proxy{
 		Config:   c,
 		Logger:   steno.NewLogger("router.proxy"),

src/router/proxy_test.go → proxy_test.go

@@ -9,8 +9,7 @@ import (
 	. "launchpad.net/gocheck"
 	"net"
 	"net/http"
-	"router/config"
-	"router/test"
+	"github.com/cloudfoundry/gorouter/test"
 	"strconv"
 	"strings"
 	"time"
@@ -132,7 +131,7 @@ type ProxySuite struct {
 var _ = Suite(&ProxySuite{})
 
 func (s *ProxySuite) SetUpTest(c *C) {
-	x := config.DefaultConfig()
+	x := DefaultConfig()
 	x.TraceKey = "my_trace_key"
 
 	mocksController := gomock.NewController(c)

src/router/registry.go → registry.go

@@ -6,9 +6,8 @@ import (
 	mbus "github.com/cloudfoundry/go_cfmessagebus"
 	steno "github.com/cloudfoundry/gosteno"
 	"math/rand"
-	"router/config"
-	"router/stats"
-	"router/util"
+	"github.com/cloudfoundry/gorouter/stats"
+	"github.com/cloudfoundry/gorouter/util"
 	"strings"
 	"sync"
 	"time"
@@ -182,7 +181,7 @@ type Registry struct {
 	messageBus mbus.CFMessageBus
 }
 
-func NewRegistry(c *config.Config, messageBusClient mbus.CFMessageBus) *Registry {
+func NewRegistry(c *Config, messageBusClient mbus.CFMessageBus) *Registry {
 	r := &Registry{
 		messageBus: messageBusClient,
 	}

src/router/registry_test.go → registry_test.go

@@ -4,8 +4,7 @@ import (
 	"code.google.com/p/gomock/gomock"
 	"encoding/json"
 	. "launchpad.net/gocheck"
-	"router/config"
-	"router/test"
+	"github.com/cloudfoundry/gorouter/test"
 	"time"
 )
 
@@ -51,9 +50,9 @@ var bar2Reg = &registryMessage{
 }
 
 func (s *RegistrySuite) SetUpTest(c *C) {
-	var configObj *config.Config
+	var configObj *Config
 
-	configObj = config.DefaultConfig()
+	configObj = DefaultConfig()
 	configObj.DropletStaleThreshold = 1
 
 	s.mocksController = gomock.NewController(c)

src/router/router.go → router.go

@@ -8,24 +8,23 @@ import (
 	mbus "github.com/cloudfoundry/go_cfmessagebus"
 	steno "github.com/cloudfoundry/gosteno"
 	"net"
-	vcap "router/common"
-	"router/config"
-	"router/proxy"
-	"router/util"
+	vcap "github.com/cloudfoundry/gorouter/common"
+	"github.com/cloudfoundry/gorouter/proxy"
+	"github.com/cloudfoundry/gorouter/util"
 	"runtime"
 	"time"
 )
 
 type Router struct {
-	config     *config.Config
+	config     *Config
 	proxy      *Proxy
 	mbusClient mbus.CFMessageBus
 	registry   *Registry
 	varz       Varz
 	component  *vcap.VcapComponent
 }
 
-func NewRouter(c *config.Config) *Router {
+func NewRouter(c *Config) *Router {
 	router := &Router{
 		config: c,
 	}

src/router/router/main.go → router/main.go

@@ -2,8 +2,7 @@ package main
 
 import (
 	"flag"
-	"router"
-	"router/config"
+	"github.com/cloudfoundry/gorouter"
 )
 
 var configFile string
@@ -15,9 +14,9 @@ func init() {
 }
 
 func main() {
-	c := config.DefaultConfig()
+	c := router.DefaultConfig()
 	if configFile != "" {
-		c = config.InitConfigFromFile(configFile)
+		c = router.InitConfigFromFile(configFile)
 	}
 
 	router.SetupLoggerFromConfig(c)

src/router/router_test.go → router_test.go

@@ -12,16 +12,14 @@ import (
 	"net/http"
 	"os/exec"
 	"regexp"
-	"router/common"
-	"router/common/spec"
-	"router/config"
-	"router/test"
+	"github.com/cloudfoundry/gorouter/common"
+	"github.com/cloudfoundry/gorouter/test"
 	"strings"
 	"time"
 )
 
 type RouterSuite struct {
-	Config        *config.Config
+	Config        *Config
 	natsServerCmd *exec.Cmd
 	mbusClient    mbus.CFMessageBus
 	router        *Router
@@ -38,7 +36,7 @@ func (s *RouterSuite) SetUpSuite(c *C) {
 	proxyPort := nextAvailPort()
 	statusPort := nextAvailPort()
 
-	s.Config = spec.SpecConfig(s.natsPort, statusPort, proxyPort)
+	s.Config = SpecConfig(s.natsPort, statusPort, proxyPort)
 
 	s.router = NewRouter(s.Config)
 	go s.router.Run()