vagrant-bindfs 0.4.11 → 0.4.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 16065d7f1c9090dfcae7c64cfe1a0ff2503ee6ab
-  data.tar.gz: f358e402c150b416cb23a6f7875dcbc19b337c0e
+  metadata.gz: e4f4c521a2a2619356b7466fffa5b6c577799c62
+  data.tar.gz: bacede149f11117d49abc53fb15a220f18826907
 SHA512:
-  metadata.gz: 3b4c83228d585fe252ccee7f2160e0278bfb8f5f9fecf5cdb574b3e1137d63af70b36351c97d622a00df5a7034fdaffc62daa7bf9ec62e0315a576557faa9545
-  data.tar.gz: 785f266c86f3de5c7593d9c629244b16a1b857aaad94aa9a1ef7ebec27d9eaac83c98a5d18c46a3709d6054993d3d2d1d160fdf047916f06373d5e8f2c2152bb
+  metadata.gz: a4102bf7c0c8911fe0b034f8d46b0d1c338ee3abe882e0d39d23480cb51a5dee1457e2005e9fa4ea18985574953c0e2463bde4f12c1a6303efa200e07aa13c4a
+  data.tar.gz: 75682be67816e612f517bb224b8293cc22932b09a320168808fc566ab2143cbdcd02a09344ffde10f0b4bfb943fcfe40a6e3c1fd71ae010a26af945c95492ddc

data/README.md

@@ -1,7 +1,6 @@
 # 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/) mount 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`
@@ -13,7 +12,7 @@ People often recommend switching to [vagrant's VMWare-fusion provider](http://ww
 This reportedly has better performance, but shares with symlinks [won't work](http://communities.vmware.com/thread/428199?start=0&tstart=0).
 You also have to buy both the plugin and VMware Fusion.
 
-The final recommendation, at least on Linux/OSX hosts, is to [use nfs](http://docs.vagrantup.com/v2/synced-folders/nfs.html).
+The final recommendation, at least on Linux/OSX hosts, is to [use NFS](http://docs.vagrantup.com/v2/synced-folders/nfs.html).
 However, an NFS mount has the same numeric permissions in the guest as in the host.
 If you're on OSX, for instance, a folder owned by the default OSX user will appear to be [owned by `501:20`](https://groups.google.com/forum/?fromgroups#!topic/vagrant-up/qXXJ-AQuKQM) in the guest.
 
@@ -29,7 +28,7 @@ _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.
+vagrant-bindfs is distributed as a Ruby gem.
 You can install it as any other Vagrant plugin with `vagrant plugin install vagrant-bindfs`.
 
 
@@ -78,21 +77,18 @@ Vagrant.configure("2") do |config|
   # Use vagrant-bindfs to re-mount folder
   config.bindfs.bind_folder "/vagrant-nfs", "guest/mount/point"
 
-
-  ## Share the default `vagrant` folder via NFS with your own options
-  config.vm.synced_folder ".", "/vagrant", type: :nfs
-  config.bindfs.bind_folder "/vagrant", "/vagrant"
-
   # Bind a folder after provisioning
   config.bindfs.bind_folder "/vagrant-after-provision", "another/guest/mount/point", after: :provision
 
 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.
+
 ### 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.1.
+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.
 
 Both long arguments and shorthand are supported.

data/lib/vagrant-bindfs/cap/redhat/install_bindfs.rb

@@ -14,26 +14,36 @@ module VagrantPlugins
                 else
                   comm.sudo("yum -y install fuse fuse-devel gcc wget tar make")
                   comm.sudo <<-SHELL
-                  for u in "#{SOURCE_URLS.join('" "')}"; do
+                  for u in "#{source_urls(machine).join('" "')}"; do
                     if wget -q --spider $u; then
                       url=$u;
                       break;
                     fi;
                   done;
-                  [ -n "$url" ]                         && \
-                  wget $url -O bindfs.tar.gz            && \
-                  tar --overwrite -zxvf bindfs.tar.gz   && \
-                  [ -d ./bindfs-#{SOURCE_VERSION} ]     && \
-                  cd bindfs-#{SOURCE_VERSION}           && \
-                  ./configure                           && \
-                  make                                  && \
-                  make install                          && \
+                  [ -n "$url" ]                               && \
+                  wget $url -O bindfs.tar.gz                  && \
+                  tar --overwrite -zxvf bindfs.tar.gz         && \
+                  [ -d ./bindfs-#{source_version(machine)} ]  && \
+                  cd bindfs-#{source_version(machine)}        && \
+                  ./configure                                 && \
+                  make                                        && \
+                  make install                                && \
                   ln -s /usr/local/bin/bindfs /usr/bin
                   SHELL
                 end
               end
             end
 
+            protected
+
+            def source_urls(machine)
+              SOURCE_URLS.map{ |url| url.gsub('%{source_version}', source_version(machine)) }
+            end
+
+            def source_version(machine)
+              machine.config.bindfs.source_version
+            end
+
           end
         end
       end

data/lib/vagrant-bindfs/config.rb

@@ -1,17 +1,21 @@
-require 'vagrant'
-require 'vagrant/errors'
-require 'vagrant/util/template_renderer'
+require "vagrant"
 
 module VagrantPlugins
   module Bindfs
     class Config < Vagrant.plugin("2", :config)
-      attr_accessor :default_options, :debug, :bind_folders
+
+      attr_accessor :debug
+      attr_accessor :source_version
+
+      attr_accessor :default_options
+      attr_accessor :bind_folders
 
       def initialize
-        @default_options = UNSET_VALUE
-        @debug = UNSET_VALUE
-        @bind_folders = {}
-        @logger = Log4r::Logger.new('vagrantplugins::bindfs::config')
+        @debug            = UNSET_VALUE
+        @source_version   = UNSET_VALUE
+
+        @default_options  = UNSET_VALUE
+        @bind_folders     = {}
       end
 
       def default_options(new_values = {})
@@ -44,8 +48,17 @@ module VagrantPlugins
       end
 
       def finalize!
-        @default_options = {} if @default_options == UNSET_VALUE
-        @debug = false if @debug == UNSET_VALUE
+        if @debug == UNSET_VALUE
+          @debug = false
+        end
+
+        if @source_version == UNSET_VALUE
+          @source_version = VagrantPlugins::Bindfs::SOURCE_VERSION
+        end
+
+        if @default_options == UNSET_VALUE
+          @default_options = {}
+        end
       end
 
       def validate!(machine)
@@ -82,6 +95,13 @@ module VagrantPlugins
               path: options[:source_path]
             )
           end
+
+          unless Pathname.new(options[:dest_path]).to_path.match(/^\/vagrant/).nil?
+            errors << I18n.t(
+                "vagrant.config.bindfs.errors.destination_path_reserved",
+                path: options[:dest_path]
+            )
+          end
         end
 
         if errors.any?

data/lib/vagrant-bindfs/version.rb

@@ -1,12 +1,12 @@
 module VagrantPlugins
   module Bindfs
     
-    VERSION         = "0.4.11"
+    VERSION         = "0.4.12"
     
     SOURCE_VERSION  = "1.13.4"
     SOURCE_URLS     = [
-      "http://bindfs.org/downloads/bindfs-#{SOURCE_VERSION}.tar.gz",
-      "http://bindfs.dnsalias.net/downloads/bindfs-#{SOURCE_VERSION}.tar.gz"
+      "http://bindfs.org/downloads/bindfs-%{source_version}.tar.gz",
+      "http://bindfs.dnsalias.net/downloads/bindfs-%{source_version}.tar.gz"
     ]
     
   end

data/locales/en.yml

@@ -13,8 +13,9 @@ en:
         errors:
           invalid_hook: "Invalid hook specified. Must use one of %{hooks}"
           no_path_supplied: "You must pass a destination and a source path as arguments"
-          destination_path_relative: "Destination path is relative for bind whatever"
-          source_path_relative: "Source path is relative for bind whatever"
+          destination_path_relative: "Destination path %{path} is relative for bind whatever"
+          destination_path_reserved: "Destination path %{path} is part of a reserved subtree for Vagrant use"
+          source_path_relative: "Source path %{path} is relative for bind whatever"
           source_path_not_exist: "Cannot bind source path %{path} because it doesn't exist"
           user_not_exist: "Cannot bind to user '%{user}' because it doesn't exist"
           group_not_exist: "Cannot bind to group '%{group}' because it doesn't exist"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-bindfs
 version: !ruby/object:Gem::Version
-  version: 0.4.11
+  version: 0.4.12
 platform: ruby
 authors:
 - Gaël-Ian Havard
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-28 00:00:00.000000000 Z
+date: 2016-11-18 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
@@ -63,7 +63,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - "~>"
     - !ruby/object:Gem::Version
-      version: '2.2'
+      version: 2.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="