vagrant-vsphere 0.9.0 → 0.9.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a02c9f4ac97953016ac3fac92a14e7efbcc5b673
-  data.tar.gz: 038f06bf972ccfcd6692b642b91f3922b8d9a618
+  metadata.gz: bbccf22b0e44382e8f2add33082883350d12afb5
+  data.tar.gz: 535b241382bf743cf38772121109fc2f6e37635b
 SHA512:
-  metadata.gz: 347b867ae7551d99311daab235e410ff51e372aabdedd5c2e5c83418050e43dee02c4d516d5c91b74e6ae22bd50d1ed8c80f96882ee22bd3c411df4d91b80c06
-  data.tar.gz: 93e5f3aef54aa2f63a861767469500a2b8219edfbd3296bbf42a8dbb447f0554df347dcaf5b7589a7739a6237109b04c99e0bc9058e53751039adf0298558f22
+  metadata.gz: f219f8c40f9ffd9680e1d70c5355dd33e71459a3215832ad1ab724b37dc53c811b8c6f3430c1936be2f2f839bb123cc3fa97ff51c8bf1978cef303c809f006a1
+  data.tar.gz: c014ce7bb4eed32bc3bc39358bad9e25630dad57a4905700f5aba803978160884796ded09d87278120df846f7b8b0e6496dd787b9423a42f8b1c3e60fd680a93

data/.gitignore

@@ -5,3 +5,4 @@ pkg/*
 *.box
 Gemfile.lock
 /vendor/
+/synced_folders

data/README.md

@@ -12,9 +12,9 @@ This provider is built on top of the [RbVmomi](https://github.com/vmware/rbvmomi
 * libxml2, libxml2-dev, libxslt, libxslt-dev
 
 ## Current Version
-**0.9.0**
+**0.9.1**
 
-vagrant-vsphere (0.9.0) is available from [RubyGems.org](https://rubygems.org/gems/vagrant-vsphere)
+vagrant-vsphere (0.9.1) is available from [RubyGems.org](https://rubygems.org/gems/vagrant-vsphere)
 
 ## Installation
 
@@ -168,7 +168,8 @@ This is useful if running Vagrant from multiple directories or if multiple machi
 * 0.9.0
   * increases Vagrant requirements to 1.6.3+
   * Supports differentiating between SSH/WinRM communicator [#67 marnovdm:feature/waiting-for-winrm](https://github.com/nsidc/vagrant-vsphere/pull/67)
-
+* 0.9.1
+  * reuse folder sync code from Vagrant core. [#66 mkuzmin:sync-folders](https://github.com/nsidc/vagrant-vsphere/pull/66)
 
 
 ## Versioning

data/lib/vSphere/action.rb

@@ -37,8 +37,8 @@ module VagrantPlugins
               end
               
               b3.use Provision
-              b3.use SyncFolders 
-            end        
+              b3.use SyncedFolders
+            end
           end
         end
       end
@@ -104,7 +104,7 @@ module VagrantPlugins
           end
           b.use CloseVSphere 
           b.use Provision          
-          b.use SyncFolders          
+          b.use SyncedFolders
         end
       end
 
@@ -165,7 +165,6 @@ module VagrantPlugins
       autoload :MessageNotRunning, action_root.join('message_not_running')
       autoload :PowerOff, action_root.join('power_off')
       autoload :PowerOn, action_root.join('power_on')
-      autoload :SyncFolders, action_root.join('sync_folders')
     end
   end
 end

data/lib/vSphere/errors.rb

@@ -6,9 +6,6 @@ module VagrantPlugins
       class VSphereError < Vagrant::Errors::VagrantError
         error_namespace('vsphere.errors')
       end
-      class RsyncError < VSphereError
-        error_key(:rsync_error)
-      end
     end
   end
 end

data/lib/vSphere/plugin.rb

@@ -1,4 +1,14 @@
-require 'vagrant'
+begin
+  require "vagrant"
+rescue LoadError
+  raise "The Vagrant vSphere plugin must be run within Vagrant."
+end
+
+# This is a sanity check to make sure no one is attempting to install
+# this into an early Vagrant version.
+if Vagrant::VERSION < "1.5"
+  raise "The Vagrant vSphere plugin is only compatible with Vagrant 1.5+"
+end
 
 module VagrantPlugins
   module VSphere

data/lib/vSphere/version.rb

@@ -1,5 +1,5 @@
 module VagrantPlugins
   module VSphere
-    VERSION = '0.9.0'
+    VERSION = '0.9.1'
   end
 end

data/locales/en.yml

@@ -20,8 +20,6 @@ en:
       Waiting for SSH to become available...
     waiting_for_winrm: |-
       Waiting for WinRM to become available...
-    rsync_folder: |-
-      Rsyncing folder: %{hostpath} => %{guestpath}
 
     errors:
       missing_template: |-
@@ -38,19 +36,8 @@ en:
         Configured configuration spec not found
       missing_datastore: |-
         Configured data store not found
-      rsync_error: |-
-        There was an error when attemping to rsync a share folder.
-        Please inspect the error message below for more info.
-
-        Host path: %{hostpath}
-        Guest path: %{guestpath}
-        Error: %{stderr}
       too_many_private_networks: |-
         There a more private networks configured than can be assigned to the customization spec
-      rsync_not_found: |-
-        Warning! Folder sync disabled because the rsync binary is
-        missing. Make sure rsync is installed and the binary can
-        be found in PATH.
     config:
       host: |-
         Configuration must specify a vSphere host

data/spec/spec_helper.rb

@@ -1,4 +1,5 @@
 require 'rbvmomi'
+require 'pathname'
 require 'vSphere/errors'
 require 'vSphere/action'
 require 'vSphere/action/connect_vsphere'
@@ -62,8 +63,11 @@ RSpec.configure do |config|
                       :state => double('state', :id => nil),
                       :communicate => double('communicator', :ready? => true),
                       :ssh_info => {},
+                      :data_dir => Pathname.new(''),
                       :id => nil,
                       :id= => nil
+
+
     @env = {
         :machine => @machine,
         :ui => double('ui', :info => nil)
@@ -81,6 +85,7 @@ RSpec.configure do |config|
     vm_folder.stub(:findByUuid).with(MISSING_UUID).and_return(nil)
     vm_folder.stub(:findByUuid).with(nil).and_return(nil)
 
+
     @child_resource_pool = double('testresourcepool')
     @root_resource_pool = double('pools', :find => @child_resource_pool)
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-vsphere
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 0.9.1
 platform: ruby
 authors:
 - Andrew Grauch
@@ -135,7 +135,6 @@ files:
 - lib/vSphere/action/message_not_running.rb
 - lib/vSphere/action/power_off.rb
 - lib/vSphere/action/power_on.rb
-- lib/vSphere/action/sync_folders.rb
 - lib/vSphere/config.rb
 - lib/vSphere/errors.rb
 - lib/vSphere/plugin.rb

data/lib/vSphere/action/sync_folders.rb

@@ -1,99 +0,0 @@
-require 'i18n'
-require "vagrant/util/subprocess"
-require "vagrant/util/scoped_hash_override"
-require "vagrant/util/which"
-
-module VagrantPlugins
-  module VSphere
-    module Action
-      # This middleware uses `rsync` to sync the folders over to the vSphere instance
-      # Borrowed from the Vagrant AWS gem, see https://github.com/mitchellh/vagrant-aws/blob/master/lib/vagrant-aws/action/sync_folders.rb
-      class SyncFolders
-        include Vagrant::Util::ScopedHashOverride
-
-        def initialize(app, env)
-          @app    = app
-        end
-
-        def call(env)
-          @app.call(env)
-
-          ssh_info = env[:machine].ssh_info
-
-          env[:machine].config.vm.synced_folders.each do |id, data|
-            data = scoped_hash_override(data, :vsphere)
-
-            # Ignore disabled shared folders
-            next if data[:disabled]
-
-            unless Vagrant::Util::Which.which('rsync')
-              env[:ui].warn(I18n.t('vsphere.errors.rsync_not_found'))
-              break
-            end
-            hostpath  = File.expand_path(data[:hostpath], env[:root_path])
-            guestpath = data[:guestpath]
-
-            # Make sure there is a trailing slash on the host path to
-            # avoid creating an additional directory with rsync
-            hostpath = "#{hostpath}/" if hostpath !~ /\/$/
-
-            # on windows rsync.exe requires cygdrive-style paths
-            if Vagrant::Util::Platform.windows?
-              hostpath = hostpath.gsub(/^(\w):/) { "/cygdrive/#{$1}" }
-            end
-
-            env[:ui].info(I18n.t("vsphere.rsync_folder",
-                                :hostpath => hostpath,
-                                :guestpath => guestpath))
-
-            # Create the guest path
-             if env[:machine].communicate.class.to_s =~ /WinRM/
-              env[:machine].communicate.execute("New-Item '#{guestpath}' -type directory -force")
-
-            else 
-              env[:machine].communicate.sudo("mkdir -p '#{guestpath}'")
-              env[:machine].communicate.sudo("chown #{ssh_info[:username]} '#{guestpath}'")
-            end
-
-            # Rsync over to the guest path using the SSH info
-            command = [
-              "rsync", "--verbose", "--archive", "-z",
-              "--exclude", ".vagrant/",
-              "-e", "ssh -p #{ssh_info[:port]} -o StrictHostKeyChecking=no #{get_private_key_options ssh_info}",
-              hostpath,
-              "#{ssh_info[:username]}@#{ssh_info[:host]}:#{guestpath}"]
-
-
-            # we need to fix permissions when using rsync.exe on windows, see
-            # http://stackoverflow.com/questions/5798807/rsync-permission-denied-created-directories-have-no-permissions
-            if Vagrant::Util::Platform.windows?
-              command.insert(1, "--chmod", "ugo=rwX")
-            end
-
-            r = Vagrant::Util::Subprocess.execute(*command)
-            if r.exit_code != 0
-              raise Errors::RsyncError,
-                :guestpath => guestpath,
-                :hostpath => hostpath,
-                :stderr => r.stderr
-            end
-          end
-        end
-
-        private
-
-        def get_private_key_options(ssh_info)
-          if ssh_info[:private_key_path].is_a? String
-            build_key_option ssh_info[:private_key_path]
-          elsif ssh_info[:private_key_path].is_a? Array
-            ssh_info[:private_key_path].map { |path| build_key_option path }.join(' ')
-          end
-        end
-
-        def build_key_option(key)
-          "-i '#{key}'"
-        end
-      end
-    end
-  end
-end