updated Makefile, formatted files

Author: jucardi

Makefile

@@ -1,19 +1,24 @@
-GO_FMT     = gofmt -s -w -l .
+all: format vet deps test build
 
-vet:
-	@go vet ./...
+format:
+	@echo "formatting files..."
+	@go get golang.org/x/tools/cmd/goimports
+	@goimports -w -l .
+	@gofmt -s -w -l .
 
-check:
-	$(GO_FMT)
+vet:
+	@echo "vetting..."
 	@go vet ./...
 
-format:
-	$(GO_FMT)
+deps:
+	@echo "installing dependencies..."
+	@go get ./...
 
 test-deps:
 	@echo "installing test dependencies..."
-	@go get github.com/stretchr/testify/assert
 	@go get github.com/smartystreets/goconvey/convey
+	@go get gopkg.in/h2non/gock.v1
+	@go get github.com/stretchr/testify/assert
 	@go get github.com/axw/gocov/...
 	@go get github.com/AlekSi/gocov-xml
 	@go get gopkg.in/matm/v1/gocov-html
@@ -24,4 +29,8 @@ test: test-deps
 	@gocov test ./... -v > test-artifacts/gocov.json
 	@cat test-artifacts/gocov.json | gocov report
 	@cat test-artifacts/gocov.json | gocov-xml > test-artifacts/coverage/coverage.xml
-	@cat test-artifacts/gocov.json | gocov-html > test-artifacts/coverage/coverage.html
+	@cat test-artifacts/gocov.json | gocov-html > test-artifacts/coverage/coverage.html
+
+build: deps
+	@echo "building..."
+	@go build ./...

streams/stream_test.go

@@ -3,13 +3,14 @@ package streams
 import (
 	"bytes"
 	"encoding/json"
-	"github.com/stretchr/testify/assert"
 	"math/rand"
 	"reflect"
 	"strconv"
 	"strings"
 	"testing"
 	"time"
+
+	"github.com/stretchr/testify/assert"
 )
 
 var testArray = []string{"peach", "apple", "pear", "plum", "pineapple", "banana", "kiwi", "orange"}