vagrant-syncer 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6f6e700c1878ab046b3eed7a6a585ed689a038ec
-  data.tar.gz: 27a802c416aa8cb32300002279266e5b2de8997d
+  metadata.gz: 3cd47298b3567673c6995d30964b20fa04a75ec5
+  data.tar.gz: 8e90c5516f9fae57e14075c575026207861fc3da
 SHA512:
-  metadata.gz: a84d6f1baadd8b25ef6c8b36f9bffcb03ac629815c6f7dd07ed276f144eb7c40001a1c39ef62bbe26dac67412c29a9cae5c62494f4f99b71a10ea1cd91363db6
-  data.tar.gz: 378228b18aa94eb7558aeb4c451f341aebacfedd59ca3c5ef52b581fce88ce59877180807a359065bcda58c2de3c21a79ed64858d308ace732d7bd8f97731538
+  metadata.gz: f9751e15a8daa2674c6c2a52332fafcd59aa1241d6291ffe76536aba6def684a01a7ae763dbfb270a64ff5f0140223c3459028cef0b93a5bda4f7f831ad700fd
+  data.tar.gz: 4778d39d2bbb111510d3470ee6f76619223a4a40dc5d26035f07e245e9cbe7ad9dbbe550d5290ead1817f1f81cb36e247a219413b7c6e27a992e774657cc3573

data/example/Vagrantfile

@@ -8,7 +8,7 @@ Vagrant.configure(2) do |config|
   config.vm.box_check_update = false
   config.vbguest.auto_update = false  if Vagrant.has_plugin?("vagrant-vbguest")
 
-  config.vm.network 'private_network', ip: '10.10.10.10'
+  config.vm.network 'private_network', type: 'dhcp'
 
   config.vm.synced_folder '.', '/vagrant', disabled: true
 
@@ -47,17 +47,24 @@ Vagrant.configure(2) do |config|
   # Default: false
   config.syncer.show_events = false
 
-  # Optional SSH arguments passed to rsync for lower CPU load
-  # Default: -o StrictHostKeyChecking=no, -o IdentitiesOnly=true, -o UserKnownHostsFile=/dev/null
+  # Optional SSH arguments passed to rsync, e.g. to lower CPU load
+  #
+  # If not overridden here, the defaults on all platforms are:
+  # -o StrictHostKeyChecking=no
+  # -o IdentitiesOnly=true
+  # -o UserKnownHostsFile=/dev/null
+  #
+  # 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',
     '-o UserKnownHostsFile=/dev/null',
     '-c arcfour,blowfish-cbc',
     '-o Compression=no',
-    '-o ControlMaster=auto',
-    "-o ControlPath=#{File.join(Dir.tmpdir, "ssh.#{rand(1000)}")}",
-    '-o ControlPersist=10m',
     '-x'
   ]
 end

data/lib/syncer/config.rb

@@ -15,14 +15,22 @@ module Vagrant
         @interval = 0.2          if @interval == UNSET_VALUE || @interval <= 0.2
         @run_on_startup = true   if @run_on_startup == UNSET_VALUE
         @show_events = false     if @show_events == UNSET_VALUE
-        @ssh_args = [
-          '-o StrictHostKeyChecking=no',
-          '-o IdentitiesOnly=true',
-          '-o UserKnownHostsFile=/dev/null',
-          '-o ControlMaster=auto',
-          "-o ControlPath=#{File.join(Dir.tmpdir, "ssh.#{rand(1000)}")}",
-          '-o ControlPersist=10m'
-        ] if @ssh_args == UNSET_VALUE
+
+        if @ssh_args = UNSET_VALUE
+          @ssh_args = [
+            '-o StrictHostKeyChecking=no',
+            '-o IdentitiesOnly=true',
+            '-o UserKnownHostsFile=/dev/null',
+          ]
+
+          unless Vagrant::Util::Platform.windows?
+            @ssh_args += [
+              '-o ControlMaster=auto',
+              "-o ControlPath=#{File.join(Dir.tmpdir, "ssh.#{rand(1000)}")}",
+              '-o ControlPersist=10m'
+            ]
+          end
+        end
       end
 
     end

data/lib/syncer/syncers/rsync.rb

@@ -87,9 +87,9 @@ module Vagrant
           abs_host_path = File.expand_path(host_dir, @machine_path)
           abs_host_path = Vagrant::Util::Platform.fs_real_path(abs_host_path).to_s
 
-          # Rsync on Windows expects Cygwin style paths
+          # Rsync on Windows expects relative paths
           if Vagrant::Util::Platform.windows?
-            abs_host_path = Vagrant::Util::Platform.cygwin_path(abs_host_path)
+            abs_host_path = abs_host_path.gsub(@machine_path + '/', '')
           end
 
           # Ensure path ends with '/' to prevent creating directory inside directory

data/lib/syncer/version.rb

@@ -1,5 +1,5 @@
 module Vagrant
   module Syncer
-    VERSION = "1.0.1"
+    VERSION = "1.0.2"
   end
 end

data/vagrant-syncer.gemspec

@@ -9,7 +9,7 @@ Gem::Specification.new do |spec|
   spec.authors       = ["Anssi Syrjäsalo"]
   spec.email         = ["anssi.syrjasalo@gmail.com"]
   spec.summary       = %q{Optimized Vagrant rsync-auto}
-  spec.description   = %q{A Vagrant synced folder plugin with watchers for large file hierarchies and (c)leaner rsync-auto.}
+  spec.description   = %q{Optimized Vagrant rsync(-auto) plugin for large file hierarchies.}
   spec.homepage      = "https://github.com/asyrjasalo/vagrant-syncer"
   spec.license       = "MIT"
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-syncer
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - Anssi Syrjäsalo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-08 00:00:00.000000000 Z
+date: 2016-03-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -38,8 +38,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: A Vagrant synced folder plugin with watchers for large file hierarchies
-  and (c)leaner rsync-auto.
+description: Optimized Vagrant rsync(-auto) plugin for large file hierarchies.
 email:
 - anssi.syrjasalo@gmail.com
 executables: