vagrant-sshfs 1.3.0 → 1.3.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: e143084a7768bace31ec459ae109ee5ccf28c7d2
-  data.tar.gz: 3e24221afc2606cbee0bde74375533a5f4e9e753
+SHA256:
+  metadata.gz: 6513280765fd1bba7182361d9f45354f46bf094d4880da5aa53f37f25fdaab3b
+  data.tar.gz: 8eda8064052fca6390542acf1ce1a63aa98e04f4c69e8c9a66ff197cc868efcc
 SHA512:
-  metadata.gz: 41a384e958c32f8dff2d5382ae2e98ceced18af213967f3709d8310fc103ea08b00394a5c5e20ed83cb7399739caca4d5227e8ec199fa6ab2f4daf5949cfbb46
-  data.tar.gz: 313b0fa48db0015bb8862918975a5d090af0e42324ce93aff202d1cd5a840b759f5e331f74ad24495e5a6f2ab3ebc2cf569d3dfd0ed1995e173f5ce89b2eb993
+  metadata.gz: b7541dfccd42e153b37da97bc8d84427ca0c87674b0d2333861d98fb946b4ca3847d9c51ac0bb511525207554b21c075a9e22bba3fd6699f03737d877abad24d
+  data.tar.gz: 2e494e523004ded8fcd6644bcdf951728a534110df6d898a2fd55350f7df64842ac089483783c2433d76c4478e30e9185fbde16fff7280a09675749f47da4385

data/Gemfile

@@ -6,12 +6,11 @@ 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 => 'v1.8.6'
+  gem "vagrant", :git => "https://github.com/mitchellh/vagrant.git", :ref => 'v2.2.9'
 end
 
 group :plugins do
-  gem "vagrant-sshfs" , path: "."
   # Add vagrant-libvirt plugin here, otherwise you won't be able to
   # use libvirt as a provider when you execute `bundle exec vagrant up`
-  gem "vagrant-libvirt" , '0.0.33'
+  gem "vagrant-libvirt" , '0.0.45'
 end

data/README.adoc

@@ -33,6 +33,9 @@ exists on Linux/Mac. On windows you only need to install
 https://cygwin.com/cgi-bin2/package-grep.cgi?grep=openssh&arch=x86_64[openssh]
 via https://cygwin.com/[cygwin] and you will get `sftp-server`.
 
+Also, we recommend running vagrant from the cygwin provided terminal. There have
+been issues with other shells leading to problems with mounts.
+
 
 [[history]]
 == History
@@ -290,12 +293,6 @@ test and install this plugin on your local machine:
 # Install development dependencies
 $ gem install bundler && bundle install
 
-# List available Rake tasks
-$ bundle exec rake -T
-
-# Run Cucumber tests
-$ bundle exec rake featuretests
-
 # Build the gem (gets generated in the 'pkg' directory
 $ bundle exec rake build
 

data/RELEASE.txt

@@ -1,51 +1,59 @@
 
+# 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 viv tests
-cd /guests/sharedfolder/code/github.com/dustymabe/vagrant-sshfs/test/libvirt
-vagrant up
+# Run misc tests
+cd /var/b/shared/code/github.com/dustymabe/vagrant-sshfs/test/misc
 follow README for running tests
 
 # Make sure to bump version in lib/vagrant-sshfs/version.rb and commit
 # DO NOT TAG YET
 
+# Craft a commit message for the tag.
+LASTTAG='v1.3.1'
+VERSION='1.3.2'
+NEWTAG="v${VERSION}"
+cat <<EOF > release-notes.txt
+This is release ${NEWTAG} of the vagrant-sshfs plugin.
 
-# Craft a commit message for the tag. View the commit message for
-  a previous tag by running: git tag -l -n100 v1.2.1
+Thanks to the following contributors for patches during this release: 
 
--> In vim add thanks to contributors - grab info with
-   git log --no-merges --pretty=format:"%h - %an - %s"
-   and
-   git log --no-merges --pretty=format:"%h - %ae - %s"
-   
-
--> In vim add commit log - grab with 
-   git log --no-merges --pretty=format:"%h %s"
-
--> In vim add release message - see previous tag for example
+$(git shortlog --no-merges --pretty=format:"%h %s" -e ${LASTTAG}..HEAD)
+EOF
 
 # After crafting message then install git-evtag and sign
 
-git-evtag sign vX.X.X
+git-evtag sign ${NEWTAG}
 
 
 close and type in password for signing
 
-verify with git-evtag verify v1.2.0
-verify with git verify-tag v1.2.0 
+verify with git-evtag verify ${NEWTAG}
+verify with git verify-tag ${NEWTAG}
 
 git push
 git push --tags 
 
-# Build with bundle exec rake build (inside viv VM)
-bundle exec rake build
+# Build with build.sh script (uses buildah)
+# We must run it in a buildah unshare session. Otherwise we get the error:
+#
+#   ++ buildah mount fedora-working-container
+#   cannot mount using driver overlay in rootless mode. You need to run it in a `buildah unshare` session
+buildah unshare ./build.sh
+
+# Sign the output (This will create a .asc file)
+gpg2 --armor --detach-sign ./vagrant-sshfs-${VERSION}.gem
+
+# make tar.gz and zip files
+git archive --format=tar.gz ${NEWTAG} > vagrant-sshfs-${VERSION}.tar.gz
+gpg2 --armor --detach-sign vagrant-sshfs-${VERSION}.tar.gz
+git archive --format=zip ${NEWTAG} > vagrant-sshfs-${VERSION}.zip
+gpg2 --armor --detach-sign vagrant-sshfs-${VERSION}.zip
 
-# Sign the output
-gpg --armor --detach-sign pkg/vagrant-sshfs-1.2.0.gem
-$ ls pkg/vagrant-sshfs-1.2.0.gem* 
-pkg/vagrant-sshfs-1.2.0.gem  pkg/vagrant-sshfs-1.2.0.gem.asc
 
 # Update release notes and upload files on github
 
 # push to rubygems with:
-gem push pkg/vagrant-sshfs-1.2.0.gem
-
+gem push ./vagrant-sshfs-${VERSION}.gem

data/Rakefile

@@ -7,9 +7,6 @@
 #
 require 'bundler/gem_tasks'
 
-# cucumber/rake/task provides us with an easy way to call cucumber
-require 'cucumber/rake/task'
-
 # rake/clean provides CLEAN/CLOBBER
 # http://www.virtuouscode.com/2014/04/28/rake-part-6-clean-and-clobber/
 # CLEAN - list to let rake know what files can be cleaned up after build
@@ -29,10 +26,3 @@ CLOBBER.include('pkg')
 task :init do
   FileUtils.mkdir_p 'build'
 end
-
-# Create new Cucumber::Rake::Task that will run Cucumber tests
-Cucumber::Rake::Task.new(:featuretests)
-
-# Define Rake::Task dependency - run :init before :featuretests
-task :featuretests => :init
-

data/build.sh

@@ -0,0 +1,43 @@
+#!/bin/bash -x
+set -ex
+
+ctr=$(buildah from registry.fedoraproject.org/fedora:31)
+
+rpms=(
+  make gcc ruby ruby-devel redhat-rpm-config # for building gems
+  gcc-c++                                    # for building unf_ext
+  libvirt-devel                              # for building ruby-libvirt gem
+  zlib-devel                                 # for building nokogiri gem
+  git                                        # for the git ls-files in gemspec file
+  bsdtar                                     # used by vagrant to unpack box files
+)
+
+WORKINGDIR='/tmp/workingdir/'
+
+# Set working directory
+buildah config --workingdir $WORKINGDIR $ctr
+
+# Get all updates and install needed rpms
+buildah run $ctr -- dnf update -y
+buildah run $ctr -- dnf install -y ${rpms[@]}
+
+# Add source code
+buildah add $ctr './' $WORKINGDIR
+
+# Install bundler
+buildah run $ctr -- gem install bundler
+
+# Install all needed gems
+buildah run $ctr -- bundle install --with plugins
+
+# Install all needed gems
+buildah run $ctr -- bundle exec rake build
+
+# Copy built files outside of container
+mount=$(buildah mount $ctr)
+package=$(ls $mount/$WORKINGDIR/pkg/vagrant-sshfs-*gem)
+echo "copying to ./$(basename $package)"
+cp $package ./
+buildah umount $ctr
+
+echo "Built package is at ./$(basename $package)"

data/lib/vagrant-sshfs.rb

@@ -4,8 +4,8 @@ rescue LoadError
   raise "The Vagrant sshfs plugin must be run within Vagrant"
 end
 
-# Only load the gem on Windows since it replaces some methods in Ruby's 
-# Process class. Also load it here before Process.uid is called the first 
+# Only load the gem on Windows since it replaces some methods in Ruby's
+# Process class. Also load it here before Process.uid is called the first
 # time by Vagrant. The Process.create() function actually gets used in
 # lib/vagrant-sshfs/cap/guest/linux/sshfs_forward_mount.rb
 if Vagrant::Util::Platform.windows?

data/lib/vagrant-sshfs/action_hostpath_fixup.rb

@@ -0,0 +1,130 @@
+require "log4r"
+
+require "vagrant/action/builtin/mixin_synced_folders"
+
+module VagrantPlugins
+  module SyncedFolderSSHFS
+
+    # Class that contains common function that are called by both
+    # HostPathFix and HostPathUnfix classes.
+    class HostPathFixCommon
+
+      include Vagrant::Action::Builtin::MixinSyncedFolders
+
+      def initialize()
+        @logger = Log4r::Logger.new("vagrant::synced_folders::sshfs")
+      end
+
+      def fix(data)
+        # If this is an arbitrary host mount we need to set the hostpath
+        # to something that will pass the config checks that assume the
+        # hostpath is coming from the vagrant host and not from an arbitrary
+        # host. Save off the original hostpath and then set the hostpath to 
+        # "." to pass the checks.
+        if data[:ssh_host]
+          data[:hostpath_orig] = data[:hostpath]
+          data[:hostpath] = "."
+        end
+      end
+
+      def unfix(data)
+        # If this is a reverse mounted folder or an arbitrary host mount
+        # then we'll set "hostpath_exact" so they don't try to create a
+        # folder on the host in Vagrant::Action::Builtin::SyncedFolders.
+        if data[:ssh_host]
+          data[:hostpath_exact] = true
+          data[:hostpath] = data[:hostpath_orig]
+          data.delete(:hostpath_orig)
+        end
+      end
+
+      # Loop through synced folder entries and either fix or unfix
+      # based on the fix arg
+      def loop_and_fix_unfix(env, fix)
+
+        opts = {
+          cached: !!env[:synced_folders_cached],
+          config: env[:synced_folders_config],
+        }
+
+        @logger.debug("SyncedFolders loading from cache: #{opts[:cached]}")
+        folders = synced_folders(env[:machine], **opts)
+
+        folders.each do |impl_name, fs|
+          next if impl_name != :sshfs
+          @logger.debug("Synced Folder Implementation: #{impl_name}")
+
+          fs.each do |id, data|
+
+            # replace data with a copy since we may delete/add new data to the config
+            data = data.dup
+
+            if fix
+                @logger.debug("fixup host path before:  - #{id}: #{data[:hostpath]} => #{data[:guestpath]}")
+                fix(data)
+                @logger.debug("fixup host path after:  - #{id}: #{data[:hostpath]} => #{data[:guestpath]}")
+            else
+                @logger.debug("unfixup host path before:  - #{id}: #{data[:hostpath]} => #{data[:guestpath]}")
+                unfix(data)
+                @logger.debug("fixup host path after:  - #{id}: #{data[:hostpath]} => #{data[:guestpath]}")
+            end
+
+            # Replace the entry in the config with the updated one
+            env[:machine].config.vm.synced_folders.delete(id)
+            env[:machine].config.vm.synced_folder(
+                data[:hostpath],
+                data[:guestpath],
+                data)
+          end
+        end
+      end
+    end
+
+    # Class that will massage the data for synced folders that are
+    # arbitrary host mounts (contain ssh_host in the options) to make
+    # it so that "host path checking" isn't performed on the vagrant
+    # host machine
+    class HostPathFix
+
+      def initialize(app, env)
+        @app    = app
+        @logger = Log4r::Logger.new("vagrant::synced_folders::sshfs")
+      end
+
+      def call(env)
+        classname = "VagrantPlugins::SyncedFolderSSHFS::HostPathFix"
+        @logger.debug("Executing hook within #{classname}")
+
+        # This part is for the IN action call
+        HostPathFixCommon.new().loop_and_fix_unfix(env, fix=true)
+
+        # Now continue until the OUT call
+        @app.call(env)
+
+      end
+    end
+
+
+    # Class that will undo the data manipulation that was done in
+    # HostPathFix and also set hostpath_exact=true if necessary
+    class HostPathUnfix
+
+      def initialize(app, env)
+        @app    = app
+        @logger = Log4r::Logger.new("vagrant::synced_folders::sshfs")
+      end
+
+      def call(env)
+        classname = "VagrantPlugins::SyncedFolderSSHFS::HostPathUnfix"
+        @logger.debug("Executing hook within #{classname}")
+
+        # This part is for the IN action call
+        HostPathFixCommon.new().loop_and_fix_unfix(env, fix=false)
+
+        # Now continue until the OUT call
+        @app.call(env)
+
+      end
+    end
+  end
+end

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

@@ -0,0 +1,24 @@
+module VagrantPlugins
+  module GuestAlpine
+    module Cap
+      class SSHFSClient
+        def self.sshfs_install(machine)
+          # Install sshfs
+          machine.communicate.sudo("apk add sshfs")
+          # Load the fuse module
+          machine.communicate.sudo("modprobe fuse")
+        end
+
+        def self.sshfs_installed(machine)
+          installed = machine.communicate.test("apk -e info sshfs")
+          if installed
+              # fuse may not get loaded at boot, so check if it's loaded otherwise force load it
+              machine.communicate.sudo("lsmod | grep fuse || modprobe fuse")
+          end
+
+          installed
+        end
+      end
+    end
+  end
+end

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/debian/sshfs_client.rb

@@ -3,6 +3,7 @@ module VagrantPlugins
     module Cap
       class SSHFSClient
         def self.sshfs_install(machine)
+          machine.communicate.sudo("apt-get update")
           machine.communicate.sudo("apt-get install -y sshfs")
         end
 

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

@@ -0,0 +1,22 @@
+module VagrantPlugins
+  module GuestFreeBSD
+    module Cap
+      class SSHFSClient
+        def self.sshfs_install(machine)
+          machine.communicate.sudo("pkg install -y fusefs-sshfs")
+          machine.communicate.sudo("kldload fuse")
+        end
+
+        def self.sshfs_installed(machine)
+          installed = machine.communicate.test("pkg info fusefs-sshfs")
+          if installed
+              # fuse may not get loaded at boot, so check if it's loaded otherwise force load it
+              machine.communicate.sudo("kldstat -m fuse || kldload fuse")
+          end
+
+          installed
+        end
+      end
+    end
+  end
+end

data/lib/vagrant-sshfs/cap/guest/freebsd/sshfs_forward_mount.rb

@@ -0,0 +1,13 @@
+require_relative "../linux/sshfs_forward_mount"
+
+module VagrantPlugins
+  module GuestFreeBSD
+    module Cap
+      class MountSSHFS < VagrantPlugins::GuestLinux::Cap::MountSSHFS
+        def self.list_mounts_command
+          "mount -p"
+        end
+      end
+    end
+  end
+end