close #232 fix assign and state

Author: groenborg

phlow/workon.go

@@ -13,6 +13,7 @@ import (
 	"github.com/praqma/git-phlow/executor"
 	"github.com/praqma/git-phlow/options"
 	"strings"
+	"errors"
 )
 
 //WorkOnUpdate ...
@@ -21,21 +22,21 @@ import (
 type WorkOnUpdate func(key string, projectSetting *setting.ProjectSetting) (string, error)
 
 //WorkOnCaller ...
+//Toplevel workon function called from cmd
 func WorkOnCaller(keyOrID string) {
 
 	INIBlock := options.GlobalFlagTarget
 	conf := setting.NewProjectStg(INIBlock)
 
 	if "jira" == strings.ToLower(conf.Service) {
-
 		WorkOn(keyOrID, conf, UpdateJIRAIssue)
 		return
 	}
 
 	if "github" == strings.ToLower(conf.Service) {
 		_, err := strconv.Atoi(keyOrID)
 		if err != nil {
-			fmt.Fprintf(os.Stdout, "Whoops \nYour argument, %s, is not a number! I only accept numbers \n", keyOrID)
+			fmt.Println("Whoops \nYour argument, " + keyOrID + ", is not a valid GitHub issue number \n")
 			os.Exit(0)
 		}
 		WorkOn(keyOrID, conf, UpdateGithubIssue)
@@ -45,12 +46,13 @@ func WorkOnCaller(keyOrID string) {
 	fmt.Println(conf.Service + "Is an unknown Service in you project .phlow file")
 }
 
+//WorkOn ...
+//creates a new workspace from issue by given WorkOnUpdate and configuration
 func WorkOn(keyOrID string, conf *setting.ProjectSetting, update WorkOnUpdate) {
 
 	git := githandler.Git{Run: executor.RunGit}
 
-	ui.PhlowSpinner.Start("Setting up workspace")
-	defer ui.PhlowSpinner.Stop()
+	fmt.Println("Preparing workspace...")
 
 	if _, err := git.Fetch("--all"); err != nil {
 		fmt.Println(err)
@@ -65,7 +67,6 @@ func WorkOn(keyOrID string, conf *setting.ProjectSetting, update WorkOnUpdate) {
 
 	branchInfo := githandler.AsList(out)
 
-	fmt.Println(plugins.IssueFromBranchName(branchInfo.Current))
 	//Are we already on the branch we want to work on
 	if plugins.IssueFromBranchName(branchInfo.Current) == keyOrID {
 		fmt.Fprintf(os.Stdout, "You are already on branch %s \n", ui.Format.Branch(branchInfo.Current))
@@ -77,28 +78,23 @@ func WorkOn(keyOrID string, conf *setting.ProjectSetting, update WorkOnUpdate) {
 
 			if _, err = git.CheckOut(branch); err != nil {
 				fmt.Println(err)
+				return
 			}
-			ui.PhlowSpinner.Stop()
+
 			fmt.Fprintf(os.Stdout, "Resuming to workspace:  %s \n", ui.Format.Branch(branch))
 			return
 		}
 	}
 
-	//Get issue and do the transition
-
 	name, err := update(keyOrID, conf)
 
-	//Proceed to create the new workspace
-
 	_, err = git.CheckOut("-b", name, conf.Remote+"/"+conf.IntegrationBranch)
 	if err != nil {
 		fmt.Println(err)
 		return
 	}
 
-	ui.PhlowSpinner.Stop()
 	fmt.Fprintf(os.Stdout, "Created workspace:  %s \n", ui.Format.Branch(name))
-
 }
 
 //UpdateJIRAIssue ...
@@ -109,48 +105,39 @@ func UpdateJIRAIssue(key string, conf *setting.ProjectSetting) (string, error) {
 	user, _ := git.Config("--get", "phlow.jirauser")
 	token, _ := git.Config("--get", "phlow.jiratoken")
 
-	//Get jira issue or fail
 	issue, err := plugins.GetJiraIssue(conf.IssueURL, key, user, token)
 	if err != nil {
 		return "", err
 	}
 
 	var transitionErr error
-	var assignErr error
+	assignErr := plugins.AssignUser(conf.IssueURL, key, user, token)
 
 	//Get transition
 	transition, err := plugins.GetTransitions(conf.IssueURL, key, user, token)
 	if err == nil {
 		for _, tran := range transition.Transitions {
-			if tran.To.Name == "In Progress" {
+			if tran.To.StatusCategory.Name == "In Progress" {
 				transitionErr = plugins.DoTransition(conf.IssueURL, key, user, token, tran.ID)
+
 				break
 			}
 		}
+		transitionErr = errors.New("No 'In Progress' transition ")
 	}
 
-	assignErr = plugins.AssignUser(conf.IssueURL, key, user, token)
-
-	ui.PhlowSpinner.Stop()
-	if transitionErr != nil || assignErr != nil {
-		fmt.Fprintf(os.Stdout, "\n-------- Issue %s updated --------  \n", ui.Format.Issue(issue.Key))
-	} else {
-		fmt.Printf("\nIssue %s could not be moved to 'In Progress'\n", ui.Format.Issue(issue.Key))
-		fmt.Printf("Assingee '%s' could not be assigned to issue %s\n", ui.Format.Assignee(user), ui.Format.Issue(issue.Key))
-		fmt.Println(ui.Format.Bold("Go to Jira and manually set the assignee and state"))
-
-	}
+	fmt.Printf("\n-------- Issue %s--------  \n", ui.Format.Issue(issue.Key))
 
 	if transitionErr != nil {
-		fmt.Fprintf(os.Stdout, "Moved to => %s \n", ui.Format.Label.G4Move(plugins.PhlowLabels["In Progress"].Title))
+		fmt.Printf("Issue %s could not be moved to 'In Progress'\n", ui.Format.Issue(issue.Key))
+	} else {
+		fmt.Printf("Moved to => %s \n", ui.Format.Label.G4Move("In Progress"))
 	}
 
 	if assignErr != nil {
-		fmt.Fprintf(os.Stdout, "Assignee => %s \n", ui.Format.Assignee(user))
-	}
-
-	if transitionErr != nil || assignErr != nil {
-		fmt.Println("----------------------------------")
+		fmt.Printf("Assingee '%s' could not be assigned to issue %s\n", ui.Format.Assignee(user), ui.Format.Issue(issue.Key))
+	} else {
+		fmt.Printf("Assignee => %s \n", ui.Format.Assignee(user))
 	}
 
 	return plugins.BranchNameFromIssue(issue.Key, issue.Fields.Summary), nil
@@ -170,21 +157,19 @@ func UpdateGithubIssue(issue string, conf *setting.ProjectSetting) (string, erro
 		panic(err)
 	}
 
+	oap := githandler.OrgAndRepo(remote)
 
-	orgAndRepo := githandler.OrgAndRepo(remote)
-	fmt.Println(orgAndRepo.Repository)
-
-	issueOb, err := plugins.GetIssueGitHub(conf.IssueURL, orgAndRepo.Organisation, orgAndRepo.Repository, issue, token)
+	issueOb, err := plugins.GetIssueGitHub(conf.IssueURL, oap.Organisation, oap.Repository, issue, token)
 	if err != nil {
-		fmt.Println("No matching issues")
+		fmt.Println(err)
 		os.Exit(0)
 	}
 
-	if _, err := plugins.GitHub.SetLabel(plugins.PhlowLabels["Status - in progress"].Title, issueOb.Number); err != nil {
+	if err := plugins.SetAssigneeGitHub(conf.IssueURL, oap.Organisation, oap.Repository, token, issue, user); err != nil {
 		fmt.Println(err)
 	}
 
-	if err := plugins.GitHub.SetAssignee(user, issueOb.Number); err != nil {
+	if _, err := plugins.SetLabelGitHub(conf.IssueURL, oap.Organisation, oap.Repository, token, plugins.PhlowLabels["Status - in progress"].Title, issue); err != nil {
 		fmt.Println(err)
 	}
 

plugins/gh.go

@@ -13,9 +13,11 @@ import (
 	"github.com/praqma/git-phlow/githandler"
 	"github.com/praqma/git-phlow/options"
 	"github.com/praqma/git-phlow/executor"
-	"io/ioutil"
 )
 
+//------------------------------------DEPRECATED SECTION------------------------------//
+//This file are being exhanged with github.go
+
 var GitHub *GitHubImpl
 var urls *pluginWebURL
 
@@ -57,111 +59,7 @@ func init() {
 	}
 }
 
-//AuthorizeGitHub ...
-//Retrieve token from github for authorization
-func AuthorizeGitHub(githubBaseURL, user, pass string) (token string, err error) {
-
-	perm, err := createGHPermissions()
-	if err != nil {
-		return "", err
-	}
-
-	req, _ := http.NewRequest("POST", githubBaseURL+"/authorizations", bytes.NewBuffer([]byte(perm)))
-	//req.Header.Set("Content-Type", "application/x-www-form-urlencoded")
-	req.Header.Add("accept", "application/json")
-	req.Header.Add("content-type", "application/json")
-	req.SetBasicAuth(user, pass)
-
-	body, err := NewPWRequest().Do(req)
-	if err != nil {
-		return "", err
-	}
-
-	re := Auth{}
-	if err = json.Unmarshal(body, &re); err != nil {
-		return "", err
-	}
-	return re.Token, nil
-}
-
-//AuthenticateGitHub
-//Checks personal access token validity by requesting private repositories and checking status code
-func AuthenticateGitHub(githubBaseURL string, user, token string) (bool, error) {
-
-	req, _ := http.NewRequest("GET", githubBaseURL+"/user/repos", nil)
-	q := req.URL.Query()
-	q.Add("access_token", token)
-	req.URL.RawQuery = q.Encode()
-	client := http.DefaultClient
-
-	res, err := client.Do(req)
-	if err != nil {
-		return false, err
-	}
-	defer res.Body.Close()
-
-	if res.StatusCode != http.StatusOK {
-		return false, errors.New(strconv.Itoa(res.StatusCode))
-	}
-	return true, nil
-}
-
-//DefaultBranchGitHub ...
-//return the default branch of the repository
-func DefaultBranchGitHub(URL, org, repo, token string) (defaultBranch string, err error) {
-
-	req, _ := http.NewRequest("GET", URL+fmt.Sprintf("/repos/%s/%s", org, repo), nil)
-	q := req.URL.Query()
-	q.Add("access_token", token)
-	req.URL.RawQuery = q.Encode()
-
-	client := http.DefaultClient
-
-	res, err := client.Do(req)
-	if err != nil {
-		return "", err
-	}
-	defer res.Body.Close()
-
-	re := Repo{}
-	err = json.NewDecoder(res.Body).Decode(&re)
-	if err != nil {
-		return "", err
-	}
-	return re.DefaultBranch, nil
-}
-
-//GetIssueGitHub ...
-//return an issue with from the number of the issue
-func GetIssueGitHub(URL, org, repo, key, token string) (*Issue, error) {
-
-	req, _ := http.NewRequest("GET", URL+fmt.Sprintf("/repos/%s/%s/issues/", org, repo)+key, nil)
-	req.Header.Set("Content-Type", "application/json")
-	q := req.URL.Query()
-	q.Add("access_token", token)
-	req.URL.RawQuery = q.Encode()
-
-	client := http.DefaultClient
-
-	res, err := client.Do(req)
-	if err != nil {
-		return nil, err
-	}
-	defer res.Body.Close()
-
-	body, err := ioutil.ReadAll(res.Body);
-	if err != nil {
-		return nil, err
-	}
-
-	re := Issue{}
-	if err = json.Unmarshal(body, &re); err != nil {
-		return nil, err
-	}
-
-	return &re, err
-}
-
+//Deprecated
 //GetIssues ...
 func (g *GitHubImpl) GetIssues() (issues []Issue, err error) {
 	URL := fmt.Sprintf(g.URLNoEsc(urls.issueURL), g.org, g.repo)
@@ -184,6 +82,7 @@ func (g *GitHubImpl) GetIssues() (issues []Issue, err error) {
 	return re, nil
 }
 
+//Deprecated
 //SetLabel ...
 func (g *GitHubImpl) SetLabel(label string, issue int) (labels []Label, err error) {
 
@@ -229,6 +128,7 @@ func (g *GitHubImpl) Default() (defaultBranch string, err error) {
 	return re.DefaultBranch, nil
 }
 
+//Deprecated
 //SetAssignee ...
 //Set assignee on a GitHub Issue
 func (g *GitHubImpl) SetAssignee(assignee string, issue int) (err error) {
@@ -254,6 +154,7 @@ type GhPermissions struct {
 	Note   string   `json:"note"`
 }
 
+//This should be rewritten
 //createGHPermissions ...
 func createGHPermissions() (string, error) {
 	hostname, err := os.Hostname()