fixed error in ui formats

groenborg · groenborg · commit 402da25e1152 · 2017-03-23T10:21:21.000+01:00
diff --git a/cmd/agent.go b/cmd/agent.go
@@ -17,7 +17,7 @@ var agentCmd = &cobra.Command{
 %s commands are a set of subcommands available for ci/cd services. They are meant as a way of services to easily
 be compatible with %s.
 These are not meant to used locally as a part of your local workflow
-`, ui.Format("agent").Bold, ui.Format("the praqmatic workflow").Bold),
+`, ui.Format.Bold("agent"), ui.Format.Bold("the praqmatic workflow")),
 }
 
 func init() {
diff --git a/cmd/auth.go b/cmd/auth.go
@@ -17,7 +17,7 @@ var authCmd = &cobra.Command{
 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'`, ui.Format("auth").Bold),
+only acces to manage issues for public repositories'`, ui.Format.Bold("auth")),
 	Run: func(cmd *cobra.Command, args []string) {
 		phlow.Auth()
 	},
diff --git a/cmd/cleanup.go b/cmd/cleanup.go
@@ -19,7 +19,7 @@ var cleanCmd = &cobra.Command{
 	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.Format("phlow clean").Bold),
+`, ui.Format.Bold("phlow clean")),
 	PreRun: func(cmd *cobra.Command, args []string) {
 		cmdperm.RequiredCurDirRepository()
 	},
diff --git a/cmd/cmdperm/prerunperm.go b/cmd/cmdperm/prerunperm.go
@@ -15,7 +15,7 @@ func RequiredAuthentication() {
 	user := githandler.ConfigGet("user", "phlow")
 
 	if token == "" || user == "" {
-		fmt.Printf("Please run %s to connect to github \n", ui.Format("auth").Bold)
+		fmt.Printf("Please run %s to connect to github \n", ui.Format.Bold("auth"))
 		os.Exit(0)
 	}
 }
diff --git a/cmd/deliver.go b/cmd/deliver.go
@@ -35,11 +35,11 @@ and pushed to your "remote default branch" and prefixed with "/delivered"
 		//Run tests before deliver
 		if len(args) > 0 {
 			if err := phlow.TestDeliver(args); err != nil {
-				fmt.Println(ui.Format("!! Tests did not exit with code 0 !!").Error)
+				fmt.Println(ui.Format.Error("!! Tests did not exit with code 0 !!"))
 				fmt.Println(err)
 				os.Exit(1)
 			}
-			fmt.Println(ui.Format("Tests exited with code 0 - starting deliver process").Success)
+			fmt.Println(ui.Format.Success("Tests exited with code 0 - starting deliver process"))
 		}
 
 		//If Run if local deliver
diff --git a/cmd/integrate.go b/cmd/integrate.go
@@ -17,7 +17,7 @@ var integrateCmd = &cobra.Command{
 	Long: fmt.Sprintf(`
 %s delivers the changes in an agent version. The current branch if will be merged into the default branch
 with your default branch and pushed to the remote.
-`, ui.Format("integrate").Bold),
+`, ui.Format.Bold("integrate")),
 	PreRun: func(cmd *cobra.Command, args []string) {
 		cmdperm.RequiredCurDirRepository()
 	},
diff --git a/cmd/mkalias.go b/cmd/mkalias.go
@@ -15,7 +15,7 @@ var mkaliasCmd = &cobra.Command{
 	Long: fmt.Sprintf(`
 %s creates all the alias for your git phlow commands, so you can type 'git workon' in stead of
 'git phlow workon', the alias will be created in your global .gitconfig file
-`, ui.Format("mkalias").Bold),
+`, ui.Format.Bold("mkalias")),
 	Run: func(cmd *cobra.Command, args []string) {
 		phlow.MkAlias()
 	},
diff --git a/cmd/upnext.go b/cmd/upnext.go
@@ -19,7 +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.
-`, ui.Format("upnext").Bold),
+`, ui.Format.Bold("upnext")),
 	PreRun: func(cmd *cobra.Command, args []string) {
 		cmdperm.RequiredCurDirRepository()
 	},
diff --git a/cmd/workon.go b/cmd/workon.go
@@ -20,7 +20,7 @@ var workonCmd = &cobra.Command{
 A branch will be created from your remote default branch and named after the title
 of the issue eg. branch => "42-calculate-meaning-of-life".
 From here you the work can start, and when finished run phlow wrapup.
-	`, ui.Format("workon").Bold),
+	`, ui.Format.Bold("workon")),
 	PreRun: func(cmd *cobra.Command, args []string) {
 		cmdperm.RequiredCurDirRepository()
 		cmdperm.RequiredAuthentication()
diff --git a/cmd/wrapup.go b/cmd/wrapup.go
@@ -16,7 +16,7 @@ var wrapupCmd = &cobra.Command{
 	Long: fmt.Sprintf(`
 %s adds all your work from the working area to the index, and makes an automatic close # commit,
 which closes an issue on github eg. commit message => "close #42 fetch meaning of life"
-`, ui.Format("wrapup").Bold),
+`, ui.Format.Bold("wrapup")),
 	PreRun: func(cmd *cobra.Command, args []string) {
 		cmdperm.RequiredCurDirRepository()
 	},
diff --git a/main.go b/main.go
@@ -1,9 +1,8 @@
 package main
 
-import (
-	"github.com/praqma/git-phlow/cmd"
-)
+import "github.com/praqma/git-phlow/cmd"
 
 func main() {
 	cmd.Execute()
+
 }
diff --git a/phlow/cleanup.go b/phlow/cleanup.go
@@ -18,7 +18,7 @@ func Clean(remoteName string) {
 		if _, err = githandler.BranchDelete(branch, "", false, options.GlobalFlagForce); err != nil {
 			fmt.Printf("Could not delete branch %s \n", branch)
 		} else {
-			fmt.Printf("Local branch %s deleted \n", ui.Format(branch).Branch)
+			fmt.Printf("Local branch %s deleted \n", ui.Format.Branch(branch))
 		}
 	}
 
@@ -27,7 +27,7 @@ func Clean(remoteName string) {
 			if _, err = githandler.BranchDelete(branch, remoteName, true, false); err != nil {
 				fmt.Printf("Could not delete branch %s \n", branch)
 			} else {
-				fmt.Printf("Remote branch %s deleted \n", ui.Format(branch).Branch)
+				fmt.Printf("Remote branch %s deleted \n", ui.Format.Branch(branch))
 			}
 		}
 		githandler.FetchPrune()
diff --git a/phlow/deliver.go b/phlow/deliver.go
@@ -37,7 +37,7 @@ func Deliver(defaultBranch string) {
 		fmt.Println(err)
 		return
 	}
-	fmt.Printf("Branch %s  is now delivered \n", ui.Format(branchInfo.Current).Branch)
+	fmt.Printf("Branch %s  is now delivered \n", ui.Format.Branch(branchInfo.Current))
 }
 
 //LocalDeliver ...
@@ -51,7 +51,7 @@ func LocalDeliver(defaultBranch string) {
 		return
 	}
 
-	fmt.Fprintf(os.Stdout, "Checking out default branch %s \n", ui.Format(defaultBranch).Branch)
+	fmt.Fprintf(os.Stdout, "Checking out default branch %s \n", ui.Format.Branch(defaultBranch))
 	//Checkout default branch: master
 	if err := githandler.CheckOut(defaultBranch); err != nil {
 		fmt.Println(err)
@@ -66,7 +66,7 @@ func LocalDeliver(defaultBranch string) {
 	}
 	fmt.Println(output)
 
-	fmt.Fprintf(os.Stdout, "Merging changes from branch %s into branch %s \n", ui.Format(branchInfo.Current).Branch, ui.Format(defaultBranch).Branch)
+	fmt.Fprintf(os.Stdout, "Merging changes from branch %s into branch %s \n", ui.Format.Branch(branchInfo.Current), ui.Format.Branch(defaultBranch))
 	//Merge feature branch into default
 	if err = githandler.Merge(branchInfo.Current); err != nil {
 		fmt.Println(err)
@@ -75,15 +75,15 @@ func LocalDeliver(defaultBranch string) {
 	githandler.BranchRename(branchInfo.Current)
 
 	//Push changes to github
-	fmt.Fprintf(os.Stdout, "Pushing changes to remote %s \n", ui.Format(defaultBranch).Branch)
+	fmt.Fprintf(os.Stdout, "Pushing changes to remote %s \n", ui.Format.Branch(defaultBranch))
 	ui.PhlowSpinner.Start("Pushing changes")
 	_, err = githandler.Push()
 	if err != nil {
 		fmt.Println(err.Error())
 		return
 	}
 	ui.PhlowSpinner.Stop()
-	fmt.Printf("Changes from %s delivered to %s \n", ui.Format(branchInfo.Current).Branch, ui.Format(defaultBranch).Branch)
+	fmt.Printf("Changes from %s delivered to %s \n", ui.Format.Branch(branchInfo.Current), ui.Format.Branch(defaultBranch))
 
 }
 
diff --git a/phlow/issues.go b/phlow/issues.go
@@ -37,23 +37,23 @@ func IssueList() {
 	var printIssue = func(issue plugins.Issues) {
 		issStr := strconv.Itoa(issue.Number)
 
-		fmt.Print(ui.Format(issStr + ": ").Bold)
+		fmt.Print(ui.Format.Bold(issStr + ": "))
 		fmt.Print(issue.Title)
 
 		for _, label := range issue.Labels {
 
-			fmt.Print(" " + ui.Format(label.Name).Label.FByG(plugins.GroupID(label.Name)))
+			fmt.Print(" " + ui.Format.FByG(plugins.GroupID(label.Name))(label.Name))
 		}
 
 		for _, user := range issue.Assignees {
-			fmt.Print(" " + ui.Format(user.Login).Assignee)
+			fmt.Print(" " + ui.Format.Assignee(user.Login))
 		}
-		fmt.Print(" " + ui.Format(issue.Milestone.Title).MileStone)
+		fmt.Print(" " + ui.Format.MileStone(issue.Milestone.Title))
 
 		fmt.Println()
 	}
 
-	fmt.Println(ui.Format("# Issues").MileStone)
+	fmt.Println(ui.Format.MileStone("# Issues"))
 
 	for _, issue := range issues {
 		assignees := issue.Assignees
diff --git a/phlow/mkalias.go b/phlow/mkalias.go
@@ -24,10 +24,10 @@ func MkAlias() {
 	for key, value := range aliases {
 		str := githandler.ConfigGet(key, group)
 		if str == "" {
-			fmt.Printf("Creating alias %s \n", ui.Format(key).Alias)
+			fmt.Printf("Creating alias %s \n", ui.Format.Alias(key))
 			githandler.ConfigSet(key, value, group)
 		} else {
-			fmt.Printf("Alias %s already exists \n", ui.Format(key).Alias)
+			fmt.Printf("Alias %s already exists \n", ui.Format.Alias(key))
 		}
 	}
 
diff --git a/phlow/workon.go b/phlow/workon.go
@@ -29,7 +29,7 @@ func WorkOn(issue int) {
 
 	fmt.Fprintln(os.Stdout, "Locating existing issue branches")
 	if plugins.IssueFromBranchName(branchInfo.Current) == issue {
-		fmt.Fprintf(os.Stdout, "You are already on branch %s \n", ui.Format(branchInfo.Current).Branch)
+		fmt.Fprintf(os.Stdout, "You are already on branch %s \n", ui.Format.Branch(branchInfo.Current))
 		return
 	}
 
@@ -38,11 +38,11 @@ func WorkOn(issue int) {
 			if err = githandler.CheckOut(branch); err != nil {
 				fmt.Println(err)
 			}
-			fmt.Fprintf(os.Stdout, "Switched to branch %s \n", ui.Format(branch).Branch)
+			fmt.Fprintf(os.Stdout, "Switched to branch %s \n", ui.Format.Branch(branch))
 			return
 		}
 	}
-	fmt.Fprintf(os.Stdout, "No local %s found. Searching github \n", ui.Format("issue-branches").Bold)
+	fmt.Fprintf(os.Stdout, "No local %s found. Searching github \n", ui.Format.Bold("issue-branches"))
 
 	//Get list of github issues
 	gitHubIssues, err := plugins.GitHub.Issue.Get()
@@ -64,7 +64,7 @@ func WorkOn(issue int) {
 				fmt.Println(err)
 				return
 			}
-			fmt.Fprintf(os.Stdout, "branch %s created and checked out \n", ui.Format(name).Branch)
+			fmt.Fprintf(os.Stdout, "branch %s created and checked out \n", ui.Format.Branch(name))
 
 			//Set labels and Assignee
 			UpdateIssue(issue)
@@ -90,9 +90,9 @@ func UpdateIssue(issue int) {
 	}
 
 	is := strconv.Itoa(issue)
-	fmt.Fprintf(os.Stdout, "\n-------- Issue %s updated --------  \n", ui.Format(is).Issue)
-	fmt.Fprintf(os.Stdout, "Label    => %s \n", ui.Format(plugins.PhlowLabels["Status - in progress"].Title).Label.G4Move)
-	fmt.Fprintf(os.Stdout, "Assignee => %s \n", ui.Format(user).Assignee)
+	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
 }
diff --git a/ui/formats.go b/ui/formats.go
@@ -4,71 +4,90 @@ import (
 	"github.com/fatih/color"
 )
 
-var cf *ColorFormat
+var Format *colorFormat
 var lsf *labelSubFormat
 
-//ColorFormat ...
+//colorFormat ...
 //color formats for terminal output
-type ColorFormat struct {
-	Bold      string
-	Success   string
-	Error     string
+type colorFormat struct {
+	Bold      func(in string) string
+	Success   func(in string) string
+	Error     func(in string) string
 	Label     *labelSubFormat
-	Assignee  string
-	Alias     string
-	Issue     string
-	Branch    string
-	MileStone string
+	Assignee  func(in string) string
+	Alias     func(in string) string
+	Issue     func(in string) string
+	Branch    func(in string) string
+	MileStone func(in string) string
 }
 
 //labelSubFormat ...
 //color formats for labels in terminal output
 type labelSubFormat struct {
-	G1Await    string
-	G2Priority string
-	G3Time     string
-	G4Move     string
+	G1Await    func(in string) string
+	G2Priority func(in string) string
+	G3Time     func(in string) string
+	G4Move     func(in string) string
+}
+
+func init() {
+	lsf = &labelSubFormat{
+		G1Await: func(in string) string {
+			return color.New(color.FgHiGreen).Add(color.Bold).Add(color.BgGreen).SprintFunc()(in)
+		},
+		G2Priority: func(in string) string {
+			return color.New(color.FgWhite).Add(color.Bold).Add(color.BgHiRed).SprintFunc()(in)
+		},
+		G3Time: func(in string) string {
+			return color.New(color.FgHiBlack).Add(color.Bold).Add(color.BgHiBlue).SprintFunc()(in)
+		},
+		G4Move: func(in string) string {
+			return color.New(color.FgBlack).Add(color.Bold).Add(color.BgHiWhite).SprintFunc()(in)
+		},
+	}
+
+	Format = &colorFormat{
+		Bold: func(in string) string {
+			return color.New(color.Bold).SprintFunc()(in)
+		},
+		Success: func(in string) string {
+			return color.New(color.FgHiGreen).SprintFunc()(in)
+		},
+		Error: func(in string) string {
+			return color.New(color.FgHiRed).SprintFunc()(in)
+		},
+		Branch: func(in string) string {
+			return color.New(color.FgHiGreen).Add(color.Bold).SprintFunc()(in)
+		},
+		Alias: func(in string) string {
+			return color.New(color.FgHiCyan).Add(color.Bold).SprintFunc()(in)
+		},
+		Assignee: func(in string) string {
+			return color.New(color.FgYellow).Add(color.Bold).SprintFunc()("@" + in)
+		},
+		Issue: func(in string) string {
+			return color.New(color.Bold).SprintFunc()("#" + in)
+		},
+		MileStone: func(in string) string {
+			return color.New(color.FgGreen).SprintFunc()(in)
+		},
+		Label: lsf,
+	}
 }
 
 //FByG ...
-//Format By Group return the format of the given group of the label
-func (l *labelSubFormat) FByG(g int) string {
-	switch g {
+//Format By Group return the Format of the given group of the label
+func (c *colorFormat) FByG(i int) (func(string) string) {
+	switch i {
 	case 1:
-		return l.G1Await
+		return c.Label.G1Await
 	case 2:
-		return l.G2Priority
+		return c.Label.G2Priority
 	case 3:
-		return l.G3Time
+		return c.Label.G3Time
 	case 4:
-		return l.G4Move
+		return c.Label.G4Move
 	default:
-		return l.G1Await
-	}
-}
-
-//Format ...
-//returns the ColorFormat
-func Format(input string) *ColorFormat {
-	if cf == nil {
-		lsf = &labelSubFormat{
-			G1Await:    color.New(color.FgHiGreen).Add(color.Bold).Add(color.BgGreen).SprintFunc()(input),
-			G2Priority: color.New(color.FgWhite).Add(color.Bold).Add(color.BgHiRed).SprintFunc()(input),
-			G3Time:     color.New(color.FgHiBlack).Add(color.Bold).Add(color.BgHiBlue).SprintFunc()(input),
-			G4Move:     color.New(color.FgBlack).Add(color.Bold).Add(color.BgHiWhite).SprintFunc()(input),
-		}
-
-		cf = &ColorFormat{
-			Bold:      color.New(color.Bold).SprintFunc()(input),
-			Success:   color.New(color.FgHiGreen).SprintFunc()(input),
-			Error:     color.New(color.FgHiRed).SprintFunc()(input),
-			Branch:    color.New(color.FgHiGreen).Add(color.Bold).SprintFunc()(input),
-			Alias:     color.New(color.FgHiCyan).Add(color.Bold).SprintFunc()(input),
-			Assignee:  color.New(color.FgYellow).Add(color.Bold).SprintFunc()("@" + input),
-			Issue:     color.New(color.Bold).SprintFunc()("#" + input),
-			MileStone: color.New(color.FgGreen).SprintFunc()(input),
-			Label:     lsf,
-		}
+		return c.Label.G1Await
 	}
-	return cf
 }

Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@ var agentCmd = &cobra.Command{`
`17`	`17`	`%s commands are a set of subcommands available for ci/cd services. They are meant as a way of services to easily`
`18`	`18`	`be compatible with %s.`
`19`	`19`	`These are not meant to used locally as a part of your local workflow`
`20`		-`, ui.Format("agent").Bold, ui.Format("the praqmatic workflow").Bold),
	`20`	+`, ui.Format.Bold("agent"), ui.Format.Bold("the praqmatic workflow")),
`21`	`21`	`}`
`22`	`22`
`23`	`23`	`func init() {`
Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@ func RequiredAuthentication() {`
`15`	`15`	`user := githandler.ConfigGet("user", "phlow")`
`16`	`16`
`17`	`17`	`if token == "" \|\| user == "" {`
`18`		`- fmt.Printf("Please run %s to connect to github \n", ui.Format("auth").Bold)`
	`18`	`+ fmt.Printf("Please run %s to connect to github \n", ui.Format.Bold("auth"))`
`19`	`19`	`os.Exit(0)`
`20`	`20`	`}`
`21`	`21`	`}`
Original file line number	Diff line number	Diff line change
`@@ -35,11 +35,11 @@ and pushed to your "remote default branch" and prefixed with "/delivered"`
`35`	`35`	`//Run tests before deliver`
`36`	`36`	`if len(args) > 0 {`
`37`	`37`	`if err := phlow.TestDeliver(args); err != nil {`
`38`		`- fmt.Println(ui.Format("!! Tests did not exit with code 0 !!").Error)`
	`38`	`+ fmt.Println(ui.Format.Error("!! Tests did not exit with code 0 !!"))`
`39`	`39`	`fmt.Println(err)`
`40`	`40`	`os.Exit(1)`
`41`	`41`	`}`
`42`		`- fmt.Println(ui.Format("Tests exited with code 0 - starting deliver process").Success)`
	`42`	`+ fmt.Println(ui.Format.Success("Tests exited with code 0 - starting deliver process"))`
`43`	`43`	`}`
`44`	`44`
`45`	`45`	`//If Run if local deliver`