temp checkin

Author: Dean Karn

.travis.yml

@@ -16,25 +16,20 @@ before_install:
   - go get -u github.com/go-playground/overalls
   - go get -u github.com/mattn/goveralls
   - go get -u golang.org/x/tools/cmd/cover
-  - go get -u github.com/golang/lint/golint
-  - go get -u github.com/gordonklaus/ineffassign
   - mkdir -p $GOPATH/src/gopkg.in
   - ln -s $GOPATH/src/github.com/$TRAVIS_REPO_SLUG $GOPATH/src/gopkg.in/webhooks.v2
   - ln -s $GOPATH/src/github.com/$TRAVIS_REPO_SLUG $GOPATH/src/gopkg.in/webhooks.v3
   - ln -s $GOPATH/src/github.com/$TRAVIS_REPO_SLUG $GOPATH/src/gopkg.in/webhooks.v4
   - ln -s $GOPATH/src/github.com/$TRAVIS_REPO_SLUG $GOPATH/src/gopkg.in/webhooks.v5
 
 before_script:
-  - go vet ./...
+  - go get -t ./...
 
 script:
- - gofmt -d -s .
- - golint ./...
- - ineffassign ./
- - go test -v ./...
- - go test -race
+ - make lint
+ - make test
 
 after_success: |
   [ $TRAVIS_GO_VERSION = 1.10.3 ] &&
-  overalls -project="github.com/go-playground/webhooks" -covermode=count -ignore=.git,examples -debug &&
+  overalls -project="github.com/go-playground/webhooks" -covermode=count -ignore=.git,_examples,testdata -debug &&
   goveralls -coverprofile=overalls.coverprofile -service travis-ci -repotoken $COVERALLS_TOKEN

Makefile

@@ -0,0 +1,17 @@
+GOCMD=go
+
+linters-install:
+	@gometalinter --version >/dev/null 2>&1 || { \
+		echo "installing linting tools..."; \
+		$(GOCMD) get github.com/alecthomas/gometalinter; \
+		gometalinter --install; \
+	}
+
+lint: linters-install
+	@gofmt -l . >gofmt.test 2>&1 && if [ -s gofmt.test ]; then echo "Fix formatting using 'gofmt -s -w .' for:"; cat gofmt.test; exit 1; fi && rm gofmt.test
+	gometalinter --vendor --disable-all --enable=vet --enable=vetshadow --enable=golint --enable=maligned --enable=megacheck --enable=ineffassign --enable=misspell --enable=errcheck --enable=goconst ./...
+
+test:
+	$(GOCMD) test -cover -race ./...
+
+.PHONY: test lint linters-install

examples/custom-logger/main.go renamed to _examples/custom-logger/main.go

@@ -9,14 +9,14 @@ import (
 	"net/http"
 )
 
-// parse errros
+// parse errors
 var (
-	ErrEventNotSpecifiedToParse = errors.New("No Event specified to parse")
-	ErrInvalidHTTPMethod        = errors.New("Invalid HTTP Method")
-	ErrMissingHookUUIDHeader    = errors.New("Missing X-Hook-UUID Header")
-	ErrMissingEventKeyHeader    = errors.New("Missing X-Event-Key Header")
-	ErrEventNotFound            = errors.New("Event not defined to be parsed")
-	ErrParsingPayload           = errors.New("Error parsing payload")
+	ErrEventNotSpecifiedToParse = errors.New("no Event specified to parse")
+	ErrInvalidHTTPMethod        = errors.New("invalid HTTP Method")
+	ErrMissingHookUUIDHeader    = errors.New("missing X-Hook-UUID Header")
+	ErrMissingEventKeyHeader    = errors.New("missing X-Event-Key Header")
+	ErrEventNotFound            = errors.New("event not defined to be parsed")
+	ErrParsingPayload           = errors.New("error parsing payload")
 	ErrUUIDVerificationFailed   = errors.New("UUID verification failed")
 )
 
@@ -96,15 +96,16 @@ func (hook Webhook) Parse(r *http.Request, events ...Event) (interface{}, error)
 	if uuid == "" {
 		return nil, ErrMissingHookUUIDHeader
 	}
-	if len(hook.uuid) > 0 && uuid != hook.uuid {
-		return nil, ErrUUIDVerificationFailed
-	}
 
 	event := r.Header.Get("X-Event-Key")
 	if event == "" {
 		return nil, ErrMissingEventKeyHeader
 	}
 
+	if len(hook.uuid) > 0 && uuid != hook.uuid {
+		return nil, ErrUUIDVerificationFailed
+	}
+
 	bitbucketEvent := Event(event)
 
 	var found bool