vagrant-nfs_guest 0.1.10 → 0.1.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0771013396d848986039995c6c141fb2f708e055
-  data.tar.gz: cb811ecd4363e1f53aa3345e801afc4c9996c867
+  metadata.gz: 68bea2f019bd5edd93dc71b5f11914463aef8e82
+  data.tar.gz: d1624a4519e1b43607df404a6f10961142941d1b
 SHA512:
-  metadata.gz: 8b009e04c677b333c8ca24203e7f1b0685b59131414428b0fcb652cc0383a89271cd6f6c54f950dac1ca302461bcf59f304650ea83731a906e942d1a12a59d5d
-  data.tar.gz: 61f4ea0c2300fcbdbe065bd1c31e5079c5380c5ffa19bf07d97a5f755b04ceca7fdb9921bdd233f55c3701a589ae34e2269c977c0e1c74ac0ee1b290b44264cd
+  metadata.gz: 18d17c27a60291cb93c48ba1f7732d9aa9bb25746ec1aaf21003df1ba7ca2f65739f54ce76d0b7b29ae9064556f42e4f7f0c551f5bf31f30da0a9409a9327875
+  data.tar.gz: 584169bcaaf4ec740a3731b0e7aee83c1933c0dc03f45a38f199fb81648e4976cd865a9debacce1a8d3429c89be30779f6998cc4781dd4a39d6a314acf1979f3

data/README.md

@@ -5,6 +5,7 @@
 - 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
 - FIXED: suspend and resume with 'up' instead of 'resume' fixed.
 - Supports Vagrant > 1.6.
 - Handles actions ```up```, ```halt```, ```destroy```, ```suspend```, ```resume``` and ```package``` properly.
@@ -28,8 +29,9 @@ Guest VMs we've tested include:
 - other Linux based guests may work fine with the generic Linux support. But no guarantee
 
 Hosts we've tested include:
-- OSX (Mavericks, Yosemite, El Capitan)
+- OSX (Mavericks, Yosemite, El Capitan, Siera)
 - Ubuntu (precise, trusty)
+- CentOS (6, 7)
 - other Linux based OSs should work fine, but will need testing, again no guarantee
 
 We're happy to receive pull-request to support alternatives hosts and guests. To implement this support it's relatively trivial if you look in ./lib/hosts and ./lib/guests.

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', type: 'nfs_guest'
+  config.vm.synced_folder './vagrant_share', '/vagrant', create: true, type: 'nfs_guest'
   #config.vm.synced_folder './vagrant_share', '/vagrant', type: 'nfs'
 
 end

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

@@ -42,6 +42,7 @@ module VagrantPlugins
             folders.each do |name, opts|
               if opts[:type] == :nfs_guest
                 nfs_guest = true
+                opts[:hostpath] = File.expand_path(opts[:hostpath], env[:root_path])
               end
             end
 

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

@@ -16,6 +16,20 @@ module VagrantPlugins
             @machine.ui.info(I18n.t("vagrant_nfs_guest.actions.vm.nfs.unmounting"))
             folders = @machine.config.vm.synced_folders
 
+            folders.each do |name, opts|
+              if opts[:type] == :nfs_guest
+                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.
+                  if Dir.pwd.start_with?(opts[:hostpath])
+                    Dir.chdir("#{opts[:hostpath]}/..")
+                  end
+                end
+              end
+            end
+
             @machine.env.host.capability(:nfs_unmount, @machine.ui, folders)
           end
 

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

@@ -18,7 +18,6 @@ module VagrantPlugins
                 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 #{nfs_options} '#{ip}:#{opts[:guestpath]}' '#{opts[:hostpath]}'"
                 if system(mount_command)
                   break

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

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

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

@@ -18,7 +18,6 @@ module VagrantPlugins
                 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 #{nfs_options} '#{ip}:#{opts[:guestpath]}' '#{opts[:hostpath]}'"
                 if system(mount_command)
                   break

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

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

data/lib/vagrant-nfs_guest/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-nfs_guest
 version: !ruby/object:Gem::Version
-  version: 0.1.10
+  version: 0.1.11
 platform: ruby
 authors:
 - Alan Garfield
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-19 00:00:00.000000000 Z
+date: 2017-02-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -52,7 +52,6 @@ files:
 - README.md
 - Rakefile
 - example_box/Vagrantfile
-- example_box/vagrant_share/.keep
 - lib/vagrant-nfs_guest.rb
 - lib/vagrant-nfs_guest/action/mount_nfs.rb
 - lib/vagrant-nfs_guest/action/unmount_nfs.rb