vagrant-bindfs 1.1.6 → 1.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 29109806b17badcdf58bb6f69156ecaa1ae7d8a410887374dee025717241613e
-  data.tar.gz: d20770847365c2c98631992d2013ff340ba8e3f33f630259cb42a59adb126217
+  metadata.gz: eb3417cbc3128343426040923ca3e7ac4b2f8bdb42fe827d72d96e5e3dc6c383
+  data.tar.gz: 81d8fcb6135c267ac35b2f99355ffa543648664310b0445f69221191502b409d
 SHA512:
-  metadata.gz: '01934f31742057f2943ada6b89dfa362e6eb463954543735da6ee382b8170f1f77294675dbfa39d60aa8a9d3a0cf82a8da40b2e21a9d71d2201e7e524cf3eddc'
-  data.tar.gz: 4b1f8bb868d0316c93ef9bf8095666408012fe2aa201c7d7bf96688b4088b3105b71ccf9d1ecd59e541746fe74d6006c934e7ec9565a96c168f171843797ef1c
+  metadata.gz: 497f0b59fe30d4aa1f57a2999a3adbfb9d6400ade72e88a62e168ea10149933a501825514a096b06646a8b39cdbbab6ef5b7c65d0a3b2f9bc9365c34612f94c7
+  data.tar.gz: 7b88615529c76195d46edc91970e0c879f66b3450523db4744afd048e01f7a3ca4a77492cf981b60491fdfd56717afb7a1cf1c5074be76cfc36a1a71622a2ad3

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

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

@@ -3,6 +3,12 @@
 module VagrantBindfs
   module Vagrant
     class Config < ::Vagrant.plugin('2', :config)
+      DEFAULT_OPTIONS = {
+        'force-user' => 'vagrant',
+        'force-group' => 'vagrant',
+        'perms' => 'u=rwX:g=rD:o=rD'
+      }.freeze
+
       attr_reader :debug
 
       attr_accessor :bindfs_version
@@ -21,10 +27,7 @@ module VagrantBindfs
         @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 +65,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 +91,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

@@ -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.6'
+  VERSION = '1.1.7'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-bindfs
 version: !ruby/object:Gem::Version
-  version: 1.1.6
+  version: 1.1.7
 platform: ruby
 authors:
 - Gaël-Ian Havard
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-01-14 00:00:00.000000000 Z
+date: 2020-05-08 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