Support for Attrib inside conf struct; removed short version of --att…

…rib.

README.md

@@ -28,7 +28,7 @@ Flags:
   -s, --suffixes=SUFFIXES  
                        File suffixes to watch.
   -c, --config=CONFIG  JSON configuration location
-  -b, --attrib         Also listen to changes to file attributes.
+  --attrib             Also listen to changes to file attributes.
   --version            Show application version.
 ```
 
@@ -55,7 +55,8 @@ Create json file with content, with name for example conf.json
 {
 	"ignore": ["some/path/to/ignore1", "some/path/to/ignore2"],
 	"args": ["dev", "test"],
-	"suffixes": [".go", ".html", ".tpl"]
+	"suffixes": [".go", ".html", ".tpl"],
+    "attrib": true
 }
 ```
 and then
@@ -109,7 +110,7 @@ If you are using Vagrant as your development environment, the edited changes do
 
 Then, watch the files with
 
-    rerun -b -c conf.json
+    rerun --attrib -c conf.json
 
 # License
 MIT

conf.go

@@ -18,13 +18,14 @@ var (
 	args     = kingpin.Flag("args", "Application arguments.").Default("").Short('a').String()
 	suffixes = kingpin.Flag("suffixes", "File suffixes to watch.").Short('s').String()
 	confPath = kingpin.Flag("config", "JSON configuration location").Short('c').String()
-	attrib   = kingpin.Flag("attrib", "Also watch attribute changes").Short('b').Bool()
+	attrib   = kingpin.Flag("attrib", "Also watch attribute changes").Bool()
 )
 
 type config struct {
 	Ignore   []string
 	Args     []string
 	Suffixes []string
+	Attrib   bool
 	build    string
 }
 
@@ -93,5 +94,7 @@ func loadConfiguration() (*config, error) {
 	conf.Ignore = parseGlobs(conf.Ignore)
 	conf.Ignore = convertAbsolutes(conf.Ignore)
 
+	conf.Attrib = *attrib
+
 	return conf, nil
 }

conf_test.go

@@ -24,6 +24,7 @@ func TestParseConfWithCliArgs(t *testing.T) {
 	*ignore = "path1,path2"
 	*args = "arg1,arg2"
 	*suffixes = ".go,.html"
+	*attrib = true
 
 	cnf, err := loadConfiguration()
 	assert.Nil(t, err, "Error should not happen if file is ok")
@@ -35,4 +36,6 @@ func TestParseConfWithCliArgs(t *testing.T) {
 	assert.True(t, contains([]string{pathPrefix + "/path1", pathPrefix + "/path2"}, cnf.Ignore[1]))
 	AssertArraysEq(t, []string{"arg1", "arg2"}, cnf.Args)
 	AssertArraysEq(t, []string{".go", ".html"}, cnf.Suffixes)
+
+	assert.True(t, cnf.Attrib)
 }

watcher.go

@@ -25,7 +25,7 @@ func (w *watcher) isEventImportant(ev fsnotify.Event) bool {
 		return false
 	}
 
-	importantEvent := ev.Op == fsnotify.Write || ev.Op == fsnotify.Rename || ev.Op == fsnotify.Remove || (*attrib && ev.Op == fsnotify.Chmod)
+	importantEvent := ev.Op == fsnotify.Write || ev.Op == fsnotify.Rename || ev.Op == fsnotify.Remove || (w.pm.conf.Attrib && ev.Op == fsnotify.Chmod)
 	if !importantEvent {
 		return false
 	}

watcher_test.go

@@ -31,7 +31,7 @@ func TestIsFileImportant(t *testing.T) {
 	assert.False(t, watcher.isEventImportant(event))
 
 	// Test attrib event in case settings are different
-	*attrib = true
+	pm.conf.Attrib = true
 	event = fsnotify.Event{"some/file.go", fsnotify.Chmod}
 	assert.True(t, watcher.isEventImportant(event))