vagrant-bindfs 0.4.4 → 0.4.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ded7690b53fef5f95c0a62e146e84f1ce44e7543
-  data.tar.gz: 4e52e161ec2787628514b10dc1b0b63da29f0a49
+  metadata.gz: 8c9cb598d4be91ddcdc513c9ba7b8e0f2de49f53
+  data.tar.gz: e8b99639a3908f00a7af3e5d9f3adcf00ab69031
 SHA512:
-  metadata.gz: e25b86d19175e5e9c18f61b318aee9ee61fd5249f7df9a879197601d53a0c1838252a7db7ce40d8a7906ddcfa7b15980135584a9a9a3774bccd794174f57711b
-  data.tar.gz: 2cfc75f2dbe087ab68628b01ec0012c74c23db968c71d78530221c74c48d05577bea0818b682675b91e48e201cd2839cd8a0d1dd5b9c04beeb6d48b50d6aab77
+  metadata.gz: bddf54282ec931287e2174b6298227575b090c649503094c8c341e775ffbc70656ba3a0c39e898460f5cb62a7353d3f7c62a53e3f4414fe48154cf78a054541b
+  data.tar.gz: a45308f802f932765f4bb874a5913a5bf2acbffa625f5371e0ec8660531f355f9285944345461941e523622063120a916feafa9ce55f3c74b2a55f1a220f2d54

data/lib/vagrant-bindfs/bind.rb

@@ -36,7 +36,7 @@ module VagrantPlugins
 
           binded_folders.each do |id, options|
 
-            command = VagrantPlugins::Bindfs::Command.new(@machine, options)
+            command = VagrantPlugins::Bindfs::Command.new(@env, options)
 
             unless @machine.communicate.test("test -d #{command.source}")
               @env[:ui].error I18n.t(

data/lib/vagrant-bindfs/command.rb

@@ -6,8 +6,9 @@ module VagrantPlugins
       attr_reader :destination
       attr_reader :arguments
 
-      def initialize(machine, options)
-        @machine = machine
+      def initialize(env, options)
+        @env     = env
+        @machine = env[:machine]
         options  = normalize_keys(options)
 
         @source       = options.delete("source-path")
@@ -70,7 +71,7 @@ module VagrantPlugins
 
       # TODO: Update after each bindfs release
       def available_options
-        @available_options || begin
+        @available_options ||= begin
           options = {
             # File ownership
             "force-user"            => { long: ["force-user", "user", "owner"], short: ["u"], type: :option,  default: "vagrant" },
@@ -165,8 +166,20 @@ module VagrantPlugins
       
       def bindfs_version
         @bindfs_version ||= begin
-          bindfs_version = @machine.communicate.execute(%{sudo -i bindfs --version | cut -d" " -f2});
-          Gem::Version.new(bindfs_version)
+          version = catch(:version) do
+            [
+              %{sudo bindfs --version | cut -d" " -f2},
+              %{sudo -i bindfs --version | cut -d" " -f2}
+            ].each do |command|
+              @machine.communicate.execute(command) do |type, version|
+                @env[:ui].info("#{command}: #{version.inspect}") if @machine.config.bindfs.debug
+                throw(:version, Gem::Version.new(version)) if Gem::Version.correct?(version)
+              end
+            end
+            Gem::Version.new("0.0")
+          end
+          @env[:ui].info("Detected bindfs version: #{version}") if @machine.config.bindfs.debug
+          version
         end
       end
 

data/lib/vagrant-bindfs/version.rb

@@ -1,6 +1,6 @@
 module VagrantPlugins
   module Bindfs
-    VERSION = "0.4.4"
+    VERSION = "0.4.5"
     SOURCE_VERSION = "1.13.0"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-bindfs
 version: !ruby/object:Gem::Version
-  version: 0.4.4
+  version: 0.4.5
 platform: ruby
 authors:
 - Gaël-Ian Havard
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-29 00:00:00.000000000 Z
+date: 2015-11-30 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