a/realize
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #84 from puradox/master

Browse Source 
Fix broken color codes on Windows
This commit is contained in:
Alessio Pracchia 2017-08-31 09:37:37 +02:00 committed by GitHub
commit 9b58dc8e43
5 changed files with 34 additions and 90 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

72
realize.go
View File

@ -118,7 +118,7 @@ func main() {
if err := r.Record(r); err != nil { if err := r.Record(r); err != nil {
return err return err
} }
fmt.Println(prefix(style.Green.Bold("Your project was successfully added."))) fmt.Fprintln(style.Output,prefix(style.Green.Bold("Your project was successfully added.")))
return nil return nil
}, },
Before: before, Before: before,
@ -158,10 +158,7 @@ func main() {
Create: true, Create: true,
}, },
Resources: settings.Resources{ Resources: settings.Resources{
Config: config, Config: config,
Outputs: outputs,
Logs: logs,
Errors: errs,
}, },
Server: settings.Server{ Server: settings.Server{
Status: false, Status: false,
@ -751,60 +748,6 @@ func main() {
return nil return nil
}, },
}, },
{
Before: func(d interact.Context) error {
d.SetDef(false, style.Green.Regular("(n)"))
return nil
},
Quest: interact.Quest{
Options: style.Yellow.Regular("[y/n]"),
Msg: "Enable file output history",
},
Action: func(d interact.Context) interface{} {
val, err := d.Ans().Bool()
if err != nil {
return d.Err()
}
r.Blueprint.Projects[len(r.Blueprint.Projects)-1].Streams.FileOut = val
return nil
},
},
{
Before: func(d interact.Context) error {
d.SetDef(false, style.Green.Regular("(n)"))
return nil
},
Quest: interact.Quest{
Options: style.Yellow.Regular("[y/n]"),
Msg: "Enable file logs history",
},
Action: func(d interact.Context) interface{} {
val, err := d.Ans().Bool()
if err != nil {
return d.Err()
}
r.Blueprint.Projects[len(r.Blueprint.Projects)-1].Streams.FileLog = val
return nil
},
},
{
Before: func(d interact.Context) error {
d.SetDef(false, style.Green.Regular("(n)"))
return nil
},
Quest: interact.Quest{
Options: style.Yellow.Regular("[y/n]"),
Msg: "Enable file errors history",
},
Action: func(d interact.Context) interface{} {
val, err := d.Ans().Bool()
if err != nil {
return d.Err()
}
r.Blueprint.Projects[len(r.Blueprint.Projects)-1].Streams.FileErr = val
return nil
},
},
{ {
Before: func(d interact.Context) error { Before: func(d interact.Context) error {
d.SetDef("", style.Green.Regular("(none)")) d.SetDef("", style.Green.Regular("(none)"))
@ -847,7 +790,7 @@ func main() {
if err := r.Record(r); err != nil { if err := r.Record(r); err != nil {
return err return err
} }
fmt.Println(prefix(style.Green.Bold("Your configuration was successful."))) fmt.Fprintln(style.Output,prefix(style.Green.Bold("Your configuration was successful.")))
return nil return nil
}, },
Before: before, Before: before,
@ -867,7 +810,7 @@ func main() {
if err := r.Record(r); err != nil { if err := r.Record(r); err != nil {
return err return err
} }
fmt.Println(prefix(style.Green.Bold("Your project was successfully removed."))) fmt.Fprintln(style.Output,prefix(style.Green.Bold("Your project was successfully removed.")))
return nil return nil
}, },
Before: before, Before: before,
@ -891,7 +834,7 @@ func main() {
if err := r.Settings.Remove(directory); err != nil { if err := r.Settings.Remove(directory); err != nil {
return err return err
} }
fmt.Println(prefix(style.Green.Bold("Realize folder successfully removed."))) fmt.Fprintln(style.Output,prefix(style.Green.Bold("Realize folder successfully removed.")))
return nil return nil
}, },
Before: before, Before: before,
@ -926,10 +869,7 @@ func before(*cli.Context) error {
Create: true, Create: true,
}, },
Resources: settings.Resources{ Resources: settings.Resources{
Config: config, Config: config,
Outputs: outputs,
Logs: logs,
Errors: errs,
}, },
Server: settings.Server{ Server: settings.Server{
Status: false, Status: false,

4
style/style.go
View File

@ -22,3 +22,7 @@ var (
Magenta = colorBase(color.FgMagenta) Magenta = colorBase(color.FgMagenta)
Green = colorBase(color.FgGreen) Green = colorBase(color.FgGreen)
) )
// Output defines the standard output of the print functions. By default, os.Stdout is used.
// When invoked on Windows machines, this automatically handles escape sequences.
var Output = color.Output

44
watcher/cmd.go
View File

@ -137,48 +137,48 @@ func (h *Blueprint) List() error {
err := h.check() err := h.check()
if err == nil { if err == nil {
for _, val := range h.Projects { for _, val := range h.Projects {
fmt.Println(style.Blue.Bold("[") + strings.ToUpper(val.Name) + style.Blue.Bold("]")) fmt.Fprintln(style.Output, style.Blue.Bold("[")+strings.ToUpper(val.Name)+style.Blue.Bold("]"))
name := style.Magenta.Bold("[") + strings.ToUpper(val.Name) + style.Magenta.Bold("]") name := style.Magenta.Bold("[") + strings.ToUpper(val.Name) + style.Magenta.Bold("]")
fmt.Println(name, style.Yellow.Regular("Base Path"), ":", style.Magenta.Regular(val.Path)) fmt.Fprintln(style.Output, name, style.Yellow.Regular("Base Path"), ":", style.Magenta.Regular(val.Path))
fmt.Println(name, style.Yellow.Regular("Fmt"), ":", style.Magenta.Regular(val.Cmds.Fmt)) fmt.Fprintln(style.Output, name, style.Yellow.Regular("Fmt"), ":", style.Magenta.Regular(val.Cmds.Fmt))
fmt.Println(name, style.Yellow.Regular("Generate"), ":", style.Magenta.Regular(val.Cmds.Generate)) fmt.Fprintln(style.Output, name, style.Yellow.Regular("Generate"), ":", style.Magenta.Regular(val.Cmds.Generate))
fmt.Println(name, style.Yellow.Regular("Test"), ":", style.Magenta.Regular(val.Cmds.Test)) fmt.Fprintln(style.Output, name, style.Yellow.Regular("Test"), ":", style.Magenta.Regular(val.Cmds.Test))
fmt.Println(name, style.Yellow.Regular("Install"), ":", style.Magenta.Regular(val.Cmds.Bin)) fmt.Fprintln(style.Output, name, style.Yellow.Regular("Install"), ":", style.Magenta.Regular(val.Cmds.Bin))
fmt.Println(name, style.Yellow.Regular("Build"), ":", style.Magenta.Regular(val.Cmds.Build)) fmt.Fprintln(style.Output, name, style.Yellow.Regular("Build"), ":", style.Magenta.Regular(val.Cmds.Build))
fmt.Println(name, style.Yellow.Regular("Run"), ":", style.Magenta.Regular(val.Cmds.Run)) fmt.Fprintln(style.Output, name, style.Yellow.Regular("Run"), ":", style.Magenta.Regular(val.Cmds.Run))
if len(val.Args) > 0 { if len(val.Args) > 0 {
fmt.Println(name, style.Yellow.Regular("Params"), ":", style.Magenta.Regular(val.Args)) fmt.Fprintln(style.Output, name, style.Yellow.Regular("Params"), ":", style.Magenta.Regular(val.Args))
} }
fmt.Println(name, style.Yellow.Regular("Watcher"), ":") fmt.Fprintln(style.Output, name, style.Yellow.Regular("Watcher"), ":")
fmt.Println(name, "\t", style.Yellow.Regular("Preview"), ":", style.Magenta.Regular(val.Watcher.Preview)) fmt.Fprintln(style.Output, name, "\t", style.Yellow.Regular("Preview"), ":", style.Magenta.Regular(val.Watcher.Preview))
if len(val.Watcher.Exts) > 0 { if len(val.Watcher.Exts) > 0 {
fmt.Println(name, "\t", style.Yellow.Regular("Extensions"), ":", style.Magenta.Regular(val.Watcher.Exts)) fmt.Fprintln(style.Output, name, "\t", style.Yellow.Regular("Extensions"), ":", style.Magenta.Regular(val.Watcher.Exts))
} }
if len(val.Watcher.Paths) > 0 { if len(val.Watcher.Paths) > 0 {
fmt.Println(name, "\t", style.Yellow.Regular("Paths"), ":", style.Magenta.Regular(val.Watcher.Paths)) fmt.Fprintln(style.Output, name, "\t", style.Yellow.Regular("Paths"), ":", style.Magenta.Regular(val.Watcher.Paths))
} }
if len(val.Watcher.Ignore) > 0 { if len(val.Watcher.Ignore) > 0 {
fmt.Println(name, "\t", style.Yellow.Regular("Ignored paths"), ":", style.Magenta.Regular(val.Watcher.Ignore)) fmt.Fprintln(style.Output, name, "\t", style.Yellow.Regular("Ignored paths"), ":", style.Magenta.Regular(val.Watcher.Ignore))
} }
if len(val.Watcher.Scripts) > 0 { if len(val.Watcher.Scripts) > 0 {
fmt.Println(name, "\t", style.Yellow.Regular("Scripts"), ":") fmt.Fprintln(style.Output, name, "\t", style.Yellow.Regular("Scripts"), ":")
for _, v := range val.Watcher.Scripts { for _, v := range val.Watcher.Scripts {
if v.Command != "" { if v.Command != "" {
fmt.Println(name, "\t\t", style.Magenta.Regular("-"), style.Yellow.Regular("Command"), ":", style.Magenta.Regular(v.Command)) fmt.Fprintln(style.Output, name, "\t\t", style.Magenta.Regular("-"), style.Yellow.Regular("Command"), ":", style.Magenta.Regular(v.Command))
if v.Path != "" { if v.Path != "" {
fmt.Println(name, "\t\t", style.Yellow.Regular("Path"), ":", style.Magenta.Regular(v.Path)) fmt.Fprintln(style.Output, name, "\t\t", style.Yellow.Regular("Path"), ":", style.Magenta.Regular(v.Path))
} }
if v.Type != "" { if v.Type != "" {
fmt.Println(name, "\t\t", style.Yellow.Regular("Type"), ":", style.Magenta.Regular(v.Type)) fmt.Fprintln(style.Output, name, "\t\t", style.Yellow.Regular("Type"), ":", style.Magenta.Regular(v.Type))
} }
} }
} }
} }
fmt.Println(name, style.Yellow.Regular("Streams"), ":") fmt.Fprintln(style.Output, name, style.Yellow.Regular("Streams"), ":")
fmt.Println(name, "\t", style.Yellow.Regular("File Out"), ":", style.Magenta.Regular(val.Streams.FileOut)) fmt.Fprintln(style.Output, name, "\t", style.Yellow.Regular("File Out"), ":", style.Magenta.Regular(val.Streams.FileOut))
fmt.Println(name, "\t", style.Yellow.Regular("File Log"), ":", style.Magenta.Regular(val.Streams.FileLog)) fmt.Fprintln(style.Output, name, "\t", style.Yellow.Regular("File Log"), ":", style.Magenta.Regular(val.Streams.FileLog))
fmt.Println(name, "\t", style.Yellow.Regular("File Err"), ":", style.Magenta.Regular(val.Streams.FileErr)) fmt.Fprintln(style.Output, name, "\t", style.Yellow.Regular("File Err"), ":", style.Magenta.Regular(val.Streams.FileErr))
} }
return nil return nil
} }

2
watcher/utils.go
View File

@ -46,7 +46,7 @@ func inArray(str string, list []string) bool {
// Rewrite the layout of the log timestamp // Rewrite the layout of the log timestamp
func (w logWriter) Write(bytes []byte) (int, error) { func (w logWriter) Write(bytes []byte) (int, error) {
return fmt.Print(style.Yellow.Regular("[") + time.Now().Format("15:04:05") + style.Yellow.Regular("]") + string(bytes)) return fmt.Fprint(style.Output, style.Yellow.Regular("[")+time.Now().Format("15:04:05")+style.Yellow.Regular("]")+string(bytes))
} }
// getEnvPath returns the first path found in env or empty string // getEnvPath returns the first path found in env or empty string

2
watcher/watcher.go
View File

@ -409,7 +409,7 @@ func (p *Project) stamp(t string, o BufferOut, msg string, stream string) {
log.Print(msg) log.Print(msg)
} }
if stream != "" { if stream != "" {
fmt.Print(stream) fmt.Fprint(style.Output, stream)
} }
go func() { go func() {
p.parent.Sync <- "sync" p.parent.Sync <- "sync"