Merge pull request #213 from Shopify/file_watcher_create_and_delete

Supporting remove event in watch.
Shopify · Oct 4, 2016 · 24284f5 · 24284f5
2 parents 08e8c8f + 3bd4242
commit 24284f5
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 6 deletions.
diff --git a/commands/watch.go b/commands/watch.go
@@ -40,7 +40,7 @@ func buildForeman(client kit.ThemeClient, args Args, config kit.Configuration) *
 func spawnWorker(queue chan kit.AssetEvent, client kit.ThemeClient) {
 	for {
 		asset := <-queue
-		if asset.Asset().IsValid() {
+		if asset.Asset().IsValid() || asset.Type() == kit.Remove {
 			client.Message("Received %s event on %s", kit.GreenText(asset.Type().String()), kit.BlueText(asset.Asset().Key))
 			client.Perform(asset)
 		}

diff --git a/kit/file_watcher.go b/kit/file_watcher.go
@@ -156,9 +156,12 @@ func convertFsEvents(events chan fsnotify.Event, filter EventFilter) chan AssetE
 		recordedEvents := map[string]fsnotify.Event{}
 		for {
 			currentEvent = <-events
+			if currentEvent.Op&fsnotify.Chmod != fsnotify.Chmod {
+				recordedEvents[currentEvent.Name] = currentEvent
+			}
 			select {
 			case currentEvent = <-events:
-				if currentEvent.Op == fsnotify.Chmod {
+				if currentEvent.Op&fsnotify.Chmod == fsnotify.Chmod {
 					continue
 				}
 				recordedEvents[currentEvent.Name] = currentEvent

diff --git a/kit/theme_client.go b/kit/theme_client.go
@@ -266,10 +266,6 @@ func (t ThemeClient) Perform(asset AssetEvent) {
 	}
 
 	resp, err := t.request(asset, event)
-	if err == nil {
-		defer resp.Body.Close()
-	}
-
 	t.eventLog <- NewAPIAssetEvent(resp, asset, err)
 }