Merge branch 'development'

.gitignore

@@ -16,6 +16,7 @@ cpthook.yml
 .idea/
 *.crt
 vendor/
+.vendor-new/
 
 # Binarys
 CptHook

.goreleaser.yml

@@ -15,6 +15,9 @@ archive:
   replacements:
     linux: Linux
     amd64: x86_64
+  files:
+    - LICENSE
+    - cpthook.yml.example
 
 checksum:
   name_template: 'checksums.txt'

.travis.yml

@@ -17,7 +17,7 @@ before_install:
 
 script:
   - cp cpthook.yml.example cpthook.yml
-  - go test
+  - go test ./...
   - CGO_ENABLED="0" GOARCH="amd64" GOOS="linux" go build -a -installsuffix cgo -o CptHook
   - docker build -f Dockerfile -t $IMAGE .
 
@@ -28,6 +28,13 @@ deploy:
     script: bash scripts/deploy.sh stable
     on:
       branch: master
+# Build tagged Docker container
+  - provider: script
+    skip_cleanup: true
+    script: bash scripts/deploy.sh $TRAVIS_TAG
+    on:
+      tags: true
+      branch: master
 # Build development Docker container
   - provider: script
     skip_cleanup: true
@@ -43,13 +50,4 @@ deploy:
       condition: $TRAVIS_OS_NAME = linux
 
 notifications:
-  webhooks:
-    urls:
-      - http://webhooks.rainbownerds.de:12345
-    on_success: always # default: always
-    on_failure: always # default: always
-    on_start: always   # default: never
-    on_cancel: always # default: always
-    on_error: always # default: always
-
   email: false

Dockerfile

@@ -2,7 +2,6 @@ FROM alpine
 LABEL maintainer mail@fleaz.me
 
 RUN apk add --no-cache ca-certificates
-COPY templates/ /templates
 COPY CptHook /
 EXPOSE 8086
 CMD ["/CptHook"]

cpthook.yml.example

@@ -1,6 +1,9 @@
 http:
     listen: ":8086"
 
+logging:
+    level: "INFO"
+
 irc:
     host: "irc.hackint.eu"
     port: 6667

gitlab.go → input/gitlab.go

@@ -1,19 +1,21 @@
-package main
+package input
 
 import (
 	"bytes"
 	"encoding/json"
 	"fmt"
-	"log"
 	"net/http"
 	"strings"
 	"text/template"
 
+	log "github.com/sirupsen/logrus"
+
 	"github.com/spf13/viper"
 )
 
 type GitlabModule struct {
 	channelMapping mapping
+	channel        chan IRCMessage
 }
 
 type mapping struct {
@@ -31,6 +33,14 @@ func contains(mapping map[string][]string, entry string) bool {
 	return false
 }
 
+func (m *GitlabModule) Init(c *viper.Viper, channel *chan IRCMessage) {
+	err := c.Unmarshal(&m.channelMapping)
+	if err != nil {
+		log.Fatal("Failed to unmarshal channelmapping into struct")
+	}
+	m.channel = *channel
+}
+
 func (m GitlabModule) sendMessage(message string, projectName string, namespace string) {
 	var channelNames []string
 	var fullProjectName = namespace + "/" + projectName
@@ -51,19 +61,12 @@ func (m GitlabModule) sendMessage(message string, projectName string, namespace
 		var event IRCMessage
 		event.Messages = append(event.Messages, message)
 		event.Channel = channelName
-		messageChannel <- event
+		m.channel <- event
 	}
 
 }
 
-func (m *GitlabModule) init(c *viper.Viper) {
-	err := c.Unmarshal(&m.channelMapping)
-	if err != nil {
-		log.Fatal("Failed to unmarshal channelmapping into struct")
-	}
-}
-
-func (m GitlabModule) getChannelList() []string {
+func (m GitlabModule) GetChannelList() []string {
 	var all []string
 
 	for _, v := range m.channelMapping.ExplicitMappings {
@@ -81,11 +84,11 @@ func (m GitlabModule) getChannelList() []string {
 	return all
 }
 
-func (m GitlabModule) getEndpoint() string {
+func (m GitlabModule) GetEndpoint() string {
 	return "/gitlab"
 }
 
-func (m GitlabModule) getHandler() http.HandlerFunc {
+func (m GitlabModule) GetHandler() http.HandlerFunc {
 
 	const pushCompareString = "[\x0312{{ .Project.Name }}\x03] {{ .UserName }} pushed {{ .TotalCommits }} commits to \x0305{{ .Branch }}\x03 {{ .Project.WebURL }}/compare/{{ .BeforeCommit }}...{{ .AfterCommit }}"
 	const pushCommitLogString = "[\x0312{{ .Project.Name }}\x03] {{ .UserName }} pushed {{ .TotalCommits }} commits to \x0305{{ .Branch }}\x03 {{ .Project.WebURL }}/commits/{{ .Branch }}"
@@ -167,6 +170,7 @@ func (m GitlabModule) getHandler() http.HandlerFunc {
 	}
 
 	return func(wr http.ResponseWriter, req *http.Request) {
+		log.Debug("Got a request for the GitlabModule")
 		defer req.Body.Close()
 		decoder := json.NewDecoder(req.Body)
 

gitlab_test.go → input/gitlab_test.go

@@ -1,27 +1,27 @@
-package main
+package input
 
 import (
-	"fmt"
 	"net/http"
 	"net/http/httptest"
 	"os"
 	"testing"
 
+	log "github.com/sirupsen/logrus"
+
 	"github.com/spf13/viper"
 )
 
 func TestGitlabHandler(t *testing.T) {
 	viper.SetConfigName("cpthook")
-	viper.AddConfigPath(".")
+	viper.AddConfigPath("../")
 	err := viper.ReadInConfig()
 	if err != nil {
-		panic(fmt.Errorf("Fatal error config file: %s", err))
+		log.Panic(err)
 	}
 
-	file, e := os.Open("./tests/gitlab.json")
+	file, e := os.Open("./test_data/gitlab.json")
 	if e != nil {
-		fmt.Printf("File error: %v\n", e)
-		os.Exit(1)
+		log.Fatal(e)
 	}
 
 	req, err := http.NewRequest("POST", "/", file)
@@ -33,8 +33,9 @@ func TestGitlabHandler(t *testing.T) {
 
 	rr := httptest.NewRecorder()
 	var gitlabModule Module = &GitlabModule{}
-	gitlabModule.init(viper.Sub("modules.gitlab"))
-	handler := http.HandlerFunc(gitlabModule.getHandler())
+	c := make(chan IRCMessage, 10)
+	gitlabModule.Init(viper.Sub("modules.gitlab"), &c)
+	handler := http.HandlerFunc(gitlabModule.GetHandler())
 
 	handler.ServeHTTP(rr, req)
 

input/helper.go

@@ -0,0 +1,21 @@
+package input
+
+import (
+	"net/http"
+
+	"github.com/spf13/viper"
+)
+
+// Module defines a common interface for all CptHook modules
+type Module interface {
+	Init(c *viper.Viper, channel *chan IRCMessage)
+	GetChannelList() []string
+	GetEndpoint() string
+	GetHandler() http.HandlerFunc
+}
+
+// IRCMessage are send over the inputChannel from the different modules
+type IRCMessage struct {
+	Messages []string
+	Channel  string
+}