close #69 list issues

groenborg · groenborg · commit 9a38ca79bc24 · 2017-03-21T11:07:54.000+01:00
diff --git a/cmd/agent.go b/cmd/agent.go
@@ -5,8 +5,8 @@ import (
 
 	"fmt"
 
-	"github.com/spf13/cobra"
 	"github.com/praqma/git-phlow/ui"
+	"github.com/spf13/cobra"
 )
 
 // agentCmd represents the agent command
diff --git a/cmd/auth.go b/cmd/auth.go
@@ -1,24 +1,24 @@
 package cmd
 
 import (
+	"fmt"
 	"github.com/praqma/git-phlow/phlow"
+	"github.com/praqma/git-phlow/ui"
 	"github.com/spf13/cobra"
 )
 
 //enable command
 var authCmd = &cobra.Command{
 	Use:   "auth",
 	Short: "authenticate with github",
-	Long: `
-[auth] is needed to enable 'workon' with issues management.
+	Long: fmt.Sprintf(`
+%s is needed to enable 'workon' with issues management.
 Auth will prompt your for a github username and password,
 which will generate a token we use for your github account.
 Don't worry the token does not create admin access,
-only acces to manage issues for public repositories'`,
+only acces to manage issues for public repositories'`, ui.Bold("auth")),
 	Run: func(cmd *cobra.Command, args []string) {
-
 		phlow.Auth()
-
 	},
 }
 
diff --git a/cmd/cleanup.go b/cmd/cleanup.go
@@ -7,21 +7,20 @@ import (
 	"github.com/praqma/git-phlow/options"
 	"github.com/praqma/git-phlow/phlow"
 	"github.com/praqma/git-phlow/plugins"
-	"github.com/spf13/cobra"
 	"github.com/praqma/git-phlow/ui"
+	"github.com/spf13/cobra"
 )
 
 // purgeCmd represents the purge command
 var cleanCmd = &cobra.Command{
-	Use:   "clean",
-	Short: "clean removes all delivered branches",
+	Use:   "cleanup",
+	Short: "cleanup removes all delivered branches",
 	Long: fmt.Sprintf(`
 %s removes all branches prefixed with 'delivered/'.
 It deletes safely by running 'git branch -d'. By default, both local and remote branches are deleted.
 `, ui.Bold("phlow clean")),
 	Run: func(cmd *cobra.Command, args []string) {
-
-		defaultBranch, _ := plugins.GetDefaultBranch(plugins.RepoURL)
+		defaultBranch, _ := plugins.GitHub.Branch.Default()
 		remote := githandler.ConfigBranchRemote(defaultBranch)
 
 		phlow.Clean(remote)
diff --git a/cmd/deliver.go b/cmd/deliver.go
@@ -7,8 +7,8 @@ import (
 	"github.com/praqma/git-phlow/options"
 	"github.com/praqma/git-phlow/phlow"
 	"github.com/praqma/git-phlow/plugins"
-	"github.com/spf13/cobra"
 	"github.com/praqma/git-phlow/ui"
+	"github.com/spf13/cobra"
 )
 
 // deliverCmd represents the deliver command
@@ -27,7 +27,7 @@ and pushed to your "remote default branch" and prefixed with "/delivered"
 `,
 	Run: func(cmd *cobra.Command, args []string) {
 
-		defaultBranch, _ := plugins.GetDefaultBranch(plugins.RepoURL)
+		defaultBranch, _ := plugins.GitHub.Branch.Default()
 
 		//Run tests before deliver
 		if len(args) > 0 {
diff --git a/cmd/integrate.go b/cmd/integrate.go
@@ -5,8 +5,8 @@ import (
 
 	"github.com/praqma/git-phlow/phlow"
 	"github.com/praqma/git-phlow/plugins"
-	"github.com/spf13/cobra"
 	"github.com/praqma/git-phlow/ui"
+	"github.com/spf13/cobra"
 )
 
 // integrateCmd represents the integrate command
@@ -19,7 +19,10 @@ with your default branch and pushed to the remote.
 `, ui.Bold("integrate")),
 	Run: func(cmd *cobra.Command, args []string) {
 
-		defaultBranch, _ := plugins.GetDefaultBranch(plugins.RepoURL)
+		defaultBranch, err := plugins.GitHub.Branch.Default()
+		if err != nil {
+			fmt.Println(err)
+		}
 		phlow.LocalDeliver(defaultBranch)
 	},
 }
diff --git a/cmd/issues.go b/cmd/issues.go
@@ -0,0 +1,25 @@
+package cmd
+
+import (
+	"github.com/praqma/git-phlow/options"
+	"github.com/praqma/git-phlow/phlow"
+	"github.com/spf13/cobra"
+)
+
+// issueCmd represents the issue command
+var issueCmd = &cobra.Command{
+	Use:   "issues",
+	Short: "list GitHub issues",
+	Long: `
+List all the open issues on GitHub with it's ID. Helps you locate what needs to be worked on
+`,
+	Run: func(cmd *cobra.Command, args []string) {
+		phlow.IssueList()
+	},
+}
+
+func init() {
+	RootCmd.AddCommand(issueCmd)
+
+	issueCmd.Flags().BoolVarP(&options.GlobalFlagMine, "mine", "m", false, "list only issues assigned to you")
+}
diff --git a/cmd/mkalias.go b/cmd/mkalias.go
@@ -4,8 +4,8 @@ import (
 	"fmt"
 
 	"github.com/praqma/git-phlow/phlow"
-	"github.com/spf13/cobra"
 	"github.com/praqma/git-phlow/ui"
+	"github.com/spf13/cobra"
 )
 
 // mkaliasCmd represents the mkalias command
diff --git a/cmd/upnext.go b/cmd/upnext.go
@@ -7,8 +7,8 @@ import (
 	"github.com/praqma/git-phlow/options"
 	"github.com/praqma/git-phlow/phlow"
 	"github.com/praqma/git-phlow/plugins"
-	"github.com/spf13/cobra"
 	"github.com/praqma/git-phlow/ui"
+	"github.com/spf13/cobra"
 )
 
 // upNextCmd represents the upnext command
@@ -22,7 +22,7 @@ The branch created first, is the branch thats up next.
 
 	Run: func(cmd *cobra.Command, args []string) {
 
-		defaultBranch, _ := plugins.GetDefaultBranch(plugins.RepoURL)
+		defaultBranch, _ := plugins.GitHub.Branch.Default()
 		remote := githandler.ConfigBranchRemote(defaultBranch)
 
 		phlow.UpNext(remote)
diff --git a/cmd/workon.go b/cmd/workon.go
@@ -6,8 +6,8 @@ import (
 	"strconv"
 
 	"github.com/praqma/git-phlow/phlow"
-	"github.com/spf13/cobra"
 	"github.com/praqma/git-phlow/ui"
+	"github.com/spf13/cobra"
 )
 
 // workonCmd represents the workon command
diff --git a/executor/executor.go b/executor/executor.go
@@ -12,7 +12,7 @@ import (
 //VerboseOutput ...
 //prints the commands being run by the program
 func VerboseOutput(application string, argv ...string) {
-	fmt.Print(application)
+	fmt.Print("Exec: ", application)
 	for _, arg := range argv {
 		fmt.Print(" " + arg)
 	}
diff --git a/githandler/config.go b/githandler/config.go
@@ -2,8 +2,8 @@ package githandler
 
 import (
 	"fmt"
-	"strings"
 	"github.com/praqma/git-phlow/executor"
+	"strings"
 )
 
 //ConfigBranchRemote ...
diff --git a/githandler/git.go b/githandler/git.go
@@ -81,22 +81,20 @@ type RemoteInfo struct {
 }
 
 //Remote ...
-func Remote(defaultBranch string) (*RemoteInfo, error) {
+//Must have either origin or upstream
+//THIS NEEDS TO BE REVISITED
+func Remote() (*RemoteInfo, error) {
 	var res string
 	var err error
-
-	if res, err = executor.ExecuteCommand("git", "config", fmt.Sprintf("branch.%s.remote", defaultBranch)); err != nil {
-		return nil, err
-	}
 	res = strings.Trim(res, "\n")
-	if res, err = executor.ExecuteCommand("git", "ls-remote", "--get-url", res); err != nil {
+	if res, err = executor.ExecuteCommand("git", "ls-remote", "--get-url", "origin"); err != nil {
 		return nil, err
 	}
 	res = strings.Trim(res, "\n")
 	return remoteUrlExtractor(res), nil
 }
 
-func remoteUrlExtractor(url string) (*RemoteInfo) {
+func remoteUrlExtractor(url string) *RemoteInfo {
 	re := regexp.MustCompile(`.+:(\S+)\/(\S+)\.git`)
 
 	//Extracts repo and org from ssh url format
diff --git a/githandler/git_test.go b/githandler/git_test.go
@@ -12,7 +12,7 @@ func TestRemote(t *testing.T) {
 	SkipConvey("Running tests on 'Remote' function (runs in project)", t, func() {
 
 		Convey("Remote should return organisation and repo name", func() {
-			remote, _ := Remote("master")
+			remote, _ := Remote()
 
 			So(remote.Repository, ShouldEqual, "git-phlow")
 			So(remote.Organisation, ShouldEqual, "Praqma")
@@ -135,5 +135,15 @@ func TestRemoteUrlExtractor(t *testing.T) {
 			So(info.Organisation, ShouldEqual, "Org")
 			So(info.Repository, ShouldEqual, "some-repo")
 		})
+
+		Convey("ssh remote url with dot should return", func() {
+			var ssh = "git@github.com:Praqma/praqma.com.git"
+			info := remoteUrlExtractor(ssh)
+			t.Log(info.Organisation)
+			t.Log(info.Repository)
+			So(info.Organisation, ShouldEqual, "Praqma")
+			So(info.Repository, ShouldEqual, "praqma.com")
+		})
+
 	})
 }
diff --git a/options/option.go b/options/option.go
@@ -11,6 +11,9 @@ var (
 	//GlobalFlagLocal ...
 	GlobalFlagLocal = false
 
+	//GlobalFlagMine ...
+	GlobalFlagMine = false
+
 	//GlobalFlagVersion ...
 	GlobalFlagVersion = false
 
diff --git a/phlow/auth.go b/phlow/auth.go
@@ -31,7 +31,7 @@ func Auth() {
 	//Read user input password
 	password := ReadPassword("password: ")
 
-	token, err := plugins.Authorize(username, password, plugins.AuthURL)
+	token, err := plugins.GitHub.Auth.Auth(username, password)
 	if err != nil {
 		fmt.Println(err)
 		return
diff --git a/phlow/cleanup.go b/phlow/cleanup.go
@@ -40,5 +40,5 @@ func Clean(remoteName string) {
 		}
 	}
 
-	fmt.Println("Cleaned workspace like a baws, Great job")
+	fmt.Println("Workspace cleaned")
 }
diff --git a/phlow/cleanup_test.go b/phlow/cleanup_test.go
diff --git a/phlow/issues.go b/phlow/issues.go
@@ -0,0 +1,66 @@
+package phlow
+
+import (
+	"fmt"
+	"github.com/praqma/git-phlow/plugins"
+	"github.com/praqma/git-phlow/ui"
+	"os"
+	"strconv"
+	"github.com/praqma/git-phlow/options"
+	"github.com/praqma/git-phlow/githandler"
+)
+
+func IssueList() {
+
+	ui.PhlowSpinner.Start("")
+	issues, err := plugins.GitHub.Issue.Get()
+	if err != nil {
+		fmt.Println(err)
+		os.Exit(0)
+	}
+	ui.PhlowSpinner.Stop()
+
+	var userIssue = func(issue []plugins.AssigneeIssue) bool {
+		user := githandler.ConfigGet("user", "phlow")
+		for _, u := range issue {
+			if u.Login == user {
+				return true
+			}
+		}
+		return false
+	}
+
+	var printIssue = func(issue plugins.Issues) {
+		issStr := strconv.Itoa(issue.Number)
+
+		fmt.Print(ui.Bold(issStr + ": "))
+		fmt.Print(issue.Title)
+
+		for _, label := range issue.Labels {
+
+			fmt.Print(" " + plugins.Colorizer(label.Name))
+		}
+
+		for _, user := range issue.Assignees {
+			fmt.Print(" " + ui.AssigneeFormat(user.Login))
+		}
+		fmt.Print(" " + plugins.MilestoneColor(issue.Milestone.Title))
+
+		fmt.Println()
+	}
+
+	fmt.Println(plugins.MilestoneColor("# Issues"))
+
+	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)
+		}
+	}
+
+}
diff --git a/phlow/mkalias.go b/phlow/mkalias.go
@@ -15,7 +15,8 @@ func MkAlias() {
 	aliases["wrapup"] = "phlow wrapup"
 	aliases["workon"] = "phlow workon"
 	aliases["deliver"] = "phlow deliver"
-	aliases["clean"] = "phlow clean"
+	aliases["cleanup"] = "phlow cleanup"
+	aliases["agent"] = "phlow agent"
 
 	for key, value := range aliases {
 		str := githandler.ConfigGet(key, group)
diff --git a/phlow/phlow_test.go b/phlow/phlow_test.go
@@ -19,6 +19,15 @@ func TestGetIssueFromBranch(t *testing.T) {
 	})
 }
 
+func TestIssues(t *testing.T) {
+	Convey("Running tests on 'Issues' command", t, func() {
+		Convey("testing output", func() {
+			IssueList()
+
+		})
+	})
+}
+
 func TestUpNext(t *testing.T) {
 	Convey("Running tests on 'GetNextBranch' function", t, func() {
 
diff --git a/phlow/workon.go b/phlow/workon.go
diff --git a/plugins/github.go b/plugins/github.go
diff --git a/plugins/github_test.go b/plugins/github_test.go
diff --git a/plugins/githubdata.go b/plugins/githubdata.go
diff --git a/plugins/plugin.go b/plugins/plugin.go
diff --git a/ui/loaders.go b/ui/loaders.go

Original file line number	Diff line number	Diff line change
`@@ -5,8 +5,8 @@ import (`
`5`	`5`
`6`	`6`	`"fmt"`
`7`	`7`
`8`		`- "github.com/spf13/cobra"`
`9`	`8`	`"github.com/praqma/git-phlow/ui"`
	`9`	`+ "github.com/spf13/cobra"`
`10`	`10`	`)`
`11`	`11`
`12`	`12`	`// agentCmd represents the agent command`
Original file line number	Diff line number	Diff line change
`@@ -4,8 +4,8 @@ import (`
`4`	`4`	`"fmt"`
`5`	`5`
`6`	`6`	`"github.com/praqma/git-phlow/phlow"`
`7`		`- "github.com/spf13/cobra"`
`8`	`7`	`"github.com/praqma/git-phlow/ui"`
	`8`	`+ "github.com/spf13/cobra"`
`9`	`9`	`)`
`10`	`10`
`11`	`11`	`// mkaliasCmd represents the mkalias command`
Original file line number	Diff line number	Diff line change
`@@ -6,8 +6,8 @@ import (`
`6`	`6`	`"strconv"`
`7`	`7`
`8`	`8`	`"github.com/praqma/git-phlow/phlow"`
`9`		`- "github.com/spf13/cobra"`
`10`	`9`	`"github.com/praqma/git-phlow/ui"`
	`10`	`+ "github.com/spf13/cobra"`
`11`	`11`	`)`
`12`	`12`
`13`	`13`	`// workonCmd represents the workon command`
Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@ import (`
`12`	`12`	`//VerboseOutput ...`
`13`	`13`	`//prints the commands being run by the program`
`14`	`14`	`func VerboseOutput(application string, argv ...string) {`
`15`		`- fmt.Print(application)`
	`15`	`+ fmt.Print("Exec: ", application)`
`16`	`16`	`for _, arg := range argv {`
`17`	`17`	`fmt.Print(" " + arg)`
`18`	`18`	`}`