Pull feature/tobias/github-provider in develop

gitprovider/github_adapter.go

@@ -0,0 +1,91 @@
+package gitprovider
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+	"log"
+	"net/http"
+
+	"github.com/meinto/glow"
+	"github.com/pkg/errors"
+)
+
+type githubAdapter struct {
+	clientID     string
+	clientSecret string
+	service
+}
+
+func (a *githubAdapter) Close(b glow.Branch) error {
+	if b.CanBeClosed() {
+		branchList, err := a.gitService.BranchList()
+		if err != nil {
+			return errors.Wrap(err, "error getting branch list")
+		}
+		targets := b.CloseBranches(branchList)
+
+		for _, t := range targets {
+			err := a.createPullRequest(b, t)
+			if err != nil {
+				return errors.Wrap(err, "error creating pull request")
+			}
+		}
+		return nil
+	}
+	return errors.New("cannot be closed")
+}
+
+func (a *githubAdapter) Publish(b glow.Branch) error {
+	if b.CanBePublished() {
+		t := b.PublishBranch()
+		return a.createPullRequest(b, t)
+	}
+	return errors.New("cannot be published")
+}
+
+func (a *githubAdapter) createPullRequest(source glow.Branch, target glow.Branch) error {
+	type Payload struct {
+		Head                string `json:"head"`
+		Base                string `json:"base"`
+		Title               string `json:"title"`
+		MaintainerCanModify bool   `json:"maintainer_can_modify"`
+	}
+
+	data := Payload{
+		Head:                source.ShortBranchName(),
+		Base:                target.ShortBranchName(),
+		Title:               fmt.Sprintf("Pull %s in %s", source.ShortBranchName(), target.ShortBranchName()),
+		MaintainerCanModify: true,
+	}
+	payloadBytes, err := json.Marshal(data)
+	if err != nil {
+		return errors.Wrap(err, "marshal json")
+	}
+
+	body := bytes.NewReader(payloadBytes)
+
+	requestURI := fmt.Sprintf(
+		"%s/repos/%s/%s/pulls?client_id=%s&client_secret=%s",
+		a.endpoint,
+		a.namespace,
+		a.project,
+		a.clientID,
+		a.clientSecret,
+	)
+	req, err := http.NewRequest("POST", requestURI, body)
+	if err != nil {
+		return errors.Wrap(err, "prepare request")
+	}
+
+	req.Header.Set("Content-Type", "application/json")
+
+	resp, err := http.DefaultClient.Do(req)
+	if err != nil {
+		return errors.Wrap(err, "do request")
+	}
+	defer resp.Body.Close()
+
+	log.Printf("created pull request of %s into %s", source.ShortBranchName(), target.ShortBranchName())
+	return nil
+}

githost/gitlab_adapter.go → gitprovider/gitlab_adapter.go

@@ -12,6 +12,7 @@ import (
 )
 
 type gitlabAdapter struct {
+	token string
 	service
 }
 

githost/service.go → gitprovider/service.go

@@ -20,7 +20,6 @@ type service struct {
 	endpoint   string
 	namespace  string
 	project    string
-	token      string
 	gitService git.Service
 }
 
@@ -32,11 +31,30 @@ func NewGitlabService(endpoint, namespace, project, token string) Service {
 	g = git.NewLoggingService(logger, g)
 
 	return &gitlabAdapter{
+		token,
+		service{
+			endpoint,
+			namespace,
+			project,
+			g,
+		},
+	}
+}
+
+func NewGithubService(endpoint, namespace, project, clientID, clientSecret string) Service {
+	logger := log.NewLogfmtLogger(log.NewSyncWriter(os.Stderr))
+	logger = log.With(logger, "ts", log.DefaultTimestampUTC)
+
+	g := git.NewGoGitService()
+	g = git.NewLoggingService(logger, g)
+
+	return &githubAdapter{
+		clientID,
+		clientSecret,
 		service{
 			endpoint,
 			namespace,
 			project,
-			token,
 			g,
 		},
 	}

pkg/cli/cmd/close.go

@@ -1,11 +1,8 @@
 package cmd
 
 import (
-	"github.com/meinto/glow/gitprovider"
-
 	"github.com/meinto/glow/pkg/cli/cmd/util"
 	"github.com/spf13/cobra"
-	"github.com/spf13/viper"
 )
 
 func init() {
@@ -27,15 +24,10 @@ var finishCmd = &cobra.Command{
 		currentBranch, err := g.CurrentBranch()
 		util.CheckForError(err, "CurrentBranch")
 
-		gh := gitprovider.NewGitlabService(
-			viper.GetString("gitProviderDomain"),
-			viper.GetString("projectNamespace"),
-			viper.GetString("projectName"),
-			viper.GetString("gitlabCIToken"),
-		)
-		gh = gitprovider.NewLoggingService(logger, gh)
+		gp, err := util.GetGitProvider()
+		util.CheckForError(err, "GetGitProvider")
 
-		gh.Close(currentBranch)
+		gp.Close(currentBranch)
 		util.CheckForError(err, "Close")
 	},
 }

pkg/cli/cmd/publish.go

@@ -1,10 +1,8 @@
 package cmd
 
 import (
-	"github.com/meinto/glow/gitprovider"
 	"github.com/meinto/glow/pkg/cli/cmd/util"
 	"github.com/spf13/cobra"
-	"github.com/spf13/viper"
 )
 
 func init() {
@@ -26,15 +24,10 @@ var publishCmd = &cobra.Command{
 		currentBranch, err := g.CurrentBranch()
 		util.CheckForError(err, "CurrentBranch")
 
-		gh := gitprovider.NewGitlabService(
-			viper.GetString("gitProviderDomain"),
-			viper.GetString("projectNamespace"),
-			viper.GetString("projectName"),
-			viper.GetString("gitlabCIToken"),
-		)
-		gh = gitprovider.NewLoggingService(logger, gh)
+		gp, err := util.GetGitProvider()
+		util.CheckForError(err, "GetGitProvider")
 
-		gh.Publish(currentBranch)
+		gp.Publish(currentBranch)
 		util.CheckForError(err, "Close")
 	},
 }

pkg/cli/cmd/util/common.go

@@ -1,9 +1,12 @@
 package util
 
 import (
+	"errors"
 	"log"
 	"os"
 
+	"github.com/meinto/glow/gitprovider"
+
 	kitlog "github.com/go-kit/kit/log"
 	"github.com/meinto/glow/git"
 	"github.com/spf13/viper"
@@ -29,3 +32,32 @@ func GetGitClient() (git.Service, error) {
 	s = git.NewLoggingService(logger, s)
 	return s, nil
 }
+
+func GetGitProvider() (gitprovider.Service, error) {
+	var s gitprovider.Service
+	switch viper.GetString("gitProvider") {
+	case "github":
+		s = gitprovider.NewGithubService(
+			viper.GetString("gitProviderDomain"),
+			viper.GetString("projectNamespace"),
+			viper.GetString("projectName"),
+			viper.GetString("clientId"),
+			viper.GetString("clientSecret"),
+		)
+		break
+	case "gitlab":
+		s = gitprovider.NewGitlabService(
+			viper.GetString("gitProviderDomain"),
+			viper.GetString("projectNamespace"),
+			viper.GetString("projectName"),
+			viper.GetString("gitlabCIToken"),
+		)
+		break
+	default:
+		return nil, errors.New("git provider not specified")
+	}
+	logger := kitlog.NewLogfmtLogger(kitlog.NewSyncWriter(os.Stderr))
+	logger = kitlog.With(logger, "ts", kitlog.DefaultTimestampUTC)
+	s = gitprovider.NewLoggingService(logger, s)
+	return s, nil
+}