vagrant-syncer 1.1.7 → 1.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: df7339055662081551ead92ca8baf31151e1f4cc
-  data.tar.gz: 9c94aa4f7a88f3c2f68aa5e89157ebf52472539b
+  metadata.gz: 87f0de4b26b2a4925479368125aeebb54acd4746
+  data.tar.gz: b65baa6db0cdbf65635145d1e0df18ba262c671a
 SHA512:
-  metadata.gz: 260f98e46518294da614ed692644ad823281f0198ee65de515ec5af9fdf8af5e4db79f6d8e3edf0464f7d07b309f510ee184a89fd970c4f1b8849de1671bd09a
-  data.tar.gz: 306fa08765ae37fdf5b52ec5801214133b97d0d5afd05f6309dbf29ffb5b85e08456a3cd5de0b07145e6d4f1fe9aaf505868d126a35227279c4c4fe14c142eba
+  metadata.gz: ed08fa4bc963c82f076a03df602ca51a719633379c120669b6c704c0b56b997115fb8bbd0eeab216f95efae085d8f67a0c8a4e8144a2e0aa9553f174fc478ec9
+  data.tar.gz: cf46a519718b0beaad24c91b5d786b83034712990afa9178ac23d08429cdb01a598be214049a1ede52cb246b2f7065d11862b09bc0d653601ed8b0c040abea66

data/lib/syncer/actions.rb

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

data/lib/syncer/command/rsync.rb

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

data/lib/syncer/machine.rb

@@ -65,7 +65,11 @@ module Vagrant
 
       def full_sync
         @syncers.each do |syncer|
-          syncer.sync([syncer.host_path])
+          @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
 
@@ -73,7 +77,7 @@ module Vagrant
         text = @listener_polling ? 'syncer.states.polling' : 'syncer.states.watching'
         @paths.each do |path|
           @logger.info(I18n.t(text, {
-            path: path,
+            host_path: path,
             listener: @listener_name,
             interval: @listener_interval
           }))

data/lib/syncer/syncers/rsync.rb

@@ -6,7 +6,7 @@ module Vagrant
     module Syncers
       class Rsync
 
-        attr_reader :host_path
+        attr_reader :host_path, :guest_path
 
         def initialize(path_opts, machine)
           @machine = machine
@@ -14,6 +14,7 @@ module Vagrant
 
           @machine_path = machine.env.root_path.to_s
           @host_path = parse_host_path(path_opts[:hostpath])
+          @guest_path = path_opts[:guestpath]
           @rsync_verbose = path_opts[:rsync__verbose] || false
           @rsync_args = parse_rsync_args(path_opts[:rsync__args],
             path_opts[:rsync__rsync_path])
@@ -22,14 +23,14 @@ module Vagrant
 
           ssh_username = machine.ssh_info[:username]
           ssh_host = machine.ssh_info[:host]
-          @ssh_target = "#{ssh_username}@#{ssh_host}:#{path_opts[:guestpath]}"
+          @ssh_target = "#{ssh_username}@#{ssh_host}:#{@guest_path}"
 
           @vagrant_command_opts = {
             workdir: @machine_path
           }
 
           @vagrant_rsync_opts = {
-            guestpath: path_opts[:guestpath],
+            guestpath: @guest_path,
             chown: path_opts[:rsync__chown],
             owner: path_opts[:owner],
             group: path_opts[:group]
@@ -45,7 +46,7 @@ module Vagrant
           end
         end
 
-        def sync(changed_paths=[])
+        def sync(changed_paths=[], initial=false)
           rsync_command = [
             "rsync",
             @rsync_args,
@@ -57,7 +58,7 @@ module Vagrant
           ].flatten
 
           rsync_vagrant_command = rsync_command + [@vagrant_command_opts]
-          if @rsync_verbose
+          if !initial && @rsync_verbose
             @vagrant_command_opts[:notify] = [:stdout, :stderr]
             result = Vagrant::Util::Subprocess.execute(*rsync_vagrant_command) do |io_name, data|
               data.each_line do |line|

data/lib/syncer/version.rb

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

data/locales/en.yml

@@ -1,9 +1,9 @@
 en:
   syncer:
     states:
-      initial: "Rsyncing %{path}"
-      watching: "Watching %{path} (using %{listener}) every %{interval} seconds."
-      polling: "Polling %{path} (using %{listener}) every %{interval} seconds."
+      initial: "Rsyncing %{host_path} -> %{guest_path} get it up to date."
+      watching: "Watching %{host_path} (using %{listener}) every %{interval} seconds."
+      polling: "Polling %{host_path} (using %{listener}) every %{interval} seconds."
     rsync:
       failed: "Rsync failed: %{error}"
       failed_command: "The failed command was: %{command}"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-syncer
 version: !ruby/object:Gem::Version
-  version: 1.1.7
+  version: 1.1.8
 platform: ruby
 authors:
 - Anssi Syrjäsalo