From c9b5054cde294eba459f4c626999f93275cebbb2 Mon Sep 17 00:00:00 2001
From: Cory Bennett <cbennett@netflix.com>
Date: Sat, 28 Oct 2017 14:22:59 -0700
Subject: [PATCH] fix default values to load after parsing configs

---
 jiracmd/edit.go              | 6 +++---
 jiracmd/epicList.go          | 6 +++---
 jiracmd/exportTemplates.go   | 6 +++---
 jiracmd/list.go              | 6 +++---
 jiracmd/request.go           | 6 +++---
 jiracmd/subtask.go           | 6 +++---
 jiracmd/transition.go        | 6 +++---
 jiracmd/unexportTemplates.go | 7 +++----
 8 files changed, 24 insertions(+), 25 deletions(-)

diff --git a/jiracmd/edit.go b/jiracmd/edit.go
index 635a6f9..1310902 100644
--- a/jiracmd/edit.go
+++ b/jiracmd/edit.go
@@ -33,12 +33,12 @@ func CmdEditRegistry() *jiracli.CommandRegistryEntry {
 		"Edit issue details",
 		func(fig *figtree.FigTree, cmd *kingpin.CmdClause) error {
 			jiracli.LoadConfigs(cmd, fig, &opts)
-			if opts.QueryFields == "" {
-				opts.QueryFields = "assignee,created,priority,reporter,status,summary,updated,issuetype,comments,description,votes,created,customfield_10110,components"
-			}
 			return CmdEditUsage(cmd, &opts, fig)
 		},
 		func(o *oreo.Client, globals *jiracli.GlobalOptions) error {
+			if opts.QueryFields == "" {
+				opts.QueryFields = "assignee,created,priority,reporter,status,summary,updated,issuetype,comments,description,votes,created,customfield_10110,components"
+			}
 			return CmdEdit(o, globals, &opts)
 		},
 	}
diff --git a/jiracmd/epicList.go b/jiracmd/epicList.go
index a3de1ce..76bdd78 100644
--- a/jiracmd/epicList.go
+++ b/jiracmd/epicList.go
@@ -26,6 +26,9 @@ func CmdEpicListRegistry() *jiracli.CommandRegistryEntry {
 		"Prints list of issues for an epic with optional search criteria",
 		func(fig *figtree.FigTree, cmd *kingpin.CmdClause) error {
 			jiracli.LoadConfigs(cmd, fig, &opts)
+			return CmdEpicListUsage(cmd, &opts, fig)
+		},
+		func(o *oreo.Client, globals *jiracli.GlobalOptions) error {
 			if opts.MaxResults == 0 {
 				opts.MaxResults = 500
 			}
@@ -35,9 +38,6 @@ func CmdEpicListRegistry() *jiracli.CommandRegistryEntry {
 			if opts.Sort == "" {
 				opts.Sort = "priority asc, key"
 			}
-			return CmdEpicListUsage(cmd, &opts, fig)
-		},
-		func(o *oreo.Client, globals *jiracli.GlobalOptions) error {
 			return CmdEpicList(o, globals, &opts)
 		},
 	}
diff --git a/jiracmd/exportTemplates.go b/jiracmd/exportTemplates.go
index bb6dbe6..38ef75a 100644
--- a/jiracmd/exportTemplates.go
+++ b/jiracmd/exportTemplates.go
@@ -23,12 +23,12 @@ func CmdExportTemplatesRegistry() *jiracli.CommandRegistryEntry {
 		"Export templates for customizations",
 		func(fig *figtree.FigTree, cmd *kingpin.CmdClause) error {
 			jiracli.LoadConfigs(cmd, fig, &opts)
-			if opts.Dir == "" {
-				opts.Dir = fmt.Sprintf("%s/.jira.d/templates", jiracli.Homedir())
-			}
 			return CmdExportTemplatesUsage(cmd, &opts)
 		},
 		func(o *oreo.Client, globals *jiracli.GlobalOptions) error {
+			if opts.Dir == "" {
+				opts.Dir = fmt.Sprintf("%s/.jira.d/templates", jiracli.Homedir())
+			}
 			return CmdExportTemplates(globals, &opts)
 		},
 	}
diff --git a/jiracmd/list.go b/jiracmd/list.go
index c0503d8..1fe9b14 100644
--- a/jiracmd/list.go
+++ b/jiracmd/list.go
@@ -27,6 +27,9 @@ func CmdListRegistry() *jiracli.CommandRegistryEntry {
 		"Prints list of issues for given search criteria",
 		func(fig *figtree.FigTree, cmd *kingpin.CmdClause) error {
 			jiracli.LoadConfigs(cmd, fig, &opts)
+			return CmdListUsage(cmd, &opts, fig)
+		},
+		func(o *oreo.Client, globals *jiracli.GlobalOptions) error {
 			if opts.MaxResults == 0 {
 				opts.MaxResults = 500
 			}
@@ -36,9 +39,6 @@ func CmdListRegistry() *jiracli.CommandRegistryEntry {
 			if opts.Sort == "" {
 				opts.Sort = "priority asc, key"
 			}
-			return CmdListUsage(cmd, &opts, fig)
-		},
-		func(o *oreo.Client, globals *jiracli.GlobalOptions) error {
 			return CmdList(o, globals, &opts)
 		},
 	}
diff --git a/jiracmd/request.go b/jiracmd/request.go
index 57ffe50..6a72c51 100644
--- a/jiracmd/request.go
+++ b/jiracmd/request.go
@@ -32,14 +32,14 @@ func CmdRequestRegistry() *jiracli.CommandRegistryEntry {
 		"Open issue in requestr",
 		func(fig *figtree.FigTree, cmd *kingpin.CmdClause) error {
 			jiracli.LoadConfigs(cmd, fig, &opts)
-			if opts.Method == "" {
-				opts.Method = "GET"
-			}
 			jiracli.TemplateUsage(cmd, &opts.CommonOptions)
 			jiracli.GJsonQueryUsage(cmd, &opts.CommonOptions)
 			return CmdRequestUsage(cmd, &opts)
 		},
 		func(o *oreo.Client, globals *jiracli.GlobalOptions) error {
+			if opts.Method == "" {
+				opts.Method = "GET"
+			}
 			return CmdRequest(o, globals, &opts)
 		},
 	}
diff --git a/jiracmd/subtask.go b/jiracmd/subtask.go
index 8f50cdf..7d90315 100644
--- a/jiracmd/subtask.go
+++ b/jiracmd/subtask.go
@@ -33,12 +33,12 @@ func CmdSubtaskRegistry() *jiracli.CommandRegistryEntry {
 		"Subtask issue",
 		func(fig *figtree.FigTree, cmd *kingpin.CmdClause) error {
 			jiracli.LoadConfigs(cmd, fig, &opts)
-			if opts.IssueType == "" {
-				opts.IssueType = "Sub-task"
-			}
 			return CmdSubtaskUsage(cmd, &opts)
 		},
 		func(o *oreo.Client, globals *jiracli.GlobalOptions) error {
+			if opts.IssueType == "" {
+				opts.IssueType = "Sub-task"
+			}
 			return CmdSubtask(o, globals, &opts)
 		},
 	}
diff --git a/jiracmd/transition.go b/jiracmd/transition.go
index a60cce5..15442c8 100644
--- a/jiracmd/transition.go
+++ b/jiracmd/transition.go
@@ -39,12 +39,12 @@ func CmdTransitionRegistry(transition string) *jiracli.CommandRegistryEntry {
 		help,
 		func(fig *figtree.FigTree, cmd *kingpin.CmdClause) error {
 			jiracli.LoadConfigs(cmd, fig, &opts)
-			if opts.Transition == "" {
-				opts.Transition = transition
-			}
 			return CmdTransitionUsage(cmd, &opts)
 		},
 		func(o *oreo.Client, globals *jiracli.GlobalOptions) error {
+			if opts.Transition == "" {
+				opts.Transition = transition
+			}
 			return CmdTransition(o, globals, &opts)
 		},
 	}
diff --git a/jiracmd/unexportTemplates.go b/jiracmd/unexportTemplates.go
index 9ed69b4..caaad6e 100644
--- a/jiracmd/unexportTemplates.go
+++ b/jiracmd/unexportTemplates.go
@@ -20,13 +20,12 @@ func CmdUnexportTemplatesRegistry() *jiracli.CommandRegistryEntry {
 		"Remove unmodified exported templates",
 		func(fig *figtree.FigTree, cmd *kingpin.CmdClause) error {
 			jiracli.LoadConfigs(cmd, fig, &opts)
-			if opts.Dir != "" {
-				opts.Dir = fmt.Sprintf("%s/.jira.d/templates", jiracli.Homedir())
-			}
-
 			return CmdExportTemplatesUsage(cmd, &opts)
 		},
 		func(o *oreo.Client, globals *jiracli.GlobalOptions) error {
+			if opts.Dir != "" {
+				opts.Dir = fmt.Sprintf("%s/.jira.d/templates", jiracli.Homedir())
+			}
 			return CmdUnexportTemplates(globals, &opts)
 		},
 	}