vagrant-syncer 1.0.7 → 1.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b63ad4d5959b021a757e370b28dc00afbaf17fdb
-  data.tar.gz: 28100efa5de0c18e4bfb87f3877afaf8b233bf29
+  metadata.gz: ddd963382d77f2cf8809225b08b3072d8af37fb5
+  data.tar.gz: 2fba2298a98e17e527b46d412dc13183bbfc3145
 SHA512:
-  metadata.gz: 9ecc08db460cfd9f6925024ec4e707e98eeb4b0ac52e196adaf4c990bc2a21cbab638144b85be24e2cf2a3571554bacdaa31693a13e4b210543e95d10a896558
-  data.tar.gz: e714a252e4669fd01c7439043513ea5219e7c636f408805752cdeddd28859bfbfd708c7cad5a525d008907135964262d5114267424db8b0cf4c3aaf4afe70dec
+  metadata.gz: bffe66c12c22d82c09da1e7be491846a039afbe3d993819134094e99a91dd95f612c06c3889ca2dcc399d2ced74130be2cba74ebc7bfc5103b7cfe1de88f5351
+  data.tar.gz: 01a43a58085be761482795941336236e8d8b2e9c784b74c7d3bc4cc6c4ab35371cbdf07031088aa5e6189175b16e49300391883fef805529e68be4aad014783c

data/example/Vagrantfile

@@ -12,6 +12,13 @@ Vagrant.configure(2) do |config|
 
   config.vm.synced_folder '.', '/vagrant', disabled: true
 
+  config.vm.synced_folder "dotfiles", "/home/vagrant", type: 'rsync',
+    rsync__args: [
+      "--archive",
+      "--out-format=%L%n"
+    ],
+    rsync__verbose: true
+
   config.vm.synced_folder "files", "/home/vagrant/files", type: 'rsync',
     rsync__args: [
       "--archive",

data/example/dotfiles/.dircolors

@@ -0,0 +1,79 @@
+COLOR tty
+
+TERM ansi
+TERM color_xterm
+TERM color-xterm
+TERM con132x25
+TERM con132x30
+TERM con132x43
+TERM con132x60
+TERM con80x25
+TERM con80x28
+TERM con80x30
+TERM con80x43
+TERM con80x50
+TERM con80x60
+TERM cons25
+TERM console
+TERM cygwin
+TERM dtterm
+TERM dvtm
+TERM dvtm-256color
+TERM Eterm
+TERM eterm-color
+TERM fbterm
+TERM gnome
+TERM gnome-256color
+TERM jfbterm
+TERM konsole
+TERM konsole-256color
+TERM kterm
+TERM linux
+TERM linux-c
+TERM mach-color
+TERM mlterm
+TERM nxterm
+TERM putty
+TERM putty-256color
+TERM rxvt
+TERM rxvt-256color
+TERM rxvt-cygwin
+TERM rxvt-cygwin-native
+TERM rxvt-unicode
+TERM rxvt-unicode256
+TERM rxvt-unicode-256color
+TERM screen
+TERM screen-16color
+TERM screen-16color-bce
+TERM screen-16color-s
+TERM screen-16color-bce-s
+TERM screen-256color
+TERM screen-256color-bce
+TERM screen-256color-s
+TERM screen-256color-bce-s
+TERM screen-bce
+TERM screen-w
+TERM screen.linux
+TERM screen.xterm-new
+TERM st
+TERM st-meta
+TERM st-256color
+TERM st-meta-256color
+TERM vt100
+TERM xterm
+TERM xterm-new
+TERM xterm-16color
+TERM xterm-256color
+TERM xterm-88color
+TERM xterm-color
+TERM xterm-debian
+TERM xterm-termite
+
+EIGHTBIT 1
+
+# Directories
+DIR 01;36       # bolded;cyan
+
+# Plain text files
+.txt 32         # green
+.not 31         # red

data/lib/syncer/listeners/fsevents.rb

@@ -5,8 +5,8 @@ module Vagrant
     module Listeners
       class FSEvents
 
-        def initialize(absolute_path, excludes, settings, callback)
-          @absolute_path = absolute_path
+        def initialize(paths, excludes, settings, callback)
+          @paths = paths
           @settings = settings.merge!(no_defer: false)
           @callback = callback
           # rb-fsevent does not support excludes.
@@ -15,7 +15,7 @@ module Vagrant
         def run
           changes = Queue.new
           fsevent = FSEvent.new
-          fsevent.watch @absolute_path, @settings do |paths|
+          fsevent.watch @paths, @settings do |paths|
             paths.each { |path| changes << path }
           end
           Thread.new { fsevent.run }

data/lib/syncer/listeners/inotify.rb

@@ -5,8 +5,8 @@ module Vagrant
     module Listeners
       class INotify
 
-        def initialize(absolute_path, excludes, settings, callback)
-          @absolute_path = absolute_path
+        def initialize(paths, excludes, settings, callback)
+          @paths = paths
           @settings = settings
           @callback = callback
           # rb-inotify does not support excludes.
@@ -14,7 +14,10 @@ module Vagrant
 
         def run
           notifier = ::INotify::Notifier.new
-          notifier.watch(@absolute_path, :modify, :create, :delete, :recursive) {}
+
+          @paths.each do |path|
+            notifier.watch(path, :modify, :create, :delete, :recursive) {}
+          end
 
           loop do
             directories = Set.new

data/lib/syncer/listeners/listen.rb

@@ -1,5 +1,4 @@
 require 'listen'
-require 'vagrant/util/busy'
 
 module Vagrant
   module Syncer
@@ -22,12 +21,14 @@ module Vagrant
           Regexp.new(pattern)
         end
 
-        def initialize(absolute_path, excludes, settings, callback)
-          @absolute_path = absolute_path
+        def initialize(paths, excludes, settings, callback)
+          @paths = paths
           @settings = settings
-          @callback = callback
+          @callback = Proc.new do |mod, add, rem|
+            callback.call(mod + add + rem)
+          end
 
-          if excludes
+          if excludes.any?
             @settings[:ignore!] = []
             excludes.each do |pattern|
               @settings[:ignore!] << self.class.excludes_to_listen(pattern.to_s)
@@ -36,11 +37,7 @@ module Vagrant
         end
 
         def run
-          listener = ::Listen.to(@absolute_path, @settings) do |mod, add, rem|
-            @callback.call(mod + add + rem)
-          end
-
-          listener.start
+          ::Listen.to(*@paths, @settings, &@callback).start
           sleep
         end
       end

data/lib/syncer/machine.rb

@@ -1,5 +1,7 @@
 require 'vagrant/action/builtin/mixin_synced_folders'
 
+require_relative 'syncers/rsync'
+
 module Vagrant
   module Syncer
     class Machine
@@ -8,28 +10,84 @@ module Vagrant
 
       def initialize(machine, polling=false)
         @paths = []
+        @syncers = []
+        @excludes = []
+        @logger = machine.ui
+
+        @listener_verbose = machine.config.syncer.show_events
+        @listener_interval = machine.config.syncer.interval
+
+        listener_settings = {
+          latency: @listener_interval,
+          wait_for_delay: @listener_interval / 2
+        }
 
-        cached = synced_folders(machine, cached: true)
-        fresh  = synced_folders(machine)
-        diff   = synced_folders_diff(cached, fresh)
-        if !diff[:added].empty?
-          machine.ui.warn(I18n.t("vagrant.rsync_auto_new_folders"))
+        if polling
+          require_relative 'listeners/listen'
+          @listener_class = Vagrant::Syncer::Listeners::Listen
+          listener_settings[:force_polling] = polling
+        elsif machine.config.syncer.force_listen_gem
+          require_relative '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
+          when /linux/
+            require_relative 'listeners/inotify'
+            @listener_class = Vagrant::Syncer::Listeners::INotify
+          else
+            require_relative 'listeners/listen'
+            @listener_class = Vagrant::Syncer::Listeners::Listen
+          end
         end
 
-        folders = cached[:rsync]
-        return unless folders
+        @listener_name = @listener_class.to_s.gsub(/^.*::/, '')
 
-        folders.each do |id, folder_opts|
-          @paths << Path.new(folder_opts, machine, polling)
+        synced_folders(machine)[:rsync].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)
         end
+
+        @listener = @listener_class.new(
+          @paths,
+          @excludes,
+          listener_settings,
+          change_callback
+        )
       end
 
       def full_sync
-        @paths.each(&:initial_sync)
+        @syncers.each do |syncer|
+          syncer.sync([syncer.host_path])
+        end
       end
 
       def listen
-        @paths.each(&:listen)
+        text = @listener_polling ? 'syncer.states.polling' : 'syncer.states.watching'
+        @paths.each do |path|
+          @logger.info(I18n.t(text, {
+            path: path,
+            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
       end
 
     end

data/lib/syncer/syncers/rsync.rb

@@ -6,15 +6,17 @@ module Vagrant
     module Syncers
       class Rsync
 
+        attr_reader :host_path
+
         def initialize(path_opts, machine)
           @machine = machine
           @logger = machine.ui
 
           @machine_path = machine.env.root_path.to_s
           @host_path = parse_host_path(path_opts[:hostpath])
+          @rsync_verbose = path_opts[:rsync__verbose] || false
           @rsync_args = parse_rsync_args(path_opts[:rsync__args],
             path_opts[:rsync__rsync_path])
-          @rsync_verbose = path_opts[:rsync__verbose] || false
           @ssh_command = parse_ssh_command(machine.config.syncer.ssh_args)
           @exclude_args = parse_exclude_args(path_opts[:rsync__exclude])
 
@@ -119,12 +121,10 @@ module Vagrant
         end
 
         def parse_rsync_args(rsync_args=nil, rsync_path=nil)
-          rsync_args ||= ["--archive", "--delete", "--compress", "--copy-links",
-            "--verbose"]
+          rsync_args ||= ["--archive", "--delete", "--compress", "--copy-links"]
 
-          # The default rsync output, later user opt --out-format arguments
-          # take presence.
-          rsync_args.unshift("--out-format=%L%n")
+          # This implies --verbose, set nicer output by default
+          rsync_args.unshift("--out-format=%L/%f")  if @rsync_verbose
 
           rsync_chmod_args_given = rsync_args.any? { |arg|
             arg.start_with?("--chmod=")

data/lib/syncer/version.rb

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

data/lib/vagrant-syncer.rb

@@ -6,7 +6,6 @@ end
 
 require 'syncer/actions'
 require 'syncer/machine'
-require 'syncer/path'
 require 'syncer/plugin'
 require 'syncer/version'
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-syncer
 version: !ruby/object:Gem::Version
-  version: 1.0.7
+  version: 1.0.8
 platform: ruby
 authors:
 - Anssi Syrjäsalo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-11 00:00:00.000000000 Z
+date: 2016-03-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -57,6 +57,7 @@ files:
 - bin/setup
 - build_and_install.sh
 - example/Vagrantfile
+- example/dotfiles/.dircolors
 - example/files/directory/excluded_directory/yes.txt
 - example/files/directory/file_in_directory.txt
 - example/files/directory/nested_directory/excluded_directory/yes.txt
@@ -80,7 +81,6 @@ files:
 - lib/syncer/listeners/inotify.rb
 - lib/syncer/listeners/listen.rb
 - lib/syncer/machine.rb
-- lib/syncer/path.rb
 - lib/syncer/plugin.rb
 - lib/syncer/synced_folder.rb
 - lib/syncer/syncers/rsync.rb

data/lib/syncer/path.rb

@@ -1,84 +0,0 @@
-require 'vagrant/util/platform'
-
-require_relative 'syncers/rsync'
-
-module Vagrant
-  module Syncer
-    class Path
-
-      def initialize(path_opts, machine, listener_polling=false)
-        @logger = machine.ui
-        @source_path = path_opts[:hostpath]
-        @syncer = Syncers::Rsync.new(path_opts, machine)
-        @absolute_path = File.expand_path(@source_path, machine.env.root_path)
-
-        @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,
-          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/
-            require_relative 'listeners/fsevents'
-            @listener_class = Vagrant::Syncer::Listeners::FSEvents
-          when /linux/
-            require_relative 'listeners/inotify'
-            @listener_class = Vagrant::Syncer::Listeners::INotify
-          else
-            require_relative 'listeners/listen'
-            @listener_class = Vagrant::Syncer::Listeners::Listen
-          end
-        end
-
-        @listener_name = @listener_class.to_s.gsub(/^.*::/, '')
-
-        @listener = @listener_class.new(
-          @absolute_path,
-          path_opts[:rsync__excludes],
-          listener_settings,
-          change_callback
-        )
-      end
-
-      def initial_sync
-        @logger.info(I18n.t('syncer.states.initial', path: @absolute_path))
-        @syncer.sync([@source_path])
-      end
-
-      def listen
-        text = @listener_polling ? 'syncer.states.polling' : 'syncer.states.watching'
-        @logger.info(I18n.t(text, {
-          path: @absolute_path,
-          listener: @listener_name,
-          interval: @listener_interval
-        }))
-        @listener.run
-      end
-
-      private
-
-      def change_callback
-        Proc.new do |changed|
-          if @listener_verbose
-            @logger.info(@listener_name + ": " + changed.join(', '))
-          end
-          @syncer.sync(changed)
-        end
-      end
-
-    end
-  end
-end