close #82 update plow for concourse

Author: groenborg

ci/notes/CHANGELOG.md

@@ -1,7 +1,7 @@
-We have changed to agent upnext command so automation becomes easier, this is a quickfix and non critical
-for users who uses do not use the agent commandset.
+We have enhanced the phlow so it's better to use it when building pipelines supporting pretested integration
 
 
-#### Patch
-- upnext returns a name ready for checkout #79 @groenborg
+
+#### Features
+- upnext now has a prefix option #79 @groenborg
 

cmd/upnext.go

@@ -19,6 +19,7 @@ var upNextCmd = &cobra.Command{
 	Long: fmt.Sprintf(`
 %s gets the next branch ready for integration based on the branch creation time.
 The branch created first, is the branch thats up next.
+if no --prefix flag is set, the default prefix is ready/
 `, ui.Format.Bold("upnext")),
 	PreRun: func(cmd *cobra.Command, args []string) {
 		cmdperm.RequiredCurDirRepository()
@@ -28,7 +29,7 @@ The branch created first, is the branch thats up next.
 		defaultBranch, _ := plugins.GitHub.Branch.Default()
 		remote := githandler.ConfigBranchRemote(defaultBranch)
 
-		phlow.UpNext(remote)
+		phlow.UpNext(remote, options.GlobalFlagPrefixForReady)
 	},
 }
 
@@ -38,4 +39,5 @@ func init() {
 
 	upNextCmd.Flags().BoolVar(&options.GlobalFlagHumanReadable, "human", false, "output human readable info")
 
+	upNextCmd.Flags().StringVarP(&options.GlobalFlagPrefixForReady, "prefix", "p", "", "prefix branches ready for integration")
 }

githandler/branch.go

@@ -78,14 +78,14 @@ func BranchDelivered(remote string) (localBranches []string, remoteBranches []st
 }
 
 //BranchReady ...
-func BranchReady(remote string) (remoteBranches []string) {
+func BranchReady(remote string, prefix string) (remoteBranches []string) {
 	info, err := Branch()
 	if err != nil {
 		return
 	}
 
 	for _, branch := range info.List {
-		if strings.HasPrefix(branch, "remotes/"+remote+"/ready") {
+		if strings.HasPrefix(branch, "remotes/"+remote+"/"+prefix) {
 			branch = strings.TrimPrefix(branch, "remotes/")
 			remoteBranches = append(remoteBranches, branch)
 		}

options/option.go

@@ -26,6 +26,9 @@ var (
 	//GlobalFlagHumanReadable ...
 	GlobalFlagHumanReadable bool
 
+	//GlobalFlagPrefixForReady ...
+	GlobalFlagPrefixForReady string
+
 	//GlobalFlagHard ...
 	GlobalFlagHard bool
 

phlow/upnext.go

@@ -13,9 +13,13 @@ import (
 //UpNext ...
 //Returns the next branch ready for integration based on time of creation
 //Oldest branches gets integrated first.
-func UpNext(remote string) {
+func UpNext(remote string, prefix string) {
 
-	branches := githandler.BranchReady(remote)
+	if prefix == "" {
+		prefix = "ready/"
+	}
+
+	branches := githandler.BranchReady(remote, prefix)
 
 	if len(branches) != 0 {
 		if options.GlobalFlagHumanReadable {