vagrant-invade 0.6.4 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dd40809f47915424d22391ac52ef13899ce46285
-  data.tar.gz: ccdaa0b5ef73e7b5b374fd319b60fc9fe1a9abb8
+  metadata.gz: f6d05d703e83eeb6fc6d8ffb8e0de3c50988d58f
+  data.tar.gz: 8dafe62da9c4bc56d8fb82d01062ccec910924f6
 SHA512:
-  metadata.gz: a6c1373e32591bdd714b8a96ac78c59c06049e93ac5294b21adb593d41f051edd8b21372b3d6601fe83ddf8988bbce1758ba62f6036007e40e80c87c66ebdd90
-  data.tar.gz: 21e75da17edaace7d6ac27377a40a21dd7c189ec3dfb6e62ec9b6e96373c8e0acac0d0cc9667ab6da4907b8b09f183c445bf27cb9b68430a75ac059ce7943623
+  metadata.gz: 0ca932f0f09a78d05fbe3f0fc7de6f5b6da85d26c49b6abf8c35d34af84e9ad5880a980de74d600ac0961b414664aca98107f9ef677043bc5a72b424fe5fe088
+  data.tar.gz: 21beb6a37e3e975f10185247c05e7171a9388c06954de003145d5357262df9e74ced320f5fa745db7002683bbfcfe46856aed0c0e49d6b41e151ae7986787ed8

data/Gemfile

@@ -2,6 +2,7 @@ source 'https://rubygems.org'
 
 group :development do
   gem 'vagrant', git: 'https://github.com/mitchellh/vagrant.git', :ref => 'v1.8.5'
+  gem 'bundler', '>= 1.12.5'
 end
 
 group :plugins do

data/Gemfile.lock

@@ -24,7 +24,7 @@ GIT
 PATH
   remote: .
   specs:
-    vagrant-invade (0.6.3)
+    vagrant-invade (0.7.0)
 
 GEM
   remote: https://rubygems.org/
@@ -103,7 +103,7 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  bundler (~> 1.12, >= 1.12.5)
+  bundler (>= 1.12.5)
   rake (~> 10.0)
   vagrant!
   vagrant-invade!

data/lib/vagrant-invade/action/process.rb

@@ -28,7 +28,7 @@ module VagrantPlugins
           config = env[:invade]
 
           # Remove empty Hashes
-          config.delete_blank
+          config = config.compact(config)
 
           config.each do |config_key, config_data|
             if config_key == 'machines'

data/lib/vagrant-invade/extend.rb

@@ -8,9 +8,12 @@ class Hash
       d
   end
 
-  def delete_blank
-    delete_if do |_, v|
-      (v.respond_to?(:empty?) ? v.empty? : !v) or v.instance_of?(Hash) && v.delete_blank.empty?
+  def compact(opts={})
+    inject({}) do |new_hash, (k,v)|
+      if !v.nil?
+        new_hash[k] = opts[:recurse] && v.class == Hash ? v.compact(opts) : v
+      end
+      new_hash
     end
   end
 end

data/lib/vagrant-invade/module/hostmanager/template.erb

@@ -1,5 +1,5 @@
 <% if enabled %>
-# --- Hostmanager Settings --- #
+# --- Hostmanager Global Settings --- #
   config.hostmanager.enabled = <%= enabled %>
   config.hostmanager.manage_host = <%= manage_host %>
   config.hostmanager.manage_guest = <%= manage_guest %>

data/lib/vagrant-invade/module/network/private/private.rb

@@ -20,7 +20,7 @@ module VagrantPlugins
             b = binding
 
             # Delete all nil keys
-            @private_network_data.delete_blank
+            @private_network_data.compact
 
             ip = @private_network_data['ip']
 

data/lib/vagrant-invade/module/nfs/nfs.rb

@@ -5,10 +5,9 @@ module VagrantPlugins
       class Nfs < InvadeModule
 
         attr_reader :result
-        attr_accessor :machine_name, :nfs_data
+        attr_accessor :nfs_data
 
-        def initialize(machine_name, nfs_data, result: nil)
-          @machine_name = machine_name
+        def initialize(nfs_data, result: nil)
           @nfs_data = nfs_data
           @result = result
         end
@@ -20,8 +19,8 @@ module VagrantPlugins
 
             # Values for nfs part
             functional = @nfs_data['functional']
-            map_uid = @nfs_data['map_uid']
-            map_gid = @nfs_data['map_gid']
+            @nfs_data['map_uid'] ? map_uid = @nfs_data['map_uid'] : map_uid = Process.uid
+            @nfs_data['map_gid'] ? map_gid = @nfs_data['map_gid'] : map_gid = Process.gid
             verify_installed = @nfs_data['verify_installed']
 
             eruby = Erubis::Eruby.new(File.read(self.get_template_path(__FILE__)))

data/lib/vagrant-invade/module/nfs/rules.yml

@@ -3,10 +3,10 @@ functional:
   default: nil
 map_uid:
   type: Integer
-  default: Process.uid
+  default: nil
 map_gid:
   type: Integer
-  default: Process.gid
+  default: nil
 verify_installed:
   type: Boolean
   default: nil

data/lib/vagrant-invade/module/nfs/template.erb

@@ -1,12 +1,9 @@
-    <% if functional %>
-    <%= machine_name %>.nfs.functional = <%= functional %>
-    <% end %>
-    <% if map_uid %>
-    <%= machine_name %>.nfs.map_uid = <%= map_uid %>
-    <% end %>
-    <% if map_gid %>
-    <%= machine_name %>.nfs.map_gid = <%= map_gid %>
-    <% end %>
-    <% if verify_installed %>
-    <%= machine_name %>.nfs.verify_installed = <%= verify_installed %>
-    <% end %>
+# --- NFS Global Settings --- #
+	<% if functional %>
+	config.nfs.functional = <%= functional %>
+	<% end %>
+	config.nfs.map_uid = <%= map_uid %>
+  config.nfs.map_gid = <%= map_gid %>
+  <% if verify_installed %>
+  config.nfs.verify_installed = <%= verify_installed %>
+  <% end %>

data/lib/vagrant-invade/module/plugin/hostmanager/hostmanager.rb

@@ -27,9 +27,6 @@ module VagrantPlugins
 
               # Values for hostmanager section
               enabled = @hostmanager_data['enabled']
-              manage_host = @hostmanager_data['manage_host']
-              ignore_private_ip = @hostmanager_data['ignore_private_ip']
-              include_offline =@hostmanager_data['include_offline']
               aliases = @hostmanager_data['aliases']
 
               eruby = Erubis::Eruby.new(File.read(self.get_template_path(__FILE__)))

data/lib/vagrant-invade/module/plugin/hostmanager/rules.yml

@@ -1,3 +1,6 @@
+enabled:
+  type: Boolean
+  default: true
 aliases:
   type: Array
   default:

data/lib/vagrant-invade/module/plugin/hostmanager/template.erb

@@ -1,3 +1,5 @@
-<% if aliases %>
+<% if enabled %>
+	<% if aliases %>
   <%= machine_name %>.hostmanager.aliases = <%= aliases %>
   <% end %>
+<% end %>

data/lib/vagrant-invade/module/synced_folder/nfs/nfs.rb

@@ -29,6 +29,10 @@ module VagrantPlugins
               source = @nfs_data['source']
               path = @nfs_data['path']
               mount_options = @nfs_data['mount_options']
+              linux__nfs_options = @nfs_data['linux__nfs_options']
+              bsd__nfs_options = @nfs_data['bsd__nfs_options']
+              nfs_version = @nfs_data['nfs_version']
+              nfs_udp = @nfs_data['nfs_udp']
 
               eruby = Erubis::Eruby.new(File.read(self.get_template_path(__FILE__)))
               @result = eruby.result b

data/lib/vagrant-invade/module/synced_folder/nfs/rules.yml

@@ -20,3 +20,15 @@ mount_options:
   type: Array
   default:
     - nolock
+linux__nfs_options:
+  type: Array
+  default: nil
+bsd__nfs_options:
+  type: Array
+  default: nil
+nfs_version:
+  type: Integer
+  default: nil
+nfs_udp:
+  type: Boolean
+  default: nil

data/lib/vagrant-invade/module/synced_folder/nfs/template.erb

@@ -1,2 +1,2 @@
     <%= machine_name %>.vm.synced_folder '<%= source %>', '<%= path %>',
-      type: 'nfs'<% if mount_options %>, mount_options: <%= mount_options %><% end %><% if enabled %>, disabled: true<% end %>
+      type: 'nfs'<% if mount_options %>, mount_options: <%= mount_options %><% end %><% if linux__nfs_options %>, linux__nfs_options: <%= linux__nfs_options %><% end %><% if bsd__nfs_options %>, bsd__nfs_options: <%= bsd__nfs_options%><% end %><% if nfs_version %>, nfs_version: <%= nfs_version %><% end %><% unless nfs_udp.nil? %>, nfs_udp: <%= nfs_udp %><% end %><% if enabled %>, disabled: true<% end %>

data/lib/vagrant-invade/module/vagrant/vagrantfile/template.erb

@@ -6,5 +6,6 @@ Vagrant.configure(2) do |config|
   <% machines.each do |_, data| %>
 <%= data %>
   <% end %>
-  <%= hostmanager %>
+  <%= global_hostmanager %>
+  <%= global_nfs %>
 end

data/lib/vagrant-invade/module/vagrant/vagrantfile/vagrantfile.rb

@@ -19,7 +19,8 @@ module VagrantPlugins
             begin
 
               # Set variables for template files
-              hostmanager = @vagrantfile_data['hostmanager']
+              global_hostmanager = @vagrantfile_data['hostmanager']
+              global_nfs = @vagrantfile_data['nfs']
               machines = @vagrantfile_data['machines']
 
               eruby = Erubis::Eruby.new(File.read(self.get_template_path(__FILE__)))

data/lib/vagrant-invade/validator.rb

@@ -27,6 +27,7 @@ module VagrantPlugins
 
             # Fill with defaults
             @ruleset.rules.each do |rule_key, rule_value|
+
               unless rule_value['default'] == 'nil'
                 value_data[rule_key] = rule_value['default'] if value_data[rule_key].nil?
               end

data/lib/vagrant-invade/version.rb

@@ -1,5 +1,5 @@
 module VagrantPlugins
   module Invade
-    VERSION = '0.6.4'
+    VERSION = '0.7.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-invade
 version: !ruby/object:Gem::Version
-  version: 0.6.4
+  version: 0.7.0
 platform: ruby
 authors:
 - Lennart Stein
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-30 00:00:00.000000000 Z
+date: 2017-01-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler