vagrant-invade 0.4.8 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8aa063a5bb88cb75629fc5e12cd9f97fa4094a90
-  data.tar.gz: e80c31179ae0efac9aecc2f971651a22edd7f321
+  metadata.gz: f5191a889f6ebf32cf3c274ca1e181c8279bc69c
+  data.tar.gz: 38baac08e719c4592a75398db5de41e31b51af71
 SHA512:
-  metadata.gz: 87f1af65c50937a5d6be87c20197e75c6276d68e7b71f878c42ea197c39002636b501ef7ae66cd0bc57d72c7d826aa85d504f3295986328cd35d49edb812449a
-  data.tar.gz: 769fb0830b2a1a6575501692d3b109fcca5f8b787d6a9ef395459d6023efc15bca0a8851571107a2b85feb62066f54a62542bcb4517ba86bdb9059f0cfc65f0c
+  metadata.gz: 0148801b3964e771405d343f93e835f923fb413039396f8b3733ea430c1e7235d18d3e7948f1c50e537d21e3c7ff2aadd266115d1c37f54a2be3e66f929acb86
+  data.tar.gz: 1d1e97b99888876a00420972612d4acacdfe91a2be6dfc6b99546b4bc30bc055f79c2c634e4f1cd73c7b923b7cd5cd6f1c1b6810152abec018a105e21b9ea65a

data/Gemfile

@@ -1,7 +1,8 @@
 source "https://rubygems.org"
 
 group :development do
-  gem "vagrant", git: "https://github.com/mitchellh/vagrant.git", :ref => 'v1.7.4'
+  gem "vagrant", git: "https://github.com/mitchellh/vagrant.git", :ref => 'v1.8.5'
+  gem "vagrant-hostmanager", git: "https://github.com/devopsgroup-io/vagrant-hostmanager"
 end
 
 group :plugins do

data/Gemfile.lock

@@ -1,41 +1,47 @@
+GIT
+  remote: https://github.com/devopsgroup-io/vagrant-hostmanager
+  revision: 4ae7655be4ca149482b43592acf0e759463a0bfc
+  specs:
+    vagrant-hostmanager (1.8.5)
+
 GIT
   remote: https://github.com/mitchellh/vagrant.git
-  revision: 78ea5e4a78ce644717ab16d8001ab77430168f0f
-  ref: v1.7.4
+  revision: 93f9528687b9a737585d22bc4db5d2ab5d9852d3
+  ref: v1.8.5
   specs:
-    vagrant (1.7.4)
-      bundler (>= 1.5.2, <= 1.10.5)
+    vagrant (1.8.5)
+      bundler (= 1.12.5)
       childprocess (~> 0.5.0)
       erubis (~> 2.7.0)
       hashicorp-checkpoint (~> 0.1.1)
       i18n (>= 0.6.0, <= 0.8.0)
-      listen (~> 3.0.2)
+      listen (~> 3.1.5)
       log4r (~> 1.1.9, < 1.1.11)
       net-scp (~> 1.1.0)
       net-sftp (~> 2.1)
-      net-ssh (>= 2.6.6, < 2.10.0)
-      nokogiri (= 1.6.3.1)
+      net-ssh (~> 3.0.1)
+      nokogiri (= 1.6.7.1)
       rb-kqueue (~> 0.2.0)
-      rest-client (>= 1.6.0, < 2.0)
+      rest-client (>= 1.6.0, < 3.0)
       wdm (~> 0.1.0)
-      winrm (~> 1.3)
-      winrm-fs (~> 0.2.0)
+      winrm (~> 1.6)
+      winrm-fs (~> 0.3.0)
 
 PATH
   remote: .
   specs:
-    vagrant-invade (0.4.8)
+    vagrant-invade (0.5.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
     builder (3.2.2)
-    childprocess (0.5.8)
+    childprocess (0.5.9)
       ffi (~> 1.0, >= 1.0.11)
-    domain_name (0.5.25)
+    domain_name (0.5.20160615)
       unf (>= 0.0.5, < 1.0.0)
     erubis (2.7.0)
-    ffi (1.9.10)
+    ffi (1.9.14)
     gssapi (1.2.0)
       ffi (>= 1.0.1)
     gyoku (1.3.1)
@@ -43,65 +49,68 @@ GEM
     hashicorp-checkpoint (0.1.4)
     http-cookie (1.0.2)
       domain_name (~> 0.5)
-    httpclient (2.7.0.1)
+    httpclient (2.8.1)
     i18n (0.7.0)
-    listen (3.0.5)
-      rb-fsevent (>= 0.9.3)
-      rb-inotify (>= 0.9)
+    listen (3.1.5)
+      rb-fsevent (~> 0.9, >= 0.9.4)
+      rb-inotify (~> 0.9, >= 0.9.7)
+      ruby_dep (~> 1.2)
     little-plugger (1.1.4)
     log4r (1.1.10)
-    logging (1.8.2)
-      little-plugger (>= 1.1.3)
-      multi_json (>= 1.8.4)
-    mime-types (2.99)
-    mini_portile (0.6.0)
-    multi_json (1.11.2)
+    logging (2.1.0)
+      little-plugger (~> 1.1)
+      multi_json (~> 1.10)
+    mime-types (3.1)
+      mime-types-data (~> 3.2015)
+    mime-types-data (3.2016.0521)
+    mini_portile2 (2.0.0)
+    multi_json (1.12.1)
     net-scp (1.1.2)
       net-ssh (>= 2.6.5)
     net-sftp (2.1.2)
       net-ssh (>= 2.6.5)
-    net-ssh (2.9.2)
+    net-ssh (3.0.2)
     netrc (0.11.0)
-    nokogiri (1.6.3.1)
-      mini_portile (= 0.6.0)
+    nokogiri (1.6.7.1)
+      mini_portile2 (~> 2.0.0.rc2)
     nori (2.6.0)
-    rb-fsevent (0.9.6)
-    rb-inotify (0.9.5)
+    rb-fsevent (0.9.7)
+    rb-inotify (0.9.7)
       ffi (>= 0.5.0)
     rb-kqueue (0.2.4)
       ffi (>= 0.5.0)
-    rest-client (1.8.0)
+    rest-client (2.0.0)
       http-cookie (>= 1.0.2, < 2.0)
-      mime-types (>= 1.16, < 3.0)
-      netrc (~> 0.7)
-    rubyntlm (0.4.0)
-    rubyzip (1.1.7)
+      mime-types (>= 1.16, < 4.0)
+      netrc (~> 0.8)
+    ruby_dep (1.4.0)
+    rubyntlm (0.6.0)
+    rubyzip (1.2.0)
     unf (0.1.4)
       unf_ext
-    unf_ext (0.0.7.1)
-    uuidtools (2.1.5)
+    unf_ext (0.0.7.2)
     wdm (0.1.1)
-    winrm (1.3.5)
+    winrm (1.8.1)
       builder (>= 2.1.2)
       gssapi (~> 1.2)
       gyoku (~> 1.0)
       httpclient (~> 2.2, >= 2.2.0.2)
       logging (>= 1.6.1, < 3.0)
       nori (~> 2.0)
-      rubyntlm (~> 0.4.0)
-      uuidtools (~> 2.1.2)
-    winrm-fs (0.2.3)
+      rubyntlm (~> 0.6.0)
+    winrm-fs (0.3.2)
       erubis (~> 2.7)
-      logging (~> 1.6, >= 1.6.1)
+      logging (>= 1.6.1, < 3.0)
       rubyzip (~> 1.1)
-      winrm (~> 1.3.0)
+      winrm (~> 1.5)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
   vagrant!
+  vagrant-hostmanager!
   vagrant-invade!
 
 BUNDLED WITH
-   1.10.5
+   1.12.5

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

@@ -17,87 +17,96 @@ module VagrantPlugins
           # Define invade config
           config = @env[:invade]
 
-          # Iterate over each machine configuration
-          machines = config['machines']
+          # Final vagrantfile hash
+          vagrantfile = Hash.new
 
-          unless machines == nil
+          # Machine hashes
+          machine = Hash.new
+          machine_part = Hash.new
 
-            part = Hash.new
-            definition = Hash.new
+          # Hostmanager plugin configuration
+          unless config['hostmanager'] == nil
+            vagrantfile['hostmanager'] = Generator::HostManager.new(config['hostmanager']).generate
+          end
 
-            machines.each_with_index do |(machine, section), index|
+          # Iterate over each machine defined in config
+          unless config['machines'] == nil
+            config['machines'].each_with_index do |(name, part), index|
 
-              # VM
-              unless section['vm'] == nil
-                part['vm'] = Generator::Section::VM.new(machine, section['vm']).generate
+                # VM
+              unless part['vm'] == nil
+                machine_part['vm'] = Generator::MachinePart::VM.new(name, part['vm']).generate
               end
 
               # NETWORK
-              unless section['network'] == nil
-                part['network'] = ''
+              unless part['network'] == nil
+                machine_part['network'] = ''
 
-                section['network'].each do |type, data|
-                  part['network'].concat(Generator::Section::Network.new(machine, type, data).generate)
+                part['network'].each do |type, data|
+                  machine_part['network'].concat(Generator::MachinePart::Network.new(name, type, data).generate)
                 end
               end
 
               # SSH
-              unless section['ssh'] == nil
-                part['ssh'] = (Generator::Section::SSH.new(machine, section['ssh']).generate)
+              unless part['ssh'] == nil
+                machine_part['ssh'] = (Generator::MachinePart::SSH.new(name, part['ssh']).generate)
               end
 
               # PROVIDER
-              unless section['provider'] == nil
-                part['provider'] = ''
+              unless part['provider'] == nil
+                machine_part['provider'] = ''
 
-                section['provider'].each do |type, data|
-                  parts = Generator::Section::Provider.new(machine, type, data).generate
-                  part['provider'].concat(parts)
+                part['provider'].each do |type, data|
+                  parts = Generator::MachinePart::Provider.new(name, type, data).generate
+                  machine_part['provider'].concat(parts)
                 end
               end
 
               # SYNCED FOLDER
-              unless section['synced_folder'] == nil
-                part['synced_folder'] = ''
+              unless part['synced_folder'] == nil
+                machine_part['synced_folder'] = ''
 
-                section['synced_folder'].each do |name, data|
-                  parts = Generator::Section::SyncedFolder.new(machine, data).generate
-                  part['synced_folder'].concat(parts)
+                part['synced_folder'].each do |folder_name, data|
+                  parts = Generator::MachinePart::SyncedFolder.new(folder_name, data).generate
+                  machine_part['synced_folder'].concat(parts)
                 end
               end
 
               # PROVISION
-              unless section['provision'] == nil
-                part['provision'] = ''
+              unless part['provision'] == nil
+                machine_part['provision'] = ''
 
-                section['provision'].each do |name, data|
-                  parts = Generator::Section::Provision.new(machine, name, data).generate
-                  part['provision'].concat(parts)
+                part['provision'].each do |provision_name, data|
+                  parts = Generator::MachinePart::Provision.new(name, provision_name, data).generate
+                  machine_part['provision'].concat(parts)
                 end
               end
 
               # PLUGIN
-              unless section['plugin'] == nil
-                part['plugin'] = ''
+              unless part['plugin'] == nil
+                machine_part['plugin'] = ''
 
-                section['plugin'].each do |type, data|
-                  parts = Generator::Section::Plugin.new(machine, @env[:ui], type, data).generate
-                  part['plugin'].concat(parts)
+                part['plugin'].each do |type, data|
+                  parts = Generator::MachinePart::Plugin.new(name, @env[:ui], type, data).generate
+                  machine_part['plugin'].concat(parts)
                 end
               end
 
-              # Add as definition
-              definition[machine] = Generator::Definition.new(machine, part).generate
+              # Generate machine from parts
+              machine[name] = Generator::Machine.new(name, machine_part).generate
+
             end
 
-            # Finally generate Vagrantfile from generated definitions and add it to Vagrant environment
-            @env[:invade]['vagrantfile'] = Generator::Vagrantfile.new(env, definition).generate
+            vagrantfile['machine'] = machine
+          end
 
-            # Finally done with generating. Delete machines from Vagrant environment
-            @env[:invade].delete("machines")
+          # Finally generate Vagrantfile from machines and add it to Vagrant env
+          @env[:invade]['vagrantfile'] = Generator::Vagrantfile.new(vagrantfile).generate
 
-            @app.call(env)
-          end
+          # Finally done with generating. Delete machines from Vagrant env
+          @env[:invade].delete("machines")
+
+          @app.call(env)
         end
 
       end

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

@@ -23,7 +23,12 @@ module VagrantPlugins
           ###############################################################
 
           # INVADE
-          config['invade'] = Validator::Invade.new(env, config['invade']).validate
+          config['invade'] = Validator::Invade.new(config['invade']).validate
+
+          # Hostmanager Plugin
+          unless config['hostmanager'] == nil
+            config['hostmanager'] = Validator::HostManager.new( config['hostmanager']).validate
+          end
 
           # Iterate over each machine configuration
           machines = config['machines']
@@ -33,7 +38,6 @@ module VagrantPlugins
               # VM
               unless sections['vm'] == nil
                 @env[:ui].info("\n[Invade] #{machine.upcase}: Validating VM section...") unless quiet
-
                 sections['vm'] = Validator::VM.new(env, sections['vm']).validate
               end
 
@@ -118,6 +122,7 @@ module VagrantPlugins
                 sections['ssh'] = Validator::SSH.new(env, sections['ssh']).validate
               end
 
+              # PLUGINS
               unless sections['plugin'] == nil
                 @env[:ui].info("\n[Invade] #{machine.upcase}: Validating PLUGIN section...") unless quiet
 

data/lib/vagrant-invade/builder/hostmanager.rb

@@ -0,0 +1,40 @@
+module VagrantPlugins
+  module Invade
+    module Builder
+
+      require 'erubis'
+
+      class HostManager
+
+        attr_reader :result
+        attr_accessor :hostmanager_data
+
+        def initialize(hostmanager_data, result: nil)
+          @hostmanager_data = hostmanager_data
+          @result = result
+        end
+
+        def build
+          b = binding
+          template_file = "#{TEMPLATE_PATH}/hostmanager.erb"
+
+          begin
+
+            # Values for hostmanager part
+            enabled = @hostmanager_data['enabled']
+            manage_host = @hostmanager_data['manage_host']
+            manage_guest = @hostmanager_data['manage_guest']
+            ignore_private_ip = @hostmanager_data['ignore_private_ip']
+            include_offline = @hostmanager_data['include_offline']
+
+            eruby = Erubis::Eruby.new(File.read(template_file))
+            @result = eruby.result b
+          rescue TypeError, SyntaxError, SystemCallError => e
+            raise(e)
+          end
+        end
+      end
+
+    end
+  end
+end

data/lib/vagrant-invade/builder/machine.rb

@@ -0,0 +1,45 @@
+module VagrantPlugins
+  module Invade
+    module Builder
+
+      require 'erubis'
+
+      class Machine
+
+        attr_reader :result
+        attr_accessor :machine_data
+
+        def initialize(machine_name, machine_data, result: nil)
+          @machine_name = machine_name
+          @machine_data  = machine_data
+          @result   = result
+        end
+
+        def build
+          b = binding
+          template_file = "#{TEMPLATE_PATH}/machine.erb"
+
+          begin
+
+            # Machine name
+            machine_name = @machine_name
+
+            # Data to build machine entry
+            vm = @machine_data['vm']
+            network = @machine_data['network']
+            ssh = @machine_data['ssh']
+            provider = @machine_data['provider']
+            synced_folder = @machine_data['synced_folder']
+            plugin = @machine_data['plugin']
+            provision = @machine_data['provision']
+
+            eruby = Erubis::Eruby.new(File.read(template_file))
+            @result = eruby.result b
+          rescue TypeError, SyntaxError, SystemCallError => e
+            raise(e)
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -7,10 +7,10 @@ module VagrantPlugins
       class Vagrantfile
 
         attr_reader :result
-        attr_accessor :definitions
+        attr_accessor :vagrantfile_data
 
-        def initialize(definitions, result: nil)
-          @definitions  = definitions
+        def initialize(vagrantfile_data, result: nil)
+          @vagrantfile_data  = vagrantfile_data
           @result   = result
         end
 
@@ -20,8 +20,9 @@ module VagrantPlugins
 
           begin
 
-            # definitions for vagrantfile to build
-            definitions = @definitions
+            # Set variables for template files
+            hostmanager = @vagrantfile_data['hostmanager']
+            machines = @vagrantfile_data['machine']
 
             eruby = Erubis::Eruby.new(File.read(template_file))
             @result = eruby.result b

data/lib/vagrant-invade/builder.rb

@@ -2,6 +2,7 @@ module VagrantPlugins
   module Invade
     module Builder
 
+      autoload :HostManager, 'vagrant-invade/builder/hostmanager'
       autoload :VM, 'vagrant-invade/builder/vm'
       autoload :Network, 'vagrant-invade/builder/network'
       autoload :SSH, 'vagrant-invade/builder/ssh'
@@ -9,7 +10,7 @@ module VagrantPlugins
       autoload :Provision, 'vagrant-invade/builder/provision'
       autoload :SyncedFolder, 'vagrant-invade/builder/synced_folder'
       autoload :Plugin, 'vagrant-invade/builder/plugin'
-      autoload :Definition, 'vagrant-invade/builder/definition'
+      autoload :Machine, 'vagrant-invade/builder/machine'
       autoload :Vagrantfile, 'vagrant-invade/builder/vagrantfile'
 
       TEMPLATE_PATH = File.join(File.dirname(__FILE__), 'template')

data/lib/vagrant-invade/generator/hostmanager.rb

@@ -0,0 +1,23 @@
+module VagrantPlugins
+  module Invade
+    module Generator
+
+      class HostManager
+
+        attr_accessor :hostmanager_data
+
+        def initialize(hostmanager_data)
+          @hostmanager_data = hostmanager_data
+        end
+
+        def generate
+          hostmanager = Builder::HostManager.new(@hostmanager_data)
+          hostmanager.build
+
+          hostmanager.result
+        end
+
+      end
+    end
+  end
+end

data/lib/vagrant-invade/generator/machine.rb

@@ -0,0 +1,25 @@
+module VagrantPlugins
+  module Invade
+    module Generator
+
+      class Machine
+
+        attr_accessor :machine_data
+
+        def initialize(machine_name, machine_data)
+            @machine_name = machine_name
+            @machine_data = machine_data
+        end
+
+        def generate
+            machine = Builder::Machine.new(@machine_name, @machine_data)
+            machine.build
+
+            machine.result
+        end
+
+      end
+
+    end
+  end
+end

data/lib/vagrant-invade/generator/{section → machine_part}/network.rb

@@ -1,7 +1,7 @@
 module VagrantPlugins
   module Invade
     module Generator
-      module Section
+      module MachinePart
 
         class Network
 

data/lib/vagrant-invade/generator/{section → machine_part}/plugin.rb

@@ -1,7 +1,7 @@
 module VagrantPlugins
   module Invade
     module Generator
-      module Section
+      module MachinePart
 
         class Plugin
 

data/lib/vagrant-invade/generator/{section → machine_part}/provider.rb

@@ -1,7 +1,7 @@
 module VagrantPlugins
   module Invade
     module Generator
-      module Section
+      module MachinePart
 
         class Provider
 

data/lib/vagrant-invade/generator/{section → machine_part}/provision.rb

@@ -1,7 +1,7 @@
 module VagrantPlugins
   module Invade
     module Generator
-      module Section
+      module MachinePart
 
         class Provision
 

data/lib/vagrant-invade/generator/{section → machine_part}/ssh.rb

@@ -1,7 +1,7 @@
 module VagrantPlugins
   module Invade
     module Generator
-      module Section
+      module MachinePart
 
         class SSH
 

data/lib/vagrant-invade/generator/{section → machine_part}/synced_folder.rb

@@ -1,7 +1,7 @@
 module VagrantPlugins
   module Invade
     module Generator
-      module Section
+      module MachinePart
 
         class SyncedFolder
 

data/lib/vagrant-invade/generator/{section → machine_part}/vm.rb

@@ -1,7 +1,7 @@
 module VagrantPlugins
   module Invade
     module Generator
-      module Section
+      module MachinePart
 
         class VM
 

data/lib/vagrant-invade/generator/machine_part.rb

@@ -0,0 +1,23 @@
+module VagrantPlugins
+  module Invade
+    module Generator
+      
+      module MachinePart
+
+        autoload :VM, 'vagrant-invade/generator/machine_part/vm'
+        autoload :Network, 'vagrant-invade/generator/machine_part/network'
+        autoload :SSH, 'vagrant-invade/generator/machine_part/ssh'
+        autoload :Provider, 'vagrant-invade/generator/machine_part/provider'
+        autoload :SyncedFolder, 'vagrant-invade/generator/machine_part/synced_folder'
+        autoload :Provision, 'vagrant-invade/generator/machine_part/provision'
+        autoload :Plugin, 'vagrant-invade/generator/machine_part/plugin'
+
+        attr_accessor :machine_part
+
+        def initialize(machine_part)
+
+        end
+      end
+    end
+  end
+end

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

@@ -4,10 +4,9 @@ module VagrantPlugins
 
       class Vagrantfile
 
-        attr_accessor :env, :vagrantfile_data
+        attr_accessor :vagrantfile_data
 
-        def initialize(env, vagrantfile_data)
-          @env = env
+        def initialize(vagrantfile_data)
           @vagrantfile_data = vagrantfile_data
         end
 

data/lib/vagrant-invade/generator.rb

@@ -2,8 +2,9 @@ module VagrantPlugins
   module Invade
     module Generator
 
-      autoload :Section, 'vagrant-invade/generator/section'
-      autoload :Definition, 'vagrant-invade/generator/definition'
+      autoload :HostManager, 'vagrant-invade/generator/hostmanager'
+      autoload :MachinePart, 'vagrant-invade/generator/machine_part'
+      autoload :Machine, 'vagrant-invade/generator/machine'
       autoload :Vagrantfile, 'vagrant-invade/generator/vagrantfile'
 
     end

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

@@ -0,0 +1,8 @@
+<% if enabled =%>
+# --- Hostmanager Settings --- #
+  config.hostmanager.enabled = <%= enabled %>
+  config.hostmanager.manage_host = <%= manage_host %>
+  config.hostmanager.manage_guest = <%= manage_guest %>
+  config.hostmanager.ignore_private_ip = <%= ignore_private_ip %>
+  config.hostmanager.include_offline = <%= include_offline %>
+<% end %>

data/lib/vagrant-invade/template/{definition.erb → machine.erb}

@@ -1,31 +1,29 @@
 config.vm.define "<%= machine_name %>" do |<%= machine_name %>|
 
   <% if vm %>
-    # --- VM Section ---
   <%= vm %>
   <% end %>
   <% if network %>
-    # --- Network Section ---
   <%= network %>
   <% end %>
   <% if ssh %>
-    # --- SSH Section ---
+    # --- SSH Part --- #
     <%= ssh %>
   <% end %>
   <% if provider %>
-    # --- Provider Section ---
-  <%= provider %>
+    # --- Provider Part --- #
+<%= provider %>
   <% end %>
   <% if synced_folder %>
-    # --- Synced Folder Section ---
-  <%= synced_folder %>
+    # --- Synced Folder Part --- #
+<%= synced_folder %>
   <% end %>
   <% if provision %>
-    # --- Provision Section ---
+    # --- Provision Part --- #
   <%= provision %>
   <% end %>
   <% if plugin %>
-    # --- Plugin Section
+    # --- Plugin Part --- #
   <%= plugin %>
   <% end %>
   end

data/lib/vagrant-invade/template/network/forwarded_port.erb

@@ -1,8 +1,8 @@
-
-  <%= machine_name %>.vm.network "forwarded_port"
-  <% if guest %>, guest: <%= guest %><% end %>
-  <% if guest_ip %>, guest_ip: <%= guest_ip %><% end %>
-  <% if host %>, host: <%= host %><% end %>
-  <% if host_ip %>, host_ip: <%= host_ip %><% end %>
-  <% if protocol %>, protocol: <%= protocol %><% end %>
-  <% if auto_correct %>, auto_correct: <%= auto_correct %><% end %>
+  # --- Network Part --- #
+    <%= machine_name %>.vm.network "forwarded_port"
+    <% if guest %>, guest: <%= guest %><% end %>
+    <% if guest_ip %>, guest_ip: <%= guest_ip %><% end %>
+    <% if host %>, host: <%= host %><% end %>
+    <% if host_ip %>, host_ip: <%= host_ip %><% end %>
+    <% if protocol %>, protocol: <%= protocol %><% end %>
+    <% if auto_correct %>, auto_correct: <%= auto_correct %><% end %>

data/lib/vagrant-invade/template/network/private_network.erb

@@ -1,2 +1,2 @@
-
+  # --- Network Part --- #
     <%= machine_name %>.vm.network "private_network"<% if ip %>, ip: "<%= ip %>"<% end %><% if dhcp %>, type: "<%= dhcp %>"<% end %><% if auto_config %>, auto_config: <%= auto_config %><% end %>

data/lib/vagrant-invade/template/network/public_network.erb

@@ -1,4 +1,4 @@
-
+  # --- Network Part --- #
     <%= machine_name %>.vm.network "public_network"
     <% if ip %>, ip: <%= ip %><% end %>
     <% if type %>, type: <%= type %><% end %>

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

@@ -1,15 +1,3 @@
-  <% if enabled %>
-  <%= machine_name %>.hostmanager.enabled = <%= enabled %>
-    <% end %>
-    <% if manage_host %>
-    <%= machine_name %>.hostmanager.manage_host = <%= manage_host %>
-    <% end %>
-    <% if ignore_private_ip %>
-    <%= machine_name %>.hostmanager.ignore_private_ip = <%= ignore_private_ip %>
-    <% end %>
-    <% if include_offline %>
-    <%= machine_name %>.hostmanager.include_offline = <%= include_offline %>
-    <% end %>
-    <% if aliases %>
-    <%= machine_name %>.hostmanager.aliases = <%= aliases %>
-    <% end %>
+<% if aliases %>
+  <%= machine_name %>.hostmanager.aliases = <%= aliases %>
+  <% end %>

data/lib/vagrant-invade/template/provider/virtualbox.erb

@@ -1,4 +1,3 @@
-
     <%= machine_name %>.vm.provider :virtualbox do |virtualbox|
       virtualbox.name = '<%= name %>'
       virtualbox.cpus = <%= cpus %>

data/lib/vagrant-invade/template/provider/vmware.erb

@@ -1,4 +1,3 @@
-
     <%= machine_name %>.vm.provider :vmware_desktop do |vmware|
       vmware.vmx['displayName'] = '<%= name %>'
       vmware.vmx['memsize'] = <%= memory %>

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

@@ -1,4 +1,3 @@
-
     <%= machine_name %>.vm.synced_folder '<%= source %>', '<%= path %>',
       type: 'nfs'<% if mount_options %>, mount_options: <%= mount_options %><% end %><% if enabled %>, disabled: true<% end %>
     <% if uid %>

data/lib/vagrant-invade/template/v2.erb

@@ -3,7 +3,8 @@
 
 Vagrant.configure(2) do |config|
 
-  <% definitions.each do |definition, data| %>
+  <% machines.each do |machine, data| %>
   <%= data %>
   <% end %>
+  <%= hostmanager %>
 end

data/lib/vagrant-invade/template/vm/vm.erb

@@ -1,4 +1,4 @@
-
+  # --- VM Part --- #
     <%= machine_name %>.vm.box = '<%= box %>'
     <% if url %>
     <%= machine_name %>.vm.box_url = '<%= url %>'

data/lib/vagrant-invade/validator/hostmanager.rb

@@ -0,0 +1,56 @@
+module VagrantPlugins
+  module Invade
+    module Validator
+
+      class HostManager
+
+        attr_accessor :env
+        attr_accessor :hostmanager
+
+        DEFAULT = {
+          'enabled' => true,
+          'manage_host' => true,
+          'manage_guest' => true,
+          'ignore_private_ip' => false,
+          'include_offline' => true
+        }
+
+        def initialize(hostmanager)
+          @hostmanager = hostmanager
+        end
+
+        def validate
+          return nil unless @hostmanager
+
+          # ENABLED
+          @hostmanager['enabled'] = Validator.validate_boolean(
+            @hostmanager['enabled'], 'enabled', DEFAULT['enabled']
+          )
+
+          # MANAGE HOST
+          @hostmanager['manage_host'] = Validator.validate_boolean(
+            @hostmanager['manage_host'], 'manage_host', DEFAULT['manage_host']
+          )
+
+          # MANAGE GUEST
+          @hostmanager['manage_guest'] = Validator.validate_boolean(
+            @hostmanager['manage_guest'], 'manage_guest', DEFAULT['manage_guest']
+          )
+
+          # IGNORE PRIVATE IP
+          @hostmanager['ignore_private_ip'] = Validator.validate_boolean(
+            @hostmanager['ignore_private_ip'], 'ignore_private_ip', DEFAULT['ignore_private_ip']
+          )
+
+          # INCLUDE OFFLINE
+          @hostmanager['include_offline'] = Validator.validate_boolean(
+            @hostmanager['include_offline'], 'include_offline', DEFAULT['include_offline']
+          )
+
+          @hostmanager
+        end
+
+      end
+    end
+  end
+end

data/lib/vagrant-invade/validator/invade.rb

@@ -12,8 +12,7 @@ module VagrantPlugins
           'debug' => false
         }
 
-        def initialize(env, invade)
-          @env = env
+        def initialize(invade)
           @invade = invade
         end
 

data/lib/vagrant-invade/validator.rb

@@ -3,6 +3,7 @@ module VagrantPlugins
     module Validator
 
       autoload :Invade, 'vagrant-invade/validator/invade'
+      autoload :HostManager, 'vagrant-invade/validator/hostmanager'
       autoload :VM, 'vagrant-invade/validator/vm'
       autoload :Network, 'vagrant-invade/validator/network'
       autoload :Provider, 'vagrant-invade/validator/provider'

data/lib/vagrant-invade/version.rb

@@ -1,5 +1,5 @@
 module VagrantPlugins
   module Invade
-    VERSION = '0.4.8'
+    VERSION = '0.5.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-invade
 version: !ruby/object:Gem::Version
-  version: 0.4.8
+  version: 0.5.0
 platform: ruby
 authors:
 - Lennart Stein
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-23 00:00:00.000000000 Z
+date: 2016-08-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -70,7 +70,8 @@ files:
 - lib/vagrant-invade/action/init.rb
 - lib/vagrant-invade/action/validate.rb
 - lib/vagrant-invade/builder.rb
-- lib/vagrant-invade/builder/definition.rb
+- lib/vagrant-invade/builder/hostmanager.rb
+- lib/vagrant-invade/builder/machine.rb
 - lib/vagrant-invade/builder/network.rb
 - lib/vagrant-invade/builder/network/forwarded_port.rb
 - lib/vagrant-invade/builder/network/private_network.rb
@@ -99,18 +100,20 @@ files:
 - lib/vagrant-invade/command/root.rb
 - lib/vagrant-invade/command/validate.rb
 - lib/vagrant-invade/generator.rb
-- lib/vagrant-invade/generator/definition.rb
-- lib/vagrant-invade/generator/section.rb
-- lib/vagrant-invade/generator/section/network.rb
-- lib/vagrant-invade/generator/section/plugin.rb
-- lib/vagrant-invade/generator/section/provider.rb
-- lib/vagrant-invade/generator/section/provision.rb
-- lib/vagrant-invade/generator/section/ssh.rb
-- lib/vagrant-invade/generator/section/synced_folder.rb
-- lib/vagrant-invade/generator/section/vm.rb
+- lib/vagrant-invade/generator/hostmanager.rb
+- lib/vagrant-invade/generator/machine.rb
+- lib/vagrant-invade/generator/machine_part.rb
+- lib/vagrant-invade/generator/machine_part/network.rb
+- lib/vagrant-invade/generator/machine_part/plugin.rb
+- lib/vagrant-invade/generator/machine_part/provider.rb
+- lib/vagrant-invade/generator/machine_part/provision.rb
+- lib/vagrant-invade/generator/machine_part/ssh.rb
+- lib/vagrant-invade/generator/machine_part/synced_folder.rb
+- lib/vagrant-invade/generator/machine_part/vm.rb
 - lib/vagrant-invade/generator/vagrantfile.rb
 - lib/vagrant-invade/plugin.rb
-- lib/vagrant-invade/template/definition.erb
+- lib/vagrant-invade/template/hostmanager.erb
+- lib/vagrant-invade/template/machine.erb
 - lib/vagrant-invade/template/network/forwarded_port.erb
 - lib/vagrant-invade/template/network/private_network.erb
 - lib/vagrant-invade/template/network/public_network.erb
@@ -129,6 +132,7 @@ files:
 - lib/vagrant-invade/template/v2.erb
 - lib/vagrant-invade/template/vm/vm.erb
 - lib/vagrant-invade/validator.rb
+- lib/vagrant-invade/validator/hostmanager.rb
 - lib/vagrant-invade/validator/invade.rb
 - lib/vagrant-invade/validator/network.rb
 - lib/vagrant-invade/validator/network/forwarded_port.rb
@@ -173,7 +177,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Create a Vagrantfile with a single YAML configuration file

data/lib/vagrant-invade/builder/definition.rb

@@ -1,45 +0,0 @@
-module VagrantPlugins
-  module Invade
-    module Builder
-
-      require 'erubis'
-
-      class Definition
-
-        attr_reader :result
-        attr_accessor :definition_data
-
-        def initialize(machine_name, definition_data, result: nil)
-          @machine_name = machine_name
-          @definition_data  = definition_data
-          @result   = result
-        end
-
-        def build
-          b = binding
-          template_file = "#{TEMPLATE_PATH}/definition.erb"
-
-          begin
-
-            # Machine name
-            machine_name = @machine_name
-
-            # Data to build definition entry
-            vm = @definition_data['vm']
-            network = @definition_data['network']
-            ssh = @definition_data['ssh']
-            provider = @definition_data['provider']
-            synced_folder = @definition_data['synced_folder']
-            plugin = @definition_data['plugin']
-            provision = @definition_data['provision']
-
-            eruby = Erubis::Eruby.new(File.read(template_file))
-            @result = eruby.result b
-          rescue TypeError, SyntaxError, SystemCallError => e
-            raise(e)
-          end
-        end
-      end
-    end
-  end
-end

data/lib/vagrant-invade/generator/definition.rb

@@ -1,25 +0,0 @@
-module VagrantPlugins
-  module Invade
-    module Generator
-
-      class Definition
-
-        attr_accessor :definition_data
-
-        def initialize(machine_name, definition_data)
-            @machine_name = machine_name
-            @definition_data = definition_data
-        end
-
-        def generate
-            definition = Builder::Definition.new(@machine_name, @definition_data)
-            definition.build
-
-            definition.result
-        end
-
-      end
-
-    end
-  end
-end

data/lib/vagrant-invade/generator/section.rb

@@ -1,17 +0,0 @@
-module VagrantPlugins
-  module Invade
-    module Generator
-      module Section
-
-        autoload :VM, 'vagrant-invade/generator/section/vm'
-        autoload :Network, 'vagrant-invade/generator/section/network'
-        autoload :SSH, 'vagrant-invade/generator/section/ssh'
-        autoload :Provider, 'vagrant-invade/generator/section/provider'
-        autoload :SyncedFolder, 'vagrant-invade/generator/section/synced_folder'
-        autoload :Provision, 'vagrant-invade/generator/section/provision'
-        autoload :Plugin, 'vagrant-invade/generator/section/plugin'
-
-      end
-    end
-  end
-end