Merge pull request #494 from raintank/force-gofmt-simplified

fail build if code is not formatted and simplified

circle.yml

@@ -25,6 +25,7 @@ test:
   override:
     - cd $IMPORTPATH && go test -v -race $(go list ./... | grep -v /vendor/)
     - cd $IMPORTPATH && go vet $(go list ./... | grep -v /vendor/)
+    - cd $IMPORTPATH && scripts/gofmt-check.sh
     - cd $IMPORTPATH && scripts/end2end_test.sh
     - cd $IMPORTPATH && go test -v -run='^$' -bench=. $(go list ./... | grep -v /vendor/)
   post:

cluster/cluster.go

@@ -32,7 +32,7 @@ var (
 func Init(name, version string, started time.Time, apiScheme string, apiPort int) {
 	Manager = &ClusterManager{
 		members: map[string]Node{
-			name: Node{
+			name: {
 				Name:          name,
 				ApiPort:       apiPort,
 				ApiScheme:     apiScheme,

cluster/cluster_test.go

@@ -21,19 +21,19 @@ func TestPeersForQuery(t *testing.T) {
 	Mode = ModeMulti
 	Manager.members = map[string]Node{
 		thisNode.Name: thisNode,
-		"node2": Node{
+		"node2": {
 			Name:       "node2",
 			Primary:    true,
 			Partitions: []int32{1, 2},
 			State:      NodeReady,
 		},
-		"node3": Node{
+		"node3": {
 			Name:       "node3",
 			Primary:    true,
 			Partitions: []int32{3, 4},
 			State:      NodeReady,
 		},
-		"node4": Node{
+		"node4": {
 			Name:       "node4",
 			Primary:    true,
 			Partitions: []int32{3, 4},

kafka/partitions.go

@@ -24,7 +24,7 @@ Iter:
 func GetPartitions(client sarama.Client, topics []string) ([]int32, error) {
 	partitionCount := 0
 	partitions := make([]int32, 0)
-    var err error
+	var err error
 	for i, topic := range topics {
 		partitions, err = client.Partitions(topic)
 		if err != nil {

scripts/gofmt-check.sh

@@ -0,0 +1,9 @@
+#!/bin/bash
+out=$(gofmt -d -s $(find . -name '*.go' | grep -v vendor | grep -v _gen.go))
+if [ "$out" != "" ]; then
+	echo "$out"
+	echo
+	echo "You might want to run something like 'find . -name '*.go' | xargs gofmt -w -s'"
+	exit 2
+fi
+exit 0