close #247 web command for jira

Author: groenborg

cmd/auth.go

@@ -29,5 +29,5 @@ Auth supports two services:
 func init() {
 	RootCmd.AddCommand(authCmd)
 
-	authCmd.Flags().StringVarP(&options.GlobalFlagTarget, "target", "t", "", "the name of the INI block in your .phlow files")
+	authCmd.Flags().StringVarP(&options.GlobalFlagTarget, "target", "t", "", "the name of the INI block in .gitconfig")
 }

cmd/deliver.go

@@ -38,5 +38,5 @@ func init() {
 
 	deliverCmd.Flags().BoolVarP(&options.GlobalFlagShowTestOutput, "showtest", "s", false, "show test output")
 
-	deliverCmd.Flags().StringVarP(&options.GlobalFlagTarget, "target", "t", "", "the name of the INI block in your .phlow files")
+	deliverCmd.Flags().StringVarP(&options.GlobalFlagTarget, "target", "t", "", "the name of the INI block in .gitconfig")
 }

cmd/issues.go

@@ -13,20 +13,24 @@ import (
 // issueCmd represents the issue command
 var issueCmd = &cobra.Command{
 	Use:   "issues",
-	Short: "list GitHub issues",
+	Short: "list issues from Task management system",
 	Long: fmt.Sprintf(`
-%s lists all the open issues on GitHub with its ID.
+%s lists the 30 next issues in your management system.
+Uses the configuration to decide target
 `, ui.Format.Bold("issues")),
 	PreRun: func(cmd *cobra.Command, args []string) {
 		cmdperm.RequiredCurDirRepository()
 	},
 	Run: func(cmd *cobra.Command, args []string) {
-		phlow.Issues()
+		phlow.IssueCaller()
 	},
 }
 
 func init() {
 	RootCmd.AddCommand(issueCmd)
 
 	issueCmd.Flags().BoolVarP(&options.GlobalFlagMine, "mine", "m", false, "only list issues assigned to you")
+
+	issueCmd.Flags().StringVarP(&options.GlobalFlagTarget, "target", "t", "", "the name of the INI block in .gitconfig")
+
 }

cmd/web.go

@@ -37,5 +37,5 @@ If no argument is given, it tries to find the issue of the currently checked out
 func init() {
 	RootCmd.AddCommand(webCmd)
 
-	webCmd.Flags().StringVarP(&options.GlobalFlagTarget, "target", "t", "", "the name of the INI block in your .phlow files")
+	webCmd.Flags().StringVarP(&options.GlobalFlagTarget, "target", "t", "", "the name of the INI block in .gitconfig")
 }

cmd/workon.go

@@ -37,6 +37,6 @@ func init() {
 	RootCmd.AddCommand(workonCmd)
 
 	//Target for configuration
-	workonCmd.Flags().StringVarP(&options.GlobalFlagTarget, "target", "t", "", "the name of the INI block in your .phlow files")
+	workonCmd.Flags().StringVarP(&options.GlobalFlagTarget, "target", "t", "", "the name of the INI block in .gitconfig")
 
 }

cmd/wrapup.go

@@ -29,5 +29,5 @@ func init() {
 
 	wrapupCmd.Flags().StringVar(&options.GlobalFlagForceMessage, "force", "", "use a custom commit message instead")
 
-	wrapupCmd.Flags().StringVarP(&options.GlobalFlagTarget, "target", "t", "", "the name of the INI block in your .gitconfig files")
+	wrapupCmd.Flags().StringVarP(&options.GlobalFlagTarget, "target", "t", "", "the name of the INI block in .gitconfig")
 }

phlow/issues.go

@@ -2,96 +2,83 @@ package phlow
 
 import (
 	"fmt"
-	"os"
 	"github.com/praqma/git-phlow/plugins"
-	"os/exec"
-	"strings"
 	"github.com/praqma/git-phlow/executor"
-	"bytes"
-	"github.com/praqma/git-phlow/ui"
-	"runtime"
+	"github.com/praqma/git-phlow/setting"
+	"github.com/praqma/git-phlow/options"
+	"github.com/praqma/git-phlow/githandler"
 )
 
-func Issues() {
-	ui.PhlowSpinner.Start("")
-	issues, err := plugins.GitHub.GetIssues()
-	if err != nil {
-		fmt.Println(err)
-		os.Exit(0)
+//IssueCaller ...
+//prints issue with given target
+func IssueCaller() {
+	conf := setting.NewProjectStg(options.GlobalFlagTarget)
+
+	if conf.Service == "github" {
+		PrintIssues(conf, FetchGH)
 	}
-	ui.PhlowSpinner.Stop()
 
-	//Collection Issues to a string
-	var buffer bytes.Buffer
-	for _, issue := range issues {
-		buffer.WriteString(issue.ToString())
+	if conf.Service == "jira" {
+		PrintIssues(conf, FetchJ)
 	}
+}
 
-	pager := GetPager()
+//Fetch ...
+//Type for getting issues
+type Fetch func(*setting.ProjectSetting) ([]plugins.Stringer, error)
 
-	if pager == "" {
-		fmt.Println(buffer.String())
-	} else {
-		IssuesInPager("less", buffer.String())
+//Fetch ...
+//Fetch for github
+func FetchGH(conf *setting.ProjectSetting) ([]plugins.Stringer, error) {
+	git := githandler.Git{Run: executor.RunGit}
+	remote, err := git.LSRemote("--get-url", conf.Remote)
+	if err != nil {
+		return nil, err
 	}
-}
 
-//GetPager ...
-//return the pager if set
-func GetPager() string {
-	pager := os.Getenv("PAGER")
-	if pager != "" {
-		return pager
+	token, err := git.Config("--get", "phlow.token")
+	if err != nil {
+		return nil, err
 	}
 
-	if runtime.GOOS == "windows" {
-		return "more"
+	oar := githandler.OrgAndRepo(remote)
+
+	list, err := plugins.GetIssuesGitHub(conf.IssueApi, oar.Organisation, oar.Repository, token)
+	if err != nil {
+		return nil, err
 	}
-	return ""
+	return list, nil
 }
 
-func IssuesInPager(pager, text string) error {
-	cmd := exec.Command(pager)
-	cmd.Stdin = strings.NewReader(text)
-	cmd.Stdout = os.Stdout
-	err := executor.ExecuteCommander(cmd)
+//FetchJ
+//fetch for Jira
+func FetchJ(conf *setting.ProjectSetting) ([]plugins.Stringer, error) {
+	git := githandler.Git{Run: executor.RunGit}
+	user, err := git.Config("--get", "phlow.jirauser")
 	if err != nil {
-		return err
+		return nil, err
 	}
-	return nil
+
+	token, err := git.Config("--get", "phlow.jiratoken")
+	if err != nil {
+		return nil, err
+	}
+	list, err := plugins.QueryIssues(conf.IssueApi, user, token)
+	if err != nil {
+		return nil, err
+	}
+	return list, nil
 }
 
-//IssueList ...
-//List open issues from GitHub
-func IssueList() {
+func PrintIssues(conf *setting.ProjectSetting, fetch Fetch) {
+	list, err := fetch(conf)
+	if err != nil {
+		fmt.Println(err)
+		return
+	}
 
-	//ui.PhlowSpinner.Start("")
-	//
-	//ui.PhlowSpinner.Stop()
-	//
-	////Nested function for finding user issues
-	//var userIssue = func(issue []plugins.AssigneeIssue) bool {
-	//	user := githandler.ConfigGet("user", "phlow")
-	//	for _, u := range issue {
-	//		if u.Login == user {
-	//			return true
-	//		}
-	//	}
-	//	return false
-	//}
-	//
-	//fmt.Println(ui.Format.MileStone("# Issue"))
-	//
-	//for _, issue := range issues {
-	//	assignees := issue.Assignees
-	//	//If mine is true we print on issues assigned to a user
-	//	if options.GlobalFlagMine {
-	//		if userIssue(assignees) {
-	//			printIssue(issue)
-	//		}
-	//	} else {
-	//		printIssue(issue)
-	//	}
-	//}
+	for _, iss := range list {
+		fmt.Println(iss.ToString())
+	}
 
 }

phlow/issues_test.go

@@ -48,15 +48,9 @@ type Assignee struct {
 	Assignees []string `json:"assignees"`
 }
 
-//Stringer ...
-//interface for github formats
-type Stringer interface {
-	ToString() string
-}
-
 //ToString ...
 //Formats issue
-func (issue *Issue) ToString() string {
+func (issue Issue) ToString() string {
 	var buffer bytes.Buffer
 
 	buffer.WriteString(ui.Format.Bold(strconv.Itoa(issue.Number) + ": "))
@@ -71,7 +65,5 @@ func (issue *Issue) ToString() string {
 	}
 	buffer.WriteString(" " + ui.Format.MileStone(issue.Milestone.Title))
 
-	buffer.WriteString("\n")
-
 	return buffer.String()
 }

plugins/ghmodels.go

@@ -87,6 +87,58 @@ func DefaultBranchGitHub(URL, org, repo, token string) (defaultBranch string, er
 
 //GetIssueGitHub ...
 //return an issue with from the number of the issue
+func GetIssuesGitHub(URL, org, repo, token string) ([]Stringer, error) {
+
+	req, _ := http.NewRequest("GET", URL+fmt.Sprintf("/repos/%s/%s/issues", org, repo), nil)
+	req.Header.Set("Content-Type", "application/json")
+	q := req.URL.Query()
+	q.Add("access_token", token)
+	q.Add("per_page", "30")
+	req.URL.RawQuery = q.Encode()
+
+	if options.GlobalFlagVerbose {
+		fmt.Println(req.URL)
+	}
+
+	client := http.DefaultClient
+
+	res, err := client.Do(req)
+	if err != nil {
+		return nil, err
+	}
+	defer res.Body.Close()
+
+	if res.StatusCode == 401 {
+		return nil, errors.New("Not Authorized \nVerify that you are authorized by running 'git phlow auth' with the same configuration")
+	}
+
+	if res.StatusCode == 404 && (org == "" || repo == "") {
+		return nil, errors.New("Could not reach GitHub API - Malformed URL \nVerify 'Remote' field is correct in configuration" +
+			"\ntry 'git ls-remote --get <Remote from config>' should return: [email protected]:org/repo.git")
+	}
+
+	if res.StatusCode != 200 {
+		return nil, errors.New("Could not get list of issues ")
+	}
+
+	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
+	}
+
+	iss := make([]Stringer, len(re))
+	for i, v := range re {
+		iss[i] = v
+	}
+
+	return iss, nil
+}
+
 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)