Merge pull request #10 from silenceper/feature/disable-run

fix #9，add `disable_run` config

.travis.yml

@@ -0,0 +1,15 @@
+language: go
+
+go:
+  - 1.11.x
+  - 1.10.x
+  - 1.9.x
+
+before_script:
+  - GO_FILES=$(find . -iname '*.go' -type f | grep -v /vendor/)
+  - go get github.com/golang/lint/golint
+
+script:
+  - go test -v -race ./...
+  - go vet ./...
+  - golint -set_exit_status $(go list ./...)

README.md

@@ -20,6 +20,8 @@ go get github.com/silenceper/gowatch
 
 - -o : 非必须，指定build的目标文件路径
 - -p : 非必须，指定需要build的package（也可以是单个文件）
+- -args: 非必须，指定程序运行时参数，例如：-args='-host=:8080,-name=demo'
+- -v: 非必须，显示gowatch版本信息
 
 例子:
 
@@ -59,6 +61,9 @@ build_pkg: ""
 # build tags
 build_tags: ""
 
+# 是否禁止自动运行
+disable_run: false
+
 ```
 
 

config.go

@@ -31,6 +31,8 @@ type config struct {
 	BuildPkg string `yaml:"build_pkg"`
 	//在go build 时期接收的-tags参数
 	BuildTags string `yaml:"build_tags"`
+	//程序是否自动运行
+	DisableRun bool `yaml:"disable_run"`
 }
 
 func parseConfig() *config {

gowatch.yml → example/gowatch.yml

@@ -1,16 +1,25 @@
 # gowatch.yml 配置示例
 #
-#appname: "test"
-#go_install: true
+# 程序名称
+appname: "example"
+
+# Output
+output: ./example
+
 #watch_exts:
 #    - .yml
+
 #cmd_args:
 #    - arg1=val1
+
 #envs:
 #    - a=b
+
 #vendor_watch: false
 
 #excluded_paths:
 #    - path
-#
+
 #build_tags: ""
+
+disable_run: false

example/main.go

@@ -0,0 +1,7 @@
+package main
+
+import "fmt"
+
+func main() {
+	fmt.Println("hello world")
+}

gowatch.go

@@ -22,6 +22,7 @@ var (
 	scheduleTime time.Time
 )
 
+//NewWatcher new watcher
 func NewWatcher(paths []string, files []string) {
 	watcher, err := fsnotify.NewWatcher()
 	if err != nil {
@@ -104,6 +105,7 @@ func getFileModTime(path string) int64 {
 	return fi.ModTime().Unix()
 }
 
+//Autobuild auto build
 func Autobuild(files []string) {
 	state.Lock()
 	defer state.Unlock()
@@ -134,9 +136,12 @@ func Autobuild(files []string) {
 		return
 	}
 	log.Infof("Build was successful\n")
-	Restart(cfg.Output)
+	if !cfg.DisableRun {
+		Restart(cfg.Output)
+	}
 }
 
+//Kill kill process
 func Kill() {
 	defer func() {
 		if e := recover(); e != nil {
@@ -151,12 +156,14 @@ func Kill() {
 	}
 }
 
+//Restart restart app
 func Restart(appname string) {
 	//log.Debugf("kill running process")
 	Kill()
 	go Start(appname)
 }
 
+//Start start app
 func Start(appname string) {
 	log.Infof("Restarting %s ...\n", appname)
 	if strings.Index(appname, "./") == -1 {
@@ -184,9 +191,8 @@ func shouldIgnoreFile(filename string) bool {
 		}
 		if r.MatchString(filename) {
 			return true
-		} else {
-			continue
 		}
+		continue
 	}
 	return false
 }

main.go

@@ -9,12 +9,13 @@ import (
 )
 
 var (
-	cfg      *config
-	currpath string
-	exit     chan bool
-	output   string
-	buildPkg string
-	cmdArgs  string
+	cfg         *config
+	currpath    string
+	exit        chan bool
+	output      string
+	buildPkg    string
+	cmdArgs     string
+	showVersion bool
 
 	started chan bool
 )
@@ -23,6 +24,7 @@ func init() {
 	flag.StringVar(&output, "o", "", "go build output")
 	flag.StringVar(&buildPkg, "p", "", "go build packages")
 	flag.StringVar(&cmdArgs, "args", "", "app run args,separated by commas. like: -args='-host=:8080,-name=demo'")
+	flag.BoolVar(&showVersion, "v", false, "show version")
 }
 
 var ignoredFilesRegExps = []string{
@@ -34,8 +36,13 @@ var ignoredFilesRegExps = []string{
 
 func main() {
 	flag.Parse()
-	cfg = parseConfig()
 
+	if showVersion {
+		printVersion()
+		os.Exit(0)
+	}
+
+	cfg = parseConfig()
 	currpath, _ = os.Getwd()
 	if cfg.AppName == "" {
 		//app名默认取目录名

version.go

@@ -0,0 +1,9 @@
+package main
+
+import "fmt"
+
+const version = "1.0"
+
+func printVersion() {
+	fmt.Println(version)
+}