close #230 add workon cmd

Author: groenborg

cmd/workon.go

@@ -3,13 +3,11 @@ package cmd
 import (
 	"fmt"
 	"os"
-	"strconv"
-
 	"github.com/praqma/git-phlow/cmd/cmdperm"
-	"github.com/praqma/git-phlow/phlow"
 	"github.com/praqma/git-phlow/ui"
 	"github.com/spf13/cobra"
 	"github.com/praqma/git-phlow/options"
+	"github.com/praqma/git-phlow/phlow"
 )
 
 // workonCmd represents the workon command
@@ -26,18 +24,13 @@ A new branch will be created, based on your remote default branch and named afte
 	},
 	Run: func(cmd *cobra.Command, args []string) {
 
-		if len(args) > 0 {
-			issue, err := strconv.Atoi(args[0])
-			if err != nil {
-				fmt.Fprintf(os.Stdout, "Whoops \nYour argument, %s, is not a number! I only accept numbers \n", args[0])
-				os.Exit(0)
-			}
-
-			phlow.WorkOn(issue)
+		if len(args) == 0 {
+			fmt.Fprintln(os.Stdout, cmd.UsageString())
 			os.Exit(0)
 		}
 
-		fmt.Fprintln(os.Stdout, cmd.UsageString())
+		phlow.WorkOnCaller(args[0])
+
 	},
 }
 

main.go

@@ -1,34 +1,11 @@
 package main
 
 import (
-	"github.com/praqma/git-phlow/plugins"
-	"fmt"
+	"github.com/praqma/git-phlow/cmd"
 )
 
 func main() {
-	//cmd.Execute()
-	/*issue, err := plugins.GetJiraIssue("http://jira.teamsinspace.com:8080", "TIS-41", "admin", "Charlie!")
-	if err != nil {
-		fmt.Println(err)
-	}
-	fmt.Println(issue.Key, issue.Fields.Summary, issue.Fields.Status.Name)
-
-	tr, err := plugins.GetTranstions("http://jira.teamsinspace.com:8080", "TIS-41", "admin", "Charlie!")
-	if err != nil {
-		fmt.Println(err)
-	}
-
-	fmt.Println(tr.Transitions)
-
-	err = plugins.DoTransition("http://jira.teamsinspace.com:8080", "TIS-41", "admin", "Charlie!",tr.Transitions[0].ID)
-	if err != nil {
-		fmt.Println(err)
-	}*/
-
-	err := plugins.AssignUser("http://jira.teamsinspace.com:8080", "TIS-41", "admin", "Charlie!")
-	if err != nil {
-		fmt.Println(err)
-	}
 
+	cmd.Execute()
 
 }

phlow/web.go

@@ -45,7 +45,7 @@ func Web(userIssue int) {
 		os.Exit(0)
 	}
 
-	if branchIssue != -1 {
+	if branchIssue != "-1" {
 		issueInfoURL = fmt.Sprintf(issueInfoURL, orgAndRepo.Organisation, orgAndRepo.Repository, branchIssue)
 		executor.RunCommand("open", issueInfoURL)
 		os.Exit(0)

phlow/workon.go

@@ -11,19 +11,43 @@ import (
 	"github.com/praqma/git-phlow/ui"
 	"github.com/praqma/git-phlow/setting"
 	"github.com/praqma/git-phlow/executor"
+	"github.com/praqma/git-phlow/options"
+	"strings"
 )
 
-//WorkonCaller ...
-func WorkonCaller() {
+//WorkOnUpdate ...
+//Type for updating issues
+//returns a name or an error
+type WorkOnUpdate func(key string, projectSetting *setting.ProjectSetting) (string, error)
 
-}
+//WorkOnCaller ...
+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)
+			os.Exit(0)
+		}
+		WorkOn(keyOrID, conf, UpdateGithubIssue)
+		return
+	}
+
+	fmt.Println(conf.Service + "Is an unknown Service in you project .phlow file")
+}
+
+func WorkOn(keyOrID string, conf *setting.ProjectSetting, update WorkOnUpdate) {
 
-//WorkOn ...
-func WorkOn(issue int) {
 	git := githandler.Git{Run: executor.RunGit}
-	conf := setting.NewProjectStg("default")
 
 	ui.PhlowSpinner.Start("Setting up workspace")
 	defer ui.PhlowSpinner.Stop()
@@ -40,13 +64,16 @@ func WorkOn(issue int) {
 	}
 
 	branchInfo := githandler.AsList(out)
-	if plugins.IssueFromBranchName(branchInfo.Current) == issue {
+
+	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))
 		return
 	}
-
+	//Does another workspace already exist with the key or ID
 	for _, branch := range branchInfo.List {
-		if plugins.IssueFromBranchName(branch) == issue {
+		if plugins.IssueFromBranchName(branch) == keyOrID {
 
 			if _, err = git.CheckOut(branch); err != nil {
 				fmt.Println(err)
@@ -57,55 +84,116 @@ func WorkOn(issue int) {
 		}
 	}
 
-	//Get list of gh issues
-	gitHubIssues, err := plugins.GitHub.GetIssues()
+	//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
 	}
 
-	//Loop through all issues verifying the work-on issue exists
-	for _, iss := range gitHubIssues {
-		if iss.Number == issue {
-			name := plugins.BranchNameFromIssue(issue, iss.Title)
+	ui.PhlowSpinner.Stop()
+	fmt.Fprintf(os.Stdout, "Created workspace:  %s \n", ui.Format.Branch(name))
 
-			_, 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 ...
+//Updates the issue on jira and returns the name of the branch
+func UpdateJIRAIssue(key string, conf *setting.ProjectSetting) (string, error) {
+	git := githandler.Git{Run: executor.RunGit}
 
-			//Set labels and Assignee
-			UpdateIssue(issue)
-			return
+	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
+
+	//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" {
+				transitionErr = plugins.DoTransition(conf.IssueURL, key, user, token, tran.ID)
+				break
+			}
 		}
 	}
+
+	assignErr = plugins.AssignUser(conf.IssueURL, key, user, token)
+
 	ui.PhlowSpinner.Stop()
-	fmt.Println("No matching issues")
+	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"))
+
+	}
+
+	if transitionErr != nil {
+		fmt.Fprintf(os.Stdout, "Moved to => %s \n", ui.Format.Label.G4Move(plugins.PhlowLabels["In Progress"].Title))
+	}
+
+	if assignErr != nil {
+		fmt.Fprintf(os.Stdout, "Assignee => %s \n", ui.Format.Assignee(user))
+	}
+
+	if transitionErr != nil || assignErr != nil {
+		fmt.Println("----------------------------------")
+	}
+
+	return plugins.BranchNameFromIssue(issue.Key, issue.Fields.Summary), nil
 }
 
-//UpdateIssue ...
-//Set Label and assignee on a GitHub issue
-func UpdateIssue(issue int) {
-	//Retrieve token
-	stg := setting.NewToolStg()
-	user := stg.User
+//UpdateGithubIssue ...
+//Updating an issue on github and returns the branch name
+func UpdateGithubIssue(issue string, conf *setting.ProjectSetting) (string, error) {
+	git := githandler.Git{Run: executor.RunGit}
+
+	token, _ := git.Config("--get", "phlow.token")
+	user, _ := git.Config("--get", "phlow.user")
+
+	//Get organisation and repository for repository
+	remote, err := git.LSRemote("--get-url", conf.Remote)
+	if err != nil {
+		panic(err)
+	}
+
 
-	if _, err := plugins.GitHub.SetLabel(plugins.PhlowLabels["Status - in progress"].Title, issue); err != nil {
+	orgAndRepo := githandler.OrgAndRepo(remote)
+	fmt.Println(orgAndRepo.Repository)
+
+	issueOb, err := plugins.GetIssueGitHub(conf.IssueURL, orgAndRepo.Organisation, orgAndRepo.Repository, issue, token)
+	if err != nil {
+		fmt.Println("No matching issues")
+		os.Exit(0)
+	}
+
+	if _, err := plugins.GitHub.SetLabel(plugins.PhlowLabels["Status - in progress"].Title, issueOb.Number); err != nil {
 		fmt.Println(err)
 	}
 
-	if err := plugins.GitHub.SetAssignee(user, issue); err != nil {
+	if err := plugins.GitHub.SetAssignee(user, issueOb.Number); err != nil {
 		fmt.Println(err)
 	}
 
-	is := strconv.Itoa(issue)
+	is := strconv.Itoa(issueOb.Number)
 	fmt.Fprintf(os.Stdout, "\n-------- Issue %s updated --------  \n", ui.Format.Issue(is))
 	fmt.Fprintf(os.Stdout, "Label    => %s \n", ui.Format.Label.G4Move(plugins.PhlowLabels["Status - in progress"].Title))
 	fmt.Fprintf(os.Stdout, "Assignee => %s \n", ui.Format.Assignee(user))
 	fmt.Println("----------------------------------")
-	return
+
+	return plugins.BranchNameFromIssue(is, issueOb.Title), nil
+
 }

plugins/gh.go

@@ -13,6 +13,7 @@ import (
 	"github.com/praqma/git-phlow/githandler"
 	"github.com/praqma/git-phlow/options"
 	"github.com/praqma/git-phlow/executor"
+	"io/ioutil"
 )
 
 var GitHub *GitHubImpl
@@ -130,6 +131,37 @@ func DefaultBranchGitHub(URL, org, repo, token string) (defaultBranch string, er
 	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
+}
+
 //GetIssues ...
 func (g *GitHubImpl) GetIssues() (issues []Issue, err error) {
 	URL := fmt.Sprintf(g.URLNoEsc(urls.issueURL), g.org, g.repo)

plugins/plugin.go

@@ -3,7 +3,6 @@ package plugins
 import (
 	"bytes"
 	"regexp"
-	"strconv"
 	"strings"
 )
 
@@ -19,6 +18,8 @@ type Authentication func(URL, user, pass string) (authenticated bool, err error)
 //interface for getting the default branch of the external service
 type DefaultBranch func(URL, org, repo, token string) (defaultBranch string, err error)
 
+
+
 //PhlowLabels ...
 //Map of labels in the phlow
 var PhlowLabels map[string]*PhlowLabel
@@ -60,7 +61,7 @@ func GroupID(name string) int {
 
 //BranchNameFromIssue ...
 //Converts issues to branch names nby removing illegal characters and inserting hyphens
-func BranchNameFromIssue(issue int, name string) string {
+func BranchNameFromIssue(issue string, name string) string {
 	var result string
 
 	removeNonAlphaNumeric := regexp.MustCompile("([^\\w-])+")
@@ -71,17 +72,13 @@ func BranchNameFromIssue(issue int, name string) string {
 
 	result = strings.Trim(result, "-")
 	result = strings.ToLower(result)
-	return strconv.Itoa(issue) + "-" + result
+	return issue + "-" + result
 }
 
 //IssueFromBranchName ...
 //Extracts the issue number from the branch name
-func IssueFromBranchName(branch string) int {
-	iss, err := strconv.Atoi(strings.Split(branch, "-")[0])
-	if err != nil {
-		return -1
-	}
-	return iss
+func IssueFromBranchName(branch string) string {
+	return strings.Split(branch, "-")[0]
 }
 
 //efficientConcatString