vagrant-fsevents 0.4.3 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ff3c027295a82cc4458e19498c34f67405a6d7b499b9d92ce5f1734c03180fc2
-  data.tar.gz: 94e3895892dfe5720a339870e9b8cb51fd9400cad118b629be231156c66601cb
+  metadata.gz: 98217ab4f20b02c03c844a5a085062017c72b5ea12b5410ec1fc25ff0fb00d5b
+  data.tar.gz: 673b9b21240ba2859381cd36939f2e5f5b81ec7af262dd324bc69bcef06c690a
 SHA512:
-  metadata.gz: 1d6eb87e0ca897174facbd5bbea0a2f117b6e4c956408dee6f5fec7c9b2c7fea7e8681e9bd8b6098691380a144957c69204f20bb7c94eb5c23849616781c5686
-  data.tar.gz: c7b42f798582d22e07d118b3140860002507afc67fba4542a970e2adacba1c6f40497c96743a131705664dd59a8c8da0fefff6b729e08a6bc74862db62d0edf7
+  metadata.gz: eceace66c2f6bac16d288069da84aa8e00265741e190c3085ee821b03334d5ae8cd777e9ed818aa3f98fa481022c36ffaa30701464ff8d1dee074a56fcb697b7
+  data.tar.gz: 8dd5bf1e0388d3a3aa27c304702e7b9d7d79a280c76cc127761c5b610faecf3111cfe09d2baae2e7ac58772c4d8e0f4dd57b8c5206003debd2b14549756f896d

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 # Changelog
 
+## 0.5.0 - 2019-04-01
+
+- Bugfix with new 'include' keyword - guest path wasn't always correct using includes
+- Updated version to semantically indicate addition of 'include' keyword
+
 ## 0.4.3 - 2019-03-31
 
 - Added new 'include' keyword (complimenting the 'exclude' keyword) to help work around symlink issues with guard/listen

data/lib/vagrant-fsevents/changeEvents.rb

@@ -7,6 +7,7 @@ module VagrantPlugins
       attr_reader :path
       attr_reader :type
       attr_reader :watch
+      attr_reader :sync_path
       attr_reader :watch_path
       attr_reader :relative_path
       attr_reader :full_path_on_guest
@@ -14,24 +15,25 @@ module VagrantPlugins
       # Takes the output of a listen callback (as arrays of strings of
       # files split by type of change) and converts them into single events
       # for a specific watch definition
-      def self.make(mods, adds, removes, watch_path, watch)
+      def self.make(mods, adds, removes, watch)
         change_events = []
         structure = { modified: mods, added: adds, removed: removes }
         structure.each do |type, files|
           files.each do |path|
-            change_events.push new(path, type, watch_path, watch)
+            change_events.push new(path, type, watch)
           end
         end
         change_events
       end
 
-      def initialize(path, type, watch_path, watch)
+      def initialize(path, type, watch)
         @path = path
         @type = type
-        @watch_path = watch_path
+        @sync_path = watch[:sync_path]
+        @watch_path = watch[:watch_path]
         @watch = watch
 
-        @relative_path = path.sub(watch_path, '')
+        @relative_path = path.sub(sync_path, '')
         @full_path_on_guest = File.join(
           (watch[:opts][:override_guestpath] || watch[:opts][:guestpath]),
           @relative_path

data/lib/vagrant-fsevents/paths.rb

@@ -21,15 +21,24 @@ module VagrantPlugins
           folder.each do |id, opts|
             next unless active_for_folder? opts[:fsevents]
 
-            hostpaths = get_hostpaths(opts, machine)
-
-            hostpaths.each do |hostpath|
-              @watch[hostpath] = { id: id, machine: machine, opts: opts }
-            end
+            add_folder_to_watch(id, opts, machine)
           end
         end
       end
 
+      # Populates `@watch` attribute from a single watch
+      def add_folder_to_watch(id, opts, machine)
+        get_paths(opts, machine).each do |paths|
+          @watch[paths[:hostpath]] = {
+            id: id,
+            machine: machine,
+            opts: opts,
+            sync_path: paths[:syncpath],
+            watch_path: paths[:hostpath]
+          }
+        end
+      end
+
       # Populates `@ignore` attribute from a single VM instance
       def add_folders_to_ignore(folders)
         folders.values.each do |folder|
@@ -69,19 +78,28 @@ module VagrantPlugins
       end
 
       # Get the hostpath(s) for a given synced folder
-      def get_hostpaths(options, machine)
+      def get_paths(options, machine)
         paths = (options[:include] || [options[:hostpath]])
         hostpaths = []
+        syncpath = get_host_path(options[:hostpath], machine)
         paths.each do |path|
-          hostpath = File.expand_path(path, machine.env.root_path)
-          hostpath = Vagrant::Util::Platform.fs_real_path(hostpath).to_s
-
-          # Avoid creating a nested directory
-          hostpath += '/' unless hostpath.end_with?('/')
-          hostpaths << hostpath
+          hostpaths << {
+            hostpath: get_host_path(path, machine),
+            syncpath: syncpath
+          }
         end
         hostpaths
       end
+
+      # Convert a path to a full path on the host machine
+      def get_host_path(path, machine)
+        hostpath = File.expand_path(path, machine.env.root_path)
+        hostpath = Vagrant::Util::Platform.fs_real_path(hostpath).to_s
+
+        # Avoid creating a nested directory
+        hostpath += '/' unless hostpath.end_with?('/')
+        hostpath
+      end
     end
   end
 end

data/lib/vagrant-fsevents/responder.rb

@@ -16,8 +16,8 @@ module VagrantPlugins
 
         clear_expired_change_locks
 
-        events_to_sync = watches.map do |watch_path, watch|
-          events = ChangeEvents.make(mods, adds, removes, watch_path, watch)
+        events_to_sync = watches.map do |_, watch|
+          events = ChangeEvents.make(mods, adds, removes, watch)
           add_locks(remove_locked_events(select_by_relevance(events)))
         end
 

data/lib/vagrant-fsevents/version.rb

@@ -1,5 +1,5 @@
 module VagrantPlugins
   module Fsevents
-    VERSION = '0.4.3'.freeze
+    VERSION = '0.5.0'.freeze
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-fsevents
 version: !ruby/object:Gem::Version
-  version: 0.4.3
+  version: 0.5.0
 platform: ruby
 authors:
 - Wolf Hatch