vagrant-bindfs 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6061d0d9f6907687e9ef1f671086781b5d575015
-  data.tar.gz: 8372270d00e9e34a5848b9771dec65f5db48dc3a
+  metadata.gz: 7592d35f88e63f1ffdb5b8af8f2d8b099ece93db
+  data.tar.gz: 89fffbd06beab56ba0259242cda9f447a62fba37
 SHA512:
-  metadata.gz: 41a2dffbf3bb6ec14d25062ae59f12b16be1c12572d3eab08d1c39c19c06aba0fad98f2e7793f2bd4e7086c784f6cc8873bb8e8b562ce780cb4fd7ef2ac717d9
-  data.tar.gz: e3fcde50aae9132fd159415f92c9dd9756b249489b2424d74060e13445c10c8bd1d7943790a89ddb5cbcc805fc3b514d19ffbeb388405377daf82cee49721e33
+  metadata.gz: ea36b98e9874197f57ec1b627c1035472acf6a129c087ce8758bb87b99e0212bd47b5dca53d3070e03e8b361f4e5373e3fdf9d47c49d80132104519f9cb650e6
+  data.tar.gz: fa7efd228f4afac3514cd096f4c93113de7d3f3b682c59fc0f1e2c9cd1670ce0a05737ad2424a977e1eac0dce72e2acb961e0de5a8fa80147996879d345a2f54

data/README.md

@@ -95,6 +95,9 @@ Both long arguments and shorthand are supported.
 If you set both, shorthand will prevail.
 Long arguments can be written indifferently with underscore ('force_user') or dash ('force-user') and as strings (:'force-user') or symbols (:force_user).
 
+Option arguments values can be anything that can be casted to a string _via_ `to_s`.
+The plugin will try to detect flag arguments values as true or false from common notations.  
+
 vagrant-bindfs detects installed version of bindfs, translate option names when needed and ignore an option if it is not supported.
 As we may have missed something, it will warn you when a binding command fail.
 

data/lib/vagrant-bindfs/bindfs/command.rb

@@ -8,8 +8,8 @@ module VagrantBindfs
         @folder = folder
       end
 
-      def to_s
-        ['bindfs', arguments_for(folder.options).join(' '), folder.source, folder.destination].compact.join(' ')
+      def to_s(bindfs_command = 'bindfs')
+        [bindfs_command, arguments_for(folder.options).join(' '), folder.source, folder.destination].compact.join(' ')
       end
 
       protected

data/lib/vagrant-bindfs/bindfs/option_set.rb

@@ -23,13 +23,16 @@ module VagrantBindfs
 
         extract_invalid_options!
         extract_unsupported_options!
+        cast_option_values!
       end
 
       def merge!(other)
         other = other.to_version(version) if other.respond_to?(:to_version)
         @options.merge!(normalize_option_names(other))
+
         extract_invalid_options!
         extract_unsupported_options!
+        cast_option_values!
       end
 
       def merge(other)
@@ -77,6 +80,26 @@ module VagrantBindfs
         names.each { |name| to[name] = @options.delete(name) }
       end
 
+      def cast_option_values!
+        @options = options.each_with_object({}) do |(key, value), normalized|
+          normalized[key] = case self.class.bindfs_options[key]['type']
+                            when 'option' then cast_value_as_option(value)
+                            when 'flag'   then cast_value_as_flag(value)
+                            end
+          normalized
+        end
+      end
+
+      def cast_value_as_option(value)
+        (value.respond_to?(:to_s) ? value.to_s : value)
+      end
+
+      def cast_value_as_flag(value)
+        return true if [true, 'true', 'True', 'yes', 'Yes', 'y', 'Y', 'on', 'On', 1].include?(value)
+        return false if [false, 'false', 'False', 'no', 'No', 'n', 'N', 'off', 'Off', 0].include?(value)
+        !!value
+      end
+
       class << self
         def bindfs_options
           @bindfs_options ||= JSON.parse(File.read(File.expand_path('../option_definitions.json', __FILE__)))

data/lib/vagrant-bindfs/vagrant/actions/installer.rb

@@ -66,33 +66,40 @@ module VagrantBindfs
         def ensure_bindfs_is_installed!
           unless guest.capability(:bindfs_bindfs_installed)
             warn(I18n.t('vagrant-bindfs.actions.bindfs.not_installed'))
-
-            case true
-            when config.install_bindfs_from_source
-              install_bindfs_from_source!
-
-            when config.bindfs_version == :latest
-              guest.capability(:bindfs_bindfs_install)
-
-            when config.bindfs_version != :latest && guest.capability(:bindfs_bindfs_search_version, config.bindfs_version)
-              guest.capability(:bindfs_bindfs_install_version, config.bindfs_version)
-
-            else
-              warn(I18n.t('vagrant-bindfs.actions.bindfs.not_found_in_repository',
-                          version: config.bindfs_version))
-              install_bindfs_from_source!
-            end
+            install_bindfs!
           end
 
           detail(I18n.t('vagrant-bindfs.actions.bindfs.detected',
                         version: guest.capability(:bindfs_bindfs_version)))
         end
 
+        def install_bindfs!
+          return install_bindfs_from_source! if install_from_source?
+          return guest.capability(:bindfs_bindfs_install) if install_latest_from_repositories?
+          return guest.capability(:bindfs_bindfs_install_version, config.bindfs_version) if install_version_from_repositories?
+
+          warn(I18n.t('vagrant-bindfs.actions.bindfs.not_found_in_repository',
+                      version: config.bindfs_version))
+          install_bindfs_from_source!
+        end
+
         def install_bindfs_from_source!
           version = (config.bindfs_version == :latest ? VagrantBindfs::Bindfs::SOURCE_VERSION : config.bindfs_version.to_s)
           guest.capability(:bindfs_bindfs_install_compilation_requirements)
           guest.capability(:bindfs_bindfs_install_from_source, version)
         end
+
+        def install_from_source?
+          config.install_bindfs_from_source
+        end
+
+        def install_latest_from_repositories?
+          config.bindfs_version == :latest && guest.capability(:bindfs_bindfs_search)
+        end
+
+        def install_version_from_repositories?
+          config.bindfs_version != :latest && guest.capability(:bindfs_bindfs_search_version, config.bindfs_version)
+        end
       end
     end
   end

data/lib/vagrant-bindfs/vagrant/actions/mounter.rb

@@ -26,7 +26,9 @@ module VagrantBindfs
 
         def bind_folders!
           info I18n.t('vagrant-bindfs.actions.mounter.start', hook: hook)
-          bindfs_version = guest.capability(:bindfs_bindfs_version)
+
+          bindfs_version    = guest.capability(:bindfs_bindfs_version)
+          bindfs_full_path  = guest.capability(:bindfs_bindfs_full_path)
 
           binded_folders(hook).each do |_, folder|
             folder.reverse_merge!(config.default_options)
@@ -54,8 +56,8 @@ module VagrantBindfs
 
             machine.communicate.tap do |comm|
               comm.sudo("mkdir -p #{folder.destination}")
-              comm.sudo(command.to_s, error_class: VagrantBindfs::Vagrant::Error, error_key: 'bindfs.mount_failed')
-              debug(command.to_s)
+              comm.sudo(command.to_s(bindfs_full_path), error_class: VagrantBindfs::Vagrant::Error, error_key: 'bindfs.mount_failed')
+              debug(command.to_s(bindfs_full_path))
             end
           end
         end

data/lib/vagrant-bindfs/vagrant/capabilities.rb

@@ -73,12 +73,20 @@ module VagrantBindfs
         end
 
         def declare_capabilities_for_bindfs!(base)
+          base.guest_capability('darwin', 'bindfs_bindfs_full_path') { Capabilities::All::Bindfs }
+          base.guest_capability('linux',  'bindfs_bindfs_full_path') { Capabilities::All::Bindfs }
+
           base.guest_capability('darwin', 'bindfs_bindfs_installed') { Capabilities::All::Bindfs }
           base.guest_capability('linux',  'bindfs_bindfs_installed') { Capabilities::All::Bindfs }
 
           base.guest_capability('darwin', 'bindfs_bindfs_version') { Capabilities::All::Bindfs }
           base.guest_capability('linux',  'bindfs_bindfs_version') { Capabilities::All::Bindfs }
 
+          base.guest_capability('darwin', 'bindfs_bindfs_search') { Capabilities::Darwin::Bindfs }
+          base.guest_capability('debian', 'bindfs_bindfs_search') { Capabilities::Debian::Bindfs }
+          base.guest_capability('redhat', 'bindfs_bindfs_search') { Capabilities::RedHat::Bindfs }
+          base.guest_capability('suse',   'bindfs_bindfs_search') { Capabilities::Suse::Bindfs }
+
           base.guest_capability('darwin', 'bindfs_bindfs_install') { Capabilities::Darwin::Bindfs }
           base.guest_capability('debian', 'bindfs_bindfs_install') { Capabilities::Debian::Bindfs }
           base.guest_capability('redhat', 'bindfs_bindfs_install') { Capabilities::RedHat::Bindfs }

data/lib/vagrant-bindfs/vagrant/capabilities/all/bindfs.rb

@@ -5,12 +5,22 @@ module VagrantBindfs
       module All
         module Bindfs
           class << self
+            def bindfs_bindfs_full_path(machine)
+              machine.communicate.execute('type bindfs | cut -d" " -f3') do |_, output|
+                path = output.strip
+                return path unless path.empty?
+              end
+              'bindfs'
+            end
+
             def bindfs_bindfs_installed(machine)
-              machine.communicate.test('bindfs --help')
+              bindfs_full_path = machine.guest.capability(:bindfs_bindfs_full_path)
+              machine.communicate.test("#{bindfs_full_path} --help")
             end
 
             def bindfs_bindfs_version(machine)
-              [%(sudo bindfs --version | cut -d" " -f2), %(sudo -i bindfs --version | cut -d" " -f2)].each do |command|
+              bindfs_full_path = machine.guest.capability(:bindfs_bindfs_full_path)
+              [%(sudo #{bindfs_full_path} --version | cut -d" " -f2), %(sudo -i #{bindfs_full_path} --version | cut -d" " -f2)].each do |command|
                 machine.communicate.execute(command) do |_, output|
                   version = output.strip
                   return Gem::Version.new(version) if !version.empty? && Gem::Version.correct?(version)

data/lib/vagrant-bindfs/vagrant/capabilities/darwin/bindfs.rb

@@ -5,6 +5,11 @@ module VagrantBindfs
       module Darwin
         module Bindfs
           class << self
+            # Homebrew only use its own github repositories
+            def bindfs_bindfs_search(_machine)
+              true
+            end
+
             def bindfs_bindfs_install(machine)
               machine.guest.capability(:bindfs_package_manager_update)
               machine.communicate.execute('brew install homebrew/fuse/bindfs')

data/lib/vagrant-bindfs/vagrant/capabilities/debian/bindfs.rb

@@ -5,6 +5,11 @@ module VagrantBindfs
       module Debian
         module Bindfs
           class << self
+            def bindfs_bindfs_search(machine)
+              machine.guest.capability(:bindfs_package_manager_update)
+              machine.communicate.test('[[ $(sudo apt-cache search bindfs | egrep "^bindfs - " | wc -l) != 0 ]]')
+            end
+
             def bindfs_bindfs_install(machine)
               machine.guest.capability(:bindfs_package_manager_update)
               machine.communicate.sudo('apt-get install -y bindfs')
@@ -13,6 +18,8 @@ module VagrantBindfs
             def bindfs_bindfs_search_version(machine, version)
               machine.guest.capability(:bindfs_package_manager_update)
               machine.communicate.tap do |comm|
+                # Ensure aptitude is installed as Ubuntu removed it
+                comm.sudo('apt-get install aptitude')
                 comm.sudo("aptitude versions bindfs | sed -n '/p/,${p}' | sed 's/\s\+/ /g' | cut -d' ' -f2") do |_, output|
                   package_version = output.strip
                   return "bindfs-#{package_version}" if !package_version.empty? && !package_version.match(/^#{version}/).nil?

data/lib/vagrant-bindfs/vagrant/capabilities/redhat/bindfs.rb

@@ -5,6 +5,11 @@ module VagrantBindfs
       module RedHat
         module Bindfs
           class << self
+            def bindfs_bindfs_search(machine)
+              machine.guest.capability(:bindfs_package_manager_update)
+              machine.communicate.test('[[ $(yum search bindfs 2>/dev/null | tail -n1) != "No matches found" ]]')
+            end
+
             def bindfs_bindfs_install(machine)
               machine.guest.capability(:bindfs_package_manager_update)
               machine.communicate.sudo('yum -y install bindfs')

data/lib/vagrant-bindfs/vagrant/capabilities/suse/bindfs.rb

@@ -5,6 +5,11 @@ module VagrantBindfs
       module Suse
         module Bindfs
           class << self
+            def bindfs_bindfs_search(machine)
+              machine.guest.capability(:bindfs_package_manager_update)
+              machine.communicate.test('zypper se -s bindfs')
+            end
+
             def bindfs_bindfs_install(machine)
               machine.guest.capability(:bindfs_package_manager_update)
               machine.communicate.sudo('zypper -n install bindfs')

data/lib/vagrant-bindfs/version.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 module VagrantBindfs
-  VERSION = '1.0.1'
+  VERSION = '1.0.2'
 end

data/locales/en.yml

@@ -11,7 +11,7 @@ en:
       fuse:
         not_installed: "Fuse seems to not be installed on the virtual machine, installing now"
         installed: "Fuse kernel module is installed"
-        not_loaded: "Fuse kernel module seems to be not loaded, trying to load it"
+        not_loaded: "Fuse kernel module seems to be not loaded on the virtual machine, loading now"
         loaded: "Fuse kernel module is loaded"
       bindfs:
         not_installed: "Bindfs seems to not be installed on the virtual machine, installing now"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-bindfs
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - Gaël-Ian Havard
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-05 00:00:00.000000000 Z
+date: 2016-12-16 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