vagrant-sshfs 1.1.0 → 1.2.0

data/lib/vagrant-sshfs.rb

@@ -4,6 +4,14 @@ 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 
+# 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?
+  require 'win32/process'
+end
+
 require "vagrant-sshfs/errors"
 require "vagrant-sshfs/version"
 require "vagrant-sshfs/plugin"

data/locales/synced_folder_sshfs.yml

@@ -3,7 +3,14 @@ en:
     sshfs:
       actions:
         installing: Installing SSHFS client...
-        mounting: Mounting SSHFS shared folders...
+        mounting: Mounting SSHFS shared folder...
+        unmounting: Unmounting SSHFS shared folder...
+        unmounting_folder: |-
+          Unmounting SSHFS shared folder mounted at %{guestpath}
+        reverse_unmounting_folder: |-
+          Unmounting SSHFS shared folder mounted at host's %{hostpath}
+        reverse_mounting_folder: |-
+          mounting folder via SSHFS: guestpath:%{guestpath} => hostpath:%{hostpath}
         slave_mounting_folder: |-
           Mounting folder via SSHFS: %{hostpath} => %{guestpath}
         normal_mounting_folder: |-
@@ -15,7 +22,9 @@ en:
         detected_host_ip: |-
           Detected host IP address is '%{ip}'
         already_mounted: |-
-          The folder %{folder} in the guest already mounted.
+          The folder %{folder} in the %{location} is already mounted.
+        not_mounted: |-
+          The folder %{folder} in the %{location} is not mounted.
       errors:
         communicator_not_ready: |-
           The machine is reporting that it is not ready to communicate via ssh. Verify
@@ -50,7 +59,35 @@ en:
           Stderr from the command:
 
           %{stderr}
+        reverse_mount_failed: |-
+          Mounting SSHFS shared folder via reverse SSHFS mount failed. Please
+          look at the below output from from the processes that were run.
+
+          SSHFS command output:
+
+          %{sshfs_output}
         slave_mount_failed: |-
-          Mounting SSHFS shared via slave SSHFS mount failed. Please look at your 
-          terminal scrollback to look for any error messages from the processes that 
-          were run.
+          Mounting SSHFS shared folder via slave SSHFS mount failed. Please
+          look at the below STDERR output from the processes that were run.
+
+          SSH command:
+
+          %{ssh_stderr}
+
+          SFTP command:
+
+          %{sftp_stderr}
+        unmount_failed: |-
+          Unmount the SSHFS mount failed.
+
+          The command and output are:
+
+          %{command}
+
+          Stdout from the command:
+
+          %{stdout}
+
+          Stderr from the command:
+
+          %{stderr}

data/test/libvirt/README.txt

@@ -0,0 +1,15 @@
+
+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
+bundle install
+bundle exec rake featuretests

data/test/libvirt/Vagrantfile

@@ -0,0 +1,35 @@
+# -*- 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/24-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/misc/README.txt

@@ -0,0 +1,29 @@
+
+# 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
+# we will mount the guest /etc/ into the host (the reverse mount).
+
+mkdir /tmp/reverse_mount_etc
+
+# Next we will define where our 3rd party host is (the normal mount).
+# This can be another vagrant box or whatever machine you want.
+export THIRD_PARTY_HOST='192.168.121.73'                                                                                                                                               
+export THIRD_PARTY_HOST_USER='vagrant'                                                                                                                                                 
+export THIRD_PARTY_HOST_PASS='vagrant'
+
+# Next vagrant up - will do 3 mounts (normal, slave, reverse).
+vagrant up
+
+# Next run the script to test the mounts:
+$ bash dotests.sh 
+Testing normal mount!
+a57e39fa692f294e860349a9451be67c
+Testing slave mount!
+e2c4ceac71dc414cb3ed864cff04a917
+Testing reverse mount!
+508619e7e68e446c84d1fcdf7e0dc577
+
+# We are printing out the machine-id under each mount to prove each
+# mount is from a different machine.

data/test/misc/Vagrantfile

@@ -0,0 +1,27 @@
+Vagrant.configure(2) do |config|
+
+    config.ssh.insert_key = 'true'
+
+    # Test a forward normal mount: 
+    #     mounting a folder from a 3rd party host into guest
+    config.vm.synced_folder "/etc/", "/tmp/forward_normal_mount_etc/", type: "sshfs",
+        ssh_host: ENV['THIRD_PARTY_HOST'],
+        ssh_username: ENV['THIRD_PARTY_HOST_USER'],
+        ssh_password: ENV['THIRD_PARTY_HOST_PASS']
+
+    # Test a forward slave mount: 
+    #   mounting /etc/ from the vagrant host into the guest
+    config.vm.synced_folder "/etc/", "/tmp/forward_slave_mount_etc/", type: "sshfs"
+
+    # Test a reverse mount:
+    # 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/24-cloud-base'
+
+    config.vm.define host do | tmp |
+        tmp.vm.hostname = host
+        tmp.vm.box = box
+    end
+end

data/test/misc/dotests.sh

@@ -0,0 +1,13 @@
+#!/bin/bash
+set -eu
+
+# Test the three mounts we have done
+
+echo "Testing normal mount!"
+vagrant ssh -- cat /tmp/forward_normal_mount_etc/machine-id
+
+echo "Testing slave mount!"
+vagrant ssh -- cat /tmp/forward_slave_mount_etc/machine-id
+
+echo "Testing reverse mount!"
+cat /tmp/reverse_mount_etc/machine-id

data/test/virtualbox/README.txt

@@ -0,0 +1,17 @@
+# 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
+bundle install
+bundle exec rake featuretests

data/test/virtualbox/Vagrantfile

@@ -0,0 +1,42 @@
+# -*- 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/24-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

data/vagrant-sshfs.gemspec

@@ -21,6 +21,11 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_development_dependency "bundler", "~> 1.7"
-  spec.add_development_dependency "rake", "~> 10.0"
+  spec.add_dependency 'win32-process'
+
+  spec.add_development_dependency 'bundler', '~> 1.7'
+  spec.add_development_dependency 'rake', '~> 10.0'
+  spec.add_development_dependency 'cucumber', '~> 2.1'
+  spec.add_development_dependency 'aruba', '~> 0.13'
+  spec.add_development_dependency 'komenda', '~> 0.1.6'
 end

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-sshfs
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Dusty Mabe
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-30 00:00:00.000000000 Z
+date: 2016-08-08 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: win32-process
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -38,6 +52,48 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
+- !ruby/object:Gem::Dependency
+  name: cucumber
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.1'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.1'
+- !ruby/object:Gem::Dependency
+  name: aruba
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.13'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.13'
+- !ruby/object:Gem::Dependency
+  name: komenda
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.1.6
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.1.6
 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:
@@ -46,24 +102,39 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".gitignore"
 - Gemfile
 - LICENSE
 - README.md
 - Rakefile
+- features/README.md
+- features/sshfs_cwd_mount.feature
+- features/step_definitions/sshfs_cwd_mount_steps.rb
+- features/support/env.rb
 - lib/vagrant-sshfs.rb
-- lib/vagrant-sshfs/cap/arch/sshfs_client.rb
-- lib/vagrant-sshfs/cap/debian/sshfs_client.rb
-- lib/vagrant-sshfs/cap/fedora/sshfs_client.rb
-- lib/vagrant-sshfs/cap/linux/sshfs_client.rb
-- lib/vagrant-sshfs/cap/linux/sshfs_mount.rb
-- lib/vagrant-sshfs/cap/redhat/sshfs_client.rb
-- lib/vagrant-sshfs/cap/suse/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
+- lib/vagrant-sshfs/cap/guest/linux/sshfs_client.rb
+- lib/vagrant-sshfs/cap/guest/linux/sshfs_forward_mount.rb
+- lib/vagrant-sshfs/cap/guest/redhat/sshfs_client.rb
+- lib/vagrant-sshfs/cap/guest/suse/sshfs_client.rb
+- lib/vagrant-sshfs/cap/host/linux/sshfs_reverse_mount.rb
 - lib/vagrant-sshfs/command.rb
 - lib/vagrant-sshfs/errors.rb
 - lib/vagrant-sshfs/plugin.rb
 - lib/vagrant-sshfs/synced_folder.rb
+- lib/vagrant-sshfs/synced_folder/sshfs_forward_mount.rb
+- 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:
@@ -85,9 +156,20 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.5.1
 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: []
+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