vagrant-bindfs 0.3.1 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1019eb9a428aedf0d85c9d6298008cfae8b22b7d
-  data.tar.gz: 114ec7c1d5200eb16beeac32f06df2e23a976bb4
+  metadata.gz: b944042068524c6b7a43c1154df47da425cc3f9e
+  data.tar.gz: fa8c0cb43388efa3c897be12eef37b302cbe6055
 SHA512:
-  metadata.gz: f840aae90268594fe341b7e05e320234bd178aae9c7102e6c23d1efde6413040afc075060038ec07d5e7c3c9eb6282e02cd0ab7f72e63dc23f904965da4c2a07
-  data.tar.gz: 59daf2c4aa63b1e91b5dbb57ad6adcc3e66423dac1631f68e353e28ee5dbde7566fe52865e350fd379f5e510873585047037d341a2fdf51560ffcfcf18855f8a
+  metadata.gz: 21bd4062a0011ec721e9ad9e1be5fa430f168a2bf24d585103468aebbae89c8c03a3a1bc4f8d6a94dbdfc71113690396c21e10c87b450a0d73f4dfe761ea57fa
+  data.tar.gz: f6a6635e4266adefdac37fdfa5f2c6e51adde626d26dd5811b907fdba816f56fa4e1f13295a5ca0f3b2e5b36c45c14e9e8bc3444da4617d7bdccbb2740d37c10

data/README.md

@@ -11,7 +11,7 @@ It's free, and it works well, but it has some [performance problems](http://snip
 
 People often recommend switching to [vagrant's VMWare-fusion provider](http://www.vagrantup.com/vmware).
 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.
+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).
 However, an NFS mount has the same numeric permissions in the guest as in the host.
@@ -26,6 +26,7 @@ Simply:
 
 _Note that `map_uid` and `map_gid` NFS options can be used to set the identity used to read/write files on the host side._
 
+
 ## Installation
 
 Vagrant-bindfs is distributed as a Ruby gem.
@@ -46,31 +47,32 @@ config.bindfs.bind_folder "/path/to/source", "/path/to/destination", options
 
 ```ruby
 Vagrant.configure("2") do |config|
-  
+
   [...] # Your VM configuration
-  
+
   ## Basic usage
   config.bindfs.bind_folder "source/dir", "mount/point"
-  
-  
+
+
   ## Advanced options
   config.bindfs.bind_folder "source/dir", "mount/point",
     perms: "u=rw:g=r:o=r",
     create_as_user: true
-  
-  
+
+
   ## Complete example for a NFS shared folder
-  
-  # Static IP is required to use NFS shared folder
+
+  # Static IP is required to use NFS shared folder,
+  # this is only required for Virtualbox provider
   config.vm.network "private_network", ip: "192.168.50.4"
-  
+
   # Declare shared folder with Vagrant syntax
-  config.vm.synced_folder "host/source/dir", "/vagrant-nfs", :type => :nfs
-  
+  config.vm.synced_folder "host/source/dir", "/vagrant-nfs", type: :nfs
+
   # 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"

data/lib/vagrant-bindfs/bind.rb

@@ -70,6 +70,14 @@ module VagrantPlugins
               raise Vagrant::Bindfs::Error, :cannot_install
             end
           end
+
+          unless @machine.guest.capability(:loaded_fuse?)
+            @env[:ui].warn(I18n.t("vagrant.config.bindfs.not_loaded"))
+
+            unless @machine.guest.capability(:modprobe_fuse)
+              raise Vagrant::Bindfs::Error, :cannot_modprobe
+            end
+          end
         end
 
       end

data/lib/vagrant-bindfs/cap/fedora/bindfs_install.rb

@@ -0,0 +1,17 @@
+module VagrantPlugins
+  module Bindfs
+    module Cap
+      module Fedora
+        module BindfsInstall
+
+          def self.bindfs_install(machine)
+            machine.communicate.tap do |comm|
+              comm.sudo('yum -y install bindfs')
+            end
+          end
+
+        end
+      end
+    end
+  end
+end

data/lib/vagrant-bindfs/cap/linux/bindfs_installed.rb

@@ -8,6 +8,14 @@ module VagrantPlugins
             machine.communicate.test("bindfs --help")
           end
 
+          def self.loaded_fuse?(machine)
+            machine.communicate.test("lsmod | grep -q fuse")
+          end
+
+          def self.modprobe_fuse(machine)
+            machine.communicate.sudo("/sbin/modprobe fuse")
+          end
+
         end
       end
     end

data/lib/vagrant-bindfs/plugin.rb

@@ -3,7 +3,7 @@ module VagrantPlugins
     class Plugin < Vagrant.plugin("2")
       name "Bindfs"
       description <<-DESC
-      This plugin allows you to mount -o bind filesystems inside the guest. This is 
+      This plugin allows you to mount -o bind filesystems inside the guest. This is
       useful to change their ownership and permissions.
       DESC
 
@@ -22,11 +22,26 @@ module VagrantPlugins
         Cap::SUSE::BindfsInstall
       end
 
+      guest_capability("fedora", "bindfs_install") do
+        require 'vagrant-bindfs/cap/fedora/bindfs_install'
+        Cap::Fedora::BindfsInstall
+      end
+
       guest_capability("linux", "bindfs_installed") do
         require "vagrant-bindfs/cap/linux/bindfs_installed"
         Cap::Linux::BindfsInstalled
       end
 
+      guest_capability("linux", "loaded_fuse?") do
+        require "vagrant-bindfs/cap/linux/bindfs_installed"
+        Cap::Linux::BindfsInstalled
+      end
+
+      guest_capability("linux", "modprobe_fuse") do
+        require "vagrant-bindfs/cap/linux/bindfs_installed"
+        Cap::Linux::BindfsInstalled
+      end
+
       require "vagrant-bindfs/bind"
 
       %w{up reload}.each do |action|

data/lib/vagrant-bindfs/version.rb

@@ -1,5 +1,5 @@
 module VagrantPlugins
   module Bindfs
-    VERSION = "0.3.1"
+    VERSION = "0.3.2"
   end
 end

data/locales/en.yml

@@ -3,6 +3,7 @@ en:
     config:
       bindfs:
         not_installed: "Bindfs seems to not be installed on the virtual machine"
+        not_loaded: "Fuse kernel module seems to be not loaded, trying to load it"
         already_mounted: "There's already a bindfs mount to destination %{dest}"
         status:
           binding_all: "Creating bind mounts for selected devices"
@@ -11,10 +12,11 @@ en:
           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"
+          cannot_modprobe: "The fuse kernel module seems to not be loadable on the virtual machine"
           binding_failed: |-
             The bind command `%{command}` failed to run!
 
             Please check options values and compatibility. For a complete documentation,
             run `sudo bindfs --help` on the VM.
-            
+
             You can see it online at http://www.cs.helsinki.fi/u/partel/bindfs_docs/bindfs.1.html.

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-bindfs
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
 platform: ruby
 authors:
 - Gaël-Ian Havard
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-10 00:00:00.000000000 Z
+date: 2014-11-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 share
@@ -24,6 +24,7 @@ extra_rdoc_files: []
 files:
 - lib/vagrant-bindfs/bind.rb
 - lib/vagrant-bindfs/cap/debian/bindfs_install.rb
+- lib/vagrant-bindfs/cap/fedora/bindfs_install.rb
 - lib/vagrant-bindfs/cap/linux/bindfs_installed.rb
 - lib/vagrant-bindfs/cap/suse/bindfs_install.rb
 - lib/vagrant-bindfs/command.rb