close #183 phlow configuration

Author: groenborg

.phlow

@@ -0,0 +1,16 @@
+[default]
+    integration_branch = master
+    remote = origin
+    service = github
+    delivery_branch_prefix = ready
+[jira]
+    integration_branch = gh_pages
+    remote = fork
+    service = jira
+    delivery_branch_prefix = integrateme
+
+[gitlab]
+    integration_branch = gh_pages
+    remote = fork
+    service = jira
+    delivery_branch_prefix = integrateme

ci/pipeline.yml

@@ -55,6 +55,7 @@ jobs:
 - name: darwin-pilot-check
   plan:
     - get: gp-version
+      passed: [heating-engines, deploying-flaps]
     - get: git-phlow 
       passed: [heating-engines, deploying-flaps]
       trigger: true
@@ -66,6 +67,7 @@ jobs:
 - name: linux-pilot-check
   plan:
     - get: gp-version
+      passed: [heating-engines, deploying-flaps]
     - get: git-phlow 
       passed: [heating-engines, deploying-flaps]
       trigger: true
@@ -77,6 +79,7 @@ jobs:
 - name: windows-pilot-check
   plan:
     - get: gp-version
+      passed: [heating-engines, deploying-flaps]
     - get: git-phlow 
       passed: [heating-engines, deploying-flaps]
       trigger: true

cmd/cmdperm/prerunperm.go

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

main.go

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

phlow/auth.go

@@ -10,22 +10,22 @@ import (
 	"golang.org/x/crypto/ssh/terminal"
 	"io"
 	"github.com/praqma/git-phlow/plugins"
-	"github.com/praqma/git-phlow/platform"
 	"github.com/praqma/git-phlow/executor"
+	"github.com/praqma/git-phlow/setting"
 )
 
 //AuthCaller
 //Wraps auth and injects dependencies
 func AuthCaller() {
-	cf := platform.KeyConfiguration{Run: executor.Run}
+	cf := setting.GitConfig{Run: executor.Run}
 	Auth(cf)
 }
 
 //Auth ...
 //Authenticates the user
-func Auth(cf platform.Configurator) {
-	token := cf.Get(platform.PhlowToken)
-	user := cf.Get(platform.PhlowUser)
+func Auth(cf setting.Configurator) {
+	token := cf.Get(setting.PhlowToken)
+	user := cf.Get(setting.PhlowUser)
 
 	if token != "" && user != "" {
 		fmt.Println("Checking token validity...")
@@ -34,8 +34,8 @@ func Auth(cf platform.Configurator) {
 			fmt.Println("Token test expected HTTP code 200 but received " + err.Error())
 			if ReadInput("Delete local token and reauthenticate? (y/n): ", os.Stdin) == "y" {
 				fmt.Println("Deleting local token and reauthenticating...")
-				cf.Unset(platform.PhlowToken)
-				cf.Unset(platform.PhlowUser)
+				cf.Unset(setting.PhlowToken)
+				cf.Unset(setting.PhlowUser)
 				AuthCaller()
 			} else {
 				fmt.Println("Aborting...")
@@ -59,8 +59,8 @@ func Auth(cf platform.Configurator) {
 		fmt.Println(err)
 		return
 	}
-	cf.Set(platform.PhlowUser, username)
-	cf.Set(platform.PhlowToken, token)
+	cf.Set(setting.PhlowUser, username)
+	cf.Set(setting.PhlowToken, token)
 
 	fmt.Println("")
 	fmt.Println(fmt.Sprintf("%s Successfully authorized: 'git phlow' is now enabled", username))

phlow/mkalias.go

@@ -1,18 +1,18 @@
 package phlow
 
 import (
-	"github.com/praqma/git-phlow/platform"
 	"fmt"
 	"github.com/praqma/git-phlow/ui"
+	"github.com/praqma/git-phlow/setting"
 )
 
 //MakeAliasCaller ...
 func MakeAliasCaller() {
-	MakeAlias(platform.DefaultConfiguration())
+	MakeAlias(setting.GitConfig{})
 }
 
 //MakeAlias ...
-func MakeAlias(conf platform.Configurator) {
+func MakeAlias(conf setting.Configurator) {
 	aliases := make(map[string]string)
 	aliases["alias.wrapup"] = "phlow wrapup"
 	aliases["alias.workon"] = "phlow workon"

phlow/park.go

@@ -9,6 +9,7 @@ import (
 	"github.com/praqma/git-phlow/githandler"
 	"github.com/praqma/git-phlow/plugins"
 	"github.com/praqma/git-phlow/ui"
+	"github.com/praqma/git-phlow/setting"
 )
 
 //WorkOn ...
@@ -78,7 +79,8 @@ func WorkOn(issue int) {
 //Set Label and assignee on a GitHub issue
 func UpdateIssue(issue int) {
 	//Retrieve token
-	user := ""//githandler.ConfigGet("user", "phlow")
+	stg := setting.NewToolStg()
+	user := stg.User
 
 	if _, err := plugins.GitHub.SetLabel(plugins.PhlowLabels["Status - in progress"].Title, issue); err != nil {
 		fmt.Println(err)