vagrant-bindfs 1.0.11 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5ea2b8920c39f6a2706fb6961e59b10821986ef0
-  data.tar.gz: d03fb93229d6e9bb52b261061a51d18b6a679246
+  metadata.gz: 8fc17d7b8bc6dadfe52d9b702d4761b473cbc388
+  data.tar.gz: 760d7bb79eb8ca7fa4efac3fe772672c6ea316f4
 SHA512:
-  metadata.gz: fe917a556f92d71713ca398329d2bd54ff6c7e87023125f14641ac868448d34087dfd887c67b377e9753ca1a3bceacd52dc10484713f94bd869106b5ed17a693
-  data.tar.gz: da6e2822e63a035c565f027247a7931f7b9424e25c365efd54db4ba531b5ae7f6b66b0081f6ef807c8ca03604269ce0d35e1fed421b46dba55d15c4289bde63d
+  metadata.gz: 1ecf98c2bf3ed2ab3c717223681a00392080fbd6277f9da19e9a939076cee4b7de69c230902f82fe1d7646de31e3e813b6944d26664c6ebf6124ae92aa5f6841
+  data.tar.gz: 0382d20c459d060917cfc7524b60c3e951f424869eab452210013280bf4ed7aa7f87e6543a4fcee41562e1b1970e9bb41cc6f58554c561f0c4be1a713b48cc2f

data/README.md

@@ -101,7 +101,7 @@ The plugin will try to detect flag arguments values as true or false from common
 vagrant-bindfs detects installed version of bindfs, translate option names when needed and ignore an option if it is not supported.
 As we may have missed something, it will warn you when a binding command fail.
 
-On Debian (this includes Ubuntu), SUSE, Fedora, CentOS (5-6) and OS X guest systems, vagrant-bindfs will try to install bindfs automatically if it is not installed.
+On Debian (this includes Ubuntu), SUSE, Fedora, CentOS (5-6), Gentoo and OS X guest systems, vagrant-bindfs will try to install bindfs automatically if it is not installed.
 On other system, you'll get warned.
 
 OS X guests may need some specific options. See [bindfs README](https://github.com/mpartel/bindfs#os-x-note) for details.
@@ -171,6 +171,34 @@ end
 **This feature only works with exact version match and does not try to resolve dependencies.**
 In particular, Fuse will always be installed from the latest version available in repositories (_via_ Homebrew Cask for OS X guests).
 
+### `force_empty_mountpoints`
+
+By default, `vagrant-bindfs` won't try to empty an existing mount point before mount. Hence, if you try to bind a folder to a non-empty directory without explicitly allowing Fuse to do so (with the `nonempty` Fuse option), mount will fail.
+
+You can ask `vagrant-bindfs` to make sure the mount points are empty with the `config.bindfs.force_empty_mountpoints` option.
+Mount poitns will then be destroyed (with `rm -rf`) prior to mount, unless you allow Fuse to not mind (with the `nonempty` Fuse option).
+
+
+```ruby
+Vagrant.configure("2") do |config|
+  
+  config.bindfs.force_empty_mountpoint = true
+  
+  # This exemple assume two directories exist in your VM:
+  # - `a/non/empty/mount/point/and/its/content`
+  # - `another/non/empty/mount/point/and/its/content` 
+  
+  # `a/non/empty/mount/point` will be destroyed before mount and
+  #  all its content will be lost.
+  config.bindfs.bind_folder "/vagrant", "a/non/empty/mount/point"
+  
+  # `a/non/empty/mount/point` will not be destroyed before mount
+  # but its content will not be accessible while in use by bindfs.
+  config.bindfs.bind_folder "/vagrant", "a/non/empty/mount/point", o: :nonempty
+  
+end
+```
+
 ## Contributing
 
 If you find this plugin useful, we could use a few enhancements!

data/Vagrantfile

@@ -35,6 +35,7 @@ Vagrant.configure('2') do |config|
 
   # For a more detailled output when you test, set this to true.
   config.bindfs.debug = false
+  config.bindfs.force_empty_mountpoints = true
 
   test_machines.each do |distro, options|
     config.vm.define "vagrant-bindfs-test-#{distro}" do |machine|

data/lib/vagrant-bindfs/bindfs.rb

@@ -2,7 +2,7 @@
 
 module VagrantBindfs
   module Bindfs
-    SOURCE_VERSION  = '1.13.9'.freeze
+    SOURCE_VERSION  = '1.13.9'
     SOURCE_URLS     = [
       'http://bindfs.org/downloads/bindfs-%<bindfs_version>.tar.gz',
       'http://bindfs.dy.fi/downloads/bindfs-%<bindfs_version>.tar.gz'

data/lib/vagrant-bindfs/vagrant/actions/mounter.rb

@@ -27,41 +27,75 @@ module VagrantBindfs
 
         def bind_folders!
           info I18n.t('vagrant-bindfs.actions.mounter.start', hook: hook)
+          binded_folders(hook).each_value do |folder|
+            bind_folder!(folder)
+          end
+        end
 
-          bindfs_version    = guest.capability(:bindfs_bindfs_version)
-          bindfs_full_path  = guest.capability(:bindfs_bindfs_full_path)
+        def bind_folder!(folder)
+          folder.reverse_merge!(config.default_options)
+          folder.to_version!(bindfs_version)
 
-          binded_folders(hook).each_value do |folder|
-            folder.reverse_merge!(config.default_options)
-            folder.to_version!(bindfs_version)
-
-            validator = VagrantBindfs::Bindfs::Validators::Runtime.new(folder, machine)
-
-            unless validator.valid?
-              error I18n.t(
-                'vagrant-bindfs.validations.errors_found',
-                dest:   folder.destination,
-                source: folder.source,
-                errors: validator.errors.join(' ')
-              )
-              next
-            end
-
-            command = VagrantBindfs::Bindfs::Command.new(folder)
-
-            detail I18n.t(
-              'vagrant-bindfs.actions.mounter.entry',
-              dest: folder.destination,
-              source: folder.source
-            )
-
-            machine.communicate.tap do |comm|
-              comm.sudo("mkdir -p #{folder.destination}")
-              comm.sudo(command.to_s(bindfs_full_path), error_class: VagrantBindfs::Vagrant::Error, error_key: 'bindfs.mount_failed')
-              debug(command.to_s(bindfs_full_path))
-            end
+          return unless valid_folder?(folder)
+
+          machine.communicate.tap do |comm|
+            empty_mountpoint!(comm, folder) if empty_mountpoint?(folder)
+            ensure_mountpoint_exists!(comm, folder)
+            execute_bind_command!(comm, folder)
           end
         end
+
+        def valid_folder?(folder)
+          validator = VagrantBindfs::Bindfs::Validators::Runtime.new(folder, machine)
+          return true if validator.valid?
+
+          error I18n.t(
+            'vagrant-bindfs.validations.errors_found',
+            dest:   folder.destination,
+            source: folder.source,
+            errors: validator.errors.join(' ')
+          )
+          false
+        end
+
+        def empty_mountpoint?(folder)
+          return false unless config.force_empty_mountpoints
+          return false if folder.options.key?('o') && !folder.options['o'].match(/nonempty/).nil?
+          true
+        end
+
+        def empty_mountpoint!(comm, folder)
+          detail I18n.t(
+            'vagrant-bindfs.actions.mounter.force_empty_mountpoints',
+            dest: folder.destination
+          )
+
+          comm.sudo("rm -rf #{folder.destination}")
+        end
+
+        def ensure_mountpoint_exists!(comm, folder)
+          comm.sudo("mkdir -p #{folder.destination}")
+        end
+
+        def execute_bind_command!(comm, folder)
+          detail I18n.t(
+            'vagrant-bindfs.actions.mounter.entry',
+            dest: folder.destination,
+            source: folder.source
+          )
+
+          command = VagrantBindfs::Bindfs::Command.new(folder)
+          comm.sudo(command.to_s(bindfs_full_path), error_class: VagrantBindfs::Vagrant::Error, error_key: 'bindfs.mount_failed')
+          debug(command.to_s(bindfs_full_path))
+        end
+
+        def bindfs_version
+          @bindfs_version ||= guest.capability(:bindfs_bindfs_version)
+        end
+
+        def bindfs_full_path
+          @bindfs_full_path ||= guest.capability(:bindfs_bindfs_full_path)
+        end
       end
     end
   end

data/lib/vagrant-bindfs/vagrant/config.rb

@@ -12,6 +12,7 @@ module VagrantBindfs
       attr_accessor :binded_folders
 
       attr_accessor :skip_validations
+      attr_reader   :force_empty_mountpoints
 
       def initialize
         @debug                      = false
@@ -26,6 +27,7 @@ module VagrantBindfs
                                                             'perms'       => 'u=rwX:g=rD:o=rD')
 
         @skip_validations           = []
+        @force_empty_mountpoints    = false
       end
 
       def debug=(value)
@@ -44,6 +46,10 @@ module VagrantBindfs
         @default_options = Bindfs::OptionSet.new(nil, options)
       end
 
+      def force_empty_mountpoints=(value)
+        @force_empty_mountpoints = (value == true)
+      end
+
       def binded_folder=(*_any_variant)
         raise VagrantBindfs::Vagrant::ConfigError, :binded_folders
       end
@@ -66,6 +72,7 @@ module VagrantBindfs
           result.binded_folders             = binded_folders.merge(other.binded_folders)
 
           result.skip_validations           = (skip_validations + other.skip_validations).uniq
+          result.force_empty_mountpoints    = (force_empty_mountpoints || other.force_empty_mountpoints)
         end
       end
 

data/lib/vagrant-bindfs/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module VagrantBindfs
-  VERSION = '1.0.11'.freeze
+  VERSION = '1.1.0'
 end

data/locales/en.yml

@@ -20,6 +20,7 @@ en:
       mounter:
         start: "Creating bind mounts after %{hook}..."
         entry: "%{source} => %{dest}"
+        force_empty_mountpoints: "All content in '%{dest}' as been removed before mount"
 
 
     validations:

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-bindfs
 version: !ruby/object:Gem::Version
-  version: 1.0.11
+  version: 1.1.0
 platform: ruby
 authors:
 - Gaël-Ian Havard
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-12-20 00:00:00.000000000 Z
+date: 2018-01-30 00:00:00.000000000 Z
 dependencies: []
 description: " A Vagrant plugin to automate bindfs mount in the VM. This allow you
   to change owner, group and permissions on files and, for example, work around NFS