vagrant-nfs_guest 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3c362cefceea2b475c4b63eda88bb57e7c4197e7
-  data.tar.gz: c1cb2d3eadd42cdd4c6a1aad1a34939963e333eb
+  metadata.gz: 41d9296319bda57f729a890c777c5f62d8ce02d9
+  data.tar.gz: f0a6dde015a24f3d0b64329a3ecbfdcbd80cc6d2
 SHA512:
-  metadata.gz: 227d93bd2efd6be64ed95ec9eac1dbbeee06a02164b08ffc846cfc25faba334f37e254b1437012cd37c9d632b22a02446da39b1e188b3d53b06fbe6c268ebd01
-  data.tar.gz: 514f46fd8dec9dcf515d73d241d42757e7e96fb3b0cc93fa3ae23818f14305582da4ae100a4fa12e8617c504b3a6211bb0c39d8b157ac5d07d9b11a1a1c46ad5
+  metadata.gz: 220e555748ee2d07ce05b4c31a18c4c865ac157a848db732344e411b84fe81fc8b8d55cb78bd3a1a885c42a0d54c80065ea8d6b96de94cdbb021c35866c1311b
+  data.tar.gz: 95dd9fb2783f243f6f7b8c567f1b845f6d68f800584ba298fe0c2e21ac4d1549bee0d783f88395260691e601228345c2c8d712c331390f514270fa3fb94d7050

data/README.md

@@ -2,12 +2,13 @@
 
 ## What's New?
 
-- Supports Vagrant 1.6!
+- Supports Vagrant 1.6! (For pre-1.5 vagrant support use the v0.0.4 release as Vagrant has incompatible changes)
 - 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
+- Will install the NFS daemon on the guest if the guest capability is supported (Ubuntu only at this stage)
 
 ## Overview
 
@@ -15,6 +16,9 @@ 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.
 
+**WARNING** this has only been tested fully using an OSX host and a Ubuntu guest.
+We're happy to receive pull-request to support alternatives hosts and guests. To implement this support is relatively trivial if you look in ./lib/hosts and ./lib/guests, and then just modify the "plugin.py" to include the new capabilities.
+
 ## Installation
 
     vagrant plugin install vagrant-nfs_guest

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

@@ -0,0 +1,31 @@
+module VagrantPlugins
+  module SyncedFolderNFSGuest
+    module HostLinux
+      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 = "sudo mount -t nfs -o noatime '#{ip}:#{opts[:guestpath]}' '#{opts[:hostpath]}'"
+                if system(mount_command)
+                  break
+                end
+              end
+            end
+          end
+
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,34 @@
+module VagrantPlugins
+  module SyncedFolderNFSGuest
+    module HostLinux
+      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 = `sudo umount '#{expanded_host_path}' 2>&1`
+
+              if $?.exitstatus != 0
+                if not umount_msg.include? 'not currently mounted'
+                  ui.info umount_msg
+                  ui.info "Maybe NFS mounts still in use!"
+                  exit(1)
+                end
+              end
+            end
+          end
+
+        end
+      end
+    end
+  end
+end

data/lib/vagrant-nfs_guest/plugin.rb

@@ -1,13 +1,13 @@
 begin
   require "vagrant"
 rescue LoadError
-  raise "The Vagrant AWS plugin must be run within Vagrant."
+  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.2.0"
-  raise "The Vagrant AWS plugin is only compatible with Vagrant 1.2+"
+  raise "The Vagrant NFS Guest plugin is only compatible with Vagrant 1.2+"
 end
 
 module VagrantPlugins
@@ -17,8 +17,10 @@ module VagrantPlugins
     class Plugin < Vagrant.plugin("2")
       name "vagrant-nfs_guest"
       description <<-DESC
-      The NFS Guest synced folders plugin enables you to use NFS exports from
-      the Guest as a synced folder implementation.
+      The Vagrant NFS Guest synced folders plugin enables you to use NFS exports from
+      the Guest as a synced folder implementation. This allows the guest to utilise
+      inotify (eg. file watchers) and other filesystem related functions that don't
+      work across NFS from the host.
       DESC
 
       config(:nfs_guest) do
@@ -91,6 +93,16 @@ module VagrantPlugins
         HostBSD::Cap::UnmountNFS
       end
 
+      host_capability(:linux, "nfs_mount") do
+        require_relative "hosts/linux/cap/mount_nfs"
+        HostLinux::Cap::MountNFS
+      end
+
+      host_capability(:linux, "nfs_unmount") do
+        require_relative "hosts/linux/cap/unmount_nfs"
+        HostLinux::Cap::UnmountNFS
+      end
+
       action_hook(:nfs_guest, :machine_action_up) do |hook|
         require_relative "action/prepare_nfs_guest_settings"
         hook.after(

data/lib/vagrant-nfs_guest/version.rb

@@ -1,5 +1,5 @@
 module VagrantPlugins
   module SyncedFolderNFSGuest
-    VERSION = "0.1.1"
+    VERSION = "0.1.2"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-nfs_guest
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Alan Garfield
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-08 00:00:00.000000000 Z
+date: 2015-01-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -63,6 +63,8 @@ files:
 - lib/vagrant-nfs_guest/guests/ubuntu/cap/nfs_server.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/linux/cap/mount_nfs.rb
+- lib/vagrant-nfs_guest/hosts/linux/cap/unmount_nfs.rb
 - lib/vagrant-nfs_guest/plugin.rb
 - lib/vagrant-nfs_guest/synced_folder.rb
 - lib/vagrant-nfs_guest/version.rb