vagrant-nfs_guest 0.0.4 → 0.1.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: dce3470eb4d34a59abc8737fa5163830ab382f2f
+  data.tar.gz: b81fd5ff295c881ec9c6ee377010970bdca3bc5a
+SHA512:
+  metadata.gz: 7a32e270cbdb9481d83a7f213986b6927ac7c3c28cbad7a7cea979ba1969b0076cab824f7255418e8927140bca1a410a6fea9fb447839e6802668dee69d46d46
+  data.tar.gz: b5b32a5a565c58420ad3c2d733740f073f208914c25a8c2d3d3a4f44ad9f3968dbb915e02c1b964096e527e9d8b705ac14a4504f1d03dce78ce86e00426ecb2b

data/Gemfile

@@ -1,11 +1,15 @@
 source 'https://rubygems.org'
 
 # Specify your gem's dependencies in vagrant-nfs_guest.gemspec
-gemspec
+#gemspec
 
 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 => "git://github.com/mitchellh/vagrant.git"
+  # 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 => "git://github.com/mitchellh/vagrant.git"
+end
+
+group :plugins do
+  gem "vagrant-nfs_guest", path: "."
 end

data/README.md

@@ -1,5 +1,16 @@
 # Vagrant-NFS_Guest
 
+## What's New?
+
+- Supports Vagrant 1.6!
+- Handles actions 'up', 'halt', 'destroy', 'suspend', 'resume' and 'package' properly
+- Uses retryable() for host to guest communications allow more fault tolerance
+- Better error messages and handling
+- Re-organisation of modules and class to better match Vagrant proper
+- Simplified the plugin events binding
+
+## Overview
+
 Allows a guest VM to export synced folders via NFS and the host to mount them.
 
 Basically it's just the usual NFS synced folders in Vagrant but the roles are reversed.

data/lib/vagrant-nfs_guest/action/mount_nfs.rb

@@ -0,0 +1,39 @@
+require 'json'
+module VagrantPlugins
+  module SyncedFolderNFSGuest
+    module Action
+      class MountNFS
+
+        def initialize(app,env)
+          @app = app
+          @logger = Log4r::Logger.new("vagrant-nfs_guest::action::unmount_nfs")
+        end
+
+        def call(env)
+          @machine = env[:machine]
+
+          if @machine.state.id == :running
+
+            raise Vagrant::Errors::NFSNoHostIP if !env[:nfs_guest_host_ip]
+            raise Vagrant::Errors::NFSNoGuestIP if !env[:nfs_guest_machine_ip]
+
+            machine_ip = env[:nfs_guest_machine_ip]
+            machine_ip = [machine_ip] if !machine_ip.is_a?(Array)
+
+            # Mount guest NFS folders
+            @machine.ui.info(I18n.t("vagrant_nfs_guest.actions.vm.nfs.mounting"))
+            folders = @machine.config.vm.synced_folders
+
+            @machine.env.host.capability(
+              :nfs_mount,
+              @machine.ui, @machine.id, machine_ip, folders
+            )
+          end
+
+          @app.call(env)
+
+        end
+      end
+    end
+  end
+end

data/lib/vagrant-nfs_guest/action/prepare_nfs_guest_settings.rb

@@ -10,17 +10,19 @@ module VagrantPlugins
 
         def initialize(app,env)
           @app = app
-          @logger = Log4r::Logger.new("vagrant::action::vm::nfs_guest")
+          @logger = Log4r::Logger.new("vagrant-nfs_guest::action::prepare_nfs_guest_settings")
         end
 
         def call(env)
           @machine = env[:machine]
-          @app.call(env)
 
           if using_nfs?
             @logger.info("Using NFS_guest, preparing NFS settings by reading host IP and machine IP")
-            add_nfs_settings_to_env!(env)
+            add_ips_to_env!(env)
           end
+
+          @app.call(env)
+
         end
 
         # We're using NFS if we have any synced folder with NFS configured. If
@@ -35,10 +37,9 @@ module VagrantPlugins
         # mounting.
         #
         # The ! indicates that this method modifies its argument.
-        def add_nfs_settings_to_env!(env)
+        def add_ips_to_env!(env)
           adapter, host_ip = find_host_only_adapter
-          machine_ip       = nil
-          machine_ip       = read_machine_ip(adapter) if adapter
+          machine_ip       = read_static_machine_ips || read_dynamic_machine_ip(adapter)
 
           raise Vagrant::Errors::NFSNoHostonlyNetwork if !host_ip || !machine_ip
 
@@ -64,6 +65,25 @@ module VagrantPlugins
           nil
         end
 
+        # Returns the IP address(es) of the guest by looking for static IPs
+        # given to host only adapters in the Vagrantfile
+        #
+        # @return [Array]<String> Configured static IPs
+        def read_static_machine_ips
+          ips = []
+          @machine.config.vm.networks.each do |type, options|
+            if type == :private_network && options[:ip].is_a?(String)
+              ips << options[:ip]
+            end
+          end
+
+          if ips.empty?
+            return nil
+          end
+
+          ips
+        end
+
         # Returns the IP address of the guest by looking at vbox guest property
         # for the appropriate guest adapter.
         #
@@ -72,7 +92,7 @@ module VagrantPlugins
         #
         # @param [Integer] adapter number to read IP for
         # @return [String] ip address of adapter
-        def read_machine_ip(adapter)
+        def read_dynamic_machine_ip(adapter)
           # vbox guest properties are 0-indexed, while showvminfo network
           # interfaces are 1-indexed. go figure.
           guestproperty_adapter = adapter - 1

data/lib/vagrant-nfs_guest/action/unmount_nfs.rb

@@ -0,0 +1,31 @@
+module VagrantPlugins
+  module SyncedFolderNFSGuest
+    module Action
+      class UnmountNFS
+
+        def initialize(app,env)
+          @app = app
+          @logger = Log4r::Logger.new("vagrant-nfs_guest::action::unmount_nfs")
+        end
+
+        def call(env)
+          @machine = env[:machine]
+
+          if @machine.state.id == :running
+            # unmount any host mounted NFS folders
+            @machine.ui.info(I18n.t("vagrant_nfs_guest.actions.vm.nfs.unmounting"))
+            folders = @machine.config.vm.synced_folders
+
+            @machine.env.host.capability(
+              :nfs_unmount,
+              @machine.ui, folders
+            )
+          end
+
+          @app.call(env)
+
+        end
+      end
+    end
+  end
+end

data/lib/vagrant-nfs_guest/config.rb

@@ -3,17 +3,20 @@ require "vagrant"
 module VagrantPlugins
   module SyncedFolderNFSGuest
     class Config < Vagrant.plugin("2", :config)
+      attr_accessor :functional
       attr_accessor :map_uid
       attr_accessor :map_gid
 
       def initialize
         super
 
-        @map_uid = UNSET_VALUE
-        @map_gid = UNSET_VALUE
+        @functional = UNSET_VALUE
+        @map_uid    = UNSET_VALUE
+        @map_gid    = UNSET_VALUE
       end
 
       def finalize!
+        @functional = true if @functional == UNSET_VALUE
         @map_uid = nil if @map_uid == UNSET_VALUE
         @map_gid = nil if @map_gid == UNSET_VALUE
       end

data/lib/vagrant-nfs_guest/errors.rb

@@ -2,8 +2,18 @@ require "vagrant"
 
 module VagrantPlugins
   module SyncedFolderNFSGuest
-    class Error < Vagrant::Errors::VagrantError
-      error_namespace("vagrant.config.nfs_guest.errors")
+    module Errors
+
+      class Error < Vagrant::Errors::VagrantError
+        error_namespace("vagrant_nfs_guest.errors")
+      end
+
+      class GuestNFSError < Error
+        error_key(:nfs_start_failed)
+        error_key(:nfs_apply_failed)
+        error_key(:nfs_update_exports_failed)
+      end
+
     end
   end
 end

data/lib/vagrant-nfs_guest/guests/linux/cap/nfs_export.rb

@@ -0,0 +1,141 @@
+require "log4r"
+
+require "vagrant/util"
+require "vagrant/util/retryable"
+
+module VagrantPlugins
+  module SyncedFolderNFSGuest
+    module GuestLinux
+      module Cap
+        class NFSExport
+          extend Vagrant::Util::Retryable
+
+          def self.nfs_apply_command(env)
+            "exportfs -r"
+          end
+
+          def self.nfs_check_command(env)
+            "/etc/init.d/nfs-kernel-server status"
+          end
+
+          def self.nfs_start_command(env)
+            "/etc/init.d/nfs-kernel-server start"
+          end
+
+          def self.nfs_exports_template(machine)
+            VagrantPlugins::SyncedFolderNFSGuest.source_root.join(
+              "templates/nfs_guest/guest_export_linux")
+          end
+
+          def self.nfs_capable?(machine)
+            nfs_check_command = machine.guest.capability(:nfs_check_command)
+            machine.communicate.test(nfs_check_command)
+          end
+
+          def self.nfs_apply_changes!(machine)
+            nfs_apply_command = machine.guest.capability(:nfs_apply_command)
+            machine.communicate.sudo(nfs_apply_command,
+                                     error_class: Errors::GuestNFSError,
+                                     error_key: :nfs_apply_failed
+                                    )
+          end
+
+          def self.nfs_start!(machine)
+            nfs_start_command = machine.guest.capability(:nfs_start_command)
+            machine.communicate.sudo(nfs_start_command,
+                                     error_class: Errors::GuestNFSError,
+                                     error_key: :nfs_start_failed
+                                    )
+          end
+
+          def self.nfs_export(machine, ip, folders)
+            nfs_exports_template = machine.guest.capability(:nfs_exports_template)
+
+            nfs_opts_setup(machine, folders)
+
+            output = Vagrant::Util::TemplateRenderer.render(
+              nfs_exports_template,
+              uuid: machine.id,
+              ips: [ip],
+              folders: folders,
+              user: Process.uid)
+
+            machine.ui.info I18n.t("vagrant_nfs_guest.guests.linux.nfs_export")
+            sleep 0.5
+
+            nfs_cleanup(machine)
+
+            retryable(on: Errors::GuestNFSError, tries: 8, sleep: 3) do 
+              output.split("\n").each do |line|
+                machine.communicate.sudo(
+                  %Q[echo '#{line}' >> /etc/exports],
+                  error_class: Errors::GuestNFSError,
+                  error_key: :nfs_update_exports_failed
+                )
+              end
+
+              if nfs_capable?(machine)
+                nfs_apply_changes!(machine)
+              else
+                nfs_start!(machine)
+              end
+            end
+          end
+
+          def self.nfs_cleanup(machine)
+            id = machine.id
+            user = Process.uid
+
+            # Use sed to just strip out the block of code which was inserted
+            # by Vagrant
+            #
+            machine_do(
+              machine,
+              "sed -r -e '/^# VAGRANT-BEGIN:( #{user})? #{id}/,/^# " +
+              "VAGRANT-END:( #{user})? #{id}/ d' -ibak /etc/exports")
+          end
+
+          def self.nfs_opts_setup(machine, folders)
+            folders.each do |k, opts|
+              if !opts[:linux__nfs_options]
+                opts[:linux__nfs_options] ||= ["rw", "no_subtree_check", "all_squash", "insecure"]
+              end
+
+              # Only automatically set anonuid/anongid if they weren't
+              # explicitly set by the user.
+              hasgid = false
+              hasuid = false
+              opts[:linux__nfs_options].each do |opt|
+                hasgid = !!(opt =~ /^anongid=/) if !hasgid
+                hasuid = !!(opt =~ /^anonuid=/) if !hasuid
+              end
+
+              opts[:linux__nfs_options] << "anonuid=#{opts[:map_uid]}" if !hasuid
+              opts[:linux__nfs_options] << "anongid=#{opts[:map_gid]}" if !hasgid
+              opts[:linux__nfs_options] << "fsid=#{opts[:uuid]}"
+
+              # Expand the guest path so we can handle things like "~/vagrant"
+              expanded_guest_path = machine.guest.capability(
+                :shell_expand_guest_path, opts[:guestpath])
+              
+              begin
+                retryable(on: Vagrant::Errors::VagrantError, tries: 8, sleep: 3) do 
+                  # Do the actual creating and mounting
+                  machine_do(machine, "mkdir -p #{expanded_guest_path}")
+                  machine_do(machine, "chown -R vagrant:vagrant #{expanded_guest_path}")
+                  machine_do(machine, "chmod 2775 #{expanded_guest_path}")
+                end
+              rescue Vagrant::Errors::VagrantError
+                raise Errors::CreateMountsFailed
+              end
+            end
+          end
+
+          def self.machine_do(machine, command)
+              machine.communicate.sudo(command)
+          end
+        end
+      end
+    end
+  end
+end

data/lib/vagrant-nfs_guest/guests/linux/cap/read_user_ids.rb

@@ -0,0 +1,27 @@
+module VagrantPlugins
+  module GuestLinux
+    module Cap
+      class ReadUserIDs
+        def self.read_uid(machine)
+          command = "id -u"
+          result  = ""
+          machine.communicate.execute(command) do |type, data|
+            result << data if type == :stdout
+          end
+
+          result.chomp.split("\n").first
+        end
+
+        def self.read_gid(machine)
+          command = "id -g"
+          result  = ""
+          machine.communicate.execute(command) do |type, data|
+            result << data if type == :stdout
+          end
+
+          result.chomp.split("\n").first
+        end
+      end
+    end
+  end
+end

data/lib/vagrant-nfs_guest/hosts/bsd/cap/mount_nfs.rb

@@ -0,0 +1,31 @@
+require "log4r"
+
+module VagrantPlugins
+  module HostBSD
+    module Cap
+      class MountNFS
+
+        def self.nfs_mount(environment, ui, id, ips, folders)
+          folders.each do |name, opts|
+            if opts[:type] != :nfs_guest
+              next
+            end
+
+            ips.each do |ip|
+              ui.detail(I18n.t("vagrant.actions.vm.share_folders.mounting_entry",
+                               guestpath: opts[:guestpath],
+                               hostpath: opts[:hostpath]))
+
+              system("mkdir -p #{opts[:hostpath]}")
+              mount_command = "mount -t nfs -o noatime '#{ip}:#{opts[:guestpath]}' '#{opts[:hostpath]}'"
+              if system(mount_command)
+                break
+              end
+            end    
+          end
+        end
+
+      end    
+    end
+  end
+end

data/lib/vagrant-nfs_guest/hosts/bsd/cap/unmount_nfs.rb

@@ -0,0 +1,33 @@
+require "log4r"
+
+module VagrantPlugins
+  module HostBSD
+    module Cap
+      class UnmountNFS
+
+        def self.nfs_unmount(environment, ui, folders)
+          folders.each do |name, opts|
+            if opts[:type] != :nfs_guest
+              next
+            end
+
+            ui.detail(I18n.t("vagrant.actions.vm.share_folders.mounting_entry",
+                             guestpath: opts[:guestpath],
+                             hostpath: opts[:hostpath]))
+
+            expanded_host_path = `printf #{opts[:hostpath]}`
+            umount_msg = `umount '#{expanded_host_path}' 2>&1`
+
+            if $?.exitstatus != 0
+              if not umount_msg.include? 'not currently mounted'
+                ui.info "NFS mounts still in use!"
+                exit(1)
+              end
+            end
+          end
+        end
+
+      end    
+    end
+  end
+end

data/lib/vagrant-nfs_guest/hosts/bsd/plugin.rb

@@ -0,0 +1,18 @@
+require "vagrant"
+
+module VagrantPlugins
+  module HostBSD
+    class Plugin < Vagrant.plugin("2")
+
+      host_capability("bsd", "nfs_mount") do
+        require_relative "cap/mount_nfs"
+        Cap::MountNFS
+      end
+
+      host_capability("bsd", "nfs_unmount") do
+        require_relative "cap/unmount_nfs"
+        Cap::UnmountNFS
+      end
+    end
+  end
+end

data/lib/vagrant-nfs_guest/plugin.rb

@@ -1,59 +1,138 @@
-require File.expand_path("../hosts/host", __FILE__)
-require File.expand_path("../hosts/bsd/host", __FILE__)
+begin
+  require "vagrant"
+rescue LoadError
+  raise "The Vagrant AWS plugin must be run within Vagrant."
+end
+
+# This is a sanity check to make sure no one is attempting to install
+# this into an early Vagrant version.
+if Vagrant::VERSION < "1.2.0"
+  raise "The Vagrant AWS plugin is only compatible with Vagrant 1.2+"
+end
 
 module VagrantPlugins
   module SyncedFolderNFSGuest
+    # This plugin implements Guest Exported NFS folders.
+    #
     class Plugin < Vagrant.plugin("2")
       name "vagrant-nfs_guest"
       description <<-DESC
-      Adds support for guest nfs exporting of synced folders
+      The NFS Guest synced folders plugin enables you to use NFS exports from
+      the Guest as a synced folder implementation.
       DESC
 
       config(:nfs_guest) do
-        require File.expand_path("../config", __FILE__)
+        require_relative "config"
         Config
       end
 
       synced_folder(:nfs_guest, 4) do
-        require File.expand_path("../synced_folder", __FILE__)
+        require_relative "synced_folder"
         SyncedFolder
       end
 
-      guest_capability(:linux, :export_nfs_folders) do
-        require File.expand_path("../cap/linux/export_nfs_folders", __FILE__)
-        Cap::Linux::ExportNFS
+      guest_capability(:linux, :nfs_export) do
+        require_relative "guests/linux/cap/nfs_export"
+        GuestLinux::Cap::NFSExport
       end
 
-      guest_capability(:linux, :export_nfs_capable) do
-        require File.expand_path("../cap/linux/export_nfs_folders", __FILE__)
-        Cap::Linux::ExportNFS
+      guest_capability(:linux, :nfs_apply_command) do
+        require_relative "guests/linux/cap/nfs_export"
+        GuestLinux::Cap::NFSExport
+      end
+
+      guest_capability(:linux, :nfs_check_command) do
+        require_relative "guests/linux/cap/nfs_export"
+        GuestLinux::Cap::NFSExport
+      end
+
+      guest_capability(:linux, :nfs_start_command) do
+        require_relative "guests/linux/cap/nfs_export"
+        GuestLinux::Cap::NFSExport
+      end
+
+      guest_capability(:linux, :nfs_exports_template) do
+        require_relative "guests/linux/cap/nfs_export"
+        GuestLinux::Cap::NFSExport
       end
 
       guest_capability(:linux, :read_uid) do
-        require File.expand_path("../cap/linux/read_user_ids", __FILE__)
-        Cap::Linux::ReadUserIDs
+        require_relative "guests/linux/cap/read_user_ids"
+        GuestLinux::Cap::ReadUserIDs
       end
 
       guest_capability(:linux, :read_gid) do
-        require File.expand_path("../cap/linux/read_user_ids", __FILE__)
-        Cap::Linux::ReadUserIDs
+        require_relative "guests/linux/cap/read_user_ids"
+        GuestLinux::Cap::ReadUserIDs
       end
 
-      guest_capability(:linux, :halt) do
-        require File.expand_path("../cap/linux/halt", __FILE__)
-        Cap::Linux::Halt
+      action_hook(:nfs_guest, :machine_action_up) do |hook|
+        require_relative "action/prepare_nfs_guest_settings"
+        hook.after(
+          VagrantPlugins::ProviderVirtualBox::Action::Boot,
+          Action::PrepareNFSGuestSettings
+        )
       end
 
-      require File.expand_path("../action/prepare_nfs_guest_settings", __FILE__)
-      action_hook(:nfs_guest, :machine_action_up) do |hook|
-        hook.before(VagrantPlugins::ProviderVirtualBox::Action::PrepareNFSSettings,
-                   Action::PrepareNFSGuestSettings)
+      action_hook(:nfs_guest, :machine_action_reload) do |hook|
+        require_relative "action/prepare_nfs_guest_settings"
+        hook.before(
+          VagrantPlugins::ProviderVirtualBox::Action::PrepareNFSSettings,
+          Action::PrepareNFSGuestSettings
+        )
+      end
+
+      action_hook(:nfs_guest, :machine_action_resume) do |hook|
+        require_relative "action/mount_nfs"
+        require_relative "action/prepare_nfs_guest_settings"
+        hook.after(
+          VagrantPlugins::ProviderVirtualBox::Action::WaitForCommunicator,
+          Action::PrepareNFSGuestSettings
+        )
+        hook.after(
+          Action::PrepareNFSGuestSettings,
+          Action::MountNFS
+        )
+      end
+
+      action_hook(:nfs_guest, :machine_action_halt) do |hook|
+        require_relative "action/unmount_nfs"
+        hook.before(
+          Vagrant::Action::Builtin::GracefulHalt,
+          Action::UnmountNFS
+        )
+      end
+
+      action_hook(:nfs_guest, :machine_action_reload) do |hook|
+        require_relative "action/unmount_nfs"
+        hook.before(
+          Vagrant::Action::Builtin::GracefulHalt,
+          Action::UnmountNFS
+        )
+      end
+
+      action_hook(:nfs_guest, :machine_action_package) do |hook|
+        require_relative "action/unmount_nfs"
+        hook.before(
+          Vagrant::Action::Builtin::GracefulHalt,
+          Action::UnmountNFS
+        )
       end
 
-      require File.expand_path("../action/unmount_mounts", __FILE__)
       action_hook(:nfs_guest, :machine_action_destroy) do |hook|
-        hook.after(Vagrant::Action::Builtin::DestroyConfirm,
-                   Action::UnmountMounts)
+        require_relative "action/unmount_nfs"
+        hook.after(
+          Vagrant::Action::Builtin::DestroyConfirm,
+          Action::UnmountNFS
+        )
+      end
+
+      action_hook(:nfs_guest, :machine_action_suspend) do |hook|
+        require_relative "action/unmount_nfs"
+        hook.before(
+          VagrantPlugins::ProviderVirtualBox::Action::Suspend,
+          Action::UnmountNFS
+        )
       end
     end
   end

data/lib/vagrant-nfs_guest/synced_folder.rb

@@ -1,25 +1,25 @@
 require 'zlib'
+require 'json'
 
 module VagrantPlugins
   module SyncedFolderNFSGuest
     class SyncedFolder < Vagrant.plugin("2", :synced_folder)
-      def usable?(machine)
-        # NFS is always available
-        true
-      end
-
-      def prepare(machine, folders, opts)
-        # Nothing is necessary to do before VM boot.
+      def usable?(machine, raise_error=false)
+        # If the machine explicitly said NFS is not supported, then
+        # it isn't supported.
+        if !machine.config.nfs_guest.functional
+          return false
+        end
+        return true if machine.env.host.capability(:nfs_installed)
+        return true if machine.guest.capability(:nfs_installed)
+        return false if !raise_error
+        raise Vagrant::Errors::NFSNotSupported
       end
 
       def enable(machine, folders, nfsopts)
         raise Vagrant::Errors::NFSNoHostIP if !nfsopts[:nfs_guest_host_ip]
         raise Vagrant::Errors::NFSNoGuestIP if !nfsopts[:nfs_guest_machine_ip]
 
-        if !machine.guest.capability(:export_nfs_capable)
-          raise VagrantPlugins::SyncedFolderNFSGuest::Error, :no_nfsd
-        end
-        
         machine_ip = nfsopts[:nfs_guest_machine_ip]
         machine_ip = [machine_ip] if !machine_ip.is_a?(Array)
 
@@ -33,13 +33,15 @@ module VagrantPlugins
           mount_folders[id] = opts.dup if opts[:guestpath]
         end
 
-        machine.ui.info I18n.t("vagrant.actions.vm.nfs.exporting")
+        machine.ui.info I18n.t("vagrant_nfs_guest.actions.vm.nfs.exporting")
         machine.guest.capability(
-          :export_nfs_folders, nfsopts[:nfs_guest_host_ip], mount_folders)
+          :nfs_export, nfsopts[:nfs_guest_host_ip], mount_folders)
 
-        machine.ui.info I18n.t("vagrant.actions.vm.nfs.mounting")
-        machine.env.host.mount_nfs_folders(
-          machine.id, machine_ip, mount_folders)
+        machine.ui.info I18n.t("vagrant_nfs_guest.actions.vm.nfs.mounting")
+        machine.env.host.capability(
+          :nfs_mount,
+          machine.ui, machine.id, machine_ip, mount_folders
+        )
       end
 
       protected

data/lib/vagrant-nfs_guest/version.rb

@@ -1,5 +1,5 @@
 module VagrantPlugins
   module SyncedFolderNFSGuest
-    VERSION = "0.0.4"
+    VERSION = "0.1.0"
   end
 end

data/lib/vagrant-nfs_guest.rb

@@ -1,27 +1,21 @@
-begin
-    require "vagrant"
-rescue LoadError
-    raise "The Vagrant nfs_guest plugin must be run within Vagrant."
-end
-
-# This is a sanity check to make sure no one is attempting to install
-# this into an early Vagrant version.
-if Vagrant::VERSION < "1.4.0"
-    raise "The Vagrant nfs_guest plugin is only compatible with Vagrant 1.4+"
-end
+require "pathname"
 
 require "vagrant-nfs_guest/plugin"
-require 'vagrant-nfs_guest/errors'
-
-require "pathname"
+require "vagrant-nfs_guest/hosts/bsd/plugin"
 
 module VagrantPlugins
   module SyncedFolderNFSGuest
+    lib_path = Pathname.new(File.expand_path("../vagrant-nfs_guest", __FILE__))
+    autoload :Errors, lib_path.join("errors")
+
+    # This returns the path to the source of this plugin.
+    #
+    # @return [Pathname]
     def self.source_root
       @source_root ||= Pathname.new(File.expand_path("../../", __FILE__))
     end
 
-    I18n.load_path << File.expand_path('locales/en.yml', source_root)
+    I18n.load_path << File.expand_path("templates/locales/en.yml", source_root)
     I18n.reload!
   end
 end

data/templates/locales/en.yml

@@ -0,0 +1,43 @@
+en:
+  vagrant_nfs_guest:
+    actions:
+      vm:
+        nfs:
+          exporting: "Exporting NFS shared folders from guest..."
+          mounting: "Mounting NFS shared folders from guest..."
+          unmounting: "Unmounting NFS shared folders from guest..."
+    guests:
+      linux:
+        nfs_export: "Preparing to edit /etc/exports on the guest..."
+
+    errors:
+      nfs_update_exports_failed: |-
+        There was an error updating the guests /etc/exports file.
+
+        %{command}
+
+        Stdout from the command:
+        %{stdout}
+
+        Stderr from the command:
+        %{stderr}
+      nfs_start_failed: |-
+        Something failed while starting the NFS service on the guest.
+
+        %{command}
+
+        Stdout from the command:
+        %{stdout}
+
+        Stderr from the command:
+        %{stderr}
+      nfs_apply_failed: |-
+        Something failed while applying changes to the NFS service on the guest.
+
+        %{command}
+
+        Stdout from the command:
+        %{stdout}
+
+        Stderr from the command:
+        %{stderr}

data/templates/nfs_guest/guest_export_linux.erb

@@ -1,6 +1,6 @@
 # VAGRANT-BEGIN: <%= user %> <%= uuid %>
 <% ips.each do |ip| %>
-<% folders.each do |name, opts| %>
+<% folders.each do |dirs, opts| %>
 "<%= opts[:guestpath] %>" <%= ip %>(<%= opts[:linux__nfs_options].join(",") %>)
 <% end %>
 <% end %>

metadata

@@ -1,46 +1,41 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-nfs_guest
 version: !ruby/object:Gem::Version
-  version: 0.0.4
-  prerelease: 
+  version: 0.1.0
 platform: ruby
 authors:
 - Alan Garfield
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-16 00:00:00.000000000 Z
+date: 2014-07-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: Adds support for guest nfs exporting of synced folders
@@ -50,56 +45,50 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".gitignore"
 - Gemfile
 - LICENSE.txt
 - README.md
 - Rakefile
 - lib/vagrant-nfs_guest.rb
+- lib/vagrant-nfs_guest/action/mount_nfs.rb
 - lib/vagrant-nfs_guest/action/prepare_nfs_guest_settings.rb
-- lib/vagrant-nfs_guest/action/unmount_mounts.rb
-- lib/vagrant-nfs_guest/cap/linux/export_nfs_folders.rb
-- lib/vagrant-nfs_guest/cap/linux/halt.rb
-- lib/vagrant-nfs_guest/cap/linux/read_user_ids.rb
+- lib/vagrant-nfs_guest/action/unmount_nfs.rb
 - lib/vagrant-nfs_guest/config.rb
 - lib/vagrant-nfs_guest/errors.rb
-- lib/vagrant-nfs_guest/hosts/bsd/host.rb
-- lib/vagrant-nfs_guest/hosts/host.rb
+- lib/vagrant-nfs_guest/guests/linux/cap/nfs_export.rb
+- lib/vagrant-nfs_guest/guests/linux/cap/read_user_ids.rb
+- lib/vagrant-nfs_guest/hosts/bsd/cap/mount_nfs.rb
+- lib/vagrant-nfs_guest/hosts/bsd/cap/unmount_nfs.rb
+- lib/vagrant-nfs_guest/hosts/bsd/plugin.rb
 - lib/vagrant-nfs_guest/plugin.rb
 - lib/vagrant-nfs_guest/synced_folder.rb
 - lib/vagrant-nfs_guest/version.rb
-- locales/en.yml
+- templates/locales/en.yml
 - templates/nfs_guest/guest_export_linux.erb
 - vagrant-nfs_guest.gemspec
 homepage: ''
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 4128011817276071124
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 4128011817276071124
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.2.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Adds support for guest nfs exporting of synced folders
 test_files: []

data/lib/vagrant-nfs_guest/action/unmount_mounts.rb

@@ -1,20 +0,0 @@
-module VagrantPlugins
-  module SyncedFolderNFSGuest
-    module Action
-      class UnmountMounts
-        def initialize(app,env)
-          @app = app
-          @logger = Log4r::Logger.new("vagrant::action::vm::nfs_guest")
-        end
-
-        def call(env)
-          @machine = env[:machine]
-          @app.call(env)
-
-          folders = @machine.config.vm.synced_folders
-          @machine.env.host.unmount_nfs_folders(folders)
-        end
-      end
-    end
-  end
-end

data/lib/vagrant-nfs_guest/cap/linux/export_nfs_folders.rb

@@ -1,116 +0,0 @@
-require 'vagrant/util/platform'
-
-module VagrantPlugins
-  module SyncedFolderNFSGuest
-    module Cap
-      module Linux
-        class ExportNFS
-          include Vagrant::Util
-
-          def self.export_nfs_capable(machine)
-            me = self.new(machine)
-            return me.nfs_capable?
-          end
-
-          def self.export_nfs_folders(machine, ip, folders)
-            me = self.new(machine, ip, folders)
-
-            me.nfs_opts_setup()
-
-            tpl_path = VagrantPlugins::SyncedFolderNFSGuest.source_root.join(
-              'templates/nfs_guest/guest_export_linux')
-            output = TemplateRenderer.render(tpl_path,
-                                             :uuid => machine.id,
-                                             :ips => [ip],
-                                             :folders => folders,
-                                             :user => Process.uid)
-
-            machine.ui.info I18n.t("vagrant.hosts.linux.nfs_export")
-            sleep 0.5
-
-            me.nfs_cleanup()
-
-            output.split("\n").each do |line|
-              machine.communicate.sudo(%Q[echo '#{line}' >> /etc/exports])
-            end
-
-            me.restart_nfs()
-          end
-
-          def initialize(machine, ip = [], folders = [])
-            @machine = machine
-            @ip = ip
-            @folders = folders
-
-            @folder_test_command  = "test -d"
-            @nfs_test_command  = "test -e /etc/exports"
-            @nfs_apply_command = "/usr/sbin/exportfs -r"
-            @nfs_check_command = "/etc/init.d/nfs-kernel-server status"
-            @nfs_start_command = "/etc/init.d/nfs-kernel-server start"
-          end
-
-          def nfs_running?
-            @machine.communicate.test("#{@nfs_check_command}")
-          end
-
-          def nfs_capable?
-            @machine.communicate.test("#{@nfs_test_command}")
-          end
-
-          # TODO - DRY this; ripped completely from plugins/hosts/linux/host.rb
-          def nfs_opts_setup()
-            @folders.each do |k, opts|
-              if !opts[:linux__nfs_options]
-                opts[:linux__nfs_options] ||= ["rw", "no_subtree_check", "all_squash", "insecure"]
-              end
-
-              # Only automatically set anonuid/anongid if they weren't
-              # explicitly set by the user.
-              hasgid = false
-              hasuid = false
-              opts[:linux__nfs_options].each do |opt|
-                hasgid = !!(opt =~ /^anongid=/) if !hasgid
-                hasuid = !!(opt =~ /^anonuid=/) if !hasuid
-              end
-
-              opts[:linux__nfs_options] << "anonuid=#{opts[:map_uid]}" if !hasuid
-              opts[:linux__nfs_options] << "anongid=#{opts[:map_gid]}" if !hasgid
-              opts[:linux__nfs_options] << "fsid=#{opts[:uuid]}"
-
-              # Expand the guest path so we can handle things like "~/vagrant"
-              expanded_guest_path = @machine.guest.capability(
-                :shell_expand_guest_path, opts[:guestpath])
-
-              # Do the actual creating and mounting
-              @machine.communicate.sudo("mkdir -p #{expanded_guest_path}")
-              @machine.communicate.sudo("chown -R vagrant:vagrant #{expanded_guest_path}")
-              @machine.communicate.sudo("chmod u+rw #{expanded_guest_path}")
-              @machine.communicate.sudo("chmod g+rws #{expanded_guest_path}")
-            end
-          end
-
-          def nfs_cleanup()
-            return if !nfs_capable?
-
-            id = @machine.id
-            user = Process.uid
-
-            # Use sed to just strip out the block of code which was inserted
-            # by Vagrant
-            @machine.communicate.sudo("sed -r -e '/^# VAGRANT-BEGIN:( #{user})? #{id}/,/^# VAGRANT-END:( #{user})? #{id}/ d' -ibak /etc/exports")
-          end
-
-          def restart_nfs()
-            if nfs_running?
-              @machine.communicate.sudo("#{@nfs_apply_command}")
-            else
-              @machine.communicate.sudo("#{@nfs_start_command}")
-            end
-          end
-        end
-      end
-    end
-  end
-end
-
-

data/lib/vagrant-nfs_guest/cap/linux/halt.rb

@@ -1,20 +0,0 @@
-require Vagrant.source_root.join("plugins/guests/linux/cap/halt")
-
-module VagrantPlugins
-  module SyncedFolderNFSGuest
-    module Cap
-      module Linux
-        class Halt
-          def self.halt(machine)
-            # unmount any host mounted NFS folders
-            folders = machine.config.vm.synced_folders
-            machine.env.host.unmount_nfs_folders(folders)
-
-            VagrantPlugins::GuestLinux::Cap::Halt.halt(machine)
-          end
-        end
-      end
-    end
-  end
-end
-

data/lib/vagrant-nfs_guest/cap/linux/read_user_ids.rb

@@ -1,29 +0,0 @@
-module VagrantPlugins
-  module SyncedFolderNFSGuest
-    module Cap
-      module Linux
-        class ReadUserIDs
-          def self.read_uid(machine)
-            command = "id -u"
-            result  = ""
-            machine.communicate.execute(command) do |type, data|
-              result << data if type == :stdout
-            end
-
-            result.chomp.split("\n").first
-          end
-
-          def self.read_gid(machine)
-            command = "id -g"
-            result  = ""
-            machine.communicate.execute(command) do |type, data|
-              result << data if type == :stdout
-            end
-
-            result.chomp.split("\n").first
-          end
-        end
-      end
-    end
-  end
-end

data/lib/vagrant-nfs_guest/hosts/bsd/host.rb

@@ -1,37 +0,0 @@
-module VagrantPlugins
-  module HostBSD
-    class Host < Vagrant.plugin("2", :host)
-      def mount_nfs_folders(id, ips, folders)
-        @logger.debug "Mounting NFS mounts..."
-        folders.each do |name, opts|
-          @logger.info opts
-          ips.each do |ip|
-            system("mkdir -p #{opts[:hostpath]}")
-            mount_command = "mount -t nfs -o noatime '#{ip}:#{opts[:guestpath]}' '#{opts[:hostpath]}'"
-            if system(mount_command)
-              break
-            end
-          end
-        end
-      end
-
-      def unmount_nfs_folders(folders)
-        @logger.debug "Unmounting NFS mounts..."
-        folders.each do |name, opts|
-          if opts[:type] == :nfs_guest
-            expanded_host_path = `printf #{opts[:hostpath]}`
-            umount_msg = `umount '#{expanded_host_path}' 2>&1`
-            @ui.info umount_msg
-            if $?.exitstatus != 0
-              if not umount_msg.include? 'not currently mounted'
-                @ui.info "NFS mounts still in use!"
-                exit(1)
-              end
-            end
-          end
-        end
-      end
-    end
-  end
-end
-

data/lib/vagrant-nfs_guest/hosts/host.rb

@@ -1,23 +0,0 @@
-module Vagrant
-  module Plugin
-    module V2
-      class Host
-        # Mounts the given hash of folders via the guests NFS export
-        #
-        # @param [String] id A unique ID that is guaranteed to be unique to
-        #   match these sets of folders.
-        # @param [Array<String>] ip IPs of the guest machine.
-        # @param [Hash] folders Shared folders to sync.
-        def mount_nfs_folders(id, ips, folders)
-        end
-
-        # Unmounts the given hash of folders
-        #
-        # @param [Hash] folders Shared folders to sync.
-        def unmount_nfs_folders(folders)
-        end
-      end
-    end
-  end
-end
-

data/locales/en.yml

@@ -1,6 +0,0 @@
-en:
-  vagrant:
-    config:
-      nfs_guest:
-        errors:
-          no_nfsd: "Guest doesn't have the necessary NFS server installed"