From eb4b80a4845a738f5a1e84504a31f6f54bc4fe92 Mon Sep 17 00:00:00 2001
From: Christopher Speller <crspeller@gmail.com>
Date: Thu, 17 Sep 2015 09:01:33 -0400
Subject: Adding gofmt to travis build

---
 Makefile                   | 18 ++++++++++++++++++
 api/auto_constants.go      |  4 ++--
 api/auto_teams.go          |  2 +-
 api/context.go             |  8 ++++----
 api/file.go                |  2 +-
 api/post.go                |  2 +-
 model/channel_count.go     |  2 +-
 store/sql_channel_store.go |  2 +-
 8 files changed, 29 insertions(+), 11 deletions(-)

diff --git a/Makefile b/Makefile
index cd82c27a3..972ebe960 100644
--- a/Makefile
+++ b/Makefile
@@ -39,6 +39,15 @@ travis:
 
 	@echo Checking for style guide compliance
 	cd web/react && $(ESLINT) --quiet components/* dispatcher/* pages/* stores/* utils/*
+	@echo Running gofmt
+	$(eval GOFMT_OUTPUT := $(shell gofmt -d -s api/ model/ store/ utils/ manualtesting/ mattermost.go 2>&1))
+	@echo "$(GOFMT_OUTPUT)"
+	@if [ ! "$(GOFMT_OUTPUT)" ]; then \
+		echo "gofmt sucess"; \
+	else \
+		echo "gofmt failure"; \
+		exit 1; \
+	fi
 
 	@$(GO) build $(GOFLAGS) ./...
 	@$(GO) install $(GOFLAGS) ./...
@@ -108,6 +117,15 @@ install:
 check: install
 	@echo Running ESLint...
 	-cd web/react && $(ESLINT) components/* dispatcher/* pages/* stores/* utils/*
+	@echo Running gofmt
+	$(eval GOFMT_OUTPUT := $(shell gofmt -d -s api/ model/ store/ utils/ manualtesting/ mattermost.go 2>&1))
+	@echo "$(GOFMT_OUTPUT)"
+	@if [[ ! "$(GOFMT_OUTPUT)" ]]; then \
+		echo "gofmt sucess"; \
+	else \
+		echo "gofmt failure"; \
+		exit 1; \
+	fi
 
 test: install
 	@mkdir -p logs
diff --git a/api/auto_constants.go b/api/auto_constants.go
index f80f15f2d..73ecb47f8 100644
--- a/api/auto_constants.go
+++ b/api/auto_constants.go
@@ -12,8 +12,8 @@ const (
 	USER_PASSWORD              = "passwd"
 	CHANNEL_TYPE               = model.CHANNEL_OPEN
 	FUZZ_USER_EMAIL_PREFIX_LEN = 10
-	BTEST_TEAM_DISPLAY_NAME            = "TestTeam"
-	BTEST_TEAM_NAME          = "z-z-testdomaina"
+	BTEST_TEAM_DISPLAY_NAME    = "TestTeam"
+	BTEST_TEAM_NAME            = "z-z-testdomaina"
 	BTEST_TEAM_EMAIL           = "test@nowhere.com"
 	BTEST_TEAM_TYPE            = model.TEAM_OPEN
 	BTEST_USER_NAME            = "Mr. Testing Tester"
diff --git a/api/auto_teams.go b/api/auto_teams.go
index e5c772b4c..dd82abe8d 100644
--- a/api/auto_teams.go
+++ b/api/auto_teams.go
@@ -52,7 +52,7 @@ func (cfg *AutoTeamCreator) createRandomTeam() (*model.Team, bool) {
 	}
 	team := &model.Team{
 		DisplayName: teamDisplayName,
-		Name:       teamName,
+		Name:        teamName,
 		Email:       teamEmail,
 		Type:        model.TEAM_OPEN,
 	}
diff --git a/api/context.go b/api/context.go
index b1b4d2d10..5925c817f 100644
--- a/api/context.go
+++ b/api/context.go
@@ -439,10 +439,10 @@ func IsBetaDomain(r *http.Request) bool {
 }
 
 var privateIpAddress = []*net.IPNet{
-	&net.IPNet{IP: net.IPv4(10, 0, 0, 1), Mask: net.IPv4Mask(255, 0, 0, 0)},
-	&net.IPNet{IP: net.IPv4(176, 16, 0, 1), Mask: net.IPv4Mask(255, 255, 0, 0)},
-	&net.IPNet{IP: net.IPv4(192, 168, 0, 1), Mask: net.IPv4Mask(255, 255, 255, 0)},
-	&net.IPNet{IP: net.IPv4(127, 0, 0, 1), Mask: net.IPv4Mask(255, 255, 255, 252)},
+	{IP: net.IPv4(10, 0, 0, 1), Mask: net.IPv4Mask(255, 0, 0, 0)},
+	{IP: net.IPv4(176, 16, 0, 1), Mask: net.IPv4Mask(255, 255, 0, 0)},
+	{IP: net.IPv4(192, 168, 0, 1), Mask: net.IPv4Mask(255, 255, 255, 0)},
+	{IP: net.IPv4(127, 0, 0, 1), Mask: net.IPv4Mask(255, 255, 255, 252)},
 }
 
 func IsPrivateIpAddress(ipAddress string) bool {
diff --git a/api/file.go b/api/file.go
index 692558acf..c24775ee2 100644
--- a/api/file.go
+++ b/api/file.go
@@ -86,7 +86,7 @@ func uploadFile(c *Context, w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	for i, _ := range files {
+	for i := range files {
 		file, err := files[i].Open()
 		defer file.Close()
 		if err != nil {
diff --git a/api/post.go b/api/post.go
index 005f3f884..21bc35b97 100644
--- a/api/post.go
+++ b/api/post.go
@@ -353,7 +353,7 @@ func fireAndForgetNotifications(post *model.Post, teamId, siteURL string) {
 					}
 				}
 
-				for id, _ := range toEmailMap {
+				for id := range toEmailMap {
 					fireAndForgetMentionUpdate(post.ChannelId, id)
 				}
 			}
diff --git a/model/channel_count.go b/model/channel_count.go
index d5daba14e..19d6ac150 100644
--- a/model/channel_count.go
+++ b/model/channel_count.go
@@ -20,7 +20,7 @@ type ChannelCounts struct {
 func (o *ChannelCounts) Etag() string {
 
 	ids := []string{}
-	for id, _ := range o.Counts {
+	for id := range o.Counts {
 		ids = append(ids, id)
 	}
 	sort.Strings(ids)
diff --git a/store/sql_channel_store.go b/store/sql_channel_store.go
index b58166fd6..3d1007874 100644
--- a/store/sql_channel_store.go
+++ b/store/sql_channel_store.go
@@ -440,7 +440,7 @@ func (s SqlChannelStore) GetExtraMembers(channelId string, limit int) StoreChann
 		if err != nil {
 			result.Err = model.NewAppError("SqlChannelStore.GetExtraMembers", "We couldn't get the extra info for channel members", "channel_id="+channelId+", "+err.Error())
 		} else {
-			for i, _ := range members {
+			for i := range members {
 				members[i].Sanitize(utils.SanitizeOptions)
 			}
 			result.Data = members
-- 
cgit v1.2.3-1-g7c22