vagrant-sshfs 1.3.4 → 1.3.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 68c00a268dd8b861a0dccc09d8038bade7d6fdda953fa4790fb057ad304c8f5b
-  data.tar.gz: f2e5f1162a74cb9bf5034d243167cca7f69f7e5ecf4bff5d74235c134f232674
+  metadata.gz: 6513280765fd1bba7182361d9f45354f46bf094d4880da5aa53f37f25fdaab3b
+  data.tar.gz: 8eda8064052fca6390542acf1ce1a63aa98e04f4c69e8c9a66ff197cc868efcc
 SHA512:
-  metadata.gz: 4afe022b17eff7aa2c4bed784dd05e8e9e4701bd6327b9792ff20c4ea551185037dc75a69100dfde7a06f47db9d06c404efeb532161427236d927eaca6257981
-  data.tar.gz: b9828d27f40ca3318c2877e2a6381f01a7d7594a54f96affbb73b2913843bcf4134f059cc458aaa16b600f395907c900f3767f6ebfaa4d3fa810f6606cbe4ef7
+  metadata.gz: b7541dfccd42e153b37da97bc8d84427ca0c87674b0d2333861d98fb946b4ca3847d9c51ac0bb511525207554b21c075a9e22bba3fd6699f03737d877abad24d
+  data.tar.gz: 2e494e523004ded8fcd6644bcdf951728a534110df6d898a2fd55350f7df64842ac089483783c2433d76c4478e30e9185fbde16fff7280a09675749f47da4385

data/Gemfile

@@ -6,7 +6,7 @@ group :development do
   # We depend on Vagrant for development, but we don't add it as a
   # gem dependency because we expect to be installed within the
   # Vagrant environment itself using `vagrant plugin`.
-  gem "vagrant", :git => "https://github.com/mitchellh/vagrant.git", :ref => 'v2.2.7'
+  gem "vagrant", :git => "https://github.com/mitchellh/vagrant.git", :ref => 'v2.2.9'
 end
 
 group :plugins do

data/lib/vagrant-sshfs/cap/guest/centos/sshfs_client.rb

@@ -0,0 +1,38 @@
+module VagrantPlugins
+  module GuestCentOS
+    module Cap
+      class SSHFSClient
+        def self.sshfs_install(machine)
+
+          case machine.guest.capability("flavor")
+            when :centos_8
+              # No need to install epel. fuse-sshfs comes from the PowerTools repo
+              # https://bugzilla.redhat.com/show_bug.cgi?id=1758884
+              machine.communicate.sudo("yum -y install --enablerepo=PowerTools fuse-sshfs")
+            when :centos_7, :centos # centos7 and centos6
+              # Install fuse-sshfs from epel
+              if !epel_installed(machine)
+                epel_install(machine)
+              end
+              machine.communicate.sudo("yum -y install fuse-sshfs")
+          end
+        end
+
+        def self.sshfs_installed(machine)
+          machine.communicate.test("rpm -q fuse-sshfs")
+        end
+
+        protected
+
+        def self.epel_installed(machine)
+          machine.communicate.test("rpm -q epel-release")
+        end
+
+        def self.epel_install(machine)
+          machine.communicate.sudo("yum -y install epel-release")
+        end
+
+      end
+    end
+  end
+end

data/lib/vagrant-sshfs/cap/guest/redhat/sshfs_client.rb

@@ -4,19 +4,16 @@ module VagrantPlugins
       class SSHFSClient
         def self.sshfs_install(machine)
 
-          rhel_version = machine.guest.capability("flavor")
-
-          # Handle the case where Vagrant doesn't yet know how to
-          # detect and return :rhel_8 https://github.com/hashicorp/vagrant/pull/11453
-          if Gem::Version.new(Vagrant::VERSION) < Gem::Version.new('2.2.8')
-            rhel_version = vagrant_lt_228_flavor_compat(machine)
-          end
-
-          case rhel_version
+          case machine.guest.capability("flavor")
             when :rhel_8
-              # No need to install epel. fuse-sshfs comes from the PowerTools repo
-              # https://bugzilla.redhat.com/show_bug.cgi?id=1758884
-              machine.communicate.sudo("yum -y install --enablerepo=PowerTools fuse-sshfs")
+              # fuse-sshfs isn't in EPEL8 and how to get it from RHEL repos
+              # without having to have the system subscribed is unclear:
+              # https://github.com/dustymabe/vagrant-sshfs/issues/108#issuecomment-601061947
+              # Using fuse-sshfs from EPEL7 works for now so let's just go with it.
+              # Do the install in such a way that the epel7 repo doesn't hang around
+              # on the system, which may have unintended consequences on RHEL8.
+              machine.communicate.sudo("rpm --import https://dl.fedoraproject.org/pub/epel/RPM-GPG-KEY-EPEL-7")
+              machine.communicate.sudo("yum -y install fuse-sshfs --repofrompath=epel7,'http://download.fedoraproject.org/pub/epel/7/$basearch'")
             when :rhel_7, :rhel # rhel7 and rhel6
               # Install fuse-sshfs from epel
               if !epel_installed(machine)
@@ -37,23 +34,11 @@ module VagrantPlugins
         end
 
         def self.epel_install(machine)
-          machine.communicate.sudo("yum -y install epel-release")
-        end
-
-        def self.vagrant_lt_228_flavor_compat(machine)
-          # This is a compatibility function to handle RHEL8 for
-          # vagrant versions that didn't include:
-          # https://github.com/hashicorp/vagrant/pull/11453
-          output = ""
-          machine.communicate.sudo("cat /etc/redhat-release") do |_, data|
-            output = data
-          end
-          if output =~ /(CentOS|Red Hat Enterprise|Scientific|Cloud|Virtuozzo)\s*Linux( .+)? release 8/i
-            return :rhel_8
-          elsif output =~ /(CentOS|Red Hat Enterprise|Scientific|Cloud|Virtuozzo)\s*Linux( .+)? release 7/i
-            return :rhel_7
-          else
-            return :rhel
+          case machine.guest.capability("flavor")
+            when :rhel_7
+              machine.communicate.sudo("rpm -ivh https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm")
+            when :rhel # rhel6
+              machine.communicate.sudo("rpm -ivh https://dl.fedoraproject.org/pub/epel/epel-release-latest-6.noarch.rpm")
           end
         end
       end

data/lib/vagrant-sshfs/plugin.rb

@@ -97,6 +97,16 @@ module VagrantPlugins
         VagrantPlugins::GuestRedHat::Cap::SSHFSClient
       end
 
+      guest_capability("centos", "sshfs_installed") do
+        require_relative "cap/guest/centos/sshfs_client"
+        VagrantPlugins::GuestCentOS::Cap::SSHFSClient
+      end
+
+      guest_capability("centos", "sshfs_install") do
+        require_relative "cap/guest/centos/sshfs_client"
+        VagrantPlugins::GuestCentOS::Cap::SSHFSClient
+      end
+
       guest_capability("fedora", "sshfs_installed") do
         require_relative "cap/guest/fedora/sshfs_client"
         VagrantPlugins::GuestFedora::Cap::SSHFSClient

data/lib/vagrant-sshfs/version.rb

@@ -1,5 +1,5 @@
 module VagrantPlugins
   module SyncedFolderSSHFS
-    VERSION = "1.3.4"
+    VERSION = "1.3.5"
   end
 end

data/test/misc/Vagrantfile

@@ -8,7 +8,7 @@ Vagrant.configure(2) do |config|
 
     # Test a forward mount to a location that is a symbolic link
     # https://github.com/dustymabe/vagrant-sshfs/issues/44
-    config.vm.synced_folder "/etc/", "/sbin/forward_slave_mount_sym_link_test/", type: "sshfs"
+    config.vm.synced_folder "/etc/", "/var/run/forward_slave_mount_sym_link_test/", type: "sshfs"
 
     # Test a forward normal mount:
     #     mounting a folder from a 3rd party host into guest
@@ -22,7 +22,7 @@ Vagrant.configure(2) do |config|
     config.vm.synced_folder "/tmp/reverse_mount_etc/", "/etc", type: "sshfs", reverse: true
 
     host = 'sshfs-tests'
-    box  = 'fedora/31-cloud-base'
+    box  = 'fedora/32-cloud-base'
 
     config.vm.define host do | tmp |
         tmp.vm.hostname = host

data/test/misc/dotests.sh

@@ -8,7 +8,7 @@ vagrant ssh -- cat /tmp/forward_slave_mount_etc/machine-id
 
 # https://github.com/dustymabe/vagrant-sshfs/issues/44
 echo -en "Testing slave forward mount with a symlink!\n\t"
-vagrant ssh -- cat /usr/sbin/forward_slave_mount_sym_link_test/machine-id
+vagrant ssh -- cat /run/forward_slave_mount_sym_link_test/machine-id
 
 echo -en "Testing normal forward mount!\n\t"
 vagrant ssh -- cat /tmp/forward_normal_mount_etc/machine-id

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-sshfs
 version: !ruby/object:Gem::Version
-  version: 1.3.4
+  version: 1.3.5
 platform: ruby
 authors:
 - Dusty Mabe
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-03-15 00:00:00.000000000 Z
+date: 2020-06-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: win32-process
@@ -71,6 +71,7 @@ files:
 - lib/vagrant-sshfs/action_hostpath_fixup.rb
 - lib/vagrant-sshfs/cap/guest/alpine/sshfs_client.rb
 - lib/vagrant-sshfs/cap/guest/arch/sshfs_client.rb
+- lib/vagrant-sshfs/cap/guest/centos/sshfs_client.rb
 - lib/vagrant-sshfs/cap/guest/debian/sshfs_client.rb
 - lib/vagrant-sshfs/cap/guest/fedora/sshfs_client.rb
 - lib/vagrant-sshfs/cap/guest/freebsd/sshfs_client.rb