vagrant-bindfs 1.1.5 → 1.1.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0c2eea3a0e7cf3a24836af90d8b9c1f85b6b172dfdc39bb94e748060ce51bb26
-  data.tar.gz: 6193954f74c1128a7d6e5fbcc94f58abf5ab2506620c9caa32a3ee44dedfe79f
+  metadata.gz: 800a3b50cbd19c5884f697e0957aab4bf0daa59eda7ab32cc99ba27ad71b5c57
+  data.tar.gz: ae67d5c8a1cada029ef51fa381abdb31b5f7ad10aac0620b842f83cb263957de
 SHA512:
-  metadata.gz: f0fbc3b99ed572bfe89bef90b713521eaba93e41a5ffa2f97cfc22d8f11f8e8d76318487a7860c1fdaf062ad3c47925db55697cd7606e867f1ae5f74527fabaf
-  data.tar.gz: 3d050014188a339be0994a8117591c6cd96490c9d6ab2af34cc61ebffc030b657c12a1e3141ca41a472251556a8cbaa27c10b442993a937eb1a76103a56e8589
+  metadata.gz: d9e690f89355198da51afe1741be3c0e8c93cbe2fb5c934b6517d5e2973919c3e54c8990789f7a1ddb900c4116ecdab32cb6a09405b2f9d042d4aa7656f7e7e0
+  data.tar.gz: a24dec7d238c4fc61a3689030ab4e8807ecbbf236af2bed3b1f008877998a4994c8f27ffc9e4cc17d410d362b8088c0da9803aab5d2aa6d8eb0d4f1dea562ba4

data/README.md

@@ -92,7 +92,7 @@ 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.14.2.
+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.
@@ -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`

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,15 +5,14 @@ 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
-      def_delegators :@options, :each, :[], :keys, :key?
+      def_delegators :@options, :each, :[], :keys, :key?, :to_h
 
       def initialize(version = nil, options = {})
         @version = version
@@ -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/bindfs.rb

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

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

@@ -14,11 +14,9 @@ module VagrantBindfs
           end
 
           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
+            @bound_folders ||= config.bound_folders.each_with_object({}) do |(id, folder), bound|
+              bound[id] = folder if hook.nil? || folder.hook == hook
+              bound
             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

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
@@ -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/gentoo/bindfs.rb

@@ -27,7 +27,7 @@ module VagrantBindfs
                 # Ensure equery is installed
                 comm.sudo('emerge app-portage/gentoolkit')
                 comm.sudo("equery -q list -po -F '$fullversion' #{bindfs_package_name} || true") do |_, output|
-                  output.strip.gsub(/\s+/, ' ').split(' ').each do |package_version|
+                  output.strip.gsub(/\s+/, ' ').split.each do |package_version|
                     return package_version unless package_version.match(/^#{version}/).nil?
                   end
                 end

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 :bound_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
 
         @bound_folders = {}
-        @default_options = Bindfs::OptionSet.new(nil,
-                                                 'force-user' => 'vagrant',
-                                                 'force-group' => 'vagrant',
-                                                 'perms' => 'u=rwX:g=rD:o=rD')
+        @default_options = UNSET_VALUE
 
         @skip_validations = []
         @force_empty_mountpoints = false
@@ -62,22 +63,20 @@ module VagrantBindfs
 
       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)
+          %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)
@@ -90,6 +89,22 @@ module VagrantBindfs
 
         { '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

@@ -25,16 +25,14 @@ module VagrantBindfs
 
       class << self
         def hooks
-          @hooks ||= begin
-            {
-              synced_folders: synced_folders_hook,
-              provision: ::Vagrant::Action::Builtin::Provision
-            }
-          end
+          @hooks ||= {
+            synced_folders: synced_folders_hook,
+            provision: ::Vagrant::Action::Builtin::Provision
+          }
         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.5'
+  VERSION = '1.1.9'
 end

metadata

@@ -1,16 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-bindfs
 version: !ruby/object:Gem::Version
-  version: 1.1.5
+  version: 1.1.9
 platform: ruby
 authors:
 - Gaël-Ian Havard
 - Igor Serebryany
 - Thomas Boerger
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-12-23 00:00:00.000000000 Z
+date: 2021-09-21 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,18 +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: []
-rubygems_version: 3.0.3
-signing_key: 
+rubygems_version: 3.1.2
+signing_key:
 specification_version: 4
 summary: A Vagrant plugin to automate bindfs mount in the VM
 test_files: