support bitbucket && removed the Byte Order Mark (BOM).

UTF-8 text string with a Byte Order Mark (BOM). The BOM identifies that
the text is UTF-8 encoded, but it should be removed before decoding.

Author: Xinguang Wang

.gitignore

@@ -0,0 +1,4 @@
+
+.ash_history
+
+webhook

Dockerfile

@@ -1,6 +1,7 @@
-FROM docker:1.11.2-git
+FROM docker:1.13.0-git
 
-ADD https://github.com/starboychina/webhook/releases/download/0.1.0/webhook /usr/bin/webhook
+#ADD https://github.com/starboychina/webhook/releases/download/0.1.0/webhook /usr/bin/webhook
+COPY webhook /usr/bin/webhook
 RUN chmod +x /usr/bin/webhook
 
 ENTRYPOINT ["/usr/bin/webhook", "--config", "/config.json"]

README.md

@@ -6,24 +6,29 @@ webhook
 
 ## What is `webhook`?
 
-`webhook` is a little webserver written in go. He waits for webhook calls by github (or gogs) to run little shell commands.
+`webhook` is a little webserver written in go. He waits for webhook calls by github (or bitbucket, gogs) to run little shell commands.
 
 ## How to use
 
 Just edit the config.json to your needs. A short example:
-You want to track the status of your Repository URL and the branch master. If there is an update to this branch you want to execute your shell script "niftyscript.sh".
+You want to track the status of your Repository URL and the branch master. If there is an update to this branch you want to execute your shell script.
 
 ```json
 {
     "Hooks":[
         {
-          "Repo":"username/repo",
-          "Branch":"master",
-          "Shell":"niftyscript.sh"
+          "Repo":"Repo URL",
+          "Branch":"development",
+          "Shell":"cd /var/ && git pull && make && make install"
+        },
+        {
+          "Repo":"Repo URL",
+          "Branch":"staging",
+          "Shell":"docker restart app-node"
         },
         {
           "Repo":"Repo URL",
-          "Branch":"master",
+          "Branch":"production",
           "Shell":"script.sh"
         }
     ]
@@ -37,7 +42,7 @@ Now start the server with
 ```
 
 and add a git-webhook for your.domain.com:9000/github. Everytime you push to master, your script gets executed.
-or add your.domain.com:9000/gogs. for gogs Repository.
+or add your.domain.com:9000/bitbucket. for bitbucket Repository, add your.domain.com:9000/gogs. for gogs Repository.
 
 ## Using Docker
 

bitbucket.go

@@ -0,0 +1,52 @@
+package main
+
+import (
+	"fmt"
+	"strings"
+)
+
+type bitbucketPayload struct {
+	// Push
+	Push bitbucketPush `json:"push"`
+	// Repository
+	Repository bitbucketRepository `json:"repository"`
+}
+
+// Push is the common Bitbucket Push Sub Entity
+type bitbucketPush struct {
+	Changes []bitbucketChange `json:"changes"`
+}
+
+// Change is the common Bitbucket Change Sub Entity
+type bitbucketChange struct {
+	New bitbucketChangeData `json:"new"`
+}
+
+// ChangeData is the common Bitbucket ChangeData Sub Entity
+type bitbucketChangeData struct {
+	Name string `json:"name"`
+}
+
+// Repository is the common Bitbucket Repository Entity
+type bitbucketRepository struct {
+	Links bitbucketLinks `json:"links"`
+}
+
+// Links is the common Bitbucket Links Sub Entity
+type bitbucketLinks struct {
+	HTML bitbucketHTML `json:"html"`
+}
+
+// HTML is the common Bitbucket HTML Sub Entity
+type bitbucketHTML struct {
+	HREF string `json:"href"`
+}
+
+func init() {
+	var payload bitbucketPayload
+	route("/bitbucket", &payload, func(hook Hook) bool {
+		fmt.Println(payload.Push.Changes[0].New.Name)
+		return strings.TrimRight(hook.Repo, "/") == payload.Repository.Links.HTML.HREF &&
+			payload.Push.Changes[0].New.Name == hook.Branch
+	})
+}

build.sh

@@ -2,7 +2,16 @@
 
 # go run cert/generate_cert.go --host blog.kansea.com --org blog.kansea.com
 
-GOOS=linux GOARCH=amd64 go build -o webhook
+# GOOS=linux GOARCH=amd64 go build -o webhook
 
-docker rmi starboychina/webhook 
-docker build -t starboychina/webhook .
+rm webhook
+docker run -it --rm -v $(pwd):/root golang:alpine sh -c '
+  apk add --update git
+  go get github.com/starboychina/webhook
+  cd /go/src/github.com/starboychina/webhook
+  go build -o /root/webhook
+'
+
+docker rmi starboychina/webhook
+docker build -t starboychina/webhook:1.13.0 .
+docker build -t starboychina .

config.json

@@ -3,12 +3,17 @@
         {
             "Repo":"https://github.com/starboychina/webhook",
             "Branch":"master",
-            "Shell":"build.sh"
+            "Shell":"cd /var/ && git pull && make && make install"
         },
         {
             "Repo":"https://try.gogs.io/starboychina/webhook",
             "Branch":"dev",
             "Shell":"date"
+        },
+        {
+            "Repo":"https://bitbucket.org/starboychina/hook",
+            "Branch":"master",
+            "Shell":"date"
         }
     ]
 }

github.go

@@ -1,10 +1,6 @@
 package main
 
 import (
-	"encoding/json"
-	"fmt"
-	"log"
-	"net/http"
 	"strings"
 )
 
@@ -18,28 +14,9 @@ type githubPayload struct {
 }
 
 func init() {
-
-	http.HandleFunc("/github", githubHandle)
-
-}
-
-func githubHandle(w http.ResponseWriter, req *http.Request) {
-	fmt.Fprintf(w, "")
-	defer req.Body.Close()
-	decoder := json.NewDecoder(req.Body)
-
 	var payload githubPayload
-	err := decoder.Decode(&payload)
-	if err != nil {
-		log.Printf("payload json decode failed: %s\n", err)
-		return
-	}
-
-	for _, hook := range config.Hooks {
-		if strings.TrimRight(hook.Repo, "/") == payload.Repo.URL && strings.Contains(payload.Ref, hook.Branch) {
-			fmt.Println(hook.Repo)
-			executeShell(hook.Shell)
-		}
-	}
-
+	route("/github", &payload, func(hook Hook) bool {
+		return strings.TrimRight(hook.Repo, "/") == payload.Repo.URL &&
+			payload.Ref == "refs/heads/"+hook.Branch
+	})
 }

gogs.go

@@ -1,10 +1,6 @@
 package main
 
 import (
-	"encoding/json"
-	"fmt"
-	"log"
-	"net/http"
 	"strings"
 )
 
@@ -18,28 +14,9 @@ type gogsPayload struct {
 }
 
 func init() {
-
-	http.HandleFunc("/gogs", gogsHandle)
-
-}
-
-func gogsHandle(w http.ResponseWriter, req *http.Request) {
-	fmt.Fprintf(w, "")
-	defer req.Body.Close()
-	decoder := json.NewDecoder(req.Body)
-
 	var payload gogsPayload
-	err := decoder.Decode(&payload)
-	if err != nil {
-		log.Printf("payload json decode failed: %s\n", err)
-		return
-	}
-
-	for _, hook := range config.Hooks {
-		if strings.TrimRight(hook.Repo, "/") == payload.Repo.URL && strings.Contains(payload.Ref, hook.Branch) {
-			fmt.Println(hook.Repo)
-			executeShell(hook.Shell)
-		}
-	}
-
+	route("/gogs", &payload, func(hook Hook) bool {
+		return strings.TrimRight(hook.Repo, "/") == payload.Repo.URL &&
+			payload.Ref == "refs/heads/"+hook.Branch
+	})
 }

httpHandle.go

@@ -0,0 +1,41 @@
+package main
+
+import (
+	"fmt"
+	"log"
+	"net/http"
+)
+
+func route(pattern string,
+	payload interface{},
+	handler func(Hook) bool) {
+
+	log.Printf(pattern)
+	http.HandleFunc(pattern, func(w http.ResponseWriter, req *http.Request) {
+		defer req.Body.Close()
+
+		err := unmarshal(req.Body, &payload)
+		if err != nil {
+			fmt.Fprintf(w, something)
+			return
+		}
+
+		loadConfig()
+
+		msg := ""
+		for _, hook := range config.Hooks {
+			if handler(hook) {
+				msg = fmt.Sprintf(executed, hook.Repo, hook.Branch)
+				logger.Printf("success: %s\n", msg)
+				msg += "`" + hook.Shell + "`"
+				executeShell(hook.Shell)
+			}
+		}
+
+		if len(msg) < 1 {
+			logger.Printf(nothingToDo)
+			msg = nothingToDo
+		}
+		fmt.Fprintf(w, msg)
+	})
+}

json.go

@@ -0,0 +1,25 @@
+package main
+
+import (
+	"bytes"
+	"encoding/json"
+	"io"
+	"io/ioutil"
+)
+
+func unmarshal(body io.Reader, v interface{}) error {
+	bodyBytes, err := ioutil.ReadAll(body)
+
+	if err != nil {
+		logger.Printf("error[ioutil.ReadAll]: %s\n", err)
+		return err
+	}
+	bodyBytes = bytes.TrimPrefix(bodyBytes, []byte("\xef\xbb\xbf"))
+	err = json.Unmarshal(bodyBytes, &v)
+
+	if err != nil {
+		logger.Printf("error[json.Unmarshal]: %s\n", err)
+		return err
+	}
+	return nil
+}