vagrant-syncer 1.1.8 → 1.1.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 87f0de4b26b2a4925479368125aeebb54acd4746
-  data.tar.gz: b65baa6db0cdbf65635145d1e0df18ba262c671a
+  metadata.gz: 1f63a13b751a40347aeaa89ae2b248ddc639a240
+  data.tar.gz: e6cd70fd78bdf3eab3bbaf4e90b22c09714d82f1
 SHA512:
-  metadata.gz: ed08fa4bc963c82f076a03df602ca51a719633379c120669b6c704c0b56b997115fb8bbd0eeab216f95efae085d8f67a0c8a4e8144a2e0aa9553f174fc478ec9
-  data.tar.gz: cf46a519718b0beaad24c91b5d786b83034712990afa9178ac23d08429cdb01a598be214049a1ede52cb246b2f7065d11862b09bc0d653601ed8b0c040abea66
+  metadata.gz: a4a245961c35ebd74bff1b309835b23041061bddf57d3e2ceb866b440a71c9d0c1ee9758d74f8913f354f0a8049d26cac915f73b3dcf4b6d1572f73ce86eb01b
+  data.tar.gz: 3247be65105b04e43f48c3112bd392d99fbf9d49c464da73f3f985654c61ea650eafb60d0e6c74f84a6f7a4a0abd8034f5ff34e9449602268db606f9576006d9

data/example/Vagrantfile

@@ -4,7 +4,7 @@
 Vagrant.configure(2) do |config|
   config.vm.box = 'ubuntu/trusty64'
 
-  # Disable checking updates for faster start up.
+  # Disable checking updates for faster startup.
   config.vm.box_check_update = false
   config.vbguest.auto_update = false  if Vagrant.has_plugin?("vagrant-vbguest")
 
@@ -54,6 +54,14 @@ Vagrant.configure(2) do |config|
   # Default: true
   config.syncer.run_on_startup = true
 
+  # Whether or not to rsync on machine up before provisioners are ran.
+  #
+  # Please do note that this does not affect to the behaviour of rsync-auto,
+  # as it does a full rsync first anyway to get the remote up to date.
+  #
+  # Default: false
+  config.syncer.disable_up_rsync = false
+
   # Whether or not to show the file system events.
   # Default: false
   config.syncer.show_events = false

data/lib/syncer/actions.rb

@@ -15,10 +15,9 @@ module Vagrant
           return  if @exit_registered
 
           at_exit do
-            if $!
-              exit_status = $!.status
-              exit exit_status  if exit_status != 0
-            end
+            exit 1  unless $!.is_a?(SystemExit)
+            exit_status = $!.status
+            exit exit_status  if exit_status != 0
 
             # If vagrant up/reload/resume exited successfully, run rsync-auto.
             env[:machine].env.cli("rsync-auto")

data/lib/syncer/command/rsync.rb

@@ -46,8 +46,9 @@ module Vagrant
             next  unless machine.communicate.ready?
             next  unless synced_folders(machine)[:rsync]
 
-            target_machine = Machine.new(machine)
-            target_machine.full_sync  if machine.ssh_info
+            if machine.ssh_info
+              Machine.new(machine).full_sync
+            end
           end
 
           return 0

data/lib/syncer/command/rsync_auto.rb

@@ -37,7 +37,7 @@ module Vagrant
           argv = parse_options(opts)
           return  unless argv
 
-          listener_threads = []
+          machine_threads = []
 
           # Build up the paths that we need to listen to.
           with_target_vms(argv) do |machine|
@@ -56,11 +56,15 @@ module Vagrant
             next  unless machine.communicate.ready?
             next  unless synced_folders(machine)[:rsync]
 
-            target_machine = Machine.new(machine, options[:poll])
-            target_machine.full_sync  if machine.ssh_info
-            listener_threads << Thread.new { target_machine.listen }
+            if machine.ssh_info
+              target_machine = Machine.new(machine)
+              machine_threads << Thread.new do
+                target_machine.full_sync
+                target_machine.listen(options[:poll])
+              end
+            end
           end
-          listener_threads.each { |t| t.join }
+          machine_threads.each { |t| t.join }
 
           return 0
         end

data/lib/syncer/config.rb

@@ -3,25 +3,28 @@ module Vagrant
     class Config < Vagrant.plugin(2, :config)
 
       attr_accessor \
+        :disable_up_rsync,
+        :force_listen_gem,
         :interval,
-        :show_events,
-        :ssh_args,
         :run_on_startup,
-        :force_listen_gem
+        :show_events,
+        :ssh_args
 
       def initialize
+        @disable_up_rsync = UNSET_VALUE
+        @force_listen_gem = UNSET_VALUE
         @interval         = UNSET_VALUE
+        @run_on_startup   = UNSET_VALUE
         @show_events      = UNSET_VALUE
         @ssh_args         = UNSET_VALUE
-        @run_on_startup   = UNSET_VALUE
-        @force_listen_gem = UNSET_VALUE
       end
 
       def finalize!
+        @disable_up_rsync = false  if @disable_up_rsync == UNSET_VALUE
+        @force_listen_gem = false  if @force_listen_gem == UNSET_VALUE
         @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/machine.rb

@@ -8,94 +8,97 @@ module Vagrant
 
       include Vagrant::Action::Builtin::MixinSyncedFolders
 
-      def initialize(machine, polling=false)
-        @paths = []
+      def initialize(machine)
+        @machine = machine
+        @logger = @machine.ui
+
+        @rsync_synced_folders = synced_folders(@machine)[:rsync]
+
         @syncers = []
-        @excludes = []
-        @logger = machine.ui
+        @rsync_synced_folders.each do |id, folder_opts|
+          @syncers << Syncers::Rsync.new(folder_opts, @machine)
+        end
+      end
 
-        @listener_verbose = machine.config.syncer.show_events
-        @listener_interval = machine.config.syncer.interval
+      def full_sync
+        @syncers.each do |syncer|
+          @logger.info(I18n.t('syncer.states.initial', {
+            host_path: syncer.host_path,
+            guest_path: syncer.guest_path
+          }))
+          syncer.sync([syncer.host_path], initial=true)
+        end
+      end
 
+      def listen(polling=false)
+        listener_excludes = []
+        listener_interval = @machine.config.syncer.interval
+        listener_verbose = @machine.config.syncer.show_events
+        listener_force_listen = @machine.config.syncer.force_listen_gem
         listener_settings = {
-          latency: @listener_interval,
-          wait_for_delay: @listener_interval / 2
+          latency: listener_interval,
+          wait_for_delay: listener_interval / 2
         }
 
         if polling
           require_relative 'listeners/listen'
-          @listener_class = Vagrant::Syncer::Listeners::Listen
+          listener_class = Vagrant::Syncer::Listeners::Listen
           listener_settings[:force_polling] = polling
-        elsif machine.config.syncer.force_listen_gem
+        elsif listener_force_listen
           require_relative 'listeners/listen'
-          @listener_class = Vagrant::Syncer::Listeners::Listen
+          listener_class = Vagrant::Syncer::Listeners::Listen
         else
           case Vagrant::Util::Platform.platform
           when /darwin/
             require_relative 'listeners/fsevents'
-            @listener_class = Vagrant::Syncer::Listeners::FSEvents
+            listener_class = Vagrant::Syncer::Listeners::FSEvents
           when /linux/
             require_relative 'listeners/inotify'
-            @listener_class = Vagrant::Syncer::Listeners::INotify
+            listener_class = Vagrant::Syncer::Listeners::INotify
           else
             require_relative 'listeners/listen'
-            @listener_class = Vagrant::Syncer::Listeners::Listen
+            listener_class = Vagrant::Syncer::Listeners::Listen
           end
         end
 
-        @listener_name = @listener_class.to_s.gsub(/^.*::/, '')
+        paths = []
+        listener_excludes = []
+        @rsync_synced_folders.each do |id, folder_opts|
+          paths << File.expand_path(folder_opts[:hostpath],
+            @machine.env.root_path)
+          if folder_opts[:rsync__excludes]
+            listener_excludes << folder_opts[:rsync__excludes]
+          end
+        end
 
-        rsync_synced_folders = synced_folders(machine)[:rsync]
+        listener_name = listener_class.to_s.gsub(/^.*::/, '')
 
-        if rsync_synced_folders
-          rsync_synced_folders.each do |id, folder_opts|
-            @paths << File.expand_path(folder_opts[:hostpath], machine.env.root_path)
-            @excludes << folder_opts[:rsync__excludes]  if folder_opts[:rsync__excludes]
-            @syncers << Syncers::Rsync.new(folder_opts, machine)
+        change_callback = Proc.new do |changed|
+          if listener_verbose
+            @logger.info(listener_name + ": " + changed.join(', '))
+          end
+          @syncers.each do |syncer|
+            syncer.sync(changed)
           end
         end
 
-        @listener = @listener_class.new(
-          @paths,
-          @excludes,
+        listener = listener_class.new(
+          paths,
+          listener_excludes,
           listener_settings,
           change_callback
         )
-      end
-
-      def full_sync
-        @syncers.each do |syncer|
-          @logger.info(I18n.t('syncer.states.initial', {
-            host_path: syncer.host_path,
-            guest_path: syncer.guest_path
-          }))
-          syncer.sync([syncer.host_path], initial=true)
-        end
-      end
 
-      def listen
-        text = @listener_polling ? 'syncer.states.polling' : 'syncer.states.watching'
-        @paths.each do |path|
+        text = polling ? 'syncer.states.polling' : 'syncer.states.watching'
+        paths.each do |path|
           @logger.info(I18n.t(text, {
             host_path: path,
-            listener: @listener_name,
-            interval: @listener_interval
+            listener: listener_name,
+            interval: listener_interval
           }))
         end
-        @listener.run
-      end
 
-      private
-
-      def change_callback
-        Proc.new do |changed|
-          if @listener_verbose
-            @logger.info(@listener_name + ": " + changed.join(', '))
-          end
-          @syncers.each do |syncer|
-            syncer.sync(changed)
-          end
-        end
+        listener.run
       end
 
     end

data/lib/syncer/synced_folder.rb

@@ -41,7 +41,9 @@ module Vagrant
           machine.ui.warn(I18n.t("vagrant.rsync_ssh_password"))
         end
 
-        Machine.new(machine).full_sync
+        unless machine.config.syncer.disable_up_rsync
+          Machine.new(machine).full_sync
+        end
       end
     end
   end

data/lib/syncer/version.rb

@@ -1,5 +1,5 @@
 module Vagrant
   module Syncer
-    VERSION = "1.1.8"
+    VERSION = "1.1.9"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-syncer
 version: !ruby/object:Gem::Version
-  version: 1.1.8
+  version: 1.1.9
 platform: ruby
 authors:
 - Anssi Syrjäsalo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-20 00:00:00.000000000 Z
+date: 2016-05-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler