vagrant-bindfs 0.3.4 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 748c092fd2cadf3c3605d820738e0f6a4a34af90
-  data.tar.gz: 9b44bc4f51b98206dc4536742049ad5bf0b6093f
+  metadata.gz: eb0a221dbae3d1303dff2f6f52617ab02e105a2d
+  data.tar.gz: 2c91c80a71052fe269ca380e18bf73b156b3dde9
 SHA512:
-  metadata.gz: 8f28c41dc2bdae4d6fca9b81e609d3f48dad43ff7469aedbf79d8affe38cec60c518bfbfc2becc17187a73efcf5ac225c9d02d87e8f7fcedce2374358514e5e2
-  data.tar.gz: 359fd4c6710a62cce62b84d76841659e9871bc9f85053a8cd939bd357d2adcb18d28e374da9c8f9fd11dca0b9994292d755dbc631102a6b48407119b6a6f3021
+  metadata.gz: 905e8a4e965323dc8433c6365707ad316159e9048697c838212fb328e2c50f303a84a4b2a13283ea41092c0ab24799cc0e942ce98ac538e70564c5d32027c2db
+  data.tar.gz: a8e7c4271630137d2374ce44c29582f65580d6426eff5500cc75149350a337eb31247d246a30b2cfd57ab95bf16767634f7d6dd0a9be20573cd55b2c9cf405a7

data/lib/vagrant-bindfs/bind.rb

@@ -66,16 +66,16 @@ module VagrantPlugins
           unless @machine.guest.capability(:bindfs_installed)
             @env[:ui].warn(I18n.t("vagrant.config.bindfs.not_installed"))
 
-            unless @machine.guest.capability(:bindfs_install)
+            unless @machine.guest.capability(:install_bindfs)
               raise Vagrant::Bindfs::Error, :cannot_install
             end
           end
 
-          unless @machine.guest.capability(:loaded_fuse?)
+          unless @machine.guest.capability(:fuse_loaded)
             @env[:ui].warn(I18n.t("vagrant.config.bindfs.not_loaded"))
 
-            unless @machine.guest.capability(:modprobe_fuse)
-              raise Vagrant::Bindfs::Error, :cannot_modprobe
+            unless @machine.guest.capability(:enable_fuse)
+              raise Vagrant::Bindfs::Error, :cannot_enable_fuse
             end
           end
         end

data/lib/vagrant-bindfs/cap/debian/{bindfs_install.rb → install_bindfs.rb}

@@ -2,9 +2,9 @@ module VagrantPlugins
   module Bindfs
     module Cap
       module Debian
-        module BindfsInstall
+        module InstallBindfs
 
-          def self.bindfs_install(machine)
+          def self.install_bindfs(machine)
             machine.communicate.tap do |comm|
               comm.sudo("apt-get update")
               comm.sudo("apt-get install -y bindfs")

data/lib/vagrant-bindfs/cap/fedora/{bindfs_install.rb → install_bindfs.rb}

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

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

@@ -8,17 +8,6 @@ module VagrantPlugins
             machine.communicate.test("bindfs --help")
           end
 
-          def self.loaded_fuse?(machine)
-            machine.communicate.test("lsmod | grep -q fuse || grep -q fuse /etc/modules")
-          end
-
-          def self.modprobe_fuse(machine)
-            unless machine.communicate.test("grep -q fuse /etc/modules")
-              machine.communicate.sudo("bash -c \"echo 'fuse' >> /etc/modules\"")
-            end
-            machine.communicate.sudo("/sbin/modprobe fuse")
-          end
-
         end
       end
     end

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

@@ -0,0 +1,15 @@
+module VagrantPlugins
+  module Bindfs
+    module Cap
+      module Linux
+        module EnableFuse
+
+          def self.enable_fuse(machine)
+            machine.communicate.sudo("/sbin/modprobe fuse")
+          end
+
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,15 @@
+module VagrantPlugins
+  module Bindfs
+    module Cap
+      module Linux
+        module FuseLoaded
+
+          def self.fuse_loaded(machine)
+            machine.communicate.test("lsmod | grep -q fuse")
+          end
+
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,27 @@
+require "vagrant-bindfs/version"
+
+module VagrantPlugins
+  module Bindfs
+    module Cap
+      module RedHat
+        module InstallBindfs
+
+          def self.install_bindfs(machine)
+            machine.communicate.tap do |comm|
+              if comm.test("test 0 -eq $(sudo yum search bindfs 2>&1 >/dev/null | wc -l)")
+                comm.sudo("yum -y install bindfs")
+              else
+                comm.sudo("yum -y install fuse fuse-devel gcc")
+                comm.sudo("wget http://bindfs.org/downloads/bindfs-#{SOURCE_VERSION}.tar.gz -O bindfs.tar.gz")
+                comm.sudo("tar --overwrite -zxvf bindfs.tar.gz")
+                comm.sudo("[ -d ./bindfs-#{SOURCE_VERSION} ] && cd bindfs-#{SOURCE_VERSION} && ./configure && make && make install")
+                comm.sudo("ln -s /usr/local/bin/bindfs /usr/bin")
+              end
+            end
+          end
+
+        end
+      end
+    end
+  end
+end

data/lib/vagrant-bindfs/cap/suse/{bindfs_install.rb → install_bindfs.rb}

@@ -1,10 +1,10 @@
 module VagrantPlugins
   module Bindfs
     module Cap
-      module SUSE
-        module BindfsInstall
+      module Suse
+        module InstallBindfs
 
-          def self.bindfs_install(machine)
+          def self.install_bindfs(machine)
             machine.communicate.tap do |comm|
               comm.sudo("zypper -n install bindfs")
             end

data/lib/vagrant-bindfs/cap/ubuntu/fuse_loaded.rb

@@ -0,0 +1,17 @@
+module VagrantPlugins
+  module Bindfs
+    module Cap
+      module Ubuntu
+        module FuseLoaded
+          
+          def self.fuse_loaded(machine)
+            # Ubuntu 6.10 and after automatically load fuse.
+            # Just check if it is installed
+            machine.communicate.test("test -e /dev/fuse")
+          end
+
+        end
+      end
+    end
+  end
+end

data/lib/vagrant-bindfs/command.rb

@@ -152,8 +152,9 @@ module VagrantPlugins
       end
 
       def bindfs_version_lower_than(version)
-        test_command = %{test "$(echo "%{v} $(sudo bindfs --version | cut -d" " -f2)" | tr " " "\n" | sort -V | tail -n 1)" == "%{v}"}
-        @machine.communicate.test(test_command % { v: version})
+        bindfs_version_command = %{sudo bindfs --version | cut -d" " -f2}
+        bindfs_version = @machine.communicate.execute(bindfs_version_command);
+        Gem::Version.new(bindfs_version) < Gem::Version.new(version)
       end
 
     end

data/lib/vagrant-bindfs/plugin.rb

@@ -1,51 +1,63 @@
 module VagrantPlugins
   module Bindfs
     class Plugin < Vagrant.plugin("2")
+      
       name "Bindfs"
       description <<-DESC
       This plugin allows you to mount -o bind filesystems inside the guest. This is
       useful to change their ownership and permissions.
       DESC
 
+      
       config(:bindfs) do
         require "vagrant-bindfs/config"
         Config
       end
+      
 
-      guest_capability("debian", "bindfs_install") do
-        require "vagrant-bindfs/cap/debian/bindfs_install"
-        Cap::Debian::BindfsInstall
+      guest_capability("linux", "bindfs_installed") do
+        require "vagrant-bindfs/cap/linux/bindfs_installed"
+        Cap::Linux::BindfsInstalled
       end
 
-      guest_capability("suse", "bindfs_install") do
-        require "vagrant-bindfs/cap/suse/bindfs_install"
-        Cap::SUSE::BindfsInstall
+      
+      guest_capability("linux", "fuse_loaded") do
+        require "vagrant-bindfs/cap/linux/fuse_loaded"
+        Cap::Linux::FuseLoaded
+      end
+      
+      guest_capability("ubuntu", "fuse_loaded") do
+        require "vagrant-bindfs/cap/ubuntu/fuse_loaded"
+        Cap::Ubuntu::FuseLoaded
       end
 
-      guest_capability("fedora", "bindfs_install") do
-        require 'vagrant-bindfs/cap/fedora/bindfs_install'
-        Cap::Fedora::BindfsInstall
+      
+      guest_capability("linux", "enable_fuse") do
+        require "vagrant-bindfs/cap/linux/enable_fuse"
+        Cap::Linux::EnableFuse
       end
+      
 
-      guest_capability("redhat", "bindfs_install") do
-        require 'vagrant-bindfs/cap/redhat/bindfs_install'
-        Cap::RedHat::BindfsInstall
+      guest_capability("debian", "install_bindfs") do
+        require "vagrant-bindfs/cap/debian/install_bindfs"
+        Cap::Debian::InstallBindfs
       end
 
-      guest_capability("linux", "bindfs_installed") do
-        require "vagrant-bindfs/cap/linux/bindfs_installed"
-        Cap::Linux::BindfsInstalled
+      guest_capability("suse", "install_bindfs") do
+        require "vagrant-bindfs/cap/suse/install_bindfs"
+        Cap::Suse::InstallBindfs
       end
 
-      guest_capability("linux", "loaded_fuse?") do
-        require "vagrant-bindfs/cap/linux/bindfs_installed"
-        Cap::Linux::BindfsInstalled
+      guest_capability("fedora", "install_bindfs") do
+        require 'vagrant-bindfs/cap/fedora/install_bindfs'
+        Cap::Fedora::InstallBindfs
       end
 
-      guest_capability("linux", "modprobe_fuse") do
-        require "vagrant-bindfs/cap/linux/bindfs_installed"
-        Cap::Linux::BindfsInstalled
+      guest_capability("redhat", "install_bindfs") do
+        require 'vagrant-bindfs/cap/redhat/install_bindfs'
+        Cap::RedHat::InstallBindfs
       end
+      
 
       require "vagrant-bindfs/bind"
 
@@ -60,6 +72,7 @@ module VagrantPlugins
           hook.before(target, Action::Bind)
         end
       end
+      
     end
   end
 end

data/lib/vagrant-bindfs/version.rb

@@ -1,6 +1,6 @@
 module VagrantPlugins
   module Bindfs
-    VERSION = "0.3.4"
+    VERSION = "0.4.0"
     SOURCE_VERSION = "1.12.6"
   end
 end

data/lib/vagrant-bindfs.rb

@@ -11,6 +11,7 @@ require "pathname"
 
 module VagrantPlugins
   module Bindfs
+    
     def self.source_root
       @source_root ||= Pathname.new(File.expand_path("../../", __FILE__))
     end

data/locales/en.yml

@@ -12,7 +12,7 @@ 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"
+          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.3.4
+  version: 0.4.0
 platform: ruby
 authors:
 - Gaël-Ian Havard
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-17 00:00:00.000000000 Z
+date: 2015-02-02 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
@@ -26,11 +26,14 @@ files:
 - README.md
 - lib/vagrant-bindfs.rb
 - 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/debian/install_bindfs.rb
+- lib/vagrant-bindfs/cap/fedora/install_bindfs.rb
 - lib/vagrant-bindfs/cap/linux/bindfs_installed.rb
-- lib/vagrant-bindfs/cap/redhat/bindfs_install.rb
-- lib/vagrant-bindfs/cap/suse/bindfs_install.rb
+- lib/vagrant-bindfs/cap/linux/enable_fuse.rb
+- lib/vagrant-bindfs/cap/linux/fuse_loaded.rb
+- lib/vagrant-bindfs/cap/redhat/install_bindfs.rb
+- lib/vagrant-bindfs/cap/suse/install_bindfs.rb
+- lib/vagrant-bindfs/cap/ubuntu/fuse_loaded.rb
 - lib/vagrant-bindfs/command.rb
 - lib/vagrant-bindfs/config.rb
 - lib/vagrant-bindfs/errors.rb

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

@@ -1,28 +0,0 @@
-module VagrantPlugins
-  module Bindfs
-    module Cap
-      module RedHat
-        module BindfsInstall
-
-          def self.bindfs_install(machine)
-            machine.communicate.tap do |comm|
-
-              require "vagrant-bindfs/version"
-
-              if comm.test("grep \"CentOS release 6\" /etc/centos-release")
-                comm.sudo("yum -y install fuse fuse-devel")
-                comm.sudo("wget http://bindfs.org/downloads/bindfs-#{VagrantPlugins::Bindfs::SOURCE_VERSION}.tar.gz -O bindfs.tar.gz")
-                comm.sudo("tar --overwrite -zxvf bindfs.tar.gz")
-                comm.sudo("[ -d ./bindfs-#{VagrantPlugins::Bindfs::SOURCE_VERSION} ] && cd bindfs-#{VagrantPlugins::Bindfs::SOURCE_VERSION} && ./configure && make && make install")
-                comm.sudo("ln -s /usr/local/bin/bindfs /usr/bin")
-              else
-                comm.sudo("yum -y install bindfs")
-              end
-            end
-          end
-
-        end # BindfsInstall
-      end # RedHat
-    end # Cap
-  end # Bindfs
-end # VagrantPlugins