vagrant-sshfs 1.3.3 → 1.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3e9ff9b1fd87da6b91c13cfb4105db3effa881e20b2531b9cd4577fe93a3e44c
-  data.tar.gz: ace7bd3d0aecc7be27a6ad38ce54a3feb8fd998d0d372abe0a234e375703160a
+  metadata.gz: 68c00a268dd8b861a0dccc09d8038bade7d6fdda953fa4790fb057ad304c8f5b
+  data.tar.gz: f2e5f1162a74cb9bf5034d243167cca7f69f7e5ecf4bff5d74235c134f232674
 SHA512:
-  metadata.gz: 45788073570dd9a335cc52de46973d980743388d014c376ec4530d94f37c43c5fd58083c41de9e692868d6736258d4c0b84179f8c9ab7fdf884bef09a340bfab
-  data.tar.gz: 4eb66e002b3d2f0d7a2ceacda2a602f043c96199196127830aaa5530c5d1790f66b73aaf41293afffdedcec7b303f9932638b391fcba49507943ca59a28ebe67
+  metadata.gz: 4afe022b17eff7aa2c4bed784dd05e8e9e4701bd6327b9792ff20c4ea551185037dc75a69100dfde7a06f47db9d06c404efeb532161427236d927eaca6257981
+  data.tar.gz: b9828d27f40ca3318c2877e2a6381f01a7d7594a54f96affbb73b2913843bcf4134f059cc458aaa16b600f395907c900f3767f6ebfaa4d3fa810f6606cbe4ef7

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.6'
+  gem "vagrant", :git => "https://github.com/mitchellh/vagrant.git", :ref => 'v2.2.7'
 end
 
 group :plugins do

data/RELEASE.txt

@@ -1,5 +1,8 @@
 
 # point local system to git for vagrant-sshfs
+    - cd /usr/share/vagrant/gems/gems
+    - sudo mv vagrant-sshfs-1.3.3 vsshfs133
+    - sudo ln -s /var/b/shared/code/github.com/dustymabe/vagrant-sshfs ./vagrant-sshfs-1.3.3
 
 # Run misc tests
 cd /var/b/shared/code/github.com/dustymabe/vagrant-sshfs/test/misc

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

@@ -3,13 +3,27 @@ module VagrantPlugins
     module Cap
       class SSHFSClient
         def self.sshfs_install(machine)
-          # Install epel rpm if not installed
-          if !epel_installed(machine)
-            epel_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
 
-          # Install sshfs (comes from epel repos)
-          machine.communicate.sudo("yum -y install fuse-sshfs")
+          case rhel_version
+            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")
+            when :rhel_7, :rhel # rhel7 and rhel6
+              # 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)
@@ -23,11 +37,23 @@ module VagrantPlugins
         end
 
         def self.epel_install(machine)
-          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")
+          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
           end
         end
       end

data/lib/vagrant-sshfs/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-sshfs
 version: !ruby/object:Gem::Version
-  version: 1.3.3
+  version: 1.3.4
 platform: ruby
 authors:
 - Dusty Mabe
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-01-05 00:00:00.000000000 Z
+date: 2020-03-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: win32-process