vagrant-bindfs 1.0.10 → 1.0.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b44e609392e7b300f9aefcd61d6afa5cc943425d
-  data.tar.gz: 1135fcbae549d91466d5a2831572265cceceb64c
+  metadata.gz: 5ea2b8920c39f6a2706fb6961e59b10821986ef0
+  data.tar.gz: d03fb93229d6e9bb52b261061a51d18b6a679246
 SHA512:
-  metadata.gz: c79b60b20d2cfe92e2c8d48f58f3bf29ff5166bcf54f2f888549c25454d59639539d2fa001f5763d244890f628370f66ea0e941469bfb30daf8714bc8d6aee61
-  data.tar.gz: 598c3cf093444f9c2fcde064ac7d3bfcefec6ce376141bb931a07c9f62d708ce2416472b68245a3a3089e206cfd2a4f56f4d60befbbc018c636e0d4e14e8dce3
+  metadata.gz: fe917a556f92d71713ca398329d2bd54ff6c7e87023125f14641ac868448d34087dfd887c67b377e9753ca1a3bceacd52dc10484713f94bd869106b5ed17a693
+  data.tar.gz: da6e2822e63a035c565f027247a7931f7b9424e25c365efd54db4ba531b5ae7f6b66b0081f6ef807c8ca03604269ce0d35e1fed421b46dba55d15c4289bde63d

data/Vagrantfile

@@ -5,13 +5,14 @@
 
 # Uncomment machines you want to test
 test_machines = {
-  # debian: { box: "bento/debian-8.5"   },
-  # ubuntu: { box: "bento/ubuntu-16.04" },
-  # fedora: { box: "bento/fedora-24"    },
-  # redhat: { box: "bento/centos-7.2"   },
+  # debian: { box: "bento/debian-9"     },
+  # ubuntu: { box: "bento/ubuntu-17.10" },
+  # fedora: { box: "bento/fedora-26"    },
+  # redhat: { box: "bento/centos-7"     },
+  # gentoo: { box: "generic/gentoo"     },
 
   # The `vagrant` user group does not exist in this box.
-  # suse:   { box: "bento/opensuse-leap-42.1",    args: { group: 'users' } },
+  # suse:   { box: "bento/opensuse-leap-42",      args: { group: 'users' } },
 
   # **This box require the Oracle VM VirtualBox Extension Pack for Virtualbox.**
   # The `vagrant` user group does not exist in this box.

data/lib/vagrant-bindfs/bindfs.rb

@@ -2,7 +2,7 @@
 
 module VagrantBindfs
   module Bindfs
-    SOURCE_VERSION  = '1.13.9'
+    SOURCE_VERSION  = '1.13.9'.freeze
     SOURCE_URLS     = [
       'http://bindfs.org/downloads/bindfs-%<bindfs_version>.tar.gz',
       'http://bindfs.dy.fi/downloads/bindfs-%<bindfs_version>.tar.gz'

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

@@ -50,9 +50,8 @@ module VagrantBindfs
           normalized_key = key.to_s.tr('_', '-')
           canonical_name = canonical_option_name(normalized_key)
 
-          if normalized.key?(canonical_name)
-            raise VagrantBindfs::Vagrant::ConfigError.new(:conflicting_options, name: canonical_name)
-          end
+          raise VagrantBindfs::Vagrant::ConfigError.new(:conflicting_options, name: canonical_name) \
+            if normalized.key?(canonical_name)
 
           normalized[canonical_name] = value
           normalized

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

@@ -0,0 +1,120 @@
+{
+  // System checks
+  "bindfs_exists_user": {
+    "darwin": "Darwin::SystemChecks",
+    "linux":  "Linux::SystemChecks"
+  },
+  "bindfs_exists_group": {
+    "darwin": "Darwin::SystemChecks",
+    "linux":  "Linux::SystemChecks"
+  },
+  "bindfs_exists_directory": {
+    "darwin": "All::SystemChecks",
+    "linux":  "All::SystemChecks"
+  },
+  "bindfs_exists_mount": {
+    "darwin": "All::SystemChecks",
+    "linux":  "All::SystemChecks"
+  },
+
+  // Package manager
+  "bindfs_package_manager_name": {
+    "darwin": "Darwin::PackageManager",
+    "debian": "Debian::PackageManager",
+    "gentoo": "Gentoo::PackageManager",
+    "redhat": "RedHat::PackageManager",
+    "suse":   "Suse::PackageManager"
+  },
+  "bindfs_package_manager_installed": {
+    "darwin": "All::PackageManager",
+    "linux":  "All::PackageManager"
+  },
+  
+  "bindfs_package_manager_install": {
+    "darwin": "Darwin::PackageManager",
+    "linux":  "Linux::PackageManager"
+  },
+  "bindfs_package_manager_update": {
+    "darwin": "Darwin::PackageManager",
+    "debian": "Debian::PackageManager",
+    "gentoo": "Gentoo::PackageManager",
+    "redhat": "RedHat::PackageManager",
+    "suse":   "Suse::PackageManager"
+  },
+  
+  // Fuse
+  "bindfs_fuse_installed": {
+    "darwin": "Darwin::Fuse",
+    "linux":  "Linux::Fuse"
+  },
+  "bindfs_fuse_install": {
+    "darwin": "Darwin::Fuse",
+    "debian": "Debian::Fuse",
+    "gentoo": "Gentoo::Fuse",
+    "redhat": "RedHat::Fuse",
+    "suse":   "Suse::Fuse"
+  },
+  "bindfs_fuse_loaded": {
+    "darwin": "Darwin::Fuse",
+    "linux":  "Linux::Fuse",
+    "ubuntu": "Ubuntu::Fuse"
+  },
+  "bindfs_fuse_load": {
+    "darwin": "Darwin::Fuse",
+    "linux":  "Linux::Fuse",
+    "ubuntu": "Ubuntu::Fuse"
+  },
+  
+  // Bindfs
+  "bindfs_bindfs_full_path": {
+    "darwin": "All::Bindfs",
+    "linux":  "All::Bindfs"
+  },
+  "bindfs_bindfs_installed": {
+    "darwin": "All::Bindfs",
+    "linux":  "All::Bindfs"
+  },
+  "bindfs_bindfs_version": {
+    "darwin": "All::Bindfs",
+    "linux":  "All::Bindfs"
+  },
+  "bindfs_bindfs_search": {
+    "darwin": "Darwin::Bindfs",
+    "debian": "Debian::Bindfs",
+    "gentoo": "Gentoo::Bindfs",
+    "redhat": "RedHat::Bindfs",
+    "suse":   "Suse::Bindfs"
+  },
+  "bindfs_bindfs_install": {
+    "darwin": "Darwin::Bindfs",
+    "debian": "Debian::Bindfs",
+    "gentoo": "Gentoo::Bindfs",
+    "redhat": "RedHat::Bindfs",
+    "suse":   "Suse::Bindfs"
+  },
+  "bindfs_bindfs_search_version": {
+    "darwin": "Darwin::Bindfs",
+    "debian": "Debian::Bindfs",
+    "gentoo": "Gentoo::Bindfs",
+    "redhat": "RedHat::Bindfs",
+    "suse":   "Suse::Bindfs"
+  },
+  "bindfs_bindfs_install_version": {
+    "darwin": "Darwin::Bindfs",
+    "debian": "Debian::Bindfs",
+    "gentoo": "Gentoo::Bindfs",
+    "redhat": "RedHat::Bindfs",
+    "suse":   "Suse::Bindfs"
+  },
+  "bindfs_bindfs_install_compilation_requirements": {
+    "darwin": "Darwin::Bindfs",
+    "debian": "Debian::Bindfs",
+    "gentoo": "Gentoo::Bindfs",
+    "redhat": "RedHat::Bindfs",
+    "suse":   "Suse::Bindfs"
+  },
+  "bindfs_bindfs_install_from_source": {
+    "darwin": "All::Bindfs",
+    "linux":  "All::Bindfs"
+  }
+}

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

@@ -11,105 +11,25 @@ module VagrantBindfs
       autoload :Debian, 'vagrant-bindfs/vagrant/capabilities/debian'
       autoload :Ubuntu, 'vagrant-bindfs/vagrant/capabilities/ubuntu'
 
+      autoload :Gentoo, 'vagrant-bindfs/vagrant/capabilities/gentoo'
+
       autoload :RedHat, 'vagrant-bindfs/vagrant/capabilities/redhat'
 
       autoload :Suse,   'vagrant-bindfs/vagrant/capabilities/suse'
 
       class << self
         def included(base)
-          declare_capabilities_for_system_checks!(base)
-          declare_capabilities_for_package_manager!(base)
-          declare_capabilities_for_fuse!(base)
-          declare_capabilities_for_bindfs!(base)
-        end
-
-        def declare_capabilities_for_system_checks!(base)
-          base.guest_capability('darwin', 'bindfs_exists_user') { Capabilities::Darwin::SystemChecks }
-          base.guest_capability('linux',  'bindfs_exists_user') { Capabilities::Linux::SystemChecks }
-
-          base.guest_capability('darwin', 'bindfs_exists_group') { Capabilities::Darwin::SystemChecks }
-          base.guest_capability('linux',  'bindfs_exists_group') { Capabilities::Linux::SystemChecks }
-
-          base.guest_capability('darwin', 'bindfs_exists_directory') { Capabilities::All::SystemChecks }
-          base.guest_capability('linux',  'bindfs_exists_directory') { Capabilities::All::SystemChecks }
-
-          base.guest_capability('darwin', 'bindfs_exists_mount') { Capabilities::All::SystemChecks }
-          base.guest_capability('linux',  'bindfs_exists_mount') { Capabilities::All::SystemChecks }
-        end
-
-        def declare_capabilities_for_package_manager!(base)
-          base.guest_capability('darwin', 'bindfs_package_manager_name') { Capabilities::Darwin::PackageManager }
-          base.guest_capability('debian', 'bindfs_package_manager_name') { Capabilities::Debian::PackageManager }
-          base.guest_capability('redhat', 'bindfs_package_manager_name') { Capabilities::RedHat::PackageManager }
-          base.guest_capability('suse',   'bindfs_package_manager_name') { Capabilities::Suse::PackageManager }
-
-          base.guest_capability('darwin', 'bindfs_package_manager_installed') { Capabilities::All::PackageManager }
-          base.guest_capability('linux',  'bindfs_package_manager_installed') { Capabilities::All::PackageManager }
-
-          base.guest_capability('darwin', 'bindfs_package_manager_install') { Capabilities::Darwin::PackageManager }
-          base.guest_capability('linux',  'bindfs_package_manager_install') { Capabilities::Linux::PackageManager }
-
-          base.guest_capability('darwin', 'bindfs_package_manager_update') { Capabilities::Darwin::PackageManager }
-          base.guest_capability('debian', 'bindfs_package_manager_update') { Capabilities::Debian::PackageManager }
-          base.guest_capability('redhat', 'bindfs_package_manager_update') { Capabilities::RedHat::PackageManager }
-          base.guest_capability('suse',   'bindfs_package_manager_update') { Capabilities::Suse::PackageManager }
-        end
-
-        def declare_capabilities_for_fuse!(base)
-          base.guest_capability('darwin', 'bindfs_fuse_installed') { Capabilities::Darwin::Fuse }
-          base.guest_capability('linux',  'bindfs_fuse_installed') { Capabilities::Linux::Fuse }
-
-          base.guest_capability('darwin', 'bindfs_fuse_install') { Capabilities::Darwin::Fuse }
-          base.guest_capability('debian', 'bindfs_fuse_install') { Capabilities::Debian::Fuse }
-          base.guest_capability('redhat', 'bindfs_fuse_install') { Capabilities::RedHat::Fuse }
-          base.guest_capability('suse',   'bindfs_fuse_install') { Capabilities::Suse::Fuse }
-
-          base.guest_capability('darwin', 'bindfs_fuse_loaded') { Capabilities::Darwin::Fuse }
-          base.guest_capability('linux',  'bindfs_fuse_loaded') { Capabilities::Linux::Fuse }
-          base.guest_capability('ubuntu', 'bindfs_fuse_loaded') { Capabilities::Ubuntu::Fuse }
-
-          base.guest_capability('darwin', 'bindfs_fuse_load') { Capabilities::Darwin::Fuse }
-          base.guest_capability('linux',  'bindfs_fuse_load') { Capabilities::Linux::Fuse }
-          base.guest_capability('ubuntu', 'bindfs_fuse_load') { Capabilities::Ubuntu::Fuse }
+          capabilities = JSON.parse(File.read(File.expand_path('../capabilities.json', __FILE__)))
+          capabilities.each do |cap_name, oses|
+            oses.each do |os_name, module_name|
+              mod = module_by_name(module_name)
+              base.guest_capability(os_name.to_s, cap_name.to_s) { mod }
+            end
+          end
         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 }
-          base.guest_capability('suse',   'bindfs_bindfs_install') { Capabilities::Suse::Bindfs }
-
-          base.guest_capability('darwin', 'bindfs_bindfs_search_version') { Capabilities::Darwin::Bindfs }
-          base.guest_capability('debian', 'bindfs_bindfs_search_version') { Capabilities::Debian::Bindfs }
-          base.guest_capability('redhat', 'bindfs_bindfs_search_version') { Capabilities::RedHat::Bindfs }
-          base.guest_capability('suse',   'bindfs_bindfs_search_version') { Capabilities::Suse::Bindfs }
-
-          base.guest_capability('darwin', 'bindfs_bindfs_install_version') { Capabilities::Darwin::Bindfs }
-          base.guest_capability('debian', 'bindfs_bindfs_install_version') { Capabilities::Debian::Bindfs }
-          base.guest_capability('redhat', 'bindfs_bindfs_install_version') { Capabilities::RedHat::Bindfs }
-          base.guest_capability('suse',   'bindfs_bindfs_install_version') { Capabilities::Suse::Bindfs }
-
-          base.guest_capability('darwin', 'bindfs_bindfs_install_compilation_requirements') { Capabilities::Darwin::Bindfs }
-          base.guest_capability('debian', 'bindfs_bindfs_install_compilation_requirements') { Capabilities::Debian::Bindfs }
-          base.guest_capability('redhat', 'bindfs_bindfs_install_compilation_requirements') { Capabilities::RedHat::Bindfs }
-          base.guest_capability('suse',   'bindfs_bindfs_install_compilation_requirements') { Capabilities::Suse::Bindfs }
-
-          base.guest_capability('darwin', 'bindfs_bindfs_install_from_source') { Capabilities::All::Bindfs }
-          base.guest_capability('linux',  'bindfs_bindfs_install_from_source') { Capabilities::All::Bindfs }
+        def module_by_name(camel_cased_word)
+          camel_cased_word.split('::').inject(self) { |constant, name| constant.const_get(name) }
         end
       end
     end

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

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+module VagrantBindfs
+  module Vagrant
+    module Capabilities
+      module Gentoo
+        autoload :PackageManager, 'vagrant-bindfs/vagrant/capabilities/gentoo/package_manager'
+        autoload :Fuse,           'vagrant-bindfs/vagrant/capabilities/gentoo/fuse'
+        autoload :Bindfs,         'vagrant-bindfs/vagrant/capabilities/gentoo/bindfs'
+      end
+    end
+  end
+end

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

@@ -0,0 +1,68 @@
+# frozen_string_literal: true
+
+module VagrantBindfs
+  module Vagrant
+    module Capabilities
+      module Gentoo
+        module Bindfs
+          class << self
+            def bindfs_bindfs_search(machine)
+              machine.guest.capability(:bindfs_package_manager_update)
+              machine.communicate.tap do |comm|
+                # Ensure equery is installed
+                comm.sudo('emerge app-portage/gentoolkit')
+                return comm.test("equery -q list -po #{bindfs_package_name}")
+              end
+            end
+
+            def bindfs_bindfs_install(machine)
+              machine.guest.capability(:bindfs_package_manager_update)
+              allow_bindfs_installation(machine)
+              machine.communicate.sudo("emerge #{bindfs_package_name}")
+            end
+
+            def bindfs_bindfs_search_version(machine, version)
+              machine.guest.capability(:bindfs_package_manager_update)
+              machine.communicate.tap do |comm|
+                # Ensure equery is installed
+                comm.sudo('emerge app-portage/gentoolkit')
+                comm.sudo("equery -q list -po -F '$fullversion' #{bindfs_package_name} || true") do |_, output|
+                  output.strip.gsub(/\s+/, ' ').split(' ').each do |package_version|
+                    return package_version if !package_version.empty? && !package_version.match(/^#{version}/).nil?
+                  end
+                end
+              end
+              false
+            end
+
+            def bindfs_bindfs_install_version(machine, version)
+              machine.guest.capability(:bindfs_package_manager_update)
+              package_version = machine.guest.capability(:bindfs_bindfs_search_version, version)
+              allow_bindfs_installation(machine)
+              machine.communicate.sudo("emerge =#{bindfs_package_name}-#{package_version.shellescape}")
+            end
+
+            def bindfs_bindfs_install_compilation_requirements(machine)
+              machine.guest.capability(:bindfs_package_manager_update)
+              machine.communicate.sudo('emerge wget tar')
+            end
+
+            private
+
+            def bindfs_package_name
+              'sys-fs/bindfs'
+            end
+
+            def allow_bindfs_installation(machine)
+              machine.communicate.sudo <<-SHELL
+                arch=$(equery -q list -po -F '$keywords' #{bindfs_package_name})
+                keywords=$(echo $arch | tr ' ' "\n" | sort | uniq | tr "\n" ' ')
+                echo "#{bindfs_package_name} $keywords" > /etc/portage/package.accept_keywords/bindfs
+              SHELL
+            end
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+module VagrantBindfs
+  module Vagrant
+    module Capabilities
+      module Gentoo
+        module Fuse
+          class << self
+            def bindfs_fuse_install(machine)
+              machine.guest.capability(:bindfs_package_manager_update)
+              machine.communicate.sudo('emerge sys-fs/fuse')
+            end
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+module VagrantBindfs
+  module Vagrant
+    module Capabilities
+      module Gentoo
+        module PackageManager
+          class << self
+            def bindfs_package_manager_name(_machine)
+              'emerge'
+            end
+
+            def bindfs_package_manager_update(machine)
+              machine.communicate.sudo('emaint -a sync')
+            end
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -26,18 +26,20 @@ module VagrantBindfs
       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,
+              synced_folders: synced_folders_hook,
               provision:      ::Vagrant::Action::Builtin::Provision
             }
           end
         end
+
+        def synced_folders_hook
+          if ::Vagrant::Action::Builtin.const_defined? :NFS
+            ::Vagrant::Action::Builtin::NFS
+          else
+            ::Vagrant::Action::Builtin::SyncedFolders
+          end
+        end
       end
     end
   end

data/lib/vagrant-bindfs/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module VagrantBindfs
-  VERSION = '1.0.10'
+  VERSION = '1.0.11'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-bindfs
 version: !ruby/object:Gem::Version
-  version: 1.0.10
+  version: 1.0.11
 platform: ruby
 authors:
 - Gaël-Ian Havard
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-12-01 00:00:00.000000000 Z
+date: 2017-12-20 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
@@ -42,6 +42,7 @@ files:
 - lib/vagrant-bindfs/vagrant/actions/concerns/machine.rb
 - lib/vagrant-bindfs/vagrant/actions/installer.rb
 - lib/vagrant-bindfs/vagrant/actions/mounter.rb
+- lib/vagrant-bindfs/vagrant/capabilities.json
 - lib/vagrant-bindfs/vagrant/capabilities.rb
 - lib/vagrant-bindfs/vagrant/capabilities/all.rb
 - lib/vagrant-bindfs/vagrant/capabilities/all/bindfs.rb
@@ -56,6 +57,10 @@ files:
 - lib/vagrant-bindfs/vagrant/capabilities/debian/bindfs.rb
 - lib/vagrant-bindfs/vagrant/capabilities/debian/fuse.rb
 - lib/vagrant-bindfs/vagrant/capabilities/debian/package_manager.rb
+- lib/vagrant-bindfs/vagrant/capabilities/gentoo.rb
+- lib/vagrant-bindfs/vagrant/capabilities/gentoo/bindfs.rb
+- lib/vagrant-bindfs/vagrant/capabilities/gentoo/fuse.rb
+- lib/vagrant-bindfs/vagrant/capabilities/gentoo/package_manager.rb
 - lib/vagrant-bindfs/vagrant/capabilities/linux.rb
 - lib/vagrant-bindfs/vagrant/capabilities/linux/fuse.rb
 - lib/vagrant-bindfs/vagrant/capabilities/linux/package_manager.rb