Switch to the gb build system. Fixes skizzehq#98

seiflotfy · Jan 17, 2016 · 0afc3c7 · 0afc3c7
1 parent f2f8166
commit 0afc3c7
Show file tree

Hide file tree

Showing 34 changed files with 222 additions and 71 deletions.
diff --git a/.gitignore b/.gitignore
@@ -23,3 +23,8 @@ _testmain.go
 *.test
 *.prof
 .DS_Store
+
+# gb
+bin
+pkg
+vendor/src
diff --git a/.travis.yml b/.travis.yml
@@ -3,27 +3,11 @@ go:
  - 1.5
 
 install:
- - go get github.com/hashicorp/golang-lru
- - go get github.com/BurntSushi/toml
- - go get code.google.com/p/gofarmhash
- - go get github.com/boltdb/bolt
- - go get github.com/facebookgo/httpdown
- - go get github.com/facebookgo/grace/gracehttp
- - go get github.com/dgryski/go-farm
- - go get github.com/lazybeaver/xorshift
- - go get github.com/dgryski/go-pcgr
- - go get github.com/willf/bitset
- - go get github.com/willf/bloom
- - go get github.com/retailnext/hllpp
- - go get github.com/skizzehq/count-min-log
- - go get github.com/dgryski/go-topk
- - go get github.com/gogo/protobuf/proto
- - go get google.golang.org/grpc
- - go get golang.org/x/net/context
- - go get github.com/peterh/liner
+ - go get github.com/constabulary/gb/...
 
 # before_script:
- - go vet ./...
+ - gb vendor restore
+ - go build
 
 script:
- - go test -v ./...
+ - gb test -v
diff --git a/cli/main.go → src/cli/main.go b/cli/main.go → src/cli/main.go
@@ -14,7 +14,8 @@ import (
 
 	"github.com/gogo/protobuf/proto"
 	"github.com/peterh/liner"
-	pb "github.com/skizzehq/skizze/datamodel"
+
+	pb "datamodel"
 )
 
 var client pb.SkizzeClient

diff --git a/config/config.go → src/config/config.go b/config/config.go → src/config/config.go
@@ -7,9 +7,9 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/skizzehq/skizze/utils"
-
 	"github.com/BurntSushi/toml"
+
+	"utils"
 )
 
 // Config stores all configuration parameters for Go
@@ -35,7 +35,7 @@ func parseConfigTOML() *Config {
 		utils.PanicOnError(err)
 		path, err = filepath.Abs(path)
 		utils.PanicOnError(err)
-		configPath = filepath.Join(path, "config/default.toml")
+		configPath = filepath.Join(path, "src/config/default.toml")
 	}
 	_, err := os.Open(configPath)
 	utils.PanicOnError(err)

diff --git a/config/default.toml → src/config/default.toml b/config/default.toml → src/config/default.toml
diff --git a/datamodel/constants.go → src/datamodel/constants.go b/datamodel/constants.go → src/datamodel/constants.go
diff --git a/datamodel/info.go → src/datamodel/info.go b/datamodel/info.go → src/datamodel/info.go
diff --git a/datamodel/result.go → src/datamodel/result.go b/datamodel/result.go → src/datamodel/result.go
diff --git a/datamodel/sketcher.go → src/datamodel/sketcher.go b/datamodel/sketcher.go → src/datamodel/sketcher.go
diff --git a/datamodel/skizze.pb.go → src/datamodel/skizze.pb.go b/datamodel/skizze.pb.go → src/datamodel/skizze.pb.go
diff --git a/datamodel/skizze.proto → src/datamodel/skizze.proto b/datamodel/skizze.proto → src/datamodel/skizze.proto
diff --git a/manager/domain.go → src/manager/domain.go b/manager/domain.go → src/manager/domain.go
@@ -3,9 +3,9 @@ package manager
 import (
 	"fmt"
 
-	"github.com/skizzehq/skizze/datamodel"
-	"github.com/skizzehq/skizze/storage"
-	"github.com/skizzehq/skizze/utils"
+	"datamodel"
+	"storage"
+	"utils"
 )
 
 type domainManager struct {

diff --git a/manager/info.go → src/manager/info.go b/manager/info.go → src/manager/info.go
@@ -3,9 +3,9 @@ package manager
 import (
 	"fmt"
 
-	"github.com/skizzehq/skizze/datamodel"
-	"github.com/skizzehq/skizze/storage"
-	"github.com/skizzehq/skizze/utils"
+	"datamodel"
+	"storage"
+	"utils"
 )
 
 type infoManager struct {

diff --git a/manager/manager.go → src/manager/manager.go b/manager/manager.go → src/manager/manager.go
@@ -6,10 +6,10 @@ import (
 	"sync"
 	"time"
 
-	"github.com/skizzehq/skizze/config"
-	"github.com/skizzehq/skizze/datamodel"
-	"github.com/skizzehq/skizze/storage"
-	"github.com/skizzehq/skizze/utils"
+	"config"
+	"datamodel"
+	"storage"
+	"utils"
 )
 
 func isValidType(info *datamodel.Info) bool {

diff --git a/manager/manager_test.go → src/manager/manager_test.go b/manager/manager_test.go → src/manager/manager_test.go
@@ -5,9 +5,9 @@ import (
 	"testing"
 	"time"
 
-	"github.com/skizzehq/skizze/config"
-	"github.com/skizzehq/skizze/datamodel"
-	"github.com/skizzehq/skizze/utils"
+	"config"
+	"datamodel"
+	"utils"
 )
 
 func TestNoSketches(t *testing.T) {

diff --git a/manager/sketch.go → src/manager/sketch.go b/manager/sketch.go → src/manager/sketch.go
@@ -3,10 +3,10 @@ package manager
 import (
 	"fmt"
 
-	"github.com/skizzehq/skizze/datamodel"
-	"github.com/skizzehq/skizze/sketches"
-	"github.com/skizzehq/skizze/storage"
-	"github.com/skizzehq/skizze/utils"
+	"datamodel"
+	"sketches"
+	"storage"
+	"utils"
 )
 
 type sketchManager struct {

diff --git a/server/server.go → src/server/server.go b/server/server.go → src/server/server.go
@@ -5,9 +5,10 @@ import (
 	"log"
 	"net"
 
-	pb "github.com/skizzehq/skizze/datamodel"
-	"github.com/skizzehq/skizze/manager"
 	"google.golang.org/grpc"
+
+	pb "datamodel"
+	"manager"
 )
 
 type serverStruct struct {

diff --git a/server/server_test.go → src/server/server_test.go b/server/server_test.go → src/server/server_test.go
@@ -4,9 +4,10 @@ import (
 	"log"
 	"time"
 
-	pb "github.com/skizzehq/skizze/datamodel"
-	"github.com/skizzehq/skizze/manager"
 	"google.golang.org/grpc"
+
+	pb "datamodel"
+	"manager"
 )
 
 func setupClient() (pb.SkizzeClient, *grpc.ClientConn) {

diff --git a/server/sketch.go → src/server/sketch.go b/server/sketch.go → src/server/sketch.go
@@ -4,9 +4,10 @@ import (
 	"strings"
 
 	"github.com/gogo/protobuf/proto"
-	pb "github.com/skizzehq/skizze/datamodel"
 
 	"golang.org/x/net/context"
+
+	pb "datamodel"
 )
 
 func (s *serverStruct) CreateSketch(ctx context.Context, in *pb.Sketch) (*pb.Sketch, error) {

diff --git a/server/sketch_test.go → src/server/sketch_test.go b/server/sketch_test.go → src/server/sketch_test.go
@@ -3,12 +3,12 @@ package server
 import (
 	"testing"
 
+	"github.com/gogo/protobuf/proto"
 	"golang.org/x/net/context"
 
-	"github.com/gogo/protobuf/proto"
-	"github.com/skizzehq/skizze/config"
-	pb "github.com/skizzehq/skizze/datamodel"
-	"github.com/skizzehq/skizze/utils"
+	"config"
+	pb "datamodel"
+	"utils"
 )
 
 func TestCreateSketch(t *testing.T) {

diff --git a/server/todo.go → src/server/todo.go b/server/todo.go → src/server/todo.go
@@ -1,9 +1,9 @@
 package server
 
 import (
-	pb "github.com/skizzehq/skizze/datamodel"
-
 	"golang.org/x/net/context"
+
+	pb "datamodel"
 )
 
 func (s *serverStruct) ListDomains(ctx context.Context, in *pb.Empty) (*pb.ListDomainsReply, error) {

diff --git a/sketches/bloom.go → src/sketches/bloom.go b/sketches/bloom.go → src/sketches/bloom.go
@@ -1,8 +1,9 @@
 package sketches
 
 import (
-	"github.com/skizzehq/skizze/datamodel"
 	"github.com/willf/bloom"
+
+	"datamodel"
 )
 
 //var logger = utils.GetLogger()

diff --git a/sketches/cml.go → src/sketches/cml.go b/sketches/cml.go → src/sketches/cml.go
@@ -2,8 +2,9 @@ package sketches
 
 import (
 	"github.com/seiflotfy/count-min-log"
-	"github.com/skizzehq/skizze/datamodel"
-	"github.com/skizzehq/skizze/utils"
+
+	"datamodel"
+	"utils"
 )
 
 var logger = utils.GetLogger()

diff --git a/sketches/cml_test.go → src/sketches/cml_test.go b/sketches/cml_test.go → src/sketches/cml_test.go
@@ -3,8 +3,8 @@ package sketches
 import (
 	"testing"
 
-	"github.com/skizzehq/skizze/datamodel"
-	"github.com/skizzehq/skizze/utils"
+	"datamodel"
+	"utils"
 )
 
 func TestAdd(t *testing.T) {

diff --git a/sketches/hllpp.go → src/sketches/hllpp.go b/sketches/hllpp.go → src/sketches/hllpp.go
@@ -2,7 +2,8 @@ package sketches
 
 import (
 	"github.com/retailnext/hllpp"
-	"github.com/skizzehq/skizze/datamodel"
+
+	"datamodel"
 )
 
 //var logger = utils.GetLogger()

diff --git a/sketches/proxy.go → src/sketches/proxy.go b/sketches/proxy.go → src/sketches/proxy.go
@@ -6,8 +6,8 @@ import (
 	"os"
 	"sync"
 
-	"github.com/skizzehq/skizze/datamodel"
-	"github.com/skizzehq/skizze/utils"
+	"datamodel"
+	"utils"
 )
 
 // SketchProxy ...

diff --git a/sketches/topk.go → src/sketches/topk.go b/sketches/topk.go → src/sketches/topk.go
@@ -5,7 +5,8 @@ import (
 	"encoding/gob"
 
 	"github.com/dgryski/go-topk"
-	"github.com/skizzehq/skizze/datamodel"
+
+	"datamodel"
 )
 
 const defaultRank = 100.0

diff --git a/main.go → src/skizze/main.go b/main.go → src/skizze/main.go
@@ -7,10 +7,10 @@ import (
 
 	_ "net/http/pprof"
 
-	"github.com/skizzehq/skizze/config"
-	"github.com/skizzehq/skizze/manager"
-	"github.com/skizzehq/skizze/server"
-	"github.com/skizzehq/skizze/utils"
+	"config"
+	"manager"
+	"server"
+	"utils"
 )
 
 var logger = utils.GetLogger()

diff --git a/storage/manager.go → src/storage/manager.go b/storage/manager.go → src/storage/manager.go
@@ -7,9 +7,10 @@ import (
 	"path/filepath"
 
 	"github.com/boltdb/bolt"
-	"github.com/skizzehq/skizze/config"
-	"github.com/skizzehq/skizze/datamodel"
-	"github.com/skizzehq/skizze/utils"
+
+	"config"
+	"datamodel"
+	"utils"
 )
 
 // Manager the storage should deal with 2 types of on disk files, info and data

diff --git a/storage/manager_test.go → src/storage/manager_test.go b/storage/manager_test.go → src/storage/manager_test.go
@@ -5,9 +5,9 @@ import (
 	"reflect"
 	"testing"
 
-	"github.com/skizzehq/skizze/config"
-	"github.com/skizzehq/skizze/datamodel"
-	"github.com/skizzehq/skizze/utils"
+	"config"
+	"datamodel"
+	"utils"
 )
 
 func TestSaveLoadInfo(t *testing.T) {

diff --git a/utils/log.go → src/utils/log.go b/utils/log.go → src/utils/log.go
diff --git a/utils/test_utils.go → src/utils/test_utils.go b/utils/test_utils.go → src/utils/test_utils.go
diff --git a/utils/utils.go → src/utils/utils.go b/utils/utils.go → src/utils/utils.go