diff --git a/default.go b/default.go deleted file mode 100644 index b0459298..00000000 --- a/default.go +++ /dev/null @@ -1,41 +0,0 @@ -package main - -import ( - "fmt" - "github.com/fatih/structs" - "reflect" - "strconv" -) - -func ApplyDefaultValues(struct_ interface{}) (err error) { - o := structs.New(struct_) - - for _, field := range o.Fields() { - defaultValue := field.Tag("default") - if defaultValue == "" { - continue - } - var val interface{} - switch field.Kind() { - case reflect.String: - val = defaultValue - case reflect.Bool: - if defaultValue == "true" { - val = true - } else if defaultValue == "false" { - val = false - } else { - return fmt.Errorf("invalid bool expression: %v, use true/false", defaultValue) - } - case reflect.Int: - val, err = strconv.Atoi(defaultValue) - if err != nil { - return err - } - default: - val = field.Value() - } - field.Set(val) - } - return nil -} diff --git a/flags.go b/flags.go deleted file mode 100644 index 7e8e0728..00000000 --- a/flags.go +++ /dev/null @@ -1,171 +0,0 @@ -package main - -import ( - "io/ioutil" - "log" - "os" - "reflect" - "strings" - - "github.com/fatih/structs" - "github.com/urfave/cli" - "github.com/yudai/hcl" - - "github.com/yudai/gotty/pkg/homedir" - "gopkg.in/yaml.v2" -) - -func GenerateFlags(options ...interface{}) (flags []cli.Flag, mappings map[string]string, err error) { - mappings = make(map[string]string) - - for _, struct_ := range options { - o := structs.New(struct_) - for _, field := range o.Fields() { - flagName := field.Tag("flagName") - if flagName == "" { - continue - } - envName := "CROC_" + strings.ToUpper(strings.Join(strings.Split(flagName, "-"), "_")) - mappings[flagName] = field.Name() - - flagShortName := field.Tag("flagSName") - if flagShortName != "" { - flagName += ", " + flagShortName - } - - flagDescription := field.Tag("flagDescribe") - - switch field.Kind() { - case reflect.String: - flags = append(flags, cli.StringFlag{ - Name: flagName, - Value: field.Value().(string), - Usage: flagDescription, - EnvVar: envName, - }) - case reflect.Bool: - flags = append(flags, cli.BoolFlag{ - Name: flagName, - Usage: flagDescription, - EnvVar: envName, - }) - case reflect.Int: - flags = append(flags, cli.IntFlag{ - Name: flagName, - Value: field.Value().(int), - Usage: flagDescription, - EnvVar: envName, - }) - } - } - } - - return -} - -func ApplyFlags( - flags []cli.Flag, - mappingHint map[string]string, - c *cli.Context, - options ...interface{}, -) { - objects := make([]*structs.Struct, len(options)) - for i, struct_ := range options { - objects[i] = structs.New(struct_) - } - - for flagName, fieldName := range mappingHint { - if !c.IsSet(flagName) { - continue - } - var field *structs.Field - var ok bool - for _, o := range objects { - field, ok = o.FieldOk(fieldName) - if ok { - break - } - } - if field == nil { - continue - } - var val interface{} - switch field.Kind() { - case reflect.String: - val = c.String(flagName) - case reflect.Bool: - val = c.Bool(flagName) - case reflect.Int: - val = c.Int(flagName) - } - field.Set(val) - } -} - -func ApplyConfigFile(filePath string, options ...interface{}) error { - filePath = homedir.Expand(filePath) - if _, err := os.Stat(filePath); os.IsNotExist(err) { - return err - } - - fileString := []byte{} - log.Printf("Loading config file at: %s", filePath) - fileString, err := ioutil.ReadFile(filePath) - if err != nil { - return err - } - - for _, object := range options { - if err := hcl.Decode(object, string(fileString)); err != nil { - return err - } - } - - return nil -} - -func ApplyConfigFileYaml(filePath string, options ...interface{}) error { - filePath = homedir.Expand(filePath) - if _, err := os.Stat(filePath); os.IsNotExist(err) { - return err - } - - fileString := []byte{} - log.Printf("Loading config file at: %s", filePath) - fileString, err := ioutil.ReadFile(filePath) - if err != nil { - return err - } - - for _, object := range options { - if err := yaml.Unmarshal(fileString, object); err != nil { - return err - } - - } - - return nil -} - -func SaveConfigFileYaml(filePath string, options ...interface{}) error { - filePath = homedir.Expand(filePath) - if _, err := os.Stat(filePath); os.IsNotExist(err) { - return err - } - - fd, err := os.OpenFile(filePath, os.O_WRONLY|os.O_CREATE, 0644) - if err != nil { - return err - } - defer fd.Close() - - for _, object := range options { - if byteString, err := yaml.Marshal(object); err != nil { - return err - } else { - fd.Write(byteString) - } - } - - return nil -} diff --git a/help.go b/help.go deleted file mode 100644 index ec37fc7a..00000000 --- a/help.go +++ /dev/null @@ -1,30 +0,0 @@ -package main - -var helpTemplate = ` - ,_ - >' ) - ( ( \ - || \ - /^^^^\ || - /^^\________/0 \ || - ( ` + "`" + `~+++,,_||__,,++~^^^^^^^ - ...V^V^V^V^V^V^\............................... - - -NAME: - {{.Name}} - {{.Usage}} - -USAGE: - {{.Name}} [options] - -VERSION: - {{.Version}}{{if or .Author .Email}} - -AUTHOR:{{if .Author}} - {{.Author}}{{if .Email}} - <{{.Email}}>{{end}}{{else}} - {{.Email}}{{end}}{{end}} - -OPTIONS: - {{range .Flags}}{{.}} - {{end}} -` diff --git a/logging.go b/logging.go deleted file mode 100644 index 924e3a7c..00000000 --- a/logging.go +++ /dev/null @@ -1,48 +0,0 @@ -package main - -import ( - log "github.com/cihub/seelog" -) - -func init() { - - SetLogLevel("debug") -} - -// SetLogLevel determines the log level -func SetLogLevel(level string) (err error) { - - // https://en.wikipedia.org/wiki/ANSI_escape_code#3/4_bit - // https://github.com/cihub/seelog/wiki/Log-levels - appConfig := ` - - - - - - - - - - - - - - - - - - - - - - - - ` - logger, err := log.LoggerFromConfigAsBytes([]byte(appConfig)) - if err != nil { - return - } - log.ReplaceLogger(logger) - return -} diff --git a/main.go b/main.go index f76aa377..4becf1ad 100644 --- a/main.go +++ b/main.go @@ -3,11 +3,18 @@ package main import ( "bufio" "fmt" + "io/ioutil" "os" + "reflect" + "strconv" "strings" + log "github.com/cihub/seelog" + "github.com/fatih/structs" "github.com/urfave/cli" "github.com/yudai/gotty/pkg/homedir" + "github.com/yudai/hcl" + yaml "gopkg.in/yaml.v2" ) const BUFFERSIZE = 1024 @@ -34,6 +41,11 @@ var email string var author string var version string +func init() { + + SetLogLevel("debug") +} + func main() { app := cli.NewApp() @@ -111,3 +123,258 @@ func exit(err error, code int) { } os.Exit(code) } + +func ApplyDefaultValues(struct_ interface{}) (err error) { + o := structs.New(struct_) + + for _, field := range o.Fields() { + defaultValue := field.Tag("default") + if defaultValue == "" { + continue + } + var val interface{} + switch field.Kind() { + case reflect.String: + val = defaultValue + case reflect.Bool: + if defaultValue == "true" { + val = true + } else if defaultValue == "false" { + val = false + } else { + return fmt.Errorf("invalid bool expression: %v, use true/false", defaultValue) + } + case reflect.Int: + val, err = strconv.Atoi(defaultValue) + if err != nil { + return err + } + default: + val = field.Value() + } + field.Set(val) + } + return nil +} + +func GenerateFlags(options ...interface{}) (flags []cli.Flag, mappings map[string]string, err error) { + mappings = make(map[string]string) + + for _, struct_ := range options { + o := structs.New(struct_) + for _, field := range o.Fields() { + flagName := field.Tag("flagName") + if flagName == "" { + continue + } + envName := "CROC_" + strings.ToUpper(strings.Join(strings.Split(flagName, "-"), "_")) + mappings[flagName] = field.Name() + + flagShortName := field.Tag("flagSName") + if flagShortName != "" { + flagName += ", " + flagShortName + } + + flagDescription := field.Tag("flagDescribe") + + switch field.Kind() { + case reflect.String: + flags = append(flags, cli.StringFlag{ + Name: flagName, + Value: field.Value().(string), + Usage: flagDescription, + EnvVar: envName, + }) + case reflect.Bool: + flags = append(flags, cli.BoolFlag{ + Name: flagName, + Usage: flagDescription, + EnvVar: envName, + }) + case reflect.Int: + flags = append(flags, cli.IntFlag{ + Name: flagName, + Value: field.Value().(int), + Usage: flagDescription, + EnvVar: envName, + }) + } + } + } + + return +} + +func ApplyFlags( + flags []cli.Flag, + mappingHint map[string]string, + c *cli.Context, + options ...interface{}, +) { + objects := make([]*structs.Struct, len(options)) + for i, struct_ := range options { + objects[i] = structs.New(struct_) + } + + for flagName, fieldName := range mappingHint { + if !c.IsSet(flagName) { + continue + } + var field *structs.Field + var ok bool + for _, o := range objects { + field, ok = o.FieldOk(fieldName) + if ok { + break + } + } + if field == nil { + continue + } + var val interface{} + switch field.Kind() { + case reflect.String: + val = c.String(flagName) + case reflect.Bool: + val = c.Bool(flagName) + case reflect.Int: + val = c.Int(flagName) + } + field.Set(val) + } +} + +func ApplyConfigFile(filePath string, options ...interface{}) error { + filePath = homedir.Expand(filePath) + if _, err := os.Stat(filePath); os.IsNotExist(err) { + return err + } + + fileString := []byte{} + log.Debugf("Loading config file at: %s", filePath) + fileString, err := ioutil.ReadFile(filePath) + if err != nil { + return err + } + + for _, object := range options { + if err := hcl.Decode(object, string(fileString)); err != nil { + return err + } + } + + return nil +} + +func ApplyConfigFileYaml(filePath string, options ...interface{}) error { + filePath = homedir.Expand(filePath) + if _, err := os.Stat(filePath); os.IsNotExist(err) { + return err + } + + fileString := []byte{} + log.Debugf("Loading config file at: %s", filePath) + fileString, err := ioutil.ReadFile(filePath) + if err != nil { + return err + } + + for _, object := range options { + if err := yaml.Unmarshal(fileString, object); err != nil { + return err + } + + } + + return nil +} + +func SaveConfigFileYaml(filePath string, options ...interface{}) error { + filePath = homedir.Expand(filePath) + if _, err := os.Stat(filePath); os.IsNotExist(err) { + return err + } + + fd, err := os.OpenFile(filePath, os.O_WRONLY|os.O_CREATE, 0644) + if err != nil { + return err + } + defer fd.Close() + + for _, object := range options { + if byteString, err := yaml.Marshal(object); err != nil { + return err + } else { + fd.Write(byteString) + } + } + + return nil +} + +var helpTemplate = ` + ,_ + >' ) + ( ( \ + || \ + /^^^^\ || + /^^\________/0 \ || + ( ` + "`" + `~+++,,_||__,,++~^^^^^^^ + ...V^V^V^V^V^V^\............................... + + +NAME: + {{.Name}} - {{.Usage}} + +USAGE: + {{.Name}} [options] + +VERSION: + {{.Version}}{{if or .Author .Email}} + +AUTHOR:{{if .Author}} + {{.Author}}{{if .Email}} - <{{.Email}}>{{end}}{{else}} + {{.Email}}{{end}}{{end}} + +OPTIONS: + {{range .Flags}}{{.}} + {{end}} +` + +// SetLogLevel determines the log level +func SetLogLevel(level string) (err error) { + + // https://en.wikipedia.org/wiki/ANSI_escape_code#3/4_bit + // https://github.com/cihub/seelog/wiki/Log-levels + appConfig := ` + + + + + + + + + + + + + + + + + + + + + + + + ` + logger, err := log.LoggerFromConfigAsBytes([]byte(appConfig)) + if err != nil { + return + } + log.ReplaceLogger(logger) + return +}