From d91d01565d3e3ea7c072400eb9f0de63ed4f7d56 Mon Sep 17 00:00:00 2001 From: asoseil Date: Sun, 5 Nov 2017 19:28:41 +0100 Subject: [PATCH] Merge branch 'dev' of https://github.com/tockins/realize into dev # Please enter a commit message to explain why this merge is necessary, # especially if it merges an updated upstream into a topic branch. # # Lines starting with '#' will be ignored, and an empty message aborts # the commit. --- cmd.go | 2 + settings.go | 10 --- settings_unix.go | 14 ++++ settings_windows.go | 185 +------------------------------------------- 4 files changed, 18 insertions(+), 193 deletions(-) create mode 100644 settings_unix.go diff --git a/cmd.go b/cmd.go index f7275f9..18515ba 100644 --- a/cmd.go +++ b/cmd.go @@ -19,6 +19,8 @@ type tool struct { // Cmds list of go commands type Cmds struct { + Fix Cmd `yaml:"fix,omitempty" json:"fix,omitempty"` + Clean Cmd `yaml:"clean,omitempty" json:"clean,omitempty"` Vet Cmd `yaml:"vet,omitempty" json:"vet,omitempty"` Fmt Cmd `yaml:"fmt,omitempty" json:"fmt,omitempty"` Test Cmd `yaml:"test,omitempty" json:"test,omitempty"` diff --git a/settings.go b/settings.go index 7b1af07..a712153 100644 --- a/settings.go +++ b/settings.go @@ -7,7 +7,6 @@ import ( "math/rand" "os" "path/filepath" - "syscall" "time" ) @@ -76,15 +75,6 @@ func random(n int) string { return string(b) } -// Flimit defines the max number of watched files -func (s *Settings) flimit() error { - var rLimit syscall.Rlimit - rLimit.Max = uint64(s.FileLimit) - rLimit.Cur = uint64(s.FileLimit) - - return syscall.Setrlimit(syscall.RLIMIT_NOFILE, &rLimit) -} - // Delete realize folder func (s *Settings) del(d string) error { _, err := os.Stat(d) diff --git a/settings_unix.go b/settings_unix.go new file mode 100644 index 0000000..9e72710 --- /dev/null +++ b/settings_unix.go @@ -0,0 +1,14 @@ +// +build !windows + +package main + +import "syscall" + +// Flimit defines the max number of watched files +func (s *Settings) flimit() error { + var rLimit syscall.Rlimit + rLimit.Max = uint64(s.FileLimit) + rLimit.Cur = uint64(s.FileLimit) + + return syscall.Setrlimit(syscall.RLIMIT_NOFILE, &rLimit) +} diff --git a/settings_windows.go b/settings_windows.go index 5920d1c..3a11d85 100644 --- a/settings_windows.go +++ b/settings_windows.go @@ -1,189 +1,8 @@ +// +build windows + package main -import ( - yaml "gopkg.in/yaml.v2" - "io/ioutil" - "os" - "path/filepath" - "strings" - "syscall" - "time" -) - -// settings const -const ( - Permission = 0775 - Directory = ".realize" - File = "realize.yaml" - FileOut = "outputs.log" - FileErr = "errors.log" - FileLog = "logs.log" -) - -// random string preference -const ( - letterIdxBits = 6 // 6 bits to represent a letter index - letterIdxMask = 1<= 0; { - if remain == 0 { - cache, remain = src.Int63(), letterIdxMax - } - if idx := int(cache & letterIdxMask); idx < len(letterBytes) { - b[i] = letterBytes[idx] - i-- - } - cache >>= letterIdxBits - remain-- - } - return string(b) -} - -// Wdir return the current working Directory -func (s Settings) wdir() string { - dir, err := os.Getwd() - s.validate(err) - return filepath.Base(dir) -} - // Flimit defines the max number of watched files func (s *Settings) flimit() error { return nil } - -// Delete realize folder -func (s *Settings) delete(d string) error { - _, err := os.Stat(d) - if !os.IsNotExist(err) { - return os.RemoveAll(d) - } - return err -} - -// Path cleaner -func (s Settings) path(path string) string { - return strings.Replace(filepath.Clean(path), "\\", "/", -1) -} - -// Validate checks a fatal error -func (s Settings) validate(err error) error { - if err != nil { - s.fatal(err, "") - } - return nil -} - -// Read from config file -func (s *Settings) read(out interface{}) error { - localConfigPath := s.File - // backward compatibility - path := filepath.Join(Directory, s.File) - if _, err := os.Stat(path); err == nil { - localConfigPath = path - } - content, err := s.stream(localConfigPath) - if err == nil { - err = yaml.Unmarshal(content, out) - return err - } - return err -} - -// Record create and unmarshal the yaml config file -func (s *Settings) record(out interface{}) error { - y, err := yaml.Marshal(out) - if err != nil { - return err - } - if _, err := os.Stat(Directory); os.IsNotExist(err) { - if err = os.Mkdir(Directory, Permission); err != nil { - return s.write(s.File, y) - } - } - return s.write(filepath.Join(Directory, s.File), y) -} - -// Stream return a byte stream of a given file -func (s Settings) stream(file string) ([]byte, error) { - _, err := os.Stat(file) - if err != nil { - return nil, err - } - content, err := ioutil.ReadFile(file) - s.validate(err) - return content, err -} - -// Fatal prints a fatal error with its additional messages -func (s Settings) fatal(err error, msg ...interface{}) { - if len(msg) > 0 && err != nil { - log.Fatalln(red.regular(msg...), err.Error()) - } else if err != nil { - log.Fatalln(err.Error()) - } -} - -// Write a file -func (s Settings) write(name string, data []byte) error { - err := ioutil.WriteFile(name, data, Permission) - return s.validate(err) -} - -// Name return the project name or the path of the working dir -func (s Settings) name(name string, path string) string { - if name == "" && path == "" { - return s.wdir() - } else if path != "/" { - return filepath.Base(path) - } - return name -} - -// Create a new file and return its pointer -func (s Settings) create(path string, name string) *os.File { - var file string - if _, err := os.Stat(Directory); err == nil { - file = filepath.Join(path, Directory, name) - } else { - file = filepath.Join(path, name) - } - out, err := os.OpenFile(file, os.O_APPEND|os.O_WRONLY|os.O_CREATE|os.O_SYNC, Permission) - s.validate(err) - return out -}