Fixes #5 - DirWatcher & FileWatcher now implement context.Context and…

… if the caller needs, one can wait for internal goroutines to finish

dirwatcher.go

@@ -10,18 +10,19 @@ import (
 // Events can be masked by providing fileMask. DirWatcher does not generate events for
 // folders or subfolders.
 type DirWatcher struct {
+	context.Context
 	C chan FileEvent
 }
 
 // NewDirWatcher creates DirWatcher recursively waiting for events in the given root folder and
 // emitting FileEvents in channel C, that correspond to fileMask. Folder events are ignored (having IN_ISDIR set to 1)
 func NewDirWatcher(ctx context.Context, fileMask uint32, root string) (*DirWatcher, error) {
+	ctx, cancel := context.WithCancel(ctx)
 	dw := &DirWatcher{
-		C: make(chan FileEvent),
+		Context: ctx,
+		C:       make(chan FileEvent),
 	}
 
-	ctx, cancel := context.WithCancel(ctx)
-
 	i, err := NewInotify(ctx)
 	if err != nil {
 		cancel()
@@ -59,6 +60,7 @@ func NewDirWatcher(ctx context.Context, fileMask uint32, root string) (*DirWatch
 	events := make(chan FileEvent)
 
 	go func() {
+		defer cancel()
 		for _, event := range queue {
 			events <- event
 		}

dirwatcher_test.go

@@ -78,4 +78,22 @@ func TestDirWatcher(t *testing.T) {
 		}
 
 	})
+
+	t.Run("ClosedDirwatcherHasDoneContext", func(t *testing.T) {
+		ctx, cancel := context.WithCancel(ctx)
+		defer cancel()
+
+		dw, err := NewDirWatcher(ctx, IN_CREATE, dir)
+		if err != nil {
+			t.Error(err)
+		}
+
+		cancel()
+
+		select {
+		case <-dw.Context.Done():
+		default:
+			t.Fail()
+		}
+	})
 }

filewatcher.go

@@ -8,18 +8,19 @@ import (
 // FileWatcher waits for events generated by filesystem for a specific list of file paths, including
 // IN_CREATE for not yet existing files and IN_DELETE for removed.
 type FileWatcher struct {
+	context.Context
 	C chan FileEvent
 }
 
 // NewFileWatcher creates FileWatcher with provided inotify mask and list of files to wait events for.
 func NewFileWatcher(ctx context.Context, mask uint32, files ...string) (*FileWatcher, error) {
 
+	ctx, cancel := context.WithCancel(ctx)
 	f := &FileWatcher{
-		C: make(chan FileEvent),
+		Context: ctx,
+		C:       make(chan FileEvent),
 	}
 
-	ctx, cancel := context.WithCancel(ctx)
-
 	inotify, err := NewInotify(ctx)
 	if err != nil {
 		cancel()

filewatcher_test.go

@@ -61,4 +61,23 @@ func TestFileWatcher(t *testing.T) {
 
 	})
 
+	t.Run("ClosedFileWatcherHasClosedChannel", func(t *testing.T) {
+		ctx, cancel := context.WithCancel(ctx)
+		defer cancel()
+
+		fw, err := NewFileWatcher(ctx, IN_ALL_EVENTS, filepath.Join(dir, "foo"))
+		if err != nil {
+			t.Error(err)
+		}
+
+		cancel()
+
+		select {
+		case <-fw.Done():
+		default:
+			t.Fail()
+		}
+
+	})
+
 }