vagrant-bindfs 1.1.3 → 1.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: a939bc8f86df88a4b9d3164574ed41c2fa4630d5
-  data.tar.gz: 3ed4be8df541eeb94d90f18c3e8cd6a381406807
+SHA256:
+  metadata.gz: 1fa28f942676808592e86a1fbad388ad70006aeda091b39486b3d75165292cc2
+  data.tar.gz: 21393b9f50debe7e6033643ebe68417652d3197217e9ecfb530cc2ed505a6923
 SHA512:
-  metadata.gz: c9615bbf021eac190443f5f6d5e428bb0b1f61ca791ccd861c2cd5ce278655e1e0b52e31447cedb51efa65df382c4a5dcd9661d21faa0803647814687f42f006
-  data.tar.gz: aa395850d5bcb0516ceee3dbc242b15011e5ed205c00a1c0f60f27855324485fc5d9933fdf8814f80ce6e74860ccd1c246b3282fd27b7dfbe1f0229519ffdf6c
+  metadata.gz: d792f4f486dab52ea65ca6a7bf2cfe8f4967449d8a1f88a185b21876a1107360f004111a45b1c7d36d6cda8a7dda62b1b17ae612f77016f408f373d58a48d03d
+  data.tar.gz: bb34d7b15db3c38a6138f925c2fd4a29220cc57912b4dd7055cdb7882a56711ae77c76db8cf5f9f5d7ace5d3eceba155c60d0a73e1a53014c1c39ab85f632094

data/README.md

@@ -1,12 +1,12 @@
 # vagrant-bindfs
 
-A Vagrant plugin to automate [bindfs](http://bindfs.org/) mount in the VM. This allow you to change owner, group and permissions on files and, for example, work around NFS share permissions issues.
+A Vagrant plugin to automate [bindfs](http://bindfs.org/) mounts in the VM. This allow you to change owner, group and permissions on files and, for example, work around NFS share permissions issues.
 
 
 ## Some Background: Why `vagrant-bindfs`
 
 The default vagrant provider is [virtualbox](https://www.virtualbox.org/).
-It's free, and it works well, but it has some [performance problems](http://snippets.aktagon.com/snippets/609-Slow-IO-performance-with-Vagrant-and-VirtualBox-).
+It's free and works well but has some [performance problems](http://snippets.aktagon.com/snippets/609-Slow-IO-performance-with-Vagrant-and-VirtualBox-).
 
 People often recommend switching to [vagrant's VMWare-fusion provider](http://www.vagrantup.com/vmware).
 This reportedly has better performance, but shares with symlinks [won't work](http://communities.vmware.com/thread/428199?start=0&tstart=0).
@@ -38,15 +38,15 @@ vagrant plugin install vagrant-bindfs
 
 ## Usage
 
-In your `Vagrantfile`, use `config.bindfs.bind_folder` to configure folders that will be binded on VM startup.
+In your `Vagrantfile`, use `config.bindfs.bind_folder` to configure folders that will be bound on VM startup.
 The format is:
 
 ```ruby
 config.bindfs.bind_folder "/path/to/source", "/path/to/destination", options
 ```
 
-By default, all folders are binded after folders syncing between host and guest machines.
-You can pass a special `:after` option to the bind_folder method to choose when a folder should be binded.
+By default, all folders are bound after folders syncing between host and guest machines.
+You can pass a special `:after` option to the bind_folder method to choose when a folder should be bound.
 Supported values are :
 
 * `:synced_folders` (default)
@@ -92,27 +92,27 @@ Remember that Vagrant use `/vagrant` on guest side to automatically share your p
 ### bindfs support
 
 The `bind_folder` config accept any option you can pass to bindfs.
-vagrant-bindfs is compatible with bindfs from version 1.9 to 1.13.4.
-Check [lib/vagrant-bindfs/command.rb](https://github.com/gael-ian/vagrant-bindfs/blob/master/lib/vagrant-bindfs/command.rb#L66) for a complete list of supported options and default values and read the [bindfs man page](http://bindfs.org/docs/bindfs.1.html) for full documentation.
+vagrant-bindfs is compatible with bindfs from version 1.9 to 1.14.7.
+Check [lib/vagrant-bindfs/bindfs/option_definitions.json](https://github.com/gael-ian/vagrant-bindfs/blob/master/lib/vagrant-bindfs/bindfs/option_definitions.json) for a complete list of supported options and default values and read the [bindfs man page](http://bindfs.org/docs/bindfs.1.html) for full documentation.
 
 Both long arguments and shorthand are supported.
 If you set both, shorthand will prevail.
-Long arguments can be written indifferently with underscore ('force_user') or dash ('force-user') and as strings (:'force-user') or symbols (:force_user).
+Long arguments can be written indifferently with underscore ('force_user') or dash ('force-user') and as strings ('force-user') or symbols (:force_user or :'force-user').
 
 Option arguments values can be anything that can be casted to a string _via_ `to_s`.
 The plugin will try to detect flag arguments values as true or false from common notations.  
 
-vagrant-bindfs detects installed version of bindfs, translate option names when needed and ignore an option if it is not supported.
+vagrant-bindfs detects installed version of bindfs, translates option names when needed and ignores 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), Gentoo and OS X guest systems, vagrant-bindfs will try to install bindfs automatically if it is not installed.
+On Debian (and Ubuntu), SUSE, Fedora, CentOS, 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.
 
 ## Configuration
 
-This plugin supports the following configuration options
+This plugin supports the following configuration options:
 
 ### `debug`
 
@@ -137,10 +137,10 @@ end
 
 ### `skip_validations`
 
-By default, `vagrant-bindfs` will check if the user and the group set for a binded folder exist on the virtual machine.
+By default, `vagrant-bindfs` will check if the user and the group set for a bound folder exists on the virtual machine.
 If either one, the other or both of them are missing, it will warn you and not execute any bindfs command for this folder.
 
-To skip these validations, you can add `:user`and/or `:group` to the `config.bindfs.skip_validations` array.
+To skip these validations, you can add `:user` and/or `:group` to the `config.bindfs.skip_validations` array.
 
 
 ```ruby
@@ -186,7 +186,7 @@ Mount poitns will then be destroyed (with `rm -rf`) prior to mount, unless you a
 ```ruby
 Vagrant.configure("2") do |config|
   
-  config.bindfs.force_empty_mountpoint = true
+  config.bindfs.force_empty_mountpoints = true
   
   # This exemple assume two directories exist in your VM:
   # - `a/non/empty/mount/point/and/its/content`
@@ -212,7 +212,7 @@ We could also use some more specs…
 
 ### How to Test Changes
 
-If you've made changes to this plugin, you can easily test it locally in vagrant.
+If you've made changes to this plugin, you can easily test it locally in Vagrant.
 
 Edit `Vagrantfile` and uncomment one or more of the selected test boxes.
 Then, from the root of the repo, do:
@@ -222,3 +222,5 @@ Then, from the root of the repo, do:
 
 This will spin up one or more VM and try to bindfs-mount some shares in it.
 Feel free to modify the included `Vagrantfile` or test helpers (in `test/test_helpers.rb`) to add additional boxes and test cases.
+If you add a new test machine, please ensure that it will stay available and regularly updated for future tests.
+We recommend to use [officialy supported boxes](https://goo.gl/LbkPVF). 

data/Vagrantfile

@@ -5,14 +5,14 @@
 
 # Uncomment machines you want to test
 test_machines = {
-  # debian: { box: "bento/debian-9"     },
-  # ubuntu: { box: "bento/ubuntu-18.10" },
-  # fedora: { box: "bento/fedora-29"    },
-  # redhat: { box: "bento/centos-7"     },
-  # gentoo: { box: "generic/gentoo"     },
+  # debian: { box: "bento/debian-10"      },
+  # ubuntu: { box: "bento/ubuntu-18.04"   },
+  # fedora: { box: "bento/fedora-latest"  },
+  # redhat: { box: "bento/centos-8"       },
+  # gentoo: { box: "generic/gentoo"       },
 
   # The `vagrant` user group does not exist in this box.
-  # suse:   { box: "bento/opensuse-leap-42",      args: { group: 'users' } },
+  # suse:   { box: "bento/opensuse-leap-15",      args: { group: 'users' } },
 
   # **This box require the Oracle VM VirtualBox Extension Pack for Virtualbox.**
   # The `vagrant` user group does not exist in this box.

data/lib/vagrant-bindfs/bindfs.rb

@@ -2,7 +2,7 @@
 
 module VagrantBindfs
   module Bindfs
-    SOURCE_VERSION = '1.14.0'
+    SOURCE_VERSION = '1.14.7'
     SOURCE_URLS = [
       'https://bindfs.org/downloads/%<basename>s.tar.gz',
       'https://bindfs.dy.fi/downloads/%<basename>s.tar.gz'

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

@@ -5,11 +5,10 @@ require 'digest/sha1'
 module VagrantBindfs
   module Bindfs
     class Folder
-      attr_reader :source
-      attr_reader :destination
-      attr_reader :options
-
-      attr_reader :hook
+      attr_reader :source,
+                  :destination,
+                  :options,
+                  :hook
 
       def initialize(hook, source, destination, options = {})
         @hook = hook

data/lib/vagrant-bindfs/bindfs/option_definitions.json

@@ -7,6 +7,8 @@
   "mirror":                   { "long": ["mirror"],                      "short": ["m"], "type": "option", "since": "0.0.1"   },
   "mirror-only":              { "long": ["mirror-only"],                 "short": ["M"], "type": "option", "since": "0.0.1"   },
   "map":                      { "long": ["map"],                         "short": [],    "type": "option", "since": "1.10"    },
+  "map-passwd":               { "long": ["map-passwd"],                  "short": [],    "type": "option", "since": "1.14.6"  },
+  "map-group":                { "long": ["map-group"],                   "short": [],    "type": "option", "since": "1.14.6"  },
   "uid-offset":               { "long": ["uid-offset"],                  "short": [],    "type": "option", "since": "1.13.2"  },
   "gid-offset":               { "long": ["gid-offset"],                  "short": [],    "type": "option", "since": "1.13.2"  },
 

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

@@ -5,11 +5,10 @@ require 'forwardable'
 module VagrantBindfs
   module Bindfs
     class OptionSet
-      attr_reader :version
-
-      attr_reader :options
-      attr_reader :invalid_options
-      attr_reader :unsupported_options
+      attr_reader :version,
+                  :options,
+                  :invalid_options,
+                  :unsupported_options
 
       include ::Enumerable
       extend ::Forwardable
@@ -101,7 +100,7 @@ module VagrantBindfs
         return true if [true, 'true', 'True', 'yes', 'Yes', 'y', 'Y', 'on', 'On', 1].include?(value)
         return false if [false, 'false', 'False', 'no', 'No', 'n', 'N', 'off', 'Off', 0].include?(value)
 
-        !!value # rubocop:disable Style/DoubleNegation
+        !!value
       end
 
       class << self

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

@@ -6,8 +6,8 @@ module VagrantBindfs
   module Bindfs
     module Validators
       class Config
-        attr_reader :folder
-        attr_reader :errors
+        attr_reader :folder,
+                    :errors
 
         extend ::Forwardable
         def_delegators :@folder, :source, :destination, :options
@@ -38,7 +38,7 @@ module VagrantBindfs
         end
 
         def validate_options!
-          folder.options.invalid_options.keys.each do |option_name|
+          folder.options.invalid_options.each_key do |option_name|
             @errors << I18n.t(option_name.tr('-', '_'), scope: 'vagrant-bindfs.deprecations')
           end
         end

data/lib/vagrant-bindfs/vagrant/actions/concerns/machine.rb

@@ -13,11 +13,11 @@ module VagrantBindfs
             machine.config.bindfs
           end
 
-          def binded_folders(hook = nil)
-            @binded_folders ||= begin
-              config.binded_folders.each_with_object({}) do |(id, folder), binded|
-                binded[id] = folder if hook.nil? || folder.hook == hook
-                binded
+          def bound_folders(hook = nil)
+            @bound_folders ||= begin
+              config.bound_folders.each_with_object({}) do |(id, folder), bound|
+                bound[id] = folder if hook.nil? || folder.hook == hook
+                bound
               end
             end
           end

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

@@ -4,8 +4,8 @@ module VagrantBindfs
   module Vagrant
     module Actions
       class Installer
-        attr_reader :app
-        attr_reader :env
+        attr_reader :app,
+                    :env
 
         include Concerns::Machine
         include Concerns::Log
@@ -23,7 +23,7 @@ module VagrantBindfs
         protected
 
         def apply!(_env)
-          return if binded_folders.empty?
+          return if bound_folders.empty?
 
           ensure_guest_is_ready_to_bind!
         end

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

@@ -4,9 +4,9 @@ module VagrantBindfs
   module Vagrant
     module Actions
       class Mounter
-        attr_reader :app
-        attr_reader :env
-        attr_reader :hook
+        attr_reader :app,
+                    :env,
+                    :hook
 
         include Concerns::Machine
         include Concerns::Log
@@ -19,7 +19,7 @@ module VagrantBindfs
 
         def call(env)
           app.call(env)
-          return if binded_folders(hook).empty?
+          return if bound_folders(hook).empty?
 
           bind_folders!
         end
@@ -28,7 +28,7 @@ module VagrantBindfs
 
         def bind_folders!
           info I18n.t('vagrant-bindfs.actions.mounter.start', hook: hook)
-          binded_folders(hook).each_value do |folder|
+          bound_folders(hook).each_value do |folder|
             bind_folder!(folder)
           end
         end
@@ -61,7 +61,7 @@ module VagrantBindfs
 
         def empty_mountpoint?(folder)
           return false unless config.force_empty_mountpoints
-          return false if folder.options.key?('o') && !folder.options['o'].match(/nonempty/).nil?
+          return false if folder.options.key?('o') && folder.options['o'].include?('nonempty')
 
           true
         end

data/lib/vagrant-bindfs/vagrant/capabilities/all/bindfs.rb

@@ -35,7 +35,7 @@ module VagrantBindfs
               tar_dirname = VagrantBindfs::Bindfs.source_tar_basename(version)
 
               begin
-                machine.communicate.execute INSTALL_SCRIPT.format(urls: tar_urls, dirname: tar_dirname)
+                machine.communicate.execute format(INSTALL_SCRIPT, urls: tar_urls.join('" "'), dirname: tar_dirname)
               ensure
                 machine.communicate.execute('([ -f ./bindfs.tar.gz ] && rm ./bindfs.tar.gz) || true')
                 machine.communicate.execute("([ -d ./#{tar_dirname} ] && rm -rf ./#{tar_dirname}) || true")

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

@@ -3,28 +3,29 @@
 module VagrantBindfs
   module Vagrant
     class Config < ::Vagrant.plugin('2', :config)
-      attr_reader :debug
-
-      attr_accessor :bindfs_version
-      attr_reader :install_bindfs_from_source
-
-      attr_reader :default_options
-      attr_accessor :binded_folders
-
-      attr_accessor :skip_validations
-      attr_reader :force_empty_mountpoints
-
-      def initialize
+      DEFAULT_OPTIONS = {
+        'force-user' => 'vagrant',
+        'force-group' => 'vagrant',
+        'perms' => 'u=rwX:g=rD:o=rD'
+      }.freeze
+
+      attr_reader :debug,
+                  :install_bindfs_from_source,
+                  :default_options,
+                  :force_empty_mountpoints
+
+      attr_accessor :bindfs_version,
+                    :bound_folders,
+                    :skip_validations
+
+      def initialize # rubocop:disable Lint/MissingSuper
         @debug = false
 
         @bindfs_version = UNSET_VALUE
         @install_bindfs_from_source = false
 
-        @binded_folders = {}
-        @default_options = Bindfs::OptionSet.new(nil,
-                                                 'force-user' => 'vagrant',
-                                                 'force-group' => 'vagrant',
-                                                 'perms' => 'u=rwX:g=rD:o=rD')
+        @bound_folders = {}
+        @default_options = UNSET_VALUE
 
         @skip_validations = []
         @force_empty_mountpoints = false
@@ -50,46 +51,60 @@ module VagrantBindfs
         @force_empty_mountpoints = (value == true)
       end
 
-      def binded_folder=(*_any_variant)
-        raise VagrantBindfs::Vagrant::ConfigError, :binded_folders
+      def bound_folder=(*_any_variant)
+        raise VagrantBindfs::Vagrant::ConfigError, :bound_folders
       end
 
       def bind_folder(source, destination, options = {})
         hook = options.delete(:after) || :synced_folders
         folder = Bindfs::Folder.new(hook, source, destination, options)
-        @binded_folders[folder.id] = folder
+        @bound_folders[folder.id] = folder
       end
 
       def merge(other) # rubocop:disable Metrics/AbcSize
         super.tap do |result|
-          result.debug = (debug || other.debug)
-
-          result_bindfs_version = [bindfs_version, other.bindfs_version].reject { |v| v == UNSET_VALUE }.min
-          result.bindfs_version = result_bindfs_version unless result_bindfs_version.nil?
-          result.install_bindfs_from_source = (install_bindfs_from_source || other.install_bindfs_from_source)
-
-          result.default_options = default_options.merge(other.default_options)
-          result.binded_folders = binded_folders.merge(other.binded_folders)
-
+          %i[debug force_empty_mountpoints install_bindfs_from_source].each do |boolean|
+            result.send("#{boolean}=", (send(boolean) || other.send(boolean)))
+          end
+          result.bound_folders = bound_folders.merge(other.bound_folders)
           result.skip_validations = (skip_validations + other.skip_validations).uniq
-          result.force_empty_mountpoints = (force_empty_mountpoints || other.force_empty_mountpoints)
+
+          result.bindfs_version = merge_bindfs_version(other) unless merge_bindfs_version(other) == UNSET_VALUE
+          result.default_options = merge_default_options(other) unless merge_default_options(other) == UNSET_VALUE
         end
       end
 
       def finalize!
         @bindfs_version = :latest if @bindfs_version == UNSET_VALUE
+        self.default_options = DEFAULT_OPTIONS if default_options == UNSET_VALUE
       end
 
       def validate(_machine)
         errors = _detected_errors
 
-        binded_folders.each_value do |folder|
+        bound_folders.each_value do |folder|
           validator = Bindfs::Validators::Config.new(folder)
           errors << validator.errors unless validator.valid?
         end
 
         { 'vagrant-bindfs' => errors.flatten }
       end
+
+      protected
+
+      def merge_bindfs_version(other)
+        return other.bindfs_version if bindfs_version == UNSET_VALUE
+        return bindfs_version if other.bindfs_version == UNSET_VALUE
+
+        [bindfs_version, other.bindfs_version].reject { |v| v == UNSET_VALUE }.min
+      end
+
+      def merge_default_options(other)
+        return other.default_options if default_options == UNSET_VALUE
+        return default_options if other.default_options == UNSET_VALUE
+
+        default_options.merge(other.default_options)
+      end
     end
   end
 end

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

@@ -34,7 +34,7 @@ module VagrantBindfs
         end
 
         def synced_folders_hook
-          if ::Vagrant::Action::Builtin.const_defined? :NFS
+          if ::Vagrant::Action::Builtin.const_defined?(:NFS, false)
             ::Vagrant::Action::Builtin::NFS
           else
             ::Vagrant::Action::Builtin::SyncedFolders

data/lib/vagrant-bindfs/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module VagrantBindfs
-  VERSION = '1.1.3'
+  VERSION = '1.1.8'
 end

data/locales/en.yml

@@ -42,7 +42,7 @@ en:
     errors:
       package_manager_missing: "No package manager found on the virtual machine. You may use an unsupported flavour of Linux."
       config:
-        binded_folders: "config.bindfs.binded_folders= must no be called. Use config.bindfs.bind_folders instead."
+        bound_folders: "config.bindfs.bound_folders= must no be called. Use config.bindfs.bind_folders instead."
         conflicting_options: "Another option has already been set for the canonical name '%{name}'"
 
       bindfs:

metadata

@@ -1,16 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-bindfs
 version: !ruby/object:Gem::Version
-  version: 1.1.3
+  version: 1.1.8
 platform: ruby
 authors:
 - Gaël-Ian Havard
 - Igor Serebryany
 - Thomas Boerger
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-06-20 00:00:00.000000000 Z
+date: 2020-09-04 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
@@ -86,7 +86,7 @@ licenses:
 metadata:
   allowed_push_host: https://rubygems.org
   issue_tracker: https://github.com/gael-ian/vagrant-bindfs/issues
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -94,19 +94,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - "~>"
     - !ruby/object:Gem::Version
-      version: '2.2'
-  - - "<"
-    - !ruby/object:Gem::Version
-      version: '2.7'
+      version: '2.4'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: 1.3.6
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.1
-signing_key: 
+rubygems_version: 3.0.3
+signing_key:
 specification_version: 4
 summary: A Vagrant plugin to automate bindfs mount in the VM
 test_files: