vagrant-syncer 1.0.6 → 1.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6b1cb649b133b1b2e72687523107f780915461ce
-  data.tar.gz: 099ae1ef55605d4d25cd0c6bf051b02f5c0fecfb
+  metadata.gz: b63ad4d5959b021a757e370b28dc00afbaf17fdb
+  data.tar.gz: 28100efa5de0c18e4bfb87f3877afaf8b233bf29
 SHA512:
-  metadata.gz: a0f8891268b87fd26378200efa3d395e4d29c9ae2f8a9d050c8613ec30888f0c9557a6e25973db877e525150955c324cd42a487fb6118e3af3968110c7d7214d
-  data.tar.gz: d634602c568ab7bd9039f719da9fc01f7d82c2b92209475aad01c89de0722ae476e5d1ce66183c99f376e5496518cecb3eee767e400771a3a8cbb92a7a308d5e
+  metadata.gz: 9ecc08db460cfd9f6925024ec4e707e98eeb4b0ac52e196adaf4c990bc2a21cbab638144b85be24e2cf2a3571554bacdaa31693a13e4b210543e95d10a896558
+  data.tar.gz: e714a252e4669fd01c7439043513ea5219e7c636f408805752cdeddd28859bfbfd708c7cad5a525d008907135964262d5114267424db8b0cf4c3aaf4afe70dec

data/README.md

@@ -45,18 +45,22 @@ values.
 - Vagrant's implementation assumes that the primary group of the SSH user
   has the same name as the user, if rsync option ```group``` is not explicitly
   defined. This plugin queries the user's real primary group from the guest.
-- Hooking Vagrant's ```:rsync_pre``` is removed, as this unnecessarily runs mkdir
-  to create the target directory, which rsync command creates sync-time anyway.
+- Hooking Vagrant's ```:rsync_pre``` is removed, as this unnecessarily runs
+  mkdir to create the target directory, which rsync command creates sync-time
+  anyway.
 - On Windows, expect relative paths, instead of Cygwin style, as Cygwin shall
   not be a requirement.
 - ControlPath settings are not in the default SSH arguments on Windows,
-  as they fail on [Vagrant 1.8.0 and 1.8.1](https://github.com/mitchellh/vagrant/issues/7046).
+  as they fail on
+  [Vagrant 1.8.0 and 1.8.1](https://github.com/mitchellh/vagrant/issues/7046).
+- Hide "permanently added to the known hosts" messages from rsync stderr output.
 - The rsync stdout outputs are all single line by default, and colored.
 
 
 ## Development
 
-Fork this repository, clone it and install Ruby 2.2.3, using e.g. [rbenv](https://github.com/sstephenson/rbenv):
+Fork this repository, clone it and install Ruby 2.2.3, using e.g.
+[rbenv](https://github.com/sstephenson/rbenv):
 
     cd vagrant-syncer
     rbenv install $(cat .ruby-version)
@@ -76,11 +80,15 @@ Also, I kindly take pull requests.
 
 ## Credits
 
-[vagrant-syncer](https://github.com/asyrjasalo/vagrant-syncer) was originally put together by Anssi Syrjäsalo.
+[vagrant-syncer](https://github.com/asyrjasalo/vagrant-syncer) was originally
+put together by Anssi Syrjäsalo.
 
-Thanks to [Steven Merrill's](https://github.com/smerrill) (@stevenmerrill) [vagrant-gatling-rsync](https://github.com/smerrill/vagrant-gatling-rsync)
-for [the listener implementations](https://github.com/smerrill/vagrant-gatling-rsync/tree/master/lib/vagrant-gatling-rsync/listen) and the original idea to tap into [rb-fsevent](https://github.com/thibaudgg/rb-fsevent) (OS X)
-and [rb-inotify](https://github.com/nex3/rb-inotify) (GNU/Linux) for non-CPU hog watching of hierarchies with 10,000-100,000 files.
+Thanks to [Steven Merrill's](https://github.com/smerrill) (@stevenmerrill)
+[vagrant-gatling-rsync](https://github.com/smerrill/vagrant-gatling-rsync) for
+[the listener implementations](https://github.com/smerrill/vagrant-gatling-rsync/tree/master/lib/vagrant-gatling-rsync/listen) and the original idea to tap into [rb-fsevent](https://github.com/thibaudgg/rb-fsevent)
+(OS X) and [rb-inotify](https://github.com/nex3/rb-inotify) (GNU/Linux) for
+non-CPU hog watching of hierarchies with 10,000-100,000 files.
 
-And to [Hashicorp](https://github.com/hashicorp) for [Vagrant](https://github.com/mitchellh/vagrant), even though its
-future will likely be overshadowed by [Otto](https://github.com/hashicorp/otto).
+And to [Hashicorp](https://github.com/hashicorp) for
+[Vagrant](https://github.com/mitchellh/vagrant), even though its future will
+likely be overshadowed by [Otto](https://github.com/hashicorp/otto).

data/example/Vagrantfile

@@ -4,7 +4,7 @@
 Vagrant.configure(2) do |config|
   config.vm.box = 'ubuntu/trusty64'
 
-  # Disable checking updates for faster testing
+  # Disable checking updates for faster start up.
   config.vm.box_check_update = false
   config.vbguest.auto_update = false  if Vagrant.has_plugin?("vagrant-vbguest")
 
@@ -35,30 +35,35 @@ Vagrant.configure(2) do |config|
 
   ### Vagrant syncer specific settings are introduced below
 
-  # How often (in seconds) to read file system events
-  # Default: 0.2. Minimum accepted value is 0.2.
-  config.syncer.interval = 0.2
+  # How often, in seconds, to read file system events.
+  # Default: 0.1. Minimum is 0.01.
+  config.syncer.interval = 0.1
 
-  # Whether or not to start watching after the machine is up, reloaded or resumed
+  # Whether or not to start rsync-auto after the machine is up, reloaded or
+  # resumed.
   # Default: true
   config.syncer.run_on_startup = true
 
-  # Whether or not to show the file system events
+  # Whether or not to show the file system events.
   # Default: false
   config.syncer.show_events = false
 
-  # Optional SSH arguments passed to rsync, e.g. to lower CPU load
+  # Whether or not to force using Listen gem, on OS X and Linux distros as well.
+  # Default: false
+  config.syncer.force_listen_gem = false
+
+  # Optional SSH arguments passed to rsync, e.g. to cut down CPU load.
   #
-  # If not overridden here, the defaults on all platforms are:
-  # -o StrictHostKeyChecking=no
-  # -o IdentitiesOnly=true
-  # -o UserKnownHostsFile=/dev/null
+  # If config.syncer.ssh_args are not given, the defaults on all platforms are:
+  #  -o StrictHostKeyChecking=no
+  #  -o IdentitiesOnly=true
+  #  -o UserKnownHostsFile=/dev/null
+  #
+  # On non-Windows OSes, the defaults also include these:
+  #  -o ControlMaster=auto
+  #  -o ControlPath=<path_in_temp>
+  #  -o ControlPersist=10m
   #
-  # On non-Windows operating systems, the defaults also include the following:
-  # -o ControlMaster=auto
-  # -o ControlPath=<path_in_temp>
-  # -o ControlPersist=10m
-
   config.syncer.ssh_args = [
     '-o StrictHostKeyChecking=no',
     '-o IdentitiesOnly=true',

data/lib/syncer/config.rb

@@ -2,19 +2,26 @@ module Vagrant
   module Syncer
     class Config < Vagrant.plugin(2, :config)
 
-      attr_accessor :interval, :run_on_startup, :show_events, :ssh_args
+      attr_accessor \
+        :interval,
+        :show_events,
+        :ssh_args,
+        :run_on_startup,
+        :force_listen_gem
 
       def initialize
-        @interval       = UNSET_VALUE
-        @show_events    = UNSET_VALUE
-        @ssh_args       = UNSET_VALUE
-        @run_on_startup = UNSET_VALUE
+        @interval         = UNSET_VALUE
+        @show_events      = UNSET_VALUE
+        @ssh_args         = UNSET_VALUE
+        @run_on_startup   = UNSET_VALUE
+        @force_listen_gem = UNSET_VALUE
       end
 
       def finalize!
-        @interval = 0.2          if @interval == UNSET_VALUE || @interval <= 0.2
+        @interval = 0.1          if @interval == UNSET_VALUE || @interval < 0.01
         @run_on_startup = true   if @run_on_startup == UNSET_VALUE
         @show_events = false     if @show_events == UNSET_VALUE
+        @force_listen_gem = false  if @force_listen_gem == UNSET_VALUE
 
         if @ssh_args = UNSET_VALUE
           @ssh_args = [

data/lib/syncer/listeners/fsevents.rb

@@ -22,14 +22,8 @@ module Vagrant
 
           loop do
             directories = Set.new
-            begin
-              loop do
-                change = Timeout::timeout(@settings[:latency]) { changes.pop }
-                directories << change  unless change.nil?
-              end
-            rescue Timeout::Error, ThreadError
-            end
-
+            change = changes.pop
+            directories << change  unless change.nil?
             @callback.call(directories.to_a)  unless directories.empty?
           end
         end

data/lib/syncer/listeners/inotify.rb

@@ -18,17 +18,7 @@ module Vagrant
 
           loop do
             directories = Set.new
-            begin
-              loop do
-                events = []
-                events = Timeout::timeout(@settings[:latency]) {
-                  notifier.read_events
-                }
-                events.each { |e| directories << e.absolute_name }
-              end
-            rescue Timeout::Error
-            end
-
+            notifier.read_events.each { |e| directories << e.absolute_name }
             @callback.call(directories.to_a)  unless directories.empty?
           end
         end

data/lib/syncer/listeners/listen.rb

@@ -33,7 +33,6 @@ module Vagrant
               @settings[:ignore!] << self.class.excludes_to_listen(pattern.to_s)
             end
           end
-
         end
 
         def run
@@ -41,19 +40,9 @@ module Vagrant
             @callback.call(mod + add + rem)
           end
 
-          queue = Queue.new
-          callback = lambda do
-            Thread.new { queue << true }
-          end
-
-          # Run the listener in a busy block, exit once we receive an interrupt.
-          Vagrant::Util::Busy.busy(callback) do
-            listener.start
-            queue.pop
-            listener.stop  if listener.state != :stopped
-          end
+          listener.start
+          sleep
         end
-
       end
     end
   end

data/lib/syncer/path.rb

@@ -15,15 +15,20 @@ module Vagrant
         @listener_polling = listener_polling
         @listener_verbose = machine.config.syncer.show_events
         @listener_interval = machine.config.syncer.interval
+        @force_listen_gem = machine.config.syncer.force_listen_gem
 
         listener_settings = {
-          latency: @listener_interval
+          latency: @listener_interval,
+          wait_for_delay: @listener_interval / 2
         }
 
         if @listener_polling
           require_relative 'listeners/listen'
           @listener_class = Vagrant::Syncer::Listeners::Listen
           listener_settings[:force_polling] = @listener_polling
+        elsif @force_listen_gem
+          require_relative 'listeners/listen'
+          @listener_class = Vagrant::Syncer::Listeners::Listen
         else
           case Vagrant::Util::Platform.platform
           when /darwin/

data/lib/syncer/syncers/rsync.rb

@@ -58,9 +58,9 @@ module Vagrant
             result = Vagrant::Util::Subprocess.execute(*rsync_vagrant_command) do |io_name, data|
               data.each_line do |line|
                 if io_name == :stdout
-                  @logger.success("Rsync: #{line}")
+                  @logger.success("Rsynced: #{line}")
                 elsif io_name == :stderr && !line =~ /Permanently added/
-                  @logger.warn("Rsync: #{line}")
+                  @logger.warn("Rsync stderr'ed: #{line}")
                 end
               end
             end

data/lib/syncer/version.rb

@@ -1,5 +1,5 @@
 module Vagrant
   module Syncer
-    VERSION = "1.0.6"
+    VERSION = "1.0.7"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-syncer
 version: !ruby/object:Gem::Version
-  version: 1.0.6
+  version: 1.0.7
 platform: ruby
 authors:
 - Anssi Syrjäsalo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-10 00:00:00.000000000 Z
+date: 2016-03-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler