vagrant-nfs_guest 0.1.11 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 68bea2f019bd5edd93dc71b5f11914463aef8e82
-  data.tar.gz: d1624a4519e1b43607df404a6f10961142941d1b
+  metadata.gz: 66cdfd9f758ab3bc1e50e9ea5d4343947c7fe997
+  data.tar.gz: de8345cf62d07dc961fd16ac526ee5d51088e5f7
 SHA512:
-  metadata.gz: 18d17c27a60291cb93c48ba1f7732d9aa9bb25746ec1aaf21003df1ba7ca2f65739f54ce76d0b7b29ae9064556f42e4f7f0c551f5bf31f30da0a9409a9327875
-  data.tar.gz: 584169bcaaf4ec740a3731b0e7aee83c1933c0dc03f45a38f199fb81648e4976cd865a9debacce1a8d3429c89be30779f6998cc4781dd4a39d6a314acf1979f3
+  metadata.gz: 2b9e37681172389e4e1e4f0e32fd3aabd16301aeba887899a170bea43f510663ab30840d59d40548a9f4001b911cc9f898ebd2e97630f6f36586b8eabe25acba
+  data.tar.gz: f9f80edd7590c1e1f7f784fdd367bdcf2f6cc371e62de03da28522343c8ad26599d3097209e185aea1e733b269173818111030e60a5b7d3253a98afcb6e22261

data/README.md

@@ -2,10 +2,13 @@
 
 ## What's New?
 
-- 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.
-- NEW: Now properly handles force halts
+- NEW: moved to version v1.0.0 as it's no longer a "beta" plugin, it's been well used and tested. So figured now is a good time.
+- NEW: `disabled` flag on shares now are properly respected
+- UPDATED: share directories on guest are no longer recursively `chown`.
+- Added untested support for Docker providers (Please raise any issues if they don't work!).
+- Added Parallels provider support
+- Redhat/CentOS guest support added.
+- Now properly handles force halts.
 - FIXED: suspend and resume with 'up' instead of 'resume' fixed.
 - Supports Vagrant > 1.6.
 - Handles actions ```up```, ```halt```, ```destroy```, ```suspend```, ```resume``` and ```package``` properly.

data/example_box/Vagrantfile

@@ -21,7 +21,7 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
   # 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', create: true, type: 'nfs_guest'
+  config.vm.synced_folder './vagrant_share', '/vagrant', create: true, type: 'nfs_guest', disabled: false
   #config.vm.synced_folder './vagrant_share', '/vagrant', type: 'nfs'
 
 end

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

@@ -38,11 +38,15 @@ module VagrantPlugins
 
             # grab the folders to check if any use nfs_guest and require host networking
             folders = @machine.config.vm.synced_folders
+
             nfs_guest = false
+            nfs_guest_folders = {}
+
             folders.each do |name, opts|
-              if opts[:type] == :nfs_guest
+              if opts[:type] == :nfs_guest && opts[:disabled] == false
                 nfs_guest = true
                 opts[:hostpath] = File.expand_path(opts[:hostpath], env[:root_path])
+                nfs_guest_folders[name] = opts.dup
               end
             end
 
@@ -64,7 +68,7 @@ module VagrantPlugins
                 if installed
                   # Mount guest NFS folders
                   @machine.ui.info(I18n.t("vagrant_nfs_guest.actions.vm.nfs.mounting"))
-                  @machine.env.host.capability(:nfs_mount, @machine.ui, @machine.id, machine_ip, folders)
+                  @machine.env.host.capability(:nfs_mount, @machine.ui, @machine.id, machine_ip, nfs_guest_folders)
                 end
               end
             end

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

@@ -16,21 +16,34 @@ module VagrantPlugins
             @machine.ui.info(I18n.t("vagrant_nfs_guest.actions.vm.nfs.unmounting"))
             folders = @machine.config.vm.synced_folders
 
+            nfs_guest = false
+            nfs_guest_folders = {}
+
             folders.each do |name, opts|
-              if opts[:type] == :nfs_guest
+              if opts[:type] == :nfs_guest && opts[:disabled] == false
+                nfs_guest = true
                 opts[:hostpath] = File.expand_path(opts[:hostpath], env[:root_path])
+
                 if env[:force_halt]
                   # If this is a force halt, force unmount the nfs shares.
                   opts[:unmount_options] = opts.fetch(:unmount_options, []) << '-f'
-                  # We have to change the working dir if inside a hostmount to prevent "No such file or directory - getcwd" errors.
+
+                  # We have to change the working dir if inside a hostmount to
+                  # prevent "No such file or directory - getcwd" errors.
                   if Dir.pwd.start_with?(opts[:hostpath])
                     Dir.chdir("#{opts[:hostpath]}/..")
                   end
                 end
+
+                nfs_guest_folders[name] = opts.dup
               end
             end
 
-            @machine.env.host.capability(:nfs_unmount, @machine.ui, folders)
+            if not nfs_guest
+              return
+            end
+
+            @machine.env.host.capability(:nfs_unmount, @machine.ui, nfs_guest_folders)
           end
 
           @app.call(env)

data/lib/vagrant-nfs_guest/guests/linux/cap/nfs_server.rb

@@ -151,7 +151,7 @@ module VagrantPlugins
                 opts[:group] ||= machine.ssh_info[:username]
 
                 machine.communicate.sudo(
-                  "chown -R #{opts[:owner]}:#{opts[:group]} #{expanded_guest_path}",
+                  "chown #{opts[:owner]}:#{opts[:group]} #{expanded_guest_path}",
                   error_class: Errors::GuestNFSError,
                   error_key: :nfs_create_mounts_failed
                 )

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

@@ -6,10 +6,6 @@ module VagrantPlugins
 
           def self.nfs_mount(environment, ui, id, ips, folders)
             folders.each do |name, opts|
-              if opts[:type] != :nfs_guest
-                next
-              end
-
               ips.each do |ip|
                 ui.detail(I18n.t("vagrant.actions.vm.share_folders.mounting_entry",
                                  guestpath: opts[:guestpath],

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

@@ -6,10 +6,6 @@ module VagrantPlugins
 
           def self.nfs_unmount(environment, ui, folders)
             folders.each do |name, opts|
-              if opts[:type] != :nfs_guest
-                next
-              end
-
               ui.detail(I18n.t("vagrant.actions.vm.share_folders.mounting_entry",
                                guestpath: opts[:guestpath],
                                hostpath: opts[:hostpath]))

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

@@ -6,10 +6,6 @@ module VagrantPlugins
 
           def self.nfs_mount(environment, ui, id, ips, folders)
             folders.each do |name, opts|
-              if opts[:type] != :nfs_guest
-                next
-              end
-
               ips.each do |ip|
                 ui.detail(I18n.t("vagrant.actions.vm.share_folders.mounting_entry",
                                  guestpath: opts[:guestpath],

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

@@ -6,10 +6,6 @@ module VagrantPlugins
 
           def self.nfs_unmount(environment, ui, folders)
             folders.each do |name, opts|
-              if opts[:type] != :nfs_guest
-                next
-              end
-
               ui.detail(I18n.t("vagrant.actions.vm.share_folders.mounting_entry",
                                guestpath: opts[:guestpath],
                                hostpath: opts[:hostpath]))

data/lib/vagrant-nfs_guest/version.rb

@@ -1,5 +1,5 @@
 module VagrantPlugins
   module SyncedFolderNFSGuest
-    VERSION = "0.1.11"
+    VERSION = "1.0.0"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-nfs_guest
 version: !ruby/object:Gem::Version
-  version: 0.1.11
+  version: 1.0.0
 platform: ruby
 authors:
 - Alan Garfield
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-07 00:00:00.000000000 Z
+date: 2017-05-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler