vagrant-nfs_guest 0.1.8 → 0.1.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 198e6a741e26343a7ac6474db914d04870c245f0
-  data.tar.gz: db2f73ebbeaf1aee9410ca613734e37a63141d7b
+  metadata.gz: eacf9d0633d8e0afd331d14d080dc251b5d425e8
+  data.tar.gz: 59e695490518b3c97c3e2c9be1a6dcc1ad27a2b2
 SHA512:
-  metadata.gz: 57a3c7615a07b2cae4833833ab61e5b3b7d9687657a52a691a10f9041c4874aea2ba6a1f92d47ed63f35236247dac54778a8fe1b2ce748fa287b9215640baefb
-  data.tar.gz: 45b6b20dcfa3f26dd6a9a46a5a51cf23ca2bda38eb3f75eb6cfe9518e6bb8f02d6f44e88996c38fcf49e0240b944b2c915254617595a38ce147e289de36eee75
+  metadata.gz: 75b2f3a1163f71f6f72720b2033f4455c7caedbc943a933ab97e999a22ef60ee9768a37038b9ec8eddd8ae255719ea2c5423c58349611ffd10e076cba23f45c0
+  data.tar.gz: 5a468411da16a54b95296e9070a5e732d53e5c8d262e8d9031284df9614964f5ff1e558ce6692ced1dee74a194a5b7f7762ebc64ff943e2a8cdb2792d9d11d9c

data/README.md

@@ -2,7 +2,8 @@
 
 ## What's New?
 
-- NEW: added untested support for Parallels and Docker providers (Please raise any issues if they don't work!).
+- NEW: added untested support for Docker providers (Please raise any issues if they don't work!).
+- NEW: added Parallels provider support
 - NEW: Redhat/CentOS guest support added.
 - FIXED: suspend and resume with 'up' instead of 'resume' fixed.
 - Supports Vagrant > 1.6.

data/example_box/Vagrantfile

@@ -14,13 +14,14 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
   # Create a private network, which allows host-only access to the machine
   # using a specific IP.
   config.vm.network "private_network", ip: "192.168.55.10"
+  #config.vm.network "public_network"
 
   # Share an additional folder to the guest VM. The first argument is
   # the path on the host to the actual folder. The second argument is
   # the path on the guest to mount the folder. And the optional third
   # argument is a set of non-required options.
   config.vm.synced_folder '.', '/vagrant', disabled: true
-
   config.vm.synced_folder './vagrant_share', '/vagrant', type: 'nfs_guest'
+  #config.vm.synced_folder './vagrant_share', '/vagrant', type: 'nfs'
 
 end

data/lib/vagrant-nfs_guest/action/mount_nfs.rb

@@ -36,6 +36,19 @@ module VagrantPlugins
               raise SyncedFolderNFSGuest::Errors::ProviderNFSSettingsCapMissing
             end
 
+            # grab the folders to check if any use nfs_guest and require host networking
+            folders = @machine.config.vm.synced_folders
+            nfs_guest = false
+            folders.each do |name, opts|
+              if opts[:type] == :nfs_guest
+                nfs_guest = true
+              end
+            end
+
+            if not nfs_guest
+              return
+            end
+
             # grab the ips from the provider
             host_ip, machine_ip = @machine.provider.capability(:nfs_settings)
 
@@ -50,8 +63,6 @@ module VagrantPlugins
                 if installed
                   # Mount guest NFS folders
                   @machine.ui.info(I18n.t("vagrant_nfs_guest.actions.vm.nfs.mounting"))
-                  folders = @machine.config.vm.synced_folders
-
                   @machine.env.host.capability(:nfs_mount, @machine.ui, @machine.id, machine_ip, folders)
                 end
               end

data/lib/vagrant-nfs_guest/hosts/bsd/cap/mount_nfs.rb

@@ -15,8 +15,11 @@ module VagrantPlugins
                                  guestpath: opts[:guestpath],
                                  hostpath: opts[:hostpath]))
 
+                mount_options = opts.fetch(:mount_options, ["noatime"])
+                nfs_options = mount_options.empty? ? "" : "-o #{mount_options.join(',')}"
+
                 system("mkdir -p #{opts[:hostpath]}")
-                mount_command = "mount -t nfs -o noatime '#{ip}:#{opts[:guestpath]}' '#{opts[:hostpath]}'"
+                mount_command = "mount -t nfs #{nfs_options} '#{ip}:#{opts[:guestpath]}' '#{opts[:hostpath]}'"
                 if system(mount_command)
                   break
                 end

data/lib/vagrant-nfs_guest/hosts/bsd/cap/unmount_nfs.rb

@@ -14,8 +14,10 @@ module VagrantPlugins
                                guestpath: opts[:guestpath],
                                hostpath: opts[:hostpath]))
 
+              unmount_options = opts.fetch(:unmount_options, []).join(" ")
+
               expanded_host_path = `printf #{opts[:hostpath]}`
-              umount_msg = `umount '#{expanded_host_path}' 2>&1`
+              umount_msg = `umount #{unmount_options} '#{expanded_host_path}' 2>&1`
 
               if $?.exitstatus != 0
                 if not umount_msg.include? 'not currently mounted'

data/lib/vagrant-nfs_guest/hosts/linux/cap/mount_nfs.rb

@@ -15,8 +15,11 @@ module VagrantPlugins
                                  guestpath: opts[:guestpath],
                                  hostpath: opts[:hostpath]))
 
+                mount_options = opts.fetch(:mount_options, ["noatime"])
+                nfs_options = mount_options.empty? ? "" : "-o #{mount_options.join(',')}"
+
                 system("mkdir -p #{opts[:hostpath]}")
-                mount_command = "sudo mount -t nfs -o noatime '#{ip}:#{opts[:guestpath]}' '#{opts[:hostpath]}'"
+                mount_command = "sudo mount -t nfs #{nfs_options} '#{ip}:#{opts[:guestpath]}' '#{opts[:hostpath]}'"
                 if system(mount_command)
                   break
                 end

data/lib/vagrant-nfs_guest/hosts/linux/cap/unmount_nfs.rb

@@ -14,8 +14,10 @@ module VagrantPlugins
                                guestpath: opts[:guestpath],
                                hostpath: opts[:hostpath]))
 
+              unmount_options = opts.fetch(:unmount_options, []).join(" ")
+
               expanded_host_path = `printf #{opts[:hostpath]}`
-              umount_msg = `sudo umount '#{expanded_host_path}' 2>&1`
+              umount_msg = `sudo umount #{unmount_options} '#{expanded_host_path}' 2>&1`
 
               if $?.exitstatus != 0
                 if not umount_msg.include? 'not currently mounted'

data/lib/vagrant-nfs_guest/providers/virtualbox/cap/nfs_settings.rb

@@ -1,14 +1,14 @@
+require "vagrant/util/retryable"
+
 module VagrantPlugins
   module SyncedFolderNFSGuest
     module ProviderVirtualBox
       module Cap
+        extend Vagrant::Util::Retryable
 
         def self.nfs_settings(machine)
           adapter, host_ip = self.find_host_only_adapter(machine)
           machine_ip       = self.read_static_machine_ips(machine) || self.read_dynamic_machine_ip(machine, adapter)
-
-          raise Vagrant::Errors::NFSNoHostonlyNetwork if !host_ip || !machine_ip
-
           return host_ip, machine_ip
         end
 
@@ -77,7 +77,7 @@ module VagrantPlugins
         end
 
         # Separating these out so we can stub out the sleep in tests
-        def retry_options
+        def self.retry_options
           {tries: 15, sleep: 1}
         end
       end

data/lib/vagrant-nfs_guest/synced_folder.rb

@@ -34,8 +34,7 @@ module VagrantPlugins
         host_ip, machine_ip = machine.provider.capability(:nfs_settings)
         machine_ip = [machine_ip] if !machine_ip.is_a?(Array)
 
-        raise Vagrant::Errors::NFSNoHostIP if !host_ip
-        raise Vagrant::Errors::NFSNoGuestIP if !machine_ip
+        raise Vagrant::Errors::NFSNoHostonlyNetwork if !host_ip || !machine_ip
 
         if machine.config.nfs_guest.verify_installed
           if machine.guest.capability?(:nfs_server_installed)

data/lib/vagrant-nfs_guest/version.rb

@@ -1,5 +1,5 @@
 module VagrantPlugins
   module SyncedFolderNFSGuest
-    VERSION = "0.1.8"
+    VERSION = "0.1.9"
   end
 end

data/templates/locales/en.yml

@@ -41,6 +41,16 @@ en:
         Stdout from the command:
         %{stdout}
 
+        Stderr from the command:
+        %{stderr}
+      nfs_create_mounts_failed: |-
+        Something failed while creating the NFS mounts on the guest.
+
+        %{command}
+
+        Stdout from the command:
+        %{stdout}
+
         Stderr from the command:
         %{stderr}
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-nfs_guest
 version: !ruby/object:Gem::Version
-  version: 0.1.8
+  version: 0.1.9
 platform: ruby
 authors:
 - Alan Garfield
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-21 00:00:00.000000000 Z
+date: 2016-06-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler