move repo and org options to root command

Lots of the commands use these options, so move them to the root for
consistent handling.

Signed-off-by: Doug Hellmann <doug@doughellmann.com>

cmd/pullRequests.go

@@ -142,10 +142,5 @@ func getName(user *github.User) string {
 }
 
 func init() {
-	pullRequestsCmd.Flags().StringVarP(&orgName, "org", "o", "", "github org")
-	pullRequestsCmd.Flags().StringVarP(&repoName, "repo", "r", "", "github repository")
-	pullRequestsCmd.Flags().IntVar(&daysBack, "days-back", 90,
-		"how many days back to query, defaults to 90")
-
 	rootCmd.AddCommand(pullRequestsCmd)
 }

cmd/reviewers.go

@@ -35,12 +35,6 @@ const ignoreConfigOptionName = "reviewers.ignore"
 // stats
 var ignoredReviewers = []string{}
 
-// orgName and repoName are the GitHub organization and repository to query
-var orgName, repoName string
-
-// daysBack is the number of days of history to examine (older items are ignored)
-var daysBack int
-
 // reviewersCmd represents the reviewers command
 var reviewersCmd = &cobra.Command{
 	Use:   "reviewers",
@@ -121,8 +115,4 @@ func init() {
 	reviewersCmd.Flags().StringSliceVarP(&ignoredReviewers,
 		"ignore", "i", []string{},
 		"ignore a reviewer (useful for bots), can be repeated")
-	reviewersCmd.Flags().StringVarP(&orgName, "org", "o", "", "github org")
-	reviewersCmd.Flags().StringVarP(&repoName, "repo", "r", "", "github repository")
-	reviewersCmd.Flags().IntVar(&daysBack, "days-back", 90,
-		"how many days back to query, defaults to 90")
 }

cmd/root.go

@@ -32,6 +32,12 @@ var cfgFile string
 // devMode is a flag telling us whether we are in developer mode
 var devMode bool
 
+// orgName and repoName are the GitHub organization and repository to query
+var orgName, repoName string
+
+// daysBack is the number of days of history to examine (older items are ignored)
+var daysBack int
+
 // rootCmd represents the base command when called without any subcommands
 var rootCmd = &cobra.Command{
 	Use:   "gh-review-stats",
@@ -57,8 +63,16 @@ func init() {
 
 	viper.SetDefault(githubTokenConfigOptionName, "")
 
-	rootCmd.PersistentFlags().StringVar(&cfgFile, "config", "", "config file (default is $HOME/.gh-review-stats.yml)")
-	rootCmd.PersistentFlags().BoolVar(&devMode, "dev", false, "enable developer mode, shortcutting some queries")
+	rootCmd.PersistentFlags().StringVar(&cfgFile, "config", "",
+		"config file (default is $HOME/.gh-review-stats.yml)")
+	rootCmd.PersistentFlags().BoolVar(&devMode, "dev", false,
+		"enable developer mode, shortcutting some queries")
+	rootCmd.PersistentFlags().StringVarP(&orgName, "org", "o", "",
+		"github org")
+	rootCmd.PersistentFlags().StringVarP(&repoName, "repo", "r", "",
+		"github repository")
+	rootCmd.PersistentFlags().IntVar(&daysBack, "days-back", 90,
+		"how many days back to query")
 
 }