vagrant-fsnotify 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bb3aa01722396ea81758b1750ff4dbfd180bb715
-  data.tar.gz: e8317e0b2cd4c3e768049aad6305616aec5700d4
+  metadata.gz: 29c4a59123af0c92160d68a41342002576b09edc
+  data.tar.gz: 0522021542087f6d5c1a9c40e31190785c3fc32e
 SHA512:
-  metadata.gz: b383e054ac0f94f5ca4147ba9fdd32a6d297db96217aec24df2d0fc74881b41d8803c5d3b7331e0c984a37186d21c564ed4492563eecafe6980421437f146b45
-  data.tar.gz: 350387bb4b28057ca4190784167f06945a82575dbdc28da02574469d1998269236da9a841213aaa19c0e7cd9ebc9fa03b796b878c0b0fd6b23922f16a3c9ad75
+  metadata.gz: 641fa0f680edc1d7ffc46665944cd954f1f24ec9423f864d71e33e094c973bfacbdc7fcd77f684bbef6ce4be46ade6536520674efaf449f30a9f7850a43b2580
+  data.tar.gz: 95eae2a86f3dbd7d1640a678371ad900da2045c6783d807fd6e49d7c3a9fb1ae7359eada47de448b3608042c204ccbd2d9126fe9254ebbc823749b5a9d49c89e

data/lib/vagrant-fsnotify/command-fsnotify.rb

@@ -5,7 +5,7 @@ module VagrantPlugins::Fsnotify
     include Vagrant::Action::Builtin::MixinSyncedFolders
 
     def execute
-      @logger = Log4r::Logger.new("vagrant::commands::rsync-auto")
+      @logger = Log4r::Logger.new("vagrant::commands::fsnotify")
 
       params = OptionParser.new do |o|
         o.banner = "Usage: vagrant fsnotify [vm-name]"
@@ -16,6 +16,7 @@ module VagrantPlugins::Fsnotify
       return if !argv
 
       paths = {}
+      ignores = []
       @changes = {}
 
       with_target_vms do |machine|
@@ -54,6 +55,12 @@ module VagrantPlugins::Fsnotify
               opts: opts
             }
 
+            if opts[:exclude]
+              Array(opts[:exclude]).each do |pattern|
+                ignores << exclude_to_regexp(pattern.to_s)
+              end
+            end
+
           end
 
         end
@@ -61,12 +68,19 @@ module VagrantPlugins::Fsnotify
       end
 
       if paths.empty?
-        return 0
+        @env.ui.info("Nothing to sync, exiting...")
+        return 1
       end
 
+      @logger.info("Listening to paths: #{paths.keys.sort.inspect}")
       @logger.info("Listening via: #{Listen::Adapter.select.inspect}")
+      @logger.info("Ignoring #{ignores.length} paths:")
+      ignores.each do |ignore|
+        @logger.info("  -- #{ignore.to_s}")
+      end
+
       listener_callback = method(:callback).to_proc.curry[paths]
-      listener = Listen.to(*paths.keys, &listener_callback)
+      listener = Listen.to(*paths.keys, ignore: ignores, &listener_callback)
 
       # Create the callback that lets us know when we've been interrupted
       queue    = Queue.new
@@ -95,9 +109,11 @@ module VagrantPlugins::Fsnotify
       @logger.info("  - Removed: #{removed.inspect}")
 
       @changes.each do |rel_path, time|
-        @changes.delete(rel_path) if time < Time.now.to_i - 1
+        @changes.delete(rel_path) if time < Time.now.to_i - 2
       end
 
+      tosync = {}
+
       paths.each do |hostpath, folder|
 
         modified.each do |file|
@@ -106,8 +122,8 @@ module VagrantPlugins::Fsnotify
 
             rel_path =  file.sub(hostpath, '')
 
-            if @changes[rel_path] && @changes[rel_path] > Time.now.to_i - 1
-              @logger.info("#{rel_path} was changed less than a second ago, skipping")
+            if @changes[rel_path] && @changes[rel_path] >= Time.now.to_i - 2
+              @logger.info("#{rel_path} was changed less than two seconds ago, skipping")
               next
             end
 
@@ -115,7 +131,9 @@ module VagrantPlugins::Fsnotify
             folder[:machine].ui.info("fsnotify: Changed: #{rel_path}")
 
             guestpath = File.join(folder[:opts][:guestpath], rel_path)
-            folder[:machine].communicate.execute("touch #{guestpath}")
+
+            tosync[folder[:machine]] = [] if !tosync.has_key?(folder[:machine])
+            tosync[folder[:machine]] << guestpath
 
           end
 
@@ -123,8 +141,26 @@ module VagrantPlugins::Fsnotify
 
       end
 
+      tosync.each do |machine, files|
+        machine.communicate.execute("touch '#{files.join("' '")}'")
+      end
+
     rescue => e
       @logger.error("#{e}: #{e.message}")
     end
+
+    def exclude_to_regexp(exclude)
+
+      # This is REALLY ghetto, but its a start. We can improve and
+      # keep unit tests passing in the future.
+      exclude = exclude.gsub("**", "|||GLOBAL|||")
+      exclude = exclude.gsub("*", "|||PATH|||")
+      exclude = exclude.gsub("|||PATH|||", "[^/]*")
+      exclude = exclude.gsub("|||GLOBAL|||", ".*")
+
+      Regexp.new(exclude)
+
+    end
+
   end
 end

data/lib/vagrant-fsnotify/version.rb

@@ -1,5 +1,5 @@
 module VagrantPlugins
   module Fsnotify
-    VERSION = "0.0.1"
+    VERSION = "0.0.2"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-fsnotify
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Adrien Kohlbecker