vagrant-invade 0.4.4 → 0.4.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1aad58eb8fd8f1802188d135b0e6f2a5d4ce8a62
-  data.tar.gz: 8d28a95cc2fed4b8880d9ab2d2644e862dae60c3
+  metadata.gz: 7bf54260067f47e80923d6cd17aad5fd106b6a4f
+  data.tar.gz: d29622a60426162f6db16fa554cf102755b44295
 SHA512:
-  metadata.gz: c3d051ea1548406362b8ae94764d6a396451cfd805a469844c5b5ae5ccacae705b1b3dab4a5f6a5cbea058f9a4c8050bf0e292b9686181b1c10913425e28be10
-  data.tar.gz: 52845d4ba8eac250e764be9ec4f16bf7fc7feb0c0aeb13c7212811a768ecc2d77ca34de88e221019a579bba583d007eaffa460aab613e3f11683d1089ad3286e
+  metadata.gz: c4f988ba5de968dcbde596d846e7590abeef3d922b3b92e0149f89251a8a42f2784df5a0f5dc9dcae7b9f32c1fa667b5d2f6e6df03b2850f5e9a483e413ba77a
+  data.tar.gz: 08dad8d04de000b9e111432c2b0948f5f0b7ef355bd2b6503d84871b7a93581d06af8e1a78fe3087218bc93c442759099a433a6bff342bb8dc917bbab3899fe2

data/Gemfile.lock

@@ -23,7 +23,7 @@ GIT
 PATH
   remote: .
   specs:
-    vagrant-invade (0.4.3)
+    vagrant-invade (0.4.4)
 
 GEM
   remote: https://rubygems.org/

data/invade.yml.dist

@@ -32,23 +32,27 @@ machines:
 
     # Synced Folder settings
     # synced_folder:
-    #   nfs:
-    #     name: 'www'
+    #   www:
+    #     type: nfs
     #     path: '/www'
     #     source: '..'
     #     mount_options:
     #       - nolock
+    #
+    #   ssh:
+    #     type: nfs
+    #     path: '/home/vagrant/.ssh/'
+    #     source: '/Users/$USER/.ssh/'
 
     # provision:
-    #   shell:
-    #     name: 'set-permissions'
+    #   set-permissions:
     #     inline: 'chmod 777 /tmp'
 
-    #   shell:
-    #     name: 'run-composer'
+    #   run-composer:
     #     path: '/home/vagrant/provision/shell/run-composer.sh'
 
-    #   puppet:
+    #   puppet-agent:
+    #     type: 'puppet'
     #     manifests_path: 'puppet/manifests'
     #     manifest_file: 'init.pp'
     #     module_path:

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

@@ -55,22 +55,23 @@ module VagrantPlugins
               unless section['synced_folder'] == nil
                 part['synced_folder'] = ''
 
-                section['synced_folder'].each do |type, data|
-                  parts = Generator::Section::SyncedFolder.new(machine, type, data).generate
+                section['synced_folder'].each do |name, data|
+                  parts = Generator::Section::SyncedFolder.new(machine, data).generate
                   part['synced_folder'].concat(parts)
                 end
               end
 
-              # SYNCED FOLDER
+              # PROVISION
               unless section['provision'] == nil
                 part['provision'] = ''
 
-                section['provision'].each do |type, data|
-                  parts = Generator::Section::Provision.new(machine, type, data).generate
+                section['provision'].each do |name, data|
+                  parts = Generator::Section::Provision.new(machine, name, data).generate
                   part['provision'].concat(parts)
                 end
               end
 
+              # PLUGIN
               unless section['plugin'] == nil
                 part['plugin'] = ''
 

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

@@ -32,14 +32,14 @@ module VagrantPlugins
 
               # VM
               unless sections['vm'] == nil
-                @env[:ui].info("\n[Invade] #{machine.upcase}: Validating VM configuration...") unless quiet
+                @env[:ui].info("\n[Invade] #{machine.upcase}: Validating VM section...") unless quiet
 
                 sections['vm'] = Validator::VM.new(env, sections['vm']).validate
               end
 
               # NETWORK
               unless sections['network'] == nil
-                @env[:ui].info("\n[Invade] #{machine.upcase}: Validating network configuration...") unless quiet
+                @env[:ui].info("\n[Invade] #{machine.upcase}: Validating NETWORK section...") unless quiet
 
                 sections['network'].each do |type, network|
                   @env[:ui].info("\tNetwork: #{type}") unless quiet
@@ -51,52 +51,52 @@ module VagrantPlugins
                   when 'public', 'puplic_network', 'publicnetwork', 'public-network'
                     network = Validator::Network::PublicNetwork.new(@machine_name, network).validate
                   else
-                    raise StandardError, "Network type unknown or not set. Please check the network configuration."
+                    raise StandardError, "Network type unknown or not set. Please check network section in configuration."
                   end
                 end
               end
 
               # PROVIDER
               unless sections['provider'] == nil
-                @env[:ui].info("\n[Invade] #{machine.upcase}: Validating provider configuration...") unless quiet
+                @env[:ui].info("\n[Invade] #{machine.upcase}: Validating PROVIDER section...") unless quiet
 
                 sections['provider'].each do |type, provider|
-                  @env[:ui].info("\tProvider: #{type}") unless quiet
+                  @env[:ui].info("    Provider: #{type}") unless quiet
                   case type
                   when 'virtualbox'
                     provider = Validator::Provider::VirtualBox.new(env, provider).validate
                   when 'vmware'
                     provider = Validator::Provider::VMware.new(env, provider).validate
                   else
-                    raise StandardError, "Provider unknown or not set. Please check configuration file."
+                    raise StandardError, "Provider unknown or not set. Please check provider section in configuration."
                   end
                 end
               end
 
               # SYNCED FOLDER
               unless sections['synced_folder'] == nil
-                @env[:ui].info("\n[Invade] #{machine.upcase}: Validating synced folder configuration...") unless quiet
+                @env[:ui].info("\n[Invade] #{machine.upcase}: Validating SYNCED FOLDER section...") unless quiet
 
-                sections['synced_folder'].each do |type, sf|
-                  @env[:ui].info("\tSynced Folder: #{type}") unless quiet
-                  case type
+                sections['synced_folder'].each do |name, sf|
+                  @env[:ui].info("    Synced Folder: #{name}") unless quiet
+                  case sf['type']
                   when 'nfs'
                     sf = Validator::SyncedFolder::NFS.new(env, sf).validate
                   when 'vb'
                     sf = Validator::SyncedFolder::VB.new(env, sf).validate
                   else
-                    raise StandardError, "Synced Folder type unknown or not set. Please check configuration file."
+                    raise StandardError, "Synced Folder type unknown or not set. Please check synced folder section in configuration."
                   end
                 end
               end
 
               # PROVISION
               unless sections['provision'] == nil
-                @env[:ui].info("\n[Invade] #{machine.upcase}: Validating provision configuration...") unless quiet
+                @env[:ui].info("\n[Invade] #{machine.upcase}: Validating PROVISION section...") unless quiet
 
-                sections['provision'].each do |type, provision|
-                  @env[:ui].info("\tProvision: #{type}") unless quiet
-                  case type
+                sections['provision'].each do |name, provision|
+                  @env[:ui].info("    Provision: #{name}") unless quiet
+                  case provision['type']
                   when 'shell'
                     provision = Validator::Provision::Shell.new(env, provision).validate
                   when 'shellinline', 'shell-inline'
@@ -106,23 +106,23 @@ module VagrantPlugins
                   when 'puppet-agent', 'puppetagent', 'puppet-server', 'puppet-master'
                     provision = Validator::Provision::PuppetAgent.new(env, provision).validate
                   else
-                    raise StandardError, "Provision type unknown or not set. Please check configuration file."
+                    raise StandardError, "Provision type unknown or not set. Please check provision section in configuration."
                   end
                 end
               end
 
               # SSH
               unless sections['ssh'] == nil
-                @env[:ui].info("\n[Invade] #{machine.upcase}: Validating SSH configuration...") unless quiet
+                @env[:ui].info("\n[Invade] #{machine.upcase}: Validating SSH section...") unless quiet
 
                 sections['ssh'] = Validator::SSH.new(env, sections['ssh']).validate
               end
 
               unless sections['plugin'] == nil
-                @env[:ui].info("\n[Invade] #{machine.upcase}: Validating plugin configuration...") unless quiet
+                @env[:ui].info("\n[Invade] #{machine.upcase}: Validating PLUGIN section...") unless quiet
 
                 sections['plugin'].each do |type, plugin|
-                  @env[:ui].info("\tPlugin: #{type}") unless quiet
+                  @env[:ui].info("    Plugin: #{type}") unless quiet
                   case type
                   when 'hostmanager'
                     plugin = Validator::Plugin::HostManager.new(env, plugin).validate
@@ -131,7 +131,7 @@ module VagrantPlugins
                   when 'r10k'
                     plugin = Validator::Plugin::R10k.new(env, plugin).validate
                   else
-                    raise StandardError, "Plugin type unknown or not set. Please check configuration file."
+                    raise StandardError, "Plugin type unknown or not set. Please check plugin section in configuration."
                   end
                 end
               end

data/lib/vagrant-invade/builder/provision/shell.rb

@@ -8,10 +8,11 @@ module VagrantPlugins
         class Shell
 
           attr_reader :result
-          attr_accessor :machine_name, :shell_data
+          attr_accessor :machine_name, :name, :shell_data
 
-          def initialize(machine_name, shell_data, result: nil)
+          def initialize(machine_name, name, shell_data, result: nil)
             @machine_name = machine_name
+            @shell_name = name
             @shell_data  = shell_data
             @result   = result
           end
@@ -26,7 +27,7 @@ module VagrantPlugins
               machine_name = @machine_name
 
               # Values for shell provision section
-              name = @shell_data['name']
+              name = @shell_name
               path = @shell_data['path']
               binary = @shell_data['binary']
               privileged = @shell_data['privileged']

data/lib/vagrant-invade/builder/provision/shell_inline.rb

@@ -5,15 +5,16 @@ module VagrantPlugins
 
         require 'erubis'
 
-        class Shell
+        class ShellInline
 
           attr_reader :result
-          attr_accessor :machine_name, :shell_inline_data
+          attr_accessor :machine_name, :name, :shell_inline_data
 
-          def initialize(machine_name, shell_inline_data, result: nil)
+          def initialize(machine_name, name, shell_inline_data, result: nil)
             @machine_name = machine_name
-            @shell_inline_data  = shell_inline_data
-            @result   = result
+            @shell_inline_name = name
+            @shell_inline_data = shell_inline_data
+            @result = result
           end
 
           def build
@@ -26,7 +27,7 @@ module VagrantPlugins
               machine_name = @machine_name
 
               # Values for shell provision section
-              name = @shell_inline_data['name']
+              name = @shell_inline_name
               inline = @shell_inline_data['inline']
               binary = @shell_inline_data['binary']
               privileged = @shell_inline_data['privileged']

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

@@ -5,21 +5,21 @@ module VagrantPlugins
 
         class Provision
 
-          attr_accessor :machine_name, :type, :provision_data
+          attr_accessor :machine_name, :name, :provision_data
 
-          def initialize(machine_name, type, provision_data)
+          def initialize(machine_name, name, provision_data)
             @machine_name = machine_name
-            @type = type
+            @name = name
             @provision_data = provision_data
           end
 
           def generate
-            case @type
+            case @provision_data['type']
             when 'shell'
-              provision = Builder::Provision::Shell.new(@machine_name, @provision_data)
-            when 'shell_inline', 'inline', 'shellinline'
-              provision = Builder::Provision::ShellInline.new(@machine_name, @provision_data)
-            when 'puppet', 'puppetappy', 'puppet-apply'
+              provision = Builder::Provision::Shell.new(@machine_name, @name, @provision_data)
+            when 'shell-inline', 'inline', 'shellinline'
+              provision = Builder::Provision::ShellInline.new(@machine_name, @name, @provision_data)
+            when 'puppet', 'puppetapply', 'puppet-apply'
               provision = Builder::Provision::PuppetApply.new(@machine_name, @provision_data)
             when 'puppet-agent', 'puppetagent'
               provision = Builder::Provision::PuppetAgent.new(@machine_name, @provision_data)

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

@@ -5,16 +5,15 @@ module VagrantPlugins
 
         class SyncedFolder
 
-          attr_accessor :machine_name, :type, :synced_folder_data
+          attr_accessor :machine_name, :synced_folder_data
 
-          def initialize(machine_name, type, synced_folder_data)
+          def initialize(machine_name, synced_folder_data)
             @machine_name = machine_name
-            @type = type
             @synced_folder_data = synced_folder_data
           end
 
           def generate
-            case @type
+            case @synced_folder_data['type']
             when 'vb', 'virtualbox'
               synced_folder = Builder::SyncedFolder::VirtualBox.new(@machine_name, @synced_folder_data)
             when 'nfs'

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

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

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

@@ -1 +1,2 @@
-  <%= machine_name %>.vm.network "private_network"<% if ip %>, ip: "<%= ip %>"<% end %><% if dhcp %>, type: "<%= dhcp %>"<% end %><% if auto_config %>, auto_config: <%= auto_config %><% end %>
+
+    <%= 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,5 +1,5 @@
 
-  <%= machine_name %>.vm.network "public_network"
-  <% if ip %>, ip: <%= ip %><% end %>
-  <% if type %>, type: <%= type %><% end %>
-  <% if auto_config %>, auto_config: <%= auto_config %><% end %>
+    <%= machine_name %>.vm.network "public_network"
+    <% if ip %>, ip: <%= ip %><% end %>
+    <% if type %>, type: <%= type %><% end %>
+    <% if auto_config %>, auto_config: <%= auto_config %><% end %>

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

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

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

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

data/lib/vagrant-invade/template/provision/puppet_agent.erb

@@ -1,4 +1,5 @@
-  <%= machine_name %>.vm.provision "puppet_server" do |puppet_agent|
+
+    <%= machine_name %>.vm.provision "puppet_server" do |puppet_agent|
       <% if puppet_server %>
       puppet_agent.puppet_server = '<%= puppet_server %>'
       <% end %>

data/lib/vagrant-invade/template/provision/puppet_apply.erb

@@ -1,4 +1,5 @@
-  <%= machine_name %>.vm.provision "puppet" do |puppet_apply|
+
+    <%= machine_name %>.vm.provision "puppet" do |puppet_apply|
       <% if manifests_path %>
       puppet_apply.manifests_path = '<%= manifests_path %>'
       <% end %>

data/lib/vagrant-invade/template/provision/shell.erb

@@ -1,2 +1,3 @@
-<%= machine_name %>.vm.provision "shell",
-  path: <%= path %><% unless name %>, name: <%= name %><% end %><% unless binary %>, binary: <%= binary %><% end %><% unless privileged %>, privileged: <%= privileged %><% end %>
+
+    <%= machine_name %>.vm.provision "shell",
+    path: '<%= path %>'<% if name %>, name: '<%= name %>'<% end %><% if binary %>, binary: <%= binary %><% end %><% if privileged %>, privileged: <%= privileged %><% end %>

data/lib/vagrant-invade/template/provision/shell_inline.erb

@@ -1,2 +1,3 @@
-<%= machine_name %>.vm.provision "shell",
-  inline: <%= inline %><% unless name %>, name: <%= name %><% end %><% unless binary %>, binary: <%= binary %><% end %><% unless privileged %>, privileged: <%= privileged %><% end %>
+
+    <%= machine_name %>.vm.provision "shell",
+    inline: '<%= inline %>'<% if name %>, name: '<%= name %>'<% end %><% if binary %>, binary: <%= binary %><% end %><% if privileged %>, privileged: <%= privileged %><% end %>

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

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

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

@@ -1 +1 @@
-<%= machine_name -%>.vm.synced_folder <%= source -%>, <%= path -%>, id: 'vagrant-root', owner: <%= owner -%>, <%= group -%>, mount_options: ["dmode=<%= dmode -%>,fmode=<%= fmode -%>], disabled: <%= enabled-%>
+    <%= machine_name -%>.vm.synced_folder <%= source -%>, <%= path -%>, id: 'vagrant-root', owner: <%= owner -%>, <%= group -%>, mount_options: ["dmode=<%= dmode -%>,fmode=<%= fmode -%>], disabled: <%= enabled-%>

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

@@ -1,4 +1,5 @@
-  <%= machine_name %>.vm.box = '<%= box %>'
+
+    <%= machine_name %>.vm.box = '<%= box %>'
     <% if url %>
     <%= machine_name %>.vm.box_url = '<%= url %>'
     <% end %>

data/lib/vagrant-invade/version.rb

@@ -1,5 +1,5 @@
 module VagrantPlugins
   module Invade
-    VERSION = '0.4.4'
+    VERSION = '0.4.5'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-invade
 version: !ruby/object:Gem::Version
-  version: 0.4.4
+  version: 0.4.5
 platform: ruby
 authors:
 - Lennart Stein
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-30 00:00:00.000000000 Z
+date: 2015-10-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler