vagrant-sshfs 1.3.1 → 1.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 4d157c8505dffb3fd49fc1bf75f22f0941021e4f
-  data.tar.gz: d3140fe56a5aaae22881f62a5a3503982979d641
+SHA256:
+  metadata.gz: 4ee5170d16ece9d7e22c89f4638bcaa7e093d1bfad21f888761b2261fdc14d19
+  data.tar.gz: d9992aa2257e45ebeb76ab5f74cfc71ca442ae171a1e7e63a08e5380b283bcd0
 SHA512:
-  metadata.gz: 6d2d085b190c1179951d81802a03d847cf3bddceaebbb0d7324eda7d19a0c4b66ff0c55905761590b498ca9bb5f7ad460dd5e8051f4202ae3c4008ea6b126b34
-  data.tar.gz: 4426f39f7934c6a7b2e314be8f49924792bc418b6ba522c321f372145869bcd48c33aa3f63d46e65d1adb94a1c0e4ba49ac2e6387b104278a26d825fa8b9bc3c
+  metadata.gz: 1b79b0401b7fca07baf62338044b0957d68666537d584ec9cdde577ea28b86c3bae9b1849336f5def723cf3108e30dbce72b600d29a5e26e1385aa1bcd7e6af2
+  data.tar.gz: 358ff68b772b75123b5d13b4d691e957c1ea0e5d6d82071aec5253ece6aeccc57700e5fa7f53202ed957a31510142906d9ba1eb5fa5ad040f24c38d466f5eb74

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 => 'v2.0.2'
+  gem "vagrant", :git => "https://github.com/mitchellh/vagrant.git", :ref => 'v2.2.6'
 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.43'
+  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,8 +1,8 @@
 
+# point local system to git for vagrant-sshfs
 
-# 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
@@ -36,8 +36,12 @@ verify with git verify-tag v1.2.0
 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
 gpg --armor --detach-sign pkg/vagrant-sshfs-1.2.0.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/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/plugin.rb

@@ -127,6 +127,16 @@ module VagrantPlugins
         VagrantPlugins::GuestArch::Cap::SSHFSClient
       end
 
+     guest_capability("alpine", "sshfs_installed") do
+        require_relative "cap/guest/alpine/sshfs_client"
+        VagrantPlugins::GuestAlpine::Cap::SSHFSClient
+      end
+
+      guest_capability("alpine", "sshfs_install") do
+        require_relative "cap/guest/alpine/sshfs_client"
+        VagrantPlugins::GuestAlpine::Cap::SSHFSClient
+      end
+
       guest_capability("suse", "sshfs_installed") do
         require_relative "cap/guest/suse/sshfs_client"
         VagrantPlugins::GuestSUSE::Cap::SSHFSClient

data/lib/vagrant-sshfs/version.rb

@@ -1,5 +1,5 @@
 module VagrantPlugins
   module SyncedFolderSSHFS
-    VERSION = "1.3.1"
+    VERSION = "1.3.2"
   end
 end

data/test/misc/README.txt

@@ -2,7 +2,7 @@
 # This directory is for testing the three different mount modes
 # that are supported by vagrant-sshfs
 
-# To test we will first create the directory on the machien where
+# To test we will first create the directory on the machine where
 # we will mount the guest /etc/ into the host (the reverse mount).
 
 mkdir /tmp/reverse_mount_etc

data/test/misc/Vagrantfile

@@ -21,8 +21,8 @@ Vagrant.configure(2) do |config|
     # mounting /etc/ from vagrant guest into vagrant host
     config.vm.synced_folder "/tmp/reverse_mount_etc/", "/etc", type: "sshfs", reverse: true
 
-    host = 'vagrant-sshfs-tests'
-    box  = 'fedora/25-cloud-base'
+    host = 'sshfs-tests'
+    box  = 'fedora/31-cloud-base'
 
     config.vm.define host do | tmp |
         tmp.vm.hostname = host

data/vagrant-sshfs.gemspec

@@ -25,7 +25,4 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency 'bundler'
   spec.add_development_dependency 'rake'
-  spec.add_development_dependency 'cucumber'
-  spec.add_development_dependency 'aruba'
-  spec.add_development_dependency 'komenda'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-sshfs
 version: !ruby/object:Gem::Version
-  version: 1.3.1
+  version: 1.3.2
 platform: ruby
 authors:
 - Dusty Mabe
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-12 00:00:00.000000000 Z
+date: 2019-12-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: win32-process
@@ -52,48 +52,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: cucumber
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: aruba
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: komenda
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 description: "\n    A Vagrant synced folder plugin that mounts folders via SSHFS.
   \n    This is the successor to Fabio Kreusch's implementation:\n    https://github.com/fabiokr/vagrant-sshfs"
 email:
@@ -108,12 +66,10 @@ files:
 - README.adoc
 - RELEASE.txt
 - Rakefile
-- features/README.md
-- features/sshfs_cwd_mount.feature
-- features/step_definitions/sshfs_cwd_mount_steps.rb
-- features/support/env.rb
+- build.sh
 - lib/vagrant-sshfs.rb
 - 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/debian/sshfs_client.rb
 - lib/vagrant-sshfs/cap/guest/fedora/sshfs_client.rb
@@ -134,13 +90,9 @@ files:
 - lib/vagrant-sshfs/synced_folder/sshfs_reverse_mount.rb
 - lib/vagrant-sshfs/version.rb
 - locales/synced_folder_sshfs.yml
-- test/libvirt/README.txt
-- test/libvirt/Vagrantfile
 - test/misc/README.txt
 - test/misc/Vagrantfile
 - test/misc/dotests.sh
-- test/virtualbox/README.txt
-- test/virtualbox/Vagrantfile
 - vagrant-sshfs.gemspec
 homepage: https://github.com/dustymabe/vagrant-sshfs
 licenses:
@@ -161,21 +113,12 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.14.1
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: 'A Vagrant synced folder plugin that mounts folders via SSHFS.  This is the
   successor to Fabio Kreusch''s implementation: https://github.com/fabiokr/vagrant-sshfs'
 test_files:
-- features/README.md
-- features/sshfs_cwd_mount.feature
-- features/step_definitions/sshfs_cwd_mount_steps.rb
-- features/support/env.rb
-- test/libvirt/README.txt
-- test/libvirt/Vagrantfile
 - test/misc/README.txt
 - test/misc/Vagrantfile
 - test/misc/dotests.sh
-- test/virtualbox/README.txt
-- test/virtualbox/Vagrantfile

data/features/README.md

@@ -1,21 +0,0 @@
-
-We are using Cucumber for automated testing. Read more at the
-following two links:
-
-- [link1](https://en.wikipedia.org/wiki/Cucumber_(software))
-- [link2](http://www.methodsandtools.com/tools/cucumber.php)
-
-features/
-    This is the features directory. The features directory Contains
-    feature files, which all have a .feature extension. May contain
-    subdirectories to organize feature files.
-
-features/step_definitions
-    This directory contains step definition files, which are Ruby code 
-    and have a .rb extension.
-
-features/support
-    This directory contains supporting Ruby code. Files in support
-    load before those in step_definitions, which makes it useful for
-    such things as environment configuration (commonly done in a file
-    called env.rb).

data/features/sshfs_cwd_mount.feature

@@ -1,46 +0,0 @@
-# The language in this file is Gherkin. It is the language Cucumber
-# uses to define test cases and is designed to be non-technical and
-# human readable. All Gherkin files have a .feature extension
-#
-# See more here: https://en.wikipedia.org/wiki/Cucumber_(software)
-#
-# Additionally in the setup/env.rb file we set up Aruba. Aruba is used
-# to define most of the basic step definitions that we use as part of
-# the Gherkin syntax in this file.
-#
-# For more information on the step definitions provided see:
-# https://github.com/cucumber/aruba/tree/bb5d7ff71809b5461e29153ded793d2b9a3a0624/features/testing_frameworks/cucumber/steps
-#
-Feature: SSHFS mount of vagrant current working directory
-
-  Scenario Outline: SSHFS mounting of vagrant cwd
-    Given a file named "Vagrantfile" with:
-    """
-    Vagrant.configure('2') do |config|
-      config.vm.box = '<box>'
-      # Disable the default rsync
-      config.vm.synced_folder '.', '/vagrant', disabled: true
-
-      # If using libvirt and nested virt (vagrant in vagrant) then
-      # we need to use a different network than 192.168.121.0
-      config.vm.provider :libvirt do |libvirt|
-        libvirt.management_network_name = 'vagrant-libvirt-test'
-        libvirt.management_network_address = '192.168.129.0/24'
-      end
-
-      # Mount up the current dir. It will have the Vagrantfile in there.
-      config.vm.synced_folder './', '/testdir', type: 'sshfs'
-    end
-    """
-    When I successfully run `bundle exec vagrant up`
-    Then stdout from "bundle exec vagrant up" should contain "Installing SSHFS client..."
-    And  stdout from "bundle exec vagrant up" should contain "Mounting SSHFS shared folder..."
-    And  stdout from "bundle exec vagrant up" should contain "Folder Successfully Mounted!"
-    # The code for the following test is in ./step_definitions/sshfs_cwd_mount_steps.rb
-    And vagrant current working directory should be mounted
-
-    Examples:
-      | box      |
-      | centos/7 |
-
-

data/features/step_definitions/sshfs_cwd_mount_steps.rb

@@ -1,12 +0,0 @@
-# This is a cucumber step definition. Cucumber scenarios become automated
-# tests with the addition of what are called step definitions. A step
-# definition is a block of code associated with one or more steps by a
-# regular expression (or, in simple cases, a string).
-#
-# This is the step definition for the `And vagrant current working
-# directory should be mounted` step from sshfs_cwd_mount.feature
-#
-And(/^vagrant current working directory should be mounted$/) do
-  run("vagrant ssh -c 'ls /testdir/Vagrantfile'")
-  expect(last_command_started).to have_exit_status(0)
-end

data/features/support/env.rb

@@ -1,27 +0,0 @@
-# This is a support file for the cucumber tests. This file sets up the
-# environment for the tests to run. At this point mainly that means
-# configuring Aruba. Aruba is used to define most of the basic step
-# definitions that we use as part of the Gherkin syntax in our .feature files.
-#
-# For more information on the step definitions provided see:
-# https://github.com/cucumber/aruba/tree/bb5d7ff71809b5461e29153ded793d2b9a3a0624/features/testing_frameworks/cucumber/steps
-require 'aruba/cucumber'
-require 'komenda' # use komenda for easily executing a command
-
-# Configure aruba. The options can be inferred from here:
-# https://github.com/cucumber/aruba/tree/bb5d7ff71809b5461e29153ded793d2b9a3a0624/features/configuration
-Aruba.configure do |config|
-  # Wait up to 300 seconds for the test to run
-  config.exit_timeout = 300
-  # Output stdout and stderr on test failure
-  config.activate_announcer_on_command_failure = [:stdout, :stderr]
-  # The directory where the tests are to be run
-  config.working_directory = 'build/aruba'
-end
-
-# After running tests, clean up
-After do |_scenario|
-  if File.exist?(File.join(aruba.config.working_directory, 'Vagrantfile'))
-    Komenda.run('bundle exec vagrant destroy -f', cwd: aruba.config.working_directory, fail_on_fail: true)
-  end
-end

data/test/libvirt/README.txt

@@ -1,23 +0,0 @@
-
-To bring up vagrant host:
-
-vagrant up
-
-To run tests:
-
-vagrant ssh
-
-and then:
-
-cd /sharedfolder/code/github.com/dustymabe/vagrant-sshfs/
-gem install bundler           # see [2]
-bundle install --with plugins # see [1]
-bundle exec rake featuretests
-
-[1] when running with bundler 1.13.2 I had to comment out
-    the vagrant-sshfs line in Gemfile because it errored out
-    complaining about it being defined twice. Running with
-    1.12.5 works fine.
-[2] because of [1] need to use this instead:
-      gem install bundler --version 1.12.5
-

data/test/libvirt/Vagrantfile

@@ -1,35 +0,0 @@
-# -*- mode: ruby -*-
-# vi: set ft=ruby :
-Vagrant.configure(2) do |config|
-
-    config.ssh.insert_key = 'true'
-    config.vm.synced_folder "/guests/sharedfolder", "/sharedfolder", type: "sshfs"
-
-    config.vm.provider :libvirt do |domain|
-      domain.memory = 4096
-      domain.cpus = 4
-      domain.nested = true
-    end
-
-    host = 'viv-libvirt' # vagrant in vagrant - to test libvirt
-    box  = 'fedora/25-cloud-base'
-
-    config.vm.define host do | tmp |
-        tmp.vm.hostname = host
-        tmp.vm.box = box
-    end
-  config.vm.provision "shell", inline: <<-SHELL
-    rpms=(
-      libvirt-daemon-kvm                         # for vagrant libvirt support
-      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
-    )
-    dnf install -y ${rpms[@]}
-    usermod -a -G libvirt vagrant
-    systemctl start libvirtd virtlogd
-  SHELL
-end

data/test/virtualbox/README.txt

@@ -1,25 +0,0 @@
-# XXX Note this is not working right now as nested virt. I keep
-# getting kernel tracebacks on Fedora 24.
-
-To bring up vagrant host:
-
-vagrant up
-
-To run tests:
-
-vagrant ssh
-
-and then:
-
-cd /sharedfolder/code/github.com/dustymabe/vagrant-sshfs/
-gem install bundler           # see [2]
-bundle install --with plugins # see [1]
-bundle exec rake featuretests
-
-[1] when running with bundler 1.13.2 I had to comment out
-    the vagrant-sshfs line in Gemfile because it errored out
-    complaining about it being defined twice. Running with
-    1.12.5 works fine.
-[2] because of [1] need to use this instead:
-      gem install bundler --version 1.12.5
-

data/test/virtualbox/Vagrantfile

@@ -1,42 +0,0 @@
-# -*- mode: ruby -*-
-# vi: set ft=ruby :
-#
-# XXX Note this is not working right now as nested virt. I keep
-# getting kernel tracebacks on Fedora 24.
-#
-Vagrant.configure(2) do |config|
-
-  config.ssh.insert_key = 'true'
-  config.vm.synced_folder "/guests/sharedfolder", "/sharedfolder", type: "sshfs"
-
-  config.vm.provider :libvirt do |domain|
-    domain.memory = 4096
-    domain.cpus = 4
-    domain.nested = true
-  end
-
-  host = 'viv-virtbox' # vagrant in vagrant - to test virtbox
-  box  = 'fedora/25-cloud-base'
-
-  config.vm.define host do | tmp |
-      tmp.vm.hostname = host
-      tmp.vm.box = box
-  end
-  # Must use VirtualBox-5.0 - 5.1 not supported by Vagrant yet
-  config.vm.provision "shell", inline: <<-SHELL
-    dnf config-manager --add-repo http://download.virtualbox.org/virtualbox/rpm/fedora/virtualbox.repo
-    rpms=(
-      kernel-devel-$(uname -r) kernel-headers-$(uname -r)
-      gcc make VirtualBox-5.0                    # all for virtualbox support
-      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
-    )
-    dnf install -y ${rpms[@]}
-    /usr/lib/virtualbox/vboxdrv.sh setup
-    usermod -a -G vboxusers vagrant
-  SHELL
-end