vagrant-invade 0.4.0.pre.alpha → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bff9b6146d4b3ea022bd4ced0e2f12d108e5746a
-  data.tar.gz: 6228d34f409db94f205d250828c88875bc138fd0
+  metadata.gz: c16b7033c6270a5f452c2c2b4471a01b1b7ecc93
+  data.tar.gz: 6bda2175ce3d5ba0b770ef39e96b5a67d79ce009
 SHA512:
-  metadata.gz: 52934d5f816f5405d4ac3f858ac0b1de5ea61d1fe12dccd7271fadbf36abc9ba09ebd8363005f0829998a8bcd8e041949c47cf8f6ba35df5210200a34e31c141
-  data.tar.gz: 9db271d24d4b4c531ddc5fd008dc9ae276a0b9f057d15266b0f87acffce9798652be6631f33980a096e1d799e77996bcb64a8f993ca31fec071d9868dd8be474
+  metadata.gz: ac47faa4103c8cdc9afed1b24bbbf20dbcd7c8e2bcabee977581482642498f4117d87091de43cb663aecaea9efdd053afe31ba721f9b423d6baad345a8a22e7e
+  data.tar.gz: 90b2415c3db43d9b148eeb52bd6b66c8828802089542a7d218659ce9379c80d4a4476c3d1b0ecb559b8dbc69cd3c595ba39db2ec965e4a87480216e32470e1ea

data/Gemfile.lock

@@ -23,7 +23,7 @@ GIT
 PATH
   remote: .
   specs:
-    vagrant-invade (0.3.4)
+    vagrant-invade (0.4.0)
 
 GEM
   remote: https://rubygems.org/
@@ -103,4 +103,4 @@ DEPENDENCIES
   vagrant-invade!
 
 BUNDLED WITH
-   1.10.5
+   1.10.6

data/invade.yml.dist

@@ -19,10 +19,12 @@ machines:
 
     # Provider related settings. Performance, naming
     provider:
+
       vmware:
         name: 'invade'
         cores: 4
         memory: 512
+
       virtualbox:
         name: 'invade'
         cores: 4
@@ -40,23 +42,35 @@ machines:
     #   shell:
     #     name: 'set-permissions'
     #     inline: 'chmod 777 /tmp'
+
     #   shell:
     #     name: 'run-composer'
     #     path: '/home/vagrant/provision/shell/run-composer.sh'
+
     #   puppet:
     #     manifests_path: './puppet/manifests'
     #     manifest_file: 'init.pp'
-    #     module_path: ['./puppet/modules', './puppet/vendor']
-    #     facter: []
+    #     module_path:
+    #       - './puppet/modules'
+    #       - './puppet/vendor'
+    #     facter: {}
 
     plugin:
       hostmanager:
         enabled: true
         aliases:
           - my-1337-project.local
+
       # winnfsd:
       #   enabled: true
+
       # r10k:
       #   puppet_dir: './puppet'
       #   puppetfile_path: './puppet/Puppetfile'
       #   module_path: './puppet/vendor'
+      #   modules: {
+      #     'sql' => {
+      #       'url' => 'https://github.com/example42/puppet-mysql.git',
+      #       'version' => '2.1.5'
+      #     }
+      #   }

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

@@ -18,45 +18,46 @@ module VagrantPlugins
           if !invade_config_exists || @env[:invade_command_init_force]
             write_invade_config
           else
-            @env[:ui].error "[Invade] A 'invade.yml' file already exists. Use '--force' to replace file."
+            @env[:ui].error "[Invade] 'invade.yml' file already exists. Use '--force' to replace file."
           end
 
           @app.call(env)
         end
 
         def invade_config_exists
-          current_root_path = Dir.pwd
-          invade_config_file =  "#{@dir}/invade.yml"
-          if File.exist?(invade_config_file)
-            return true
-          end
-
-          false
+          File.exist?("#{@dir}/invade.yml")
         end
 
         def invade_template_exists
-          template_file_path = "#{@dir}/invade.yml.dist"
-          if File.exist?(template_file_path)
-            return true
-          end
+          File.exist?("#{@dir}/invade.yml.dist")
+        end
 
-          false
+        def invade_user_customized_config_exists
+          File.exist?(File.expand_path('~/.invade/invade.yml.dist'))
         end
 
+        # Writes configuration file 'invade.yml'
+        #   if template file in project folder does exist it copies it#
+        #   if template file in project folder doesn't exist and a '~/.invade/invade.yml.dist' file exists it copies it
+        #   if template file in project folder doesn't exist it uses plugins default file
         def write_invade_config
-          current_root_path = Dir.pwd
-          config_file_path = "#{@dir}/invade.yml"
+          invade_config_file = "#{@dir}/invade.yml"
 
           if invade_template_exists
             template_file_path = "#{@dir}/invade.yml.dist"
-            FileUtils.cp(template_file_path, config_file_path)
-            @env[:ui].success "[Invade] Copy of template 'invade.yml.dist' created successfully. Please make your changes."
+            FileUtils.cp(template_file_path, invade_config_file)
+            @env[:ui].success "[Invade] Project template file '#{template_file_path}' was found!"
+          elsif invade_user_customized_config_exists && !invade_template_exists
+            FileUtils.cp(File.expand_path('~/.invade/invade.yml.dist'), invade_config_file)
+            @env[:ui].success "[Invade] User customized template file '~/.invade/invade.yml.dist' was found!"
           else
             plugin_root_path = File.expand_path('../../../../', __FILE__)
-            default_config_file_path = plugin_root_path + '/invade.yml.dist'
-            FileUtils.cp(default_config_file_path, config_file_path)
-            @env[:ui].success "[Invade] Copy of default 'invade.yml.dist' created successfully. Please make your changes."
+            default_invade_config_file = plugin_root_path + '/invade.yml.dist'
+            FileUtils.cp(default_invade_config_file, invade_config_file)
+            @env[:ui].warn '[Invade] Project template file or customized user configuration file NOT found!'
           end
+
+          @env[:ui].success '[Invade] \'invade.yml\' created successfully. Please make your changes.'
         end
       end
 

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

@@ -101,8 +101,10 @@ module VagrantPlugins
                     provision = Validator::Provision::Shell.new(env, provision).validate
                   when 'shellinline', 'shell-inline'
                     provision = Validator::Provision::ShellInline.new(env, provision).validate
-                  when 'puppet'
-                    provision = Validator::Provision::Puppet.new(env, provision).validate
+                  when 'puppet', 'puppetapply', 'puppet-apply'
+                    provision = Validator::Provision::PuppetApply.new(env, provision).validate
+                  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."
                   end
@@ -137,8 +139,8 @@ module VagrantPlugins
             end
           end
 
-          if Validator::VALIDATION_ERRORS > 0
-            @env[:ui].warn('[Invade] Configuration has validation warnings. Use debug mode to see details.') unless quiet
+          if Validator.get_validation_errors > 0
+            @env[:ui].warn('[Invade] Configuration has validation warnings. Run \'vagrant invade validate\' to see details.')
           else
             @env[:ui].success('[Invade] Configuration validated successfully.')
           end

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

@@ -3,9 +3,9 @@ module VagrantPlugins
     module Builder
       module Network
 
-        autoload :ForwardedPort, 'vagrant-invade/builder/network/forwarded_port.rb'
-        autoload :PrivateNetwork, 'vagrant-invade/builder/network/private_network.rb'
-        autoload :PublicNetwork, 'vagrant-invade/builder/network/public_network.rb'
+        autoload :ForwardedPort, 'vagrant-invade/builder/network/forwarded_port'
+        autoload :PrivateNetwork, 'vagrant-invade/builder/network/private_network'
+        autoload :PublicNetwork, 'vagrant-invade/builder/network/public_network'
 
       end
     end

data/lib/vagrant-invade/builder/plugin/r10k.rb

@@ -26,25 +26,36 @@ module VagrantPlugins
               @result = ""
             else
 
-            b = binding
-            template_file = "#{TEMPLATE_PATH}/plugin/r10k.erb"
+              b = binding
+              template_file = "#{TEMPLATE_PATH}/plugin/r10k.erb"
 
               begin
 
-                # Only generate puppetfile if modules are given in configuration file
+                # Only generate puppetfile if plugin is enabled and modules are configured
                 if @r10k_data['enabled'] && @r10k_data['modules']
 
-                  basic_modules = [
-                    %w(https://github.com/puppetlabs/puppetlabs-stdlib.git),
-                    %w(https://github.com/puppetlabs/puppetlabs-apt.git),
-                    %w(https://github.com/example42/puppi.git)
-                  ]
-
-                  puppetfile_path = File.expand_path(@r10k_data['puppetfile_path'])
-
-                  # Generate Puppetfile
-                  merged_modules = concat_module_array(basic_modules, @r10k_data['modules'])
-                  build_puppetfile(merged_modules, puppetfile_path)
+                  # Configured puppet dir must exists. Otherwise skip generating Puppetfile.
+                  unless Dir.exists?(@r10k['puppet_dir'])
+                    @ui.error("[Invade] Puppet dir '#{@r10k_data['puppet_dir']}' does not exists. Can't load specified modules.")
+                  else
+                    basic_modules = {
+                      'stdlib' => {
+                        'url' => 'https://github.com/puppetlabs/puppetlabs-stdlib.git'
+                      },
+                      'apt' => {
+                        'url' => 'https://github.com/puppetlabs/puppetlabs-apt.git'
+                      },
+                      'puppi' => {
+                        'url' => 'https://github.com/example42/puppi.git'
+                      }
+                    }
+
+                    puppetfile_path = File.expand_path(@r10k_data['puppetfile_path'])
+
+                    # Generate Puppetfile
+                    merged_modules = basic_modules.merge(@r10k_data['modules'])
+                    generate_puppetfile(merged_modules, puppetfile_path)
+                  end
                 end
 
                 # Get machine name
@@ -66,43 +77,33 @@ module VagrantPlugins
 
           private
 
-          def build_puppetfile(modules, puppetfile)
+          # Generates a puppetfile needed by r10k plugin to manage dependencies
+          def generate_puppetfile(modules, puppetfile)
 
             begin
               if File.exist?(puppetfile)
                   File.delete(puppetfile)
               end
 
-              File.open(puppetfile, 'w+') {|f| f.write("#Modules\n") }
+              # Create file first and add header
+              File.open(puppetfile, 'w+') {
+                |f| f.write("#Modules\n")
+              }
 
-              modules.each_with_index do |moduleScript, index|
+              modules.each do |name, module_data|
                 File.open(puppetfile, 'a+') do |f|
-                  f.puts generate_puppetfile_data(
-                    modules[index][0],
-                    module_version: modules[index][1],
-                    module_name: modules[index][2]
-                  )
+                  f.puts parse_puppetfile_data(name, module_data['url'], module_version: module_data['version'])
                 end
               end
+
             rescue StandardError => error
               print "\nIO failed: #{error}"
               raise
             end
           end
 
-          # Concats an given Array with an other Array with data
-          def concat_module_array(base_array, ext_array)
-            unless ext_array.to_a.empty? || ext_array.to_a.nil?
-              ext_array.each do |modules|
-                base_array.push(modules.flatten)
-              end
-            end
-
-            base_array
-          end
-
-          # Generates the Puppetfile needed by r10k plugin to download puppet modules
-          def generate_puppetfile_data(module_url, module_version: nil, module_name: nil)
+          # Parses the puppetfile data
+          def parse_puppetfile_data(module_name, module_url, module_version: nil)
 
             # build name part
             if module_name.nil? || module_name.empty?
@@ -119,52 +120,6 @@ module VagrantPlugins
 
             definition.concat("\n")
           end
-
-          # Gets module name from a repository URL
-          def get_module_name_from_repo_url(repository_url)
-
-            # URL must include '/'
-            unless repository_url.include? '/'
-              self.add_invade_text(
-                  MESSAGE_EXIT,
-                  sprintf(
-                      "Invalid repository path: '%s'. Path must include username and repository name. Example: 'magneton/xmen-protocol'.",
-                      repository_url
-                  )
-              )
-            end
-
-            # Get last part of the URI
-            repository_name = URI(repository_url).path.split('/').last
-
-            # Removes .git from name
-            repository_name = repository_name.partition('.').first
-
-            # Dashs in combination with lower dashs in a path are not allowed
-            dash_count = repository_name.count('-')
-            lower_dash_count = repository_name.count('_')
-
-            if dash_count > 0 && lower_dash_count > 0
-              self.add_invade_text(MESSAGE_EXIT,
-                  sprintf(
-                      "Invalid repository path: '%s'. It includes at least one dash and one lower dash. Can't generate a repository name. Please use the optional module_name paramater to manually define a name for this module.",
-                      repository_name
-                  )
-              )
-            else
-              if dash_count > 0
-                cut_character = '-'
-                repository_name = repository_name.partition(cut_character).last
-              elsif lower_dash_count > 0
-                cut_character = '_'
-                repository_name = repository_name.partition(cut_character).last
-              else
-                return repository_name
-              end
-            end
-
-            repository_name
-          end
         end
       end
     end

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

@@ -3,9 +3,9 @@ module VagrantPlugins
     module Builder
       module Plugin
 
-        autoload :HostManager, 'vagrant-invade/builder/plugin/hostmanager.rb'
-        autoload :WinNFSd, 'vagrant-invade/builder/plugin/winnfsd.rb'
-        autoload :R10k, 'vagrant-invade/builder/plugin/r10k.rb'
+        autoload :HostManager, 'vagrant-invade/builder/plugin/hostmanager'
+        autoload :WinNFSd, 'vagrant-invade/builder/plugin/winnfsd'
+        autoload :R10k, 'vagrant-invade/builder/plugin/r10k'
 
       end
     end

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

@@ -3,8 +3,8 @@ module VagrantPlugins
     module Builder
       module Provider
 
-        autoload :VirtualBox, 'vagrant-invade/builder/provider/virtualbox.rb'
-        autoload :VMware, 'vagrant-invade/builder/provider/vmware.rb'
+        autoload :VirtualBox, 'vagrant-invade/builder/provider/virtualbox'
+        autoload :VMware, 'vagrant-invade/builder/provider/vmware'
 
       end
     end

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

@@ -0,0 +1,47 @@
+module VagrantPlugins
+  module Invade
+    module Builder
+      module Provision
+
+        require 'erubis'
+
+        class PuppetAgent
+
+          attr_reader :result
+          attr_accessor :machine_name, :puppet_agent_data
+
+          def initialize(machine_name, puppet_agent_data, result: nil)
+            @machine_name = machine_name
+            @puppet_agent_data = puppet_agent_data
+            @result = result
+          end
+
+          def build
+            b = binding
+            template_file = "#{TEMPLATE_PATH}/provision/puppet_agent.erb"
+
+            begin
+
+              # Get machine name
+              machine_name = @machine_name
+
+              # Values for provider puppet_agent section
+              puppet_server = @puppet_agent_data['puppet_server']
+              puppet_node = @puppet_agent_data['puppet_node']
+              client_cert_path = @puppet_agent_data['client_cert_path']
+              client_private_key_path = @puppet_agent_data['client_private_key_path']
+              facter = @puppet_agent_data['facter']
+              options = @puppet_agent_data['options']
+
+              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
+end

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

@@ -0,0 +1,46 @@
+module VagrantPlugins
+  module Invade
+    module Builder
+      module Provision
+
+        require 'erubis'
+
+        class PuppetApply
+
+          attr_reader :result
+          attr_accessor :machine_name, :puppet_apply_data
+
+          def initialize(machine_name, puppet_apply_data, result: nil)
+            @machine_name = machine_name
+            @puppet_apply_data = puppet_apply_data
+            @result = result
+          end
+
+          def build
+            b = binding
+            template_file = "#{TEMPLATE_PATH}/provision/puppet_apply.erb"
+
+            begin
+
+              # Get machine name
+              machine_name = @machine_name
+
+              # Values for provider puppet_apply section
+              module_path = @puppet_apply_data['module_path']
+              manifests_path = @puppet_apply_data['manifests_path']
+              manifest_file = @puppet_apply_data['manifest_file']
+              hiera_config_path = @puppet_apply_data['hiera_config_path']
+              facter = @puppet_apply_data['facter']
+
+              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
+end

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

@@ -3,8 +3,10 @@ module VagrantPlugins
     module Builder
       module Provision
 
-        autoload :Shell, 'vagrant-invade/builder/provision/shell.rb'
-        autoload :Puppet, 'vagrant-invade/builder/provision/puppet.rb'
+        autoload :Shell, 'vagrant-invade/builder/provision/shell'
+        autoload :ShellInline, 'vagrant-invade/builder/provision/shell_inline'
+        autoload :PuppetApply, 'vagrant-invade/builder/provision/puppet_apply'
+        autoload :PuppetAgent, 'vagrant-invade/builder/provision/puppet_agent'
 
       end
     end

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

@@ -3,8 +3,8 @@ module VagrantPlugins
     module Builder
       module SyncedFolder
 
-        autoload :VirtualBox, 'vagrant-invade/builder/synced_folder/virtualbox.rb'
-        autoload :NFS, 'vagrant-invade/builder/synced_folder/nfs.rb'
+        autoload :VirtualBox, 'vagrant-invade/builder/synced_folder/virtualbox'
+        autoload :NFS, 'vagrant-invade/builder/synced_folder/nfs'
 
       end
     end

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

@@ -19,8 +19,10 @@ module VagrantPlugins
               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'
-              provision = Builder::Provision::Puppet.new(@machine_name, @provision_data)
+            when 'puppet', 'puppetappy', 'puppet-apply'
+              provision = Builder::Provision::PuppetApply.new(@machine_name, @provision_data)
+            when 'puppet-agent', 'puppetagent'
+              provision = Builder::Provision::PuppetAgent.new(@machine_name, @provision_data)
             else
               raise StandardError, "Provisioner unknown or not set. Please check the provision configuration."
             end

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

@@ -1,5 +1,5 @@
 <% if enabled %>
-  <%= module_name %>.r10k.puppet_dir = '<%= puppet_dir %>'
-    <%= module_name %>.r10k.puppetfile_path = '<%= puppetfile_path %>'
-    <%= module_name %>.r10k.module_path = '<%= module_path %>'
+  <%= machine_name %>.r10k.puppet_dir = '<%= puppet_dir %>'
+    <%= machine_name %>.r10k.puppetfile_path = '<%= puppetfile_path %>'
+    <%= machine_name %>.r10k.module_path = '<%= module_path %>'
   <% end %>

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

@@ -0,0 +1,20 @@
+  <%= machine_name %>.vm.provision "puppet_server" do |puppet_agent|
+      <% if puppet_server %>
+      puppet_agent.puppet_server = '<%= puppet_server %>'
+      <% end %>
+      <% if puppet_node %>
+      puppet_agent.puppet_node = '<%= puppet_node %>'
+      <% end %>
+      <% if client_cert_path %>
+      puppet_agent.client_cert_path = '<%= client_cert_path %>'
+      <% end %>
+      <% if client_private_key_path %>
+      puppet_agent.client_private_key_path = '<%= client_private_key_path %>'
+      <% end %>
+      <% if facter %>
+      puppet_agent.facter = <%= facter %>
+      <% end %>
+      <% if options %>
+      puppet_agent.options = <%= options %>
+      <% end %>
+    end

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

@@ -0,0 +1,20 @@
+  <%= machine_name %>.vm.provision "puppet" do |puppet_apply|
+      <% if manifests_path %>
+      puppet_apply.manifests_path = '<%= manifests_path %>'
+      <% end %>
+      <% if manifest_file %>
+      puppet_apply.manifest_file = '<%= manifest_file %>'
+      <% end %>
+      <% if module_path && module_path.kind_of?(String) %>
+      puppet_apply.module_path = '<%= module_path %>'
+      <% end %>
+      <% if module_path && module_path.kind_of?(Array) %>
+      puppet_apply.module_path = <%= module_path %>
+      <% end %>
+      <% if hiera_config_path %>
+      puppet_apply.hiera_config_path = '<%= hiera_config_path %>'
+      <% end %>
+      <% if facter %>
+      puppet_apply.facter = <%= facter %>
+      <% end %>
+    end

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

@@ -40,7 +40,7 @@ module VagrantPlugins
               @r10k['module_path'], 'module_path', DEFAULT['module_path']
             )
 
-            @r10k['modules'] =  Validator.validate_array(
+            @r10k['modules'] =  Validator.validate_hash(
               @r10k['modules'], 'modules', DEFAULT['modules']
             )
 

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

@@ -0,0 +1,68 @@
+require 'rbconfig'
+
+module VagrantPlugins
+  module Invade
+    module Validator
+      module Provision
+
+        # (see: https://docs.vagrantup.com/v2/provisioning/puppet_agent.html)
+        class PuppetAgent
+
+          attr_accessor :env
+          attr_accessor :puppet_agent
+
+          DEFAULT = {
+            'puppet_server' => nil,
+            'puppet_node' => nil,
+            'client_cert_path' => nil,
+            'client_private_key_path' => nil,
+            'facter' => nil,
+            'options' => nil
+          }
+
+          def initialize(env, puppet_agent)
+            @env = env
+            @puppet_agent = puppet_agent
+            @invade = env[:invade]
+          end
+
+          def validate
+            return nil unless @puppet_agent
+
+            # PUPPET SERVER
+            @puppet_agent['puppet_server'] = Validator.validate_string(
+              @puppet_agent['puppet_server'], 'puppet_server', DEFAULT['puppet_server']
+            )
+
+            # PUPPET NODE
+            @puppet_agent['puppet_node'] = Validator.validate_string(
+              @puppet_agent['puppet_node'], 'puppet_node', DEFAULT['puppet_node']
+            )
+
+            # CLIENT CERT PATH
+            @puppet_agent['client_cert_path'] = Validator.validate_array(
+              @puppet_agent['client_cert_path'], 'client_cert_path', DEFAULT['client_cert_path']
+            )
+
+            # CLIENT PRIVATE KEY PATH
+            @puppet_agent['client_private_key_path'] = Validator.validate_array(
+              @puppet_agent['client_private_key_path'], 'client_private_key_path', DEFAULT['client_private_key_path']
+            )
+
+            # FACTER
+            @puppet_agent['facter'] = Validator.validate_array(
+              @puppet_agent['facter'], 'facter', DEFAULT['facter']
+            )
+
+            # OPTIONS
+            @puppet_agent['options'] = Validator.validate_string(
+              @puppet_agent['options'], 'options', DEFAULT['options']
+            )
+
+            @puppet_agent
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,62 @@
+require 'rbconfig'
+
+module VagrantPlugins
+  module Invade
+    module Validator
+      module Provision
+
+        # (see: https://docs.vagrantup.com/v2/provisioning/puppet_apply.html)
+        class PuppetApply
+
+          attr_accessor :env
+          attr_accessor :puppet_apply
+
+          DEFAULT = {
+            'modules_path' => '.puppet/modules',
+            'manifests_path' => './puppet/manifests',
+            'manifest_file' => 'init.pp',
+            'hiera_config_path' => nil,
+            'facter' => {}
+          }
+
+          def initialize(env, puppet_apply)
+            @env = env
+            @puppet_apply = puppet_apply
+            @invade = env[:invade]
+          end
+
+          def validate
+            return nil unless @puppet_apply
+
+            # MODULES PATH
+            @puppet_apply['modules_path'] = Validator.validate_array(
+              @puppet_apply['modules_path'], 'modules_path', DEFAULT['modules_path']
+            )
+
+            # MANIFESTS PATH
+            @puppet_apply['manifests_path'] = Validator.validate_string(
+              @puppet_apply['manifests_path'], 'manifests_path', DEFAULT['manifests_path']
+            )
+
+            # MANIFEST FILE
+            @puppet_apply['manifest_file'] = Validator.validate_string(
+              @puppet_apply['manifest_file'], 'manifest_file', DEFAULT['manifest_file']
+            )
+
+            # HIERA CONFIG PATH
+            @puppet_apply['hiera_config_path'] = Validator.validate_string(
+              @puppet_apply['hiera_config_path'], 'hiera_config_path', DEFAULT['hiera_config_path']
+            )
+
+            # FACTER
+            @puppet_apply['facter'] = Validator.validate_hash(
+              @puppet_apply['facter'], 'facter', DEFAULT['facter']
+            )
+
+            @puppet_apply
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -3,6 +3,7 @@ module VagrantPlugins
     module Validator
       module Provision
 
+        # (see: https://docs.vagrantup.com/v2/provisioning/shell.html)
         class Shell
 
           attr_accessor :env
@@ -17,7 +18,7 @@ module VagrantPlugins
 
           def initialize(env, shell)
             @env = env
-            @shell = Provision.validate_base(env, shell)
+            @shell = shell
           end
 
           def validate

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

@@ -3,6 +3,7 @@ module VagrantPlugins
     module Validator
       module Provision
 
+        # (see: https://docs.vagrantup.com/v2/provisioning/shell.html)
         class ShellInline
 
           attr_accessor :env
@@ -17,7 +18,7 @@ module VagrantPlugins
 
           def initialize(env, shell_inline)
             @env = env
-            @shell_inline = Provision.validate_base(env, shell_inline)
+            @shell_inline = shell_inline
           end
 
           def validate

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

@@ -1,21 +1,23 @@
 module VagrantPlugins
   module Invade
     module Validator
+
+      # (see: https://docs.vagrantup.com/v2/provisioning/index.html)
       module Provision
 
         autoload :Shell, 'vagrant-invade/validator/provision/shell'
         autoload :ShellInline, 'vagrant-invade/validator/provision/shell_inline'
-        autoload :Puppet, 'vagrant-invade/validator/provision/puppet'
-        #autoload :Chef, 'vagrant-invade/validator/provision/chef'
+        #autoload :Ansible, 'vagrant-invade/validator/provision/ansible'
+        #autoload :CFEngine, 'vagrant-invade/validator/provision/cfengine'
+        #autoload :ChefSolo, 'vagrant-invade/validator/provision/chef_solo'
+        #autoload :ChefZero, 'vagrant-invade/validator/provision/chef_zero'
+        #autoload :ChefClient, 'vagrant-invade/validator/provision/chef_client'
+        #autoload :ChefApply, 'vagrant-invade/validator/provision/chef_apply'
         #autoload :Docker, 'vagrant-invade/validator/provision/docker'
+        autoload :PuppetApply, 'vagrant-invade/validator/provision/puppet_apply'
+        autoload :PuppetAgent, 'vagrant-invade/validator/provision/puppet_agent'
+        #autoload :Salt, 'vagrant-invade/validator/provision/salt'
 
-        DEFAULT = {}
-
-        def self.validate_base(env, provision)
-          return nil unless provision
-
-          provision
-        end
       end
     end
   end

data/lib/vagrant-invade/validator.rb

@@ -11,11 +11,9 @@ module VagrantPlugins
       autoload :SSH, 'vagrant-invade/validator/ssh'
       autoload :Plugin, 'vagrant-invade/validator/plugin'
 
-      VALIDATION_ERRORS = 0
-
-      attr_accessor :env
-      attr_accessor :invade
+      attr_accessor :env, :invade, :validation_errors
 
+      @validation_errors = 0
       @env = nil
 
       def self.set_env(env)
@@ -33,8 +31,8 @@ module VagrantPlugins
           @env[:ui].warn("\t#{name} not set. Use Vagrant default.") unless @env[:invade_validate_quiet]
           return default
         else
-          @env[:ui].warn("\tWarning: #{name} => #{value} is not a boolean. Set '#{name}' to default value #{default.to_s.upcase}.")
-          self.VALIDATION_ERRORS = self.VALIDATION_ERRORS + 1
+          @env[:ui].error("\tError: #{name} => #{value} is not a boolean. Set '#{name}' to default value #{default.to_s.upcase}.") unless @env[:invade_validate_quiet]
+          @validation_errors = @validation_errors + 1
           return default
         end
 
@@ -55,8 +53,8 @@ module VagrantPlugins
           @env[:ui].warn("\tEmpty string is not valid. Set '#{name}' => '#{default}'.") unless @env[:invade_validate_quiet]
           return default
         else
-          @env[:ui].warn("\tWarning: '#{value}' is not a string. Set to '#{name}' to default value '#{default}'.")
-          self.VALIDATION_ERRORS = self.VALIDATION_ERRORS + 1
+          @env[:ui].error("\tError: '#{value}' is not a string. Set to '#{name}' to default value '#{default}'.") unless @env[:invade_validate_quiet]
+          @validation_errors = @validation_errors + 1
           return default
         end
 
@@ -74,8 +72,8 @@ module VagrantPlugins
           @env[:ui].warn("\t#{name} not set. Use Vagrant default.") unless @env[:invade_validate_quiet]
           return default
         else
-          @env[:ui].warn("\tWarning: '#{value}' is not an integer. Set '#{name}' to default value #{default}.")
-          self.VALIDATION_ERRORS = self.VALIDATION_ERRORS + 1
+          @env[:ui].error("\tError: '#{value}' is not an integer. Set '#{name}' to default value #{default}.") unless @env[:invade_validate_quiet]
+          @validation_errors = @validation_errors + 1
           return default
         end
 
@@ -91,14 +89,35 @@ module VagrantPlugins
           @env[:ui].warn("\t#{name} not set. Use Vagrant default.") unless @env[:invade_validate_quiet]
           return default
         else
-          @env[:ui].warn("\tWarning: '#{value}' is not an array. Set '#{name}' to default value #{default}.")
-          self.VALIDATION_ERRORS = self.VALIDATION_ERRORS + 1
+          @env[:ui].error("\tError: '#{value}' is not an array. Set '#{name}' to default value #{default}.") unless @env[:invade_validate_quiet]
+          @validation_errors = @validation_errors + 1
           return default
         end
 
         value
       end
 
+      # Validates to HASH and returns the value at success or a default if not
+      def self.validate_hash(value, name, default)
+
+        if value.is_a? Hash
+          @env[:ui].success("\t#{name} => #{value}") unless @env[:invade_validate_quiet]
+        elsif value === nil
+          @env[:ui].warn("\t#{name} not set. Use Vagrant default.") unless @env[:invade_validate_quiet]
+          return default
+        else
+          @env[:ui].error("\tError: '#{value}' is not a Hash. Set '#{name}' to default value #{default}.") unless @env[:invade_validate_quiet]
+          @validation_errors = @validation_errors + 1
+          return default
+        end
+
+        value
+      end
+
+      def self.get_validation_errors
+        @validation_errors
+      end
+
       def self.is_number(value)
         value.to_f.to_s == value.to_s || value.to_i.to_s == value.to_s
       end

data/lib/vagrant-invade/version.rb

@@ -1,5 +1,5 @@
 module VagrantPlugins
   module Invade
-    VERSION = '0.4.0-alpha'
+    VERSION = '0.4.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-invade
 version: !ruby/object:Gem::Version
-  version: 0.4.0.pre.alpha
+  version: 0.4.0
 platform: ruby
 authors:
 - Lennart Stein
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-12 00:00:00.000000000 Z
+date: 2015-10-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -83,7 +83,8 @@ files:
 - lib/vagrant-invade/builder/provider/virtualbox.rb
 - lib/vagrant-invade/builder/provider/vmware.rb
 - lib/vagrant-invade/builder/provision.rb
-- lib/vagrant-invade/builder/provision/puppet.rb
+- lib/vagrant-invade/builder/provision/puppet_agent.rb
+- lib/vagrant-invade/builder/provision/puppet_apply.rb
 - lib/vagrant-invade/builder/provision/shell.rb
 - lib/vagrant-invade/builder/provision/shell_inline.rb
 - lib/vagrant-invade/builder/synced_folder.rb
@@ -116,7 +117,8 @@ files:
 - lib/vagrant-invade/template/plugin/winnfsd.erb
 - lib/vagrant-invade/template/provider/virtualbox.erb
 - lib/vagrant-invade/template/provider/vmware.erb
-- lib/vagrant-invade/template/provision/puppet.erb
+- lib/vagrant-invade/template/provision/puppet_agent.erb
+- lib/vagrant-invade/template/provision/puppet_apply.erb
 - lib/vagrant-invade/template/provision/shell.erb
 - lib/vagrant-invade/template/provision/shell_inline.erb
 - lib/vagrant-invade/template/synced_folder/nfs.erb
@@ -137,7 +139,8 @@ files:
 - lib/vagrant-invade/validator/provider/virtualbox.rb
 - lib/vagrant-invade/validator/provider/vmware.rb
 - lib/vagrant-invade/validator/provision.rb
-- lib/vagrant-invade/validator/provision/puppet.rb
+- lib/vagrant-invade/validator/provision/puppet_agent.rb
+- lib/vagrant-invade/validator/provision/puppet_apply.rb
 - lib/vagrant-invade/validator/provision/shell.rb
 - lib/vagrant-invade/validator/provision/shell_inline.rb
 - lib/vagrant-invade/validator/ssh.rb
@@ -162,9 +165,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 2.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>'
+  - - '>='
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.4.8

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

@@ -1,46 +0,0 @@
-module VagrantPlugins
-  module Invade
-    module Builder
-      module Provision
-
-        require 'erubis'
-
-        class Puppet
-
-          attr_reader :result
-          attr_accessor :machine_name, :puppet_data
-
-          def initialize(machine_name, puppet_data, result: nil)
-            @machine_name = machine_name
-            @puppet_data = puppet_data
-            @result = result
-          end
-
-          def build
-            b = binding
-            template_file = "#{TEMPLATE_PATH}/provision/puppet.erb"
-
-            begin
-
-              # Get machine name
-              machine_name = @machine_name
-
-              # Values for provider puppet section
-              module_path = @puppet_data['module_path']
-              manifests_path = @puppet_data['manifests_path']
-              manifest_file = @puppet_data['manifest_file']
-              hiera_config_path = @puppet_data['hiera_config_path']
-              facter = @puppet_data['facter']
-
-              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
-end

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

@@ -1,17 +0,0 @@
-  <%= machine_name %>.vm.provision :puppet do |puppet|
-      <% if manifests_path %>
-      puppet.manifests_path = '<%= manifests_path %>'
-      <% end %>
-      <% if manifest_file %>
-      puppet.manifest_file = '<%= manifest_file %>'
-      <% end %>
-      <% if module_path %>
-      puppet.module_path = '<%= module_path %>'
-      <% end %>
-      <% if hiera_config_path %>
-      puppet.hiera_config_path = '<%= hiera_config_path %>'
-      <% end %>
-      <% if facter %>
-      puppet.facter = <%= facter %>
-      <% end %>
-    end

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

@@ -1,61 +0,0 @@
-require 'rbconfig'
-
-module VagrantPlugins
-  module Invade
-    module Validator
-      module Provision
-
-        class Puppet
-
-          attr_accessor :env
-          attr_accessor :puppet
-
-          DEFAULT = {
-            'modules_path' => '.puppet/modules',
-            'manifests_path' => './puppet/manifests',
-            'manifest_file' => 'init.pp',
-            'hiera_config_path' => nil,
-            'facter' => {}
-          }
-
-          def initialize(env, puppet)
-            @env = env
-            @puppet = Provision.validate_base(env, puppet)
-            @invade = env[:invade]
-          end
-
-          def validate
-            return nil unless @puppet
-
-            # MODULES PATH
-            @puppet['modules_path'] = Validator.validate_array(
-              @puppet['modules_path'], 'modules_path', DEFAULT['modules_path']
-            )
-
-            # MANIFESTS PATH
-            @puppet['manifests_path'] = Validator.validate_string(
-              @puppet['manifests_path'], 'manifests_path', DEFAULT['manifests_path']
-            )
-
-            # MANIFEST FILE
-            @puppet['manifest_file'] = Validator.validate_string(
-              @puppet['manifest_file'], 'manifest_file', DEFAULT['manifest_file']
-            )
-
-            # HIERA CONFIG PATH
-            @puppet['hiera_config_path'] = Validator.validate_string(
-              @puppet['hiera_config_path'], 'hiera_config_path', DEFAULT['hiera_config_path']
-            )
-
-            # FACTER
-            @puppet['facter'] = Validator.validate_array(
-              @puppet['facter'], 'facter', DEFAULT['facter']
-            )
-
-            @puppet
-          end
-        end
-      end
-    end
-  end
-end