vagrant-bindfs 1.1.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8fc17d7b8bc6dadfe52d9b702d4761b473cbc388
-  data.tar.gz: 760d7bb79eb8ca7fa4efac3fe772672c6ea316f4
+  metadata.gz: 9551f633610c3b6c502adf56678f00dc43236df7
+  data.tar.gz: 075c79a331c35a0202f0651e8ae6675bf93345f5
 SHA512:
-  metadata.gz: 1ecf98c2bf3ed2ab3c717223681a00392080fbd6277f9da19e9a939076cee4b7de69c230902f82fe1d7646de31e3e813b6944d26664c6ebf6124ae92aa5f6841
-  data.tar.gz: 0382d20c459d060917cfc7524b60c3e951f424869eab452210013280bf4ed7aa7f87e6543a4fcee41562e1b1970e9bb41cc6f58554c561f0c4be1a713b48cc2f
+  metadata.gz: e5ec0bba133b68e41e36c00973cdae4b11987c9b75ecef635e681caf06dd7e76d221d27c13caad6fd90399b9872232a83934d9e1528395c7f2004de8f2c2609f
+  data.tar.gz: bb9345cbd978ad3a368106107d217e2ecb73c1c82611312153bf2f2ab5fbc2e0534479a131abc16adcc33bbdc2653edb1dce67df1d7bb4247e2912970eb702a6

data/README.md

@@ -28,8 +28,12 @@ _Note that `map_uid` and `map_gid` NFS options can be used to set the identity u
 
 ## Installation
 
-vagrant-bindfs is distributed as a Ruby gem.
-You can install it as any other Vagrant plugin with `vagrant plugin install vagrant-bindfs`.
+vagrant-bindfs is distributed as a Ruby gem. 
+You can install it as any other Vagrant plugin with:
+
+```bash
+vagrant plugin install vagrant-bindfs
+```
 
 
 ## Usage
@@ -83,7 +87,7 @@ Vagrant.configure("2") do |config|
 end
 ```
 
-Remember that Vagrant use `/vagrant` on guest side as a shared directory dedicated to provisioning and configuration. Binding a folder to `/vagrant` or one of its subfolders will fail.
+Remember that Vagrant use `/vagrant` on guest side to automatically share your project directory (the one with the Vagrantfile), in particular for provisioning and configuration purposes. Binding a folder to `/vagrant` or one of its subfolders may expose unexpected behaviors.
 
 ### bindfs support
 

data/Rakefile

@@ -10,7 +10,7 @@ $stdout.sync = true
 $stderr.sync = true
 
 # Change to the directory of this file
-Dir.chdir(File.expand_path('../', __FILE__))
+Dir.chdir(__dir__)
 
 # Installs the tasks for gem creation
 Bundler::GemHelper.install_tasks

data/Vagrantfile

@@ -6,8 +6,8 @@
 # Uncomment machines you want to test
 test_machines = {
   # debian: { box: "bento/debian-9"     },
-  # ubuntu: { box: "bento/ubuntu-17.10" },
-  # fedora: { box: "bento/fedora-26"    },
+  # ubuntu: { box: "bento/ubuntu-18.10" },
+  # fedora: { box: "bento/fedora-29"    },
   # redhat: { box: "bento/centos-7"     },
   # gentoo: { box: "generic/gentoo"     },
 
@@ -24,7 +24,7 @@ test_machines = {
   # documentation. See https://goo.gl/LbkPVF
 }
 
-require File.expand_path('../spec/vagrantfile_helper', __FILE__)
+require File.expand_path('spec/vagrantfile_helper', __dir__)
 
 Vagrant.configure('2') do |config|
   # Common configuration

data/lib/vagrant-bindfs.rb

@@ -11,7 +11,7 @@ module VagrantBindfs
   autoload :Bindfs,       'vagrant-bindfs/bindfs'
 end
 
-I18n.load_path << File.expand_path('../../locales/en.yml', __FILE__)
+I18n.load_path << File.expand_path('../locales/en.yml', __dir__)
 I18n.reload!
 
 require 'vagrant-bindfs/vagrant/plugin'

data/lib/vagrant-bindfs/bindfs.rb

@@ -2,7 +2,7 @@
 
 module VagrantBindfs
   module Bindfs
-    SOURCE_VERSION  = '1.13.9'
+    SOURCE_VERSION  = '1.14.0'
     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/bindfs/command.rb

@@ -28,6 +28,7 @@ module VagrantBindfs
 
       def format_flag(name, value)
         return unless !!value
+
         compatible_name = argument_compatible_name(name)
         (argument_shorthand_only?(name) ? "-#{compatible_name}" : "--#{compatible_name}")
       end

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

@@ -63,6 +63,7 @@
   "ctime-from-mtime":         { "long": ["ctime-from-mtime"],            "short": [],    "type": "flag",   "since": "0.0.1"   },
   "enabe-ioctl":              { "long": ["enable-ioctl"],                "short": [],    "type": "flag",   "since": "1.13.2"  },
   "block-devices-as-files":   { "long": ["block-devices-as-files"],      "short": [],    "type": "flag",   "since": "1.13.7"  },
+  "forward-odirect":          { "long": ["forward-odirect"],             "short": [],    "type": "option", "since": "1.14.0"  },
 
   // FUSE options
   "o":                        { "long": [],                              "short": ["o"], "type": "option", "since": "0.0.1"   },

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

@@ -76,6 +76,7 @@ module VagrantBindfs
 
       def extract_options_by_names!(names, to)
         return {} if names.empty?
+
         names.each { |name| to[name] = @options.delete(name) }
       end
 
@@ -91,18 +92,20 @@ module VagrantBindfs
 
       def cast_value_as_option(value)
         return nil if value.respond_to?(:nil?) && value.nil?
+
         (value.respond_to?(:to_s) ? value.to_s : value)
       end
 
       def cast_value_as_flag(value)
         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
       end
 
       class << self
         def bindfs_options
-          @bindfs_options ||= JSON.parse(File.read(File.expand_path('../option_definitions.json', __FILE__)))
+          @bindfs_options ||= JSON.parse(File.read(File.expand_path('option_definitions.json', __dir__)))
         end
 
         def supported_options(version)
@@ -115,6 +118,7 @@ module VagrantBindfs
         def compatible_name_for_version(option_name, version)
           return 'user'   if option_name == 'force-user' && version_lower_than(version, '1.12')
           return 'group'  if option_name == 'force-group' && version_lower_than(version, '1.12')
+
           option_name
         end
 

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

@@ -35,7 +35,6 @@ module VagrantBindfs
         def validate_destination!
           @errors << I18n.t('vagrant-bindfs.validations.destination_path_required')                     if destination.empty?
           @errors << I18n.t('vagrant-bindfs.validations.path_must_be_absolute', path: destination)      if relative_path?(destination)
-          @errors << I18n.t('vagrant-bindfs.validations.destination_path_reserved', path: destination)  if reserved_path?(destination)
         end
 
         def validate_options!
@@ -49,10 +48,6 @@ module VagrantBindfs
         def relative_path?(path)
           Pathname.new(path).relative?
         end
-
-        def reserved_path?(path)
-          !Pathname.new(path).to_path.match(%r{^\/vagrant\/}).nil?
-        end
       end
     end
   end

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

@@ -43,12 +43,14 @@ module VagrantBindfs
         def validate_user
           return if machine.config.bindfs.skip_validations.include?(:user)
           return if machine.guest.capability(:bindfs_exists_user, options['force-user'])
+
           @errors << I18n.t('vagrant-bindfs.validations.user_does_not_exist', user: options['force-user'])
         end
 
         def validate_group
           return if machine.config.bindfs.skip_validations.include?(:group)
           return if machine.guest.capability(:bindfs_exists_group, options['force-group'])
+
           @errors << I18n.t('vagrant-bindfs.validations.group_does_not_exist', group: options['force-group'])
         end
       end

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

@@ -24,6 +24,7 @@ module VagrantBindfs
 
         def apply!(_env)
           return if binded_folders.empty?
+
           ensure_guest_is_ready_to_bind!
         end
 

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

@@ -20,6 +20,7 @@ module VagrantBindfs
         def call(env)
           app.call(env)
           return if binded_folders(hook).empty?
+
           bind_folders!
         end
 
@@ -51,7 +52,7 @@ module VagrantBindfs
 
           error I18n.t(
             'vagrant-bindfs.validations.errors_found',
-            dest:   folder.destination,
+            dest: folder.destination,
             source: folder.source,
             errors: validator.errors.join(' ')
           )
@@ -61,6 +62,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?
+
           true
         end
 

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

@@ -19,7 +19,7 @@ module VagrantBindfs
 
       class << self
         def included(base)
-          capabilities = JSON.parse(File.read(File.expand_path('../capabilities.json', __FILE__)))
+          capabilities = JSON.parse(File.read(File.expand_path('capabilities.json', __dir__)))
           capabilities.each do |cap_name, oses|
             oses.each do |os_name, module_name|
               mod = module_by_name(module_name)

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

@@ -8,7 +8,7 @@ module VagrantBindfs
           class << self
             def bindfs_bindfs_search(machine)
               machine.guest.capability(:bindfs_package_manager_update)
-              machine.communicate.test('[[ $(yum search bindfs 2>/dev/null | tail -n1) != "No matches found" ]]')
+              machine.communicate.test("[[ $(yum search bindfs 2>/dev/null | egrep -i '^bindfs\.' | wc -l) != 0 ]]")
             end
 
             def bindfs_bindfs_install(machine)

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

@@ -22,9 +22,9 @@ module VagrantBindfs
 
         @binded_folders             = {}
         @default_options            = Bindfs::OptionSet.new(nil,
-                                                            'force-user'  => 'vagrant',
+                                                            'force-user' => 'vagrant',
                                                             'force-group' => 'vagrant',
-                                                            'perms'       => 'u=rwX:g=rD:o=rD')
+                                                            'perms' => 'u=rwX:g=rD:o=rD')
 
         @skip_validations           = []
         @force_empty_mountpoints    = false

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

@@ -28,7 +28,7 @@ module VagrantBindfs
           @hooks ||= begin
             {
               synced_folders: synced_folders_hook,
-              provision:      ::Vagrant::Action::Builtin::Provision
+              provision: ::Vagrant::Action::Builtin::Provision
             }
           end
         end

data/lib/vagrant-bindfs/version.rb

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

data/locales/en.yml

@@ -28,7 +28,6 @@ en:
       source_path_does_not_exist: "Source path '%{path}' doesn't exist"
 
       destination_path_required: "A destination path is required as argument to bind_folder"
-      destination_path_reserved: "Destination path '%{path}' is part of a reserved subtree for Vagrant use"
       destination_already_mounted: "Destination path '%{dest}' is already a bindfs mount"
 
       path_must_be_absolute: "Path '%{path}' is relative but an absolute path is attended"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-bindfs
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors:
 - Gaël-Ian Havard
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-30 00:00:00.000000000 Z
+date: 2019-06-07 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
@@ -92,9 +92,12 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - "~>"
+    - !ruby/object:Gem::Version
+      version: '2.2'
+  - - "<"
     - !ruby/object:Gem::Version
-      version: 2.0.0
+      version: '2.7'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="