close #164 detect github and bitbucket

Author: groenborg

ci/test/test.sh

@@ -1,19 +1,20 @@
 #!/bin/sh
 set -e -u -x
 
-#CREATE GO DIRECTORY STRUCTURE
-#THE STRUCTURE IS NECESSARY FOR GO TOOLS OTHERWISE 
-# 'build' AND 'get' WILL FAIL
-
-mkdir -p $GOPATH/src/github.com/praqma
-cp -R git-phlow/ $GOPATH/src/github.com/praqma
+#Set new GOPATH to current dir
+export GOPATH=$PWD
+export PATH=$PATH:$GOPATH/bin
 
 # RESOLVE DEPENDENCIES - TEST AND PRODUCTION
 cd $GOPATH/src/github.com/praqma/git-phlow
-go get -d -t -v ./...
+go get -t -d -v ./...
+
+#install ginkgo
+go install github.com/onsi/ginkgo/ginkgo
+
+
+# run tests
+go test -p 1 -v ./...
+
+
 
-#RUN WHOLE TEST SUITE IN VERBOSE MODE
-#THE P FLAG ENSURES TESTS WILL RUN SEQUENTIALLY
-#THEY WILL FAIL IN PARALLEL BECAUSE THE TESTFIXTURE CREATES CONFLICTING DIRECTORIES
-#HOWEVER THIS IS NOT RELATED TO THE RESULTS OF THE TESTS
-go test -v -p 1 ./...

ci/test/test.yml

@@ -4,9 +4,13 @@ platform: linux
 image_resource:
   type: docker-image
   source: {repository: golang, tag: "1.8"}
+  
+params:
+  coveralls: token   
 
 inputs:
 - name: git-phlow
+  path: src/github.com/praqma/git-phlow
 
 run:
-  path: git-phlow/ci/test/test.sh
+  path: src/github.com/praqma/git-phlow/ci/test/test.sh

cmd/auth.go

@@ -18,7 +18,7 @@ Auth will prompt you for a GitHub username and password to generate a token.
 Don't worry, the token does not include admininstrator rights, only access to manage issues for public repositories.
 `, ui.Format.Bold("auth")),
 	Run: func(cmd *cobra.Command, args []string) {
-		phlow.Auth()
+		phlow.AuthCaller()
 	},
 }
 

cmd/cmdperm/prerunperm.go

@@ -6,13 +6,15 @@ import (
 
 	"github.com/praqma/git-phlow/githandler"
 	"github.com/praqma/git-phlow/ui"
+	"github.com/praqma/git-phlow/platform"
 )
 
 //RequiredAuthentication ...
 //Validates if the user has logged in before running the command
 func RequiredAuthentication() {
-	token := githandler.ConfigGet("token", "phlow")
-	user := githandler.ConfigGet("user", "phlow")
+	conf := platform.DefaultConfiguration()
+	token := conf.Get(platform.PhlowToken)
+	user := conf.Get(platform.PhlowUser)
 
 	if token == "" || user == "" {
 		fmt.Printf("Please run %s to connect to github \n", ui.Format.Bold("auth"))

cmd/mkalias.go

@@ -3,9 +3,9 @@ package cmd
 import (
 	"fmt"
 
-	"github.com/praqma/git-phlow/phlow"
 	"github.com/praqma/git-phlow/ui"
 	"github.com/spf13/cobra"
+	"github.com/praqma/git-phlow/phlow"
 )
 
 // mkaliasCmd represents the mkalias command
@@ -18,7 +18,7 @@ This allows you to use 'git workon', rather than 'git phlow workon'.
 The aliases are added to your global .gitconfig file.
 `, ui.Format.Bold("mkalias")),
 	Run: func(cmd *cobra.Command, args []string) {
-		phlow.MkAlias()
+		phlow.MakeAliasCaller()
 	},
 }
 

executor/executor.go

@@ -20,15 +20,14 @@ func verboseOutput(argv ...string) {
 	fmt.Println()
 }
 
-
 //Commander ...
 //interface for os executions
 type Commander interface {
 	Run() error
 }
 
 //ExecuteCommander ...
-//Execute a function with control over stdout and stdin
+//Run a function with control over stdout and stdin
 func ExecuteCommander(c Commander) error {
 	err := c.Run()
 	if err != nil {
@@ -37,6 +36,34 @@ func ExecuteCommander(c Commander) error {
 	return nil
 }
 
+
+//Runner ...
+//Runner type for git executions
+type Runner func(command string, argv ...string) (string, error)
+
+//Run ...
+//implemented runner
+func Run(command string, argv ...string) (string, error) {
+	var stdOutBuffer, stdErrBuffer bytes.Buffer
+	exe := exec.Command(command, argv...)
+
+	if options.GlobalFlagVerbose {
+		verboseOutput(exe.Args...)
+	}
+
+	exe.Stderr = &stdErrBuffer
+	exe.Stdout = &stdOutBuffer
+
+	err := exe.Run()
+	if err != nil {
+		if out := stdOutBuffer.String(); stdErrBuffer.String() == "" {
+			return "", errors.New(out)
+		}
+		return "", errors.New(stdErrBuffer.String())
+	}
+	return stdOutBuffer.String(), nil
+}
+
 //ExecuteCommand ...
 //Executes a single command from strings
 func ExecuteCommand(command string, argv ...string) (string, error) {

githandler/config.go

@@ -1,13 +1,13 @@
 package githandler
 
 import (
-	"fmt"
 	"regexp"
 	"strings"
 
 	"github.com/praqma/git-phlow/executor"
 	"bytes"
 	"os/exec"
+	"fmt"
 )
 
 //CheckOut ...
@@ -21,9 +21,8 @@ func CheckoutNewBranchFromRemote(branch, defaultBranch string) error {
 	remote := ConfigBranchRemote(defaultBranch)
 	_, err := executor.ExecuteCommand("git", "checkout", "-b", branch, remote+"/"+defaultBranch)
 	return err
-}
-
 
+}
 
 //FormatPatch ...
 //dry runs patch to see if we can auto merge
@@ -137,3 +136,10 @@ func remoteURLExtractor(url string) *RemoteInfo {
 	//Clone from local repo
 	return &RemoteInfo{}
 }
+
+//ConfigBranchRemote ...
+func ConfigBranchRemote(branch string) string {
+	configArg := fmt.Sprintf("branch.%s.remote", branch)
+	output, _ := executor.ExecuteCommand("git", "config", configArg)
+	return strings.Replace(output, "\n", "", -1)
+}

githandler/git.go

@@ -1,6 +1,8 @@
 package main
 
-import "github.com/praqma/git-phlow/cmd"
+import (
+	"github.com/praqma/git-phlow/cmd"
+)
 
 func main() {
 	cmd.Execute()

main.go

@@ -14,9 +14,6 @@ var (
 	//GlobalFlagMine ...
 	GlobalFlagMine = false
 
-
-
-
 	//GlobalFlagVersion ...
 	GlobalFlagVersion = false
 
@@ -47,3 +44,15 @@ var (
 	//Date date of build
 	Date string
 )
+
+func init() {
+
+}
+
+func windows() {
+
+}
+
+func unix() {
+
+}