vagrant-bindfs 0.4.1 → 0.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d13154638cd8b30fd9176833e1ef4f6cb5ddeadb
-  data.tar.gz: f31ef1b0f0acaf804dd57835821f5fcd822d5719
+  metadata.gz: 66fe9ef2425e37e0bebdab608de94fff8db26bbd
+  data.tar.gz: 214689732bf62da3d98d6a0f767ed96ba2c3920d
 SHA512:
-  metadata.gz: 1927235815d2abc9845d84912e262da5742d7bdabe3d43d9164b3214a055a7bddc5b11e74445a9930e3d36b7e85e1f1a6815d8151deedd2486bd189c1e8cca95
-  data.tar.gz: 137621a5c4fddb75d3e2b7f9294bd822bc17ecbabdc45d797153935c3ad2609ddff731cef6969d916ce3cc2fdc6d30e37443eca653242463c36d547cdde547f8
+  metadata.gz: 7b6352b4b24398070c2da137e14dbf90cfd5253b9bcf6fd64cc486291b5d38aee58466d4a4c6f06b0c88acb700a08b7fa9632810a8d4cab9de2a422ba422270f
+  data.tar.gz: 887b967d2d3e89911b91ef731bb4e8204bdd057c3283656bf2ce1a058329dd38d12fc6d9cb4151a40ebe2405050286c8e15ebec037a5b787d0b6f5ca18cfd93f

data/README.md

@@ -42,6 +42,12 @@ The format is:
 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` (or `:hook`) option to the bind_folder method to choose when a folder should be binded.
+Supported values are :
+
+* `:synced_folders` (default)
+* `:provision`, to bind a folder after provisioning occured.
 
 ### Example
 
@@ -77,11 +83,13 @@ Vagrant.configure("2") do |config|
   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
 ```
 
-
-### Supported options
+### 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.12.6.

data/lib/vagrant-bindfs/bind.rb

@@ -4,9 +4,10 @@ module VagrantPlugins
   module Bindfs
     module Action
       class Bind
-        def initialize(app, env)
-          @app = app
-          @env = env
+        def initialize(app, env, hook)
+          @app  = app
+          @env  = env
+          @hook = hook
         end
 
         def call(env)
@@ -22,7 +23,12 @@ module VagrantPlugins
         end
 
         def binded_folders
-          @machine.config.bindfs.bind_folders
+          @binded_folders ||= begin
+            @machine.config.bindfs.bind_folders.reduce({}) do |binded, (name, options)|
+              binded[name] = options if options[:hook] == @hook
+              binded
+            end
+          end
         end
 
         def bind_folders
@@ -40,6 +46,22 @@ module VagrantPlugins
               next
             end
 
+            unless @machine.communicate.test("getent passwd #{command.user.shellescape}")
+              @env[:ui].error I18n.t(
+                "vagrant.config.bindfs.errors.user_not_exist",
+                user: command.user
+              )
+              next
+            end
+
+            unless @machine.communicate.test("getent group #{command.group.shellescape}")
+              @env[:ui].error I18n.t(
+                "vagrant.config.bindfs.errors.group_not_exist",
+                group: command.group
+              )
+              next
+            end
+
             if @machine.communicate.test("mount | grep bindfs | grep #{command.destination}")
               @env[:ui].info I18n.t(
                 "vagrant.config.bindfs.already_mounted",

data/lib/vagrant-bindfs/command.rb

@@ -19,6 +19,14 @@ module VagrantPlugins
         [ "bindfs", arguments.join(" "), source, destination ].compact.join(" ")
       end
 
+      def user
+        @arguments.join(' ')[/--(?:force-)?user=([^\s]+)/, 1]
+      end
+
+      def group
+        @arguments.join(' ')[/--(?:force-)?group=([^\s]+)/, 1]
+      end
+
       protected
 
       def arguments_for(options)

data/lib/vagrant-bindfs/config.rb

@@ -22,6 +22,7 @@ module VagrantPlugins
       def bind_folder(source_path, dest_path, options = {})
         options[:source_path] = source_path
         options[:dest_path] = dest_path
+        options[:hook] ||= options.delete(:after) || VagrantPlugins::Bindfs::Plugin.hook_names.first
 
         @bind_folders[options[:dest_path]] = options
       end
@@ -54,6 +55,13 @@ module VagrantPlugins
         bind_folders.each do |id, options|
           next if options[:disabled]
 
+          unless VagrantPlugins::Bindfs::Plugin.hook_names.include?(options[:hook].to_sym)
+            errors << I18n.t(
+                "vagrant.config.bindfs.errors.invalid_hook",
+                hooks: VagrantPlugins::Bindfs::Plugin.hook_names
+            )
+          end
+
           if options[:dest_path].nil? or options[:source_path].nil?
             errors << I18n.t(
               "vagrant.config.bindfs.errors.no_path_supplied",

data/lib/vagrant-bindfs/plugin.rb

@@ -63,14 +63,33 @@ module VagrantPlugins
 
       %w{up reload}.each do |action|
         action_hook(:bindfs, "machine_action_#{action}".to_sym) do |hook|
-          target = if Vagrant::Action::Builtin.const_defined? :NFS
-            Vagrant::Action::Builtin::NFS
-          else
-            Vagrant::Action::Builtin::SyncedFolders
+          hooks.each do |(name, action)|
+            hook.before(action, Action::Bind, name)
           end
+        end
+      end
 
-          hook.before(target, Action::Bind)
+      class << self
+        
+        def hooks
+          @hooks ||= begin
+            synced_folders = if Vagrant::Action::Builtin.const_defined? :NFS
+              Vagrant::Action::Builtin::NFS
+            else
+              Vagrant::Action::Builtin::SyncedFolders
+            end
+            
+            {
+              :synced_folders => synced_folders,
+              :provision      => Vagrant::Action::Builtin::Provision
+            }
+          end
+        end
+        
+        def hook_names
+          hooks.keys
         end
+        
       end
       
     end

data/lib/vagrant-bindfs/version.rb

@@ -1,6 +1,6 @@
 module VagrantPlugins
   module Bindfs
-    VERSION = "0.4.1"
+    VERSION = "0.4.2"
     SOURCE_VERSION = "1.12.6"
   end
 end

data/locales/en.yml

@@ -9,9 +9,13 @@ en:
           binding_all: "Creating bind mounts for selected devices"
           binding_entry: "Creating bind mount from %{source} to %{dest}"
         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"
           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"
           cannot_enable_fuse: "The fuse kernel module seems to not be loadable on the virtual machine"
           binding_failed: |-
             The bind command `%{command}` failed to run!

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-bindfs
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.4.2
 platform: ruby
 authors:
 - Gaël-Ian Havard
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-17 00:00:00.000000000 Z
+date: 2015-07-22 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 share
@@ -22,9 +22,6 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- MIT-LICENSE
-- README.md
-- lib/vagrant-bindfs.rb
 - lib/vagrant-bindfs/bind.rb
 - lib/vagrant-bindfs/cap/debian/install_bindfs.rb
 - lib/vagrant-bindfs/cap/fedora/install_bindfs.rb
@@ -39,7 +36,10 @@ files:
 - lib/vagrant-bindfs/errors.rb
 - lib/vagrant-bindfs/plugin.rb
 - lib/vagrant-bindfs/version.rb
+- lib/vagrant-bindfs.rb
 - locales/en.yml
+- README.md
+- MIT-LICENSE
 homepage: https://github.com/gael-ian/vagrant-bindfs
 licenses:
 - MIT
@@ -50,17 +50,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.0.14
 signing_key: 
 specification_version: 4
 summary: A Vagrant plugin to automate bindfs mount in the VM