vagrant-nfs_guest 0.1.3 → 0.1.4

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: e97ac578150a2727e68ad6b145a8e0e1930fb847
+  data.tar.gz: 20b94b0d05c5623f9795d49022a55767191d8860
+SHA512:
+  metadata.gz: c8d1db44a16ee5695893ae80eb1e9ec88be1debfcb0104a3ce06bde144fa8894df6cabf52f82bd493f1781e0f404eb8e08160e0752e3d4174be792559ee022d7
+  data.tar.gz: 9926c33a284c8a7c6e9fcd44852db43cc214ea50f8de3bab8d2379cd7c5b9a0cedcfd14f143c5db2c892954c52f826af6d339d6bdad1dbf2581c3869071d993c

data/lib/vagrant-nfs_guest/config.rb

@@ -6,6 +6,8 @@ module VagrantPlugins
       attr_accessor :functional
       attr_accessor :map_uid
       attr_accessor :map_gid
+      attr_accessor :host_ip
+      attr_accessor :guest_ip
 
       def initialize
         super
@@ -13,12 +15,16 @@ module VagrantPlugins
         @functional = UNSET_VALUE
         @map_uid    = UNSET_VALUE
         @map_gid    = UNSET_VALUE
+        @host_ip    = UNSET_VALUE
+        @guest_ip   = 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
+        @host_ip = nil if @host_ip == UNSET_VALUE
+        @guest_ip = nil if @guest_ip == UNSET_VALUE
       end
 
       def to_s

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

@@ -106,8 +106,7 @@ module VagrantPlugins
             # by Vagrant
             #
             machine.communicate.sudo(
-              "sed -r -e '/^# VAGRANT-BEGIN:( #{user})? #{id}/,/^# " +
-              "VAGRANT-END:( #{user})? #{id}/ d' -ibak /etc/exports",
+              "sed -r -e '/^# VAGRANT(-NFS_GUEST)?-BEGIN/,/^# VAGRANT(-NFS_GUEST)?-END/ d' -ibak /etc/exports",
               error_class: Errors::GuestNFSError,
               error_key: :nfs_guest_clean
             )

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

@@ -1,25 +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
+  module SyncedFolderNFSGuest
+    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
 
-          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
 
-        def self.read_gid(machine)
-          command = "id -g"
-          result  = ""
-          machine.communicate.execute(command) do |type, data|
-            result << data if type == :stdout
+            result.chomp.split("\n").first
           end
-
-          result.chomp.split("\n").first
         end
       end
     end

data/lib/vagrant-nfs_guest/synced_folder.rb

@@ -15,18 +15,8 @@ module VagrantPlugins
       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?(:nfs_server_installed)
-          installed = machine.guest.capability(:nfs_server_installed)
-          if !installed
-            can_install = machine.guest.capability?(:nfs_server_install)
-            raise Errors::NFSServerNotInstalledInGuest if !can_install
-            machine.ui.info I18n.t("vagrant_nfs_guest.guests.linux.nfs_server_installing")
-            machine.guest.capability(:nfs_server_install)
-          end
-        end
+        verify_nfs_options(machine, nfsopts)
+        verify_nfs_installation(machine) if machine.guest.capability?(:nfs_server_installed)
 
         machine_ip = nfsopts[:nfs_guest_machine_ip]
         machine_ip = [machine_ip] if !machine_ip.is_a?(Array)
@@ -79,6 +69,39 @@ module VagrantPlugins
         # (value == :auto)
         return machine.guest.capability("read_#{perm}".to_sym)
       end
+
+      private
+
+      def verify_nfs_installation(machine)
+        if !machine.guest.capability(:nfs_server_installed)
+          raise Errors::NFSServerNotInstalledInGuest unless machine.guest.capability?(:nfs_server_install)
+
+          machine.ui.info I18n.t("vagrant_nfs_guest.guests.linux.nfs_server_installing")
+          machine.guest.capability(:nfs_server_install)
+        end
+      end
+
+      def verify_nfs_options(machine, nfsopts = {})
+        if !nfsopts[:nfs_guest_host_ip]
+          if machine.config.nfs_guest.host_ip
+            nfsopts[:nfs_guest_host_ip] = machine.config.nfs_guest.host_ip
+          end
+
+          raise Vagrant::Errors::NFSNoHostIP if !nfsopts[:nfs_guest_host_ip]
+        end
+
+        if !nfsopts[:nfs_guest_machine_ip]
+          if machine.config.nfs_guest.guest_ip
+            nfsopts[:nfs_guest_machine_ip] = machine.config.nfs_guest.guest_ip
+          end
+
+          raise Vagrant::Errors::NFSNoGuestIP if !nfsopts[:nfs_guest_machine_ip]
+        end
+      end
+
+      def extract_guest_ip(folder)
+        folder[:guest_ip] || folder[:machine_ip]
+      end
     end
   end
 end

data/lib/vagrant-nfs_guest/version.rb

@@ -1,5 +1,5 @@
 module VagrantPlugins
   module SyncedFolderNFSGuest
-    VERSION = "0.1.3"
+    VERSION = "0.1.4"
   end
 end

data/templates/locales/en.yml

@@ -48,3 +48,6 @@ en:
 
       nfs_server_not_installed: |-
         Guest cannot install the required NFS server daemon.
+
+      nfs_guest_clean: |-
+        Something failed while cleaning up NFS shared folders on the guest.

data/templates/nfs_guest/guest_export_linux.erb

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

metadata

@@ -1,46 +1,41 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-nfs_guest
 version: !ruby/object:Gem::Version
-  version: 0.1.3
-  prerelease: 
+  version: 0.1.4
 platform: ruby
 authors:
 - Alan Garfield
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-08 00:00:00.000000000 Z
+date: 2015-03-10 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,7 +45,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".gitignore"
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -80,32 +75,25 @@ files:
 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: 2496989375820171148
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 2496989375820171148
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23.2
+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: []