taigrr/wtf
1
0
Fork 0
mirror of https://github.com/taigrr/wtf synced 2025-01-18 04:03:14 -08:00
Code Issues Projects Releases Wiki Activity

Closes #72. --info flag displays module help text

Browse Source 
Usage:

        wtf -i=todo
        wtf --info=todo
This commit is contained in:
Chris Cummer 2018-05-29 18:02:11 -07:00
parent ebf900e91b
commit f13abc9ed3
3 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
wtf.go
View File

@ -15,6 +15,7 @@ import (
"github.com/senorprogrammer/wtf/gcal" "github.com/senorprogrammer/wtf/gcal"
"github.com/senorprogrammer/wtf/git" "github.com/senorprogrammer/wtf/git"
"github.com/senorprogrammer/wtf/github" "github.com/senorprogrammer/wtf/github"
"github.com/senorprogrammer/wtf/help"
"github.com/senorprogrammer/wtf/jira" "github.com/senorprogrammer/wtf/jira"
"github.com/senorprogrammer/wtf/newrelic" "github.com/senorprogrammer/wtf/newrelic"
"github.com/senorprogrammer/wtf/opsgenie" "github.com/senorprogrammer/wtf/opsgenie"
@ -202,6 +203,10 @@ func main() {
cmdFlags := wtf.NewCommandFlags() cmdFlags := wtf.NewCommandFlags()
cmdFlags.Parse(version) cmdFlags.Parse(version)
if cmdFlags.HasInfo() {
help.DisplayHelpInfo(cmdFlags.Info)
}
/* -------------------- end flag parsing and handling -------------------- */ /* -------------------- end flag parsing and handling -------------------- */
// Responsible for creating the configuration directory and default // Responsible for creating the configuration directory and default

12
wtf/command_flags.go
View File

@ -10,6 +10,7 @@ import (
type CommandFlags struct { type CommandFlags struct {
Config string `short:"c" long:"config" optional:"yes" description:"Path to config file"` Config string `short:"c" long:"config" optional:"yes" description:"Path to config file"`
Info string `short:"i" long:"info" optional:"yes" description:"Display info about the specified module"`
Version bool `short:"v" long:"version" description:"Show Version Info"` Version bool `short:"v" long:"version" description:"Show Version Info"`
} }
@ -20,6 +21,14 @@ func NewCommandFlags() *CommandFlags {
/* -------------------- Exported Functions -------------------- */ /* -------------------- Exported Functions -------------------- */
func (cmdFlags *CommandFlags) HasConfig() bool {
return len(cmdFlags.Config) > 0
}
func (cmdFlags *CommandFlags) HasInfo() bool {
return len(cmdFlags.Info) > 0
}
func (cmdFlags *CommandFlags) Parse(version string) { func (cmdFlags *CommandFlags) Parse(version string) {
parser := flags.NewParser(cmdFlags, flags.Default) parser := flags.NewParser(cmdFlags, flags.Default)
if _, err := parser.Parse(); err != nil { if _, err := parser.Parse(); err != nil {
@ -28,14 +37,13 @@ func (cmdFlags *CommandFlags) Parse(version string) {
} }
} }
if len(cmdFlags.Config) == 0 { if !cmdFlags.HasConfig() {
homeDir, err := Home() homeDir, err := Home()
if err != nil { if err != nil {
os.Exit(1) os.Exit(1)
} }
cmdFlags.Config = filepath.Join(homeDir, ".wtf", "config.yml") cmdFlags.Config = filepath.Join(homeDir, ".wtf", "config.yml")
fmt.Printf(">> A: %s\n", cmdFlags.Config)
} }
if cmdFlags.Version { if cmdFlags.Version {

2
wtf/config_files.go
View File

@ -59,8 +59,6 @@ func CreateFile(fileName string) (string, error) {
// LoadConfigFile loads the config.yml file to configure the app // LoadConfigFile loads the config.yml file to configure the app
func LoadConfigFile(filePath string) *config.Config { func LoadConfigFile(filePath string) *config.Config {
fmt.Printf(">> B: %s\n", filePath)
absPath, _ := ExpandHomeDir(filePath) absPath, _ := ExpandHomeDir(filePath)
cfg, err := config.ParseYamlFile(absPath) cfg, err := config.ParseYamlFile(absPath)