vagrant-invade 0.7.0 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f6d05d703e83eeb6fc6d8ffb8e0de3c50988d58f
-  data.tar.gz: 8dafe62da9c4bc56d8fb82d01062ccec910924f6
+  metadata.gz: '0977b18727d49b4db925ac88c804d93ebebde0cd'
+  data.tar.gz: 6a49503d802b6121f0158cdd67c135ab2041dc0e
 SHA512:
-  metadata.gz: 0ca932f0f09a78d05fbe3f0fc7de6f5b6da85d26c49b6abf8c35d34af84e9ad5880a980de74d600ac0961b414664aca98107f9ef677043bc5a72b424fe5fe088
-  data.tar.gz: 21beb6a37e3e975f10185247c05e7171a9388c06954de003145d5357262df9e74ced320f5fa745db7002683bbfcfe46856aed0c0e49d6b41e151ae7986787ed8
+  metadata.gz: cdeaed579dc3a84480e4b9273944c79bb9c5be4788253fa0206d3c0c734b872358639ef4e3a7fd5bc3cd87df4d10033ac786f6b720baf2646dfdbb3e2d31684f
+  data.tar.gz: 3f003a531ce20fae20f4cc29911975558d657146ba65ceb94a7cf29dcd774502d9143f38e89c20b23868ad48017a343e52653c736bc73bfc428dc2a484e28d3f

data/.gitignore

@@ -1,4 +1,8 @@
+!invade-default.yml
 invade.yml
+invade.yaml
+invade-*.yml
+invade-*.yaml
 Vagrantfile
 !Vagrantfile/
 !vagrantfile.rb

data/README.md

@@ -12,7 +12,7 @@ Simply run `vagrant plugin install vagrant-invade`
 To install a certain version use the `-v 'VERSION'` option.
 
 ## Commands
-There are new commands you can use to init, validate and build your Vagrantfile.
+There are new commands you can use to init, validate and build a Vagrantfile.
 
 ### Init
 `vagrant invade init` creates the default **invade.yml** configuration file for you.
@@ -33,11 +33,12 @@ There are new commands you can use to init, validate and build your Vagrantfile.
 	* VirtualBox
 	* VMWare
 * Provision
-	* shell
-	* inline
+	* ansible
+	* ansible_local
 	* puppet-agent
 	* puppet-apply
 	* salt
+	* shell
 * Synced Folder
 	* VB
 	* NFS (use *vagrant-winnfsd* plugin to support Windows)

data/lib/vagrant-invade.rb

@@ -14,20 +14,28 @@ module VagrantPlugins
     def self.get_invade_config
 
       #Loading Invade configuration settings from file
-      invade_config_file = Dir.pwd + '/invade.yml'
+      invade_config_file = Dir.glob(Dir.pwd + "/invade.{yml,yaml}")
+      invade_config = Hash.new
 
-      if File.exists?(invade_config_file)
-        begin
-          return YAML.load_file(invade_config_file)
-        rescue SyntaxError => e
-          @logger.error e
-          fail e
-        end
-      else
-        @config_values = nil
+      # If sinlge file configuration for invade exists - use it
+      if invade_config_file.any?
+        invade_config = YAML.load_file(invade_config_file[0])
       end
+      
+      # Creates empty machine hash if it not exists
+      if invade_config['machine'].nil?
+        invade_config['machine'] = Hash.new
+      end
+      
+      # Iterate over each machine definition in ./invade/ folder and deep merge it
+      Dir.glob("#{Dir.pwd}/invade-*.{yml,yaml}") do |config|
+        invade_config.deep_merge!(YAML.load_file(config))
+      end
+
+      # Clean hash from empty/nil values recursively
+      invade_config = invade_config.deep_compact(exclude_blanks: true)
 
-      @config_values
+      invade_config
     end
   end
 end

data/lib/vagrant-invade/action.rb

@@ -28,12 +28,21 @@ module VagrantPlugins
         end
       end
 
+      def self.check
+        Vagrant::Action::Builder.new.tap do |builder|
+          builder.use Config
+          builder.use Process
+          builder.use Check
+        end
+      end
+
       # The autoload farm
       action_root = Pathname.new(File.expand_path('../action', __FILE__))
       autoload :Init, action_root.join('init')
       autoload :Config, action_root.join('config')
       autoload :Process, action_root.join('process')
       autoload :Create, action_root.join('create')
+      autoload :Check, action_root.join('check')
 
     end
   end

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

@@ -0,0 +1,48 @@
+module VagrantPlugins
+  module Invade
+    module Action
+
+      include Vagrant::Action::Builtin
+
+      class Check
+
+        def initialize(app, env)
+          @app = app
+          @env = env
+          @ui = env[:ui]
+          @logger = Log4r::Logger.new('vagrant::invade::action::check')
+
+          ENV['VAGRANT_VAGRANTFILE'] ? @vagrantfile_name = ENV['VAGRANT_VAGRANTFILE'] : @vagrantfile_name = 'Vagrantfile'
+          @root_path = Dir.pwd
+        end
+
+        def call(env)
+
+          data = @env[:invade]['vagrantfile']
+
+          checksum_helper = Helper::Checksum.new data
+          vagrantfile_path = "#{@root_path}/#{@vagrantfile_name}"
+          md5_current = checksum_helper.get_checksum_of_file(vagrantfile_path)
+          md5_generated = checksum_helper.get_checksum_of_data
+
+          if checksum_helper.check
+            @ui.success "[Invade][CHECK] NO CHANGES FOUND"
+            @ui.success "----------------------------------------------------------"
+            @ui.success "[Invade][CHECK] Current    : '#{md5_current}'"
+            @ui.success "[Invade][CHECK] Generated  : '#{md5_generated}'"
+            @ui.success "[Invade][CHECK] No changes found."
+          else
+            @ui.warn "[Invade][CHECK] CONFIGURATION FILE UPDATED"
+            @ui.warn "-------------------------------------------------------------"
+            @ui.warn "[Invade][CHECK] Current    : '#{md5_current}'"
+            @ui.warn "[Invade][CHECK] Generated  : '#{md5_generated}'"
+            @ui.warn '[Invade][CHECK] Configuration file updated - free to rebuild.'
+          end
+
+          @app.call(env)
+        end
+      end
+
+    end
+  end
+end

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

@@ -19,13 +19,13 @@ module VagrantPlugins
         def call(env)
 
           config_file_path = "#{@dir}/invade.yml"
-          # template_file_path = "#{config_file_path}.dist"
-          # default_config_file_path = "#{File.expand_path('../../../../', __FILE__)}/invade.yml.dist"
 
           # Returns with invade in environment if Invade Configuration file already exists
           if File.exist?(config_file_path)
             @logger.debug 'Config file found. Proceed.'
-            @env[:ui].info "[Invade] Using Plugin vagrant-invade-#{VERSION} to setup Vagrant!"
+            @env[:ui].info "[Invade] Using Plugin vagrant-invade-#{VERSION} to build a Vagrantfile."
+            @env[:ui].info '-----------------------------------------------------------------------'
+            @env[:ui].info ''
 
             # Add invade configuration as global environment variable since we know configuration file exists
             env[:invade] = Invade.get_invade_config
@@ -33,46 +33,13 @@ module VagrantPlugins
               raise 'Something went wrong. Configuration file could not be loaded.'
             end
           else
-            @env[:ui].info "[Invade] 'invade.yml' not exists. You forgot a 'vagrant invade init'?"
+            @env[:ui].info "[Invade] 'invade.yml' not exists. You forgot to 'vagrant invade init'?"
             exit
-
-            # # Try to copy template path from vagrant repository of project.
-            # begin
-            #   FileUtils.cp(template_file_path, config_file_path)
-            #   @logger.debug 'Config file could not be found. Copied template file.'
-            #   @env[:ui].debug '[Invade] Configuration file could not be found.'
-            #   @env[:ui].warn '[Invade] Copying template configuration...'
-            #   @env[:ui].warn "\tFrom: \"#{template_file_path}\""
-            #   @env[:ui].warn "\tTo: \"#{config_file_path}\""
-            #   sleep 2
-            #   @env[:ui].warn '[Invade] Restarting vagrant...'
-            #   sleep 3
-            #   if !Vagrant.in_installer? && !Vagrant.very_quiet?
-            #     Kernel.exec('bundle exec vagrant up') if @env[:invade_command]
-            #   else
-            #     Kernel.exec('vagrant up') if @env[:invade_command]
-            #   end
-            # rescue
-            #   # If not found default invade configuration file will be copied.
-            #   FileUtils.cp(default_config_file_path, config_file_path)
-            #   @logger.info 'Template file could not be found. Copied default invade configuration file.'
-            #   @env[:ui].warn '[Invade] Template file could not be found.'
-            #   @env[:ui].warn '[Invade] Copying default configuration...'
-            #   @env[:ui].warn "\tFrom: \"#{template_file_path}\""
-            #   @env[:ui].warn "\tTo: \"#{config_file_path}\""
-            #   sleep 2
-            #   @env[:ui].warn '[Invade] Restarting vagrant...'
-            #   sleep 3
-            #   if !Vagrant.in_installer? && !Vagrant.very_quiet?
-            #     Kernel.exec('bundle exec vagrant up') if @env[:invade_command]
-            #   else
-            #     Kernel.exec('vagrant up') if @env[:invade_command]
-            #   end
-            # end
           end
 
           @app.call(env)
         end
+
       end
 
     end

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

@@ -20,10 +20,10 @@ module VagrantPlugins
 
           data = @env[:invade]['vagrantfile']
 
-          checksum_helper = Helper::Checksum.new @env
+          checksum_helper = Helper::Checksum.new data
           vagrantfile_path = "#{@root_path}/#{@vagrantfile_name}"
           md5_current = checksum_helper.get_checksum_of_file(vagrantfile_path)
-          md5_generated = checksum_helper.get_checksum_of_data(data)
+          md5_generated = checksum_helper.get_checksum_of_data
 
           # Write new Vagrantfile if checksum is not equal
           if !checksum_helper.check

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

@@ -46,18 +46,23 @@ module VagrantPlugins
           if invade_template_exists
             template_file_path = "#{@dir}/invade.yml.dist"
             FileUtils.cp(template_file_path, invade_config_file)
-            @env[:ui].success "[Invade] Project template file '#{template_file_path}' was found!"
+            @env[:ui].success "[Invade] Using local template file '#{template_file_path}'."
           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!"
+            @env[:ui].success "[Invade] Using global template file '~/.invade/invade.yml.dist'."
           else
-            plugin_root_path = File.expand_path('../../../../', __FILE__)
-            default_invade_config_file = plugin_root_path + '/invade.yml.dist'
+            plugin_root_path = File.expand_path('../../../..', __FILE__)
+            default_invade_config_file = plugin_root_path + '/invade-default.yml'
+            template_file_path = "#{@dir}/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!'
+            @env[:ui].warn '[Invade] Global user template file \'~/.invade/invade.yml.dist\' not found.'
+            @env[:ui].warn "[Invade] Local template file './invade.yml.dist' not found."
+            @env[:ui].warn '[Invade] ------------------------------------------------------------------'
+            @env[:ui].warn "[Invade] Save a template file to it's location to use it as default."
           end
 
-          @env[:ui].success '[Invade] \'invade.yml\' created successfully. Please make your changes.'
+          @env[:ui].success ""
+          @env[:ui].success '[Invade] Default \'invade.yml\' created successfully. Please make your changes.'
         end
       end
 

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

@@ -18,6 +18,7 @@ module VagrantPlugins
           @invade_vagrantfile = Hash.new
 
           @generate = @env[:invade_generate]
+          @build_quiet = @env[:invade_build_quiet]
           @quiet = @env[:invade_validate_quiet]
 
           @logger = Log4r::Logger.new('vagrant::invade::action::validate')
@@ -27,11 +28,14 @@ module VagrantPlugins
 
           config = env[:invade]
 
-          # Remove empty Hashes
-          config = config.compact(config)
+          # If config data is not a hash, something went totally wrong or it's not correct YAML
+          # This should never happen - but better to stop the progress here.
+          if !config.is_a?(Hash)
+            raise "Something went wrong parsing your configuration file. Is your YAML in a correct format?"
+          end
 
           config.each do |config_key, config_data|
-            if config_key == 'machines'
+            if config_key == 'machine'
               process_machines(config_data)
             else
               process_vagrant_part(config_key, config_data)
@@ -43,26 +47,27 @@ module VagrantPlugins
               generator_type: Invade::Generator::Type::VAGRANTFILE
           ) if @generate
 
-          @env[:invade].delete('machines')
+          @env[:invade].delete('machine')
 
           @app.call(env)
         end
 
         private
 
-        def process_machines(machines)
-        
+        def process_machines(machine)
+
           # Iterate over machine configurations
-          machines.each_with_index do |(machine, machine_data), _|
+          machine.each_with_index do |(machine, machine_data), _|
             process_machine(machine, machine_data)
           end
 
-          @invade_vagrantfile['machines'] = @invade_machine
-          @env[:ui].success "\n[Invade]: Processed #{machines.count} machine(s)."
+          @invade_vagrantfile['machine'] = @invade_machine
+          @env[:ui].success "\n[Invade]: Processed #{machine.count} machine(s)." unless @build_quiet
 
         end
 
         def process_machine(machine_name, machine_data)
+
           # Iterate over each machine part configuration
           machine_data.each do |machine_part_name, machine_part_data|
             @env[:ui].info("\n[Invade][Machine: #{machine_name.upcase}]: Validating #{machine_part_name.upcase} part...") unless @quiet
@@ -82,6 +87,7 @@ module VagrantPlugins
         end
 
         def process_machine_part(machine, machine_part_name, machine_part_data)
+
           validated_data = validate('Machine', machine_part_name, machine_part_data, machine_part_data.depth)
           @invade_machine_part[machine_part_name] = generate(
               machine_name: machine,

data/lib/vagrant-invade/command/check.rb

@@ -0,0 +1,31 @@
+require 'optparse'
+require_relative 'base'
+
+module VagrantPlugins
+  module Invade
+    module Command
+      class Check < Base
+        def execute
+          options = {}
+          opts = OptionParser.new do |o|
+            o.banner = 'Usage: vagrant invade check [-h]'
+          end
+
+          # Parse the options
+          argv = parse_options(opts)
+          return unless argv
+
+          # Validates InVaDE configuration
+          action(Action.check, {
+            :invade_generate => true,
+            :invade_validate_quiet => true,
+            :invade_build_quiet => true
+          })
+
+          # Success, exit status 0
+          0
+        end
+      end
+    end
+  end
+end

data/lib/vagrant-invade/command/root.rb

@@ -27,10 +27,16 @@ module VagrantPlugins
           end
 
           # BUILD COMMAND ("vagrant invade build")
-            @subcommands.register(:build) do
+          @subcommands.register(:build) do
             require_relative 'build'
             Build
           end
+
+          # CHECK COMMAND ("vagrant invade check")
+          @subcommands.register(:check) do
+            require_relative 'check'
+            Check
+          end
         end
 
         def execute

data/lib/vagrant-invade/extend.rb

@@ -1,3 +1,18 @@
+class Object
+
+  def present?
+    !blank?
+  end
+
+  def presence
+    self if present?
+  end
+
+  def blank?
+    respond_to?(:empty?) ? !!empty? : !self
+  end
+end
+
 class Hash
   def depth
       a = self.to_a
@@ -8,14 +23,46 @@ class Hash
       d
   end
 
-  def compact(opts={})
+  def compact
+    self.select { |_, value| !value.nil? }
+  end
+
+  def compact!
+    self.reject! { |_, value| value.nil? }
+  end
+
+  def deep_compact(options = {})
     inject({}) do |new_hash, (k,v)|
-      if !v.nil?
-        new_hash[k] = opts[:recurse] && v.class == Hash ? v.compact(opts) : v
+      result = options[:exclude_blank] ? v.blank? : v.nil?
+      if !result
+        new_value = v.is_a?(Hash) ? v.deep_compact(options).presence : v
+        new_hash[k] = new_value if new_value
       end
       new_hash
     end
   end
+
+  def deep_merge(other_hash, &block)
+    dup.deep_merge!(other_hash, &block)
+  end
+
+  def deep_merge!(other_hash, &block)
+    other_hash.each_pair do |current_key, other_value|
+      this_value = self[current_key]
+
+      self[current_key] = if this_value.is_a?(Hash) && other_value.is_a?(Hash)
+        this_value.deep_merge(other_value, &block)
+      else
+        if block_given? && key?(current_key)
+          block.call(current_key, this_value, other_value)
+        else
+          other_value
+        end
+      end
+    end
+
+    self
+  end
 end
 
 class Array

data/lib/vagrant-invade/helper/checksum.rb

@@ -4,13 +4,12 @@ module VagrantPlugins
 
       class Checksum
 
-        attr_accessor :env, :root_path, :vagrantfile, :data
+        attr_accessor :data, :root_path, :vagrantfile
 
-        def initialize(env)
-          @env          = env
+        def initialize(data)
+          @data         = data
           @root_path    = Dir.pwd
           @vagrantfile  = ENV['VAGRANT_VAGRANTFILE'] ? vagrantfile_name = ENV['VAGRANT_VAGRANTFILE'] : vagrantfile_name = "Vagrantfile"
-          @data         = env[:invade]['vagrantfile']
         end
 
         # Compare Vagrantfile <=> invade.yml with MD5 checksum
@@ -27,7 +26,7 @@ module VagrantPlugins
           true
         end
 
-        def get_checksum_of_data(data)
+        def get_checksum_of_data
 
           begin
             checksum = Digest::MD5.hexdigest(@data)

data/lib/vagrant-invade/module/provision/ansible/ansible.rb

@@ -0,0 +1,49 @@
+module VagrantPlugins
+  module Invade
+    module InvadeModule
+      module Ansible
+
+        class Ansible <  InvadeModule
+
+          attr_reader :result
+          attr_accessor :machine_name, :ansible_data
+
+          def initialize(machine_name, ansible_data, result: nil)
+            @machine_name = machine_name
+            @ansible_data = ansible_data
+            @result = result
+          end
+
+          def build
+            b = binding
+
+            begin
+
+              # Get machine name
+              machine_name = @machine_name
+
+              # Values for ansible provisioner section
+              playbook = @ansible_data['playbook']
+              groups = @ansible_data['groups']
+              limit = @ansible_data['limit']
+              inventory_path = @ansible_data['inventory_path']
+              ask_sudo_pass = @ansible_data['ask_sudo_pass']
+              ask_vault_pass = @ansible_data['ask_vault_pass']
+              force_remote_user = @ansible_data['force_remote_user']
+              host_key_checking = @ansible_data['host_key_checking']
+              host_vars = @ansible_data['host_vars']
+              raw_ssh_args = @ansible_data['raw_ssh_args']
+              raw_arguments = @ansible_data['raw_arguments']
+
+              eruby = Erubis::Eruby.new(File.read(self.get_template_path(__FILE__)))
+              @result = eruby.result b
+            rescue TypeError, SyntaxError, SystemCallError => e
+              raise(e)
+            end
+          end
+        end
+
+      end
+    end
+  end
+end

data/lib/vagrant-invade/module/provision/ansible/rules.yml

@@ -0,0 +1,33 @@
+playbook:
+  type: String
+  default: nil
+groups:
+  type: Hash
+  default: nil
+limit:
+  type: String
+  default: nil
+inventory_path:
+  type: String
+  default: nil
+ask_sudo_pass:
+  type: Boolean
+  default: nil
+ask_vault_pass:
+  type: Boolean
+  default: nil
+force_remote_user:
+  type: Boolean
+  default: nil
+host_key_checking:
+  type: Boolean
+  default: nil
+host_vars:
+  type: Hash
+  default: nil
+raw_ssh_args:
+  type: Array
+  default: nil
+raw_arguments:
+  type: Array
+  default: nil

data/lib/vagrant-invade/module/provision/ansible/template.erb

@@ -0,0 +1,36 @@
+
+    <%= machine_name %>.vm.provision "ansible" do |ansible|
+      <% unless playbook.nil? %>
+      ansible.playbook = '<%= playbook %>'
+      <% end %>
+      <% unless groups.nil? %>
+      ansible.groups = '<%= groups %>'
+      <% end %>
+      <% unless limit.nil? %>
+      ansible.limit = '<%= limit %>'
+      <% end %>
+      <% unless inventory_path.nil? %>
+      ansible.inventory_path = '<%= inventory_path %>'
+      <% end %>
+      <% unless ask_sudo_pass.nil? %>
+      ansible.ask_sudo_pass = <%= ask_sudo_pass %>
+      <% end %>
+      <% unless ask_vault_pass.nil? %>
+      ansible.ask_vault_pass = <%= ask_vault_pass %>
+      <% end %>
+      <% unless force_remote_user.nil? %>
+      ansible.force_remote_user = <%= force_remote_user %>
+      <% end %>
+      <% unless host_key_checking.nil? %>
+      ansible.host_key_checking = <%= host_key_checking %>
+      <% end %>
+      <% unless host_vars.nil? %>
+      ansible.host_vars = <%= host_vars %>
+      <% end %>
+      <% unless raw_ssh_args.nil? %>
+      ansible.raw_ssh_args = <%= raw_ssh_args %>
+      <% end %>
+      <% unless raw_arguments.nil? %>
+      ansible.raw_arguments = <%= raw_arguments %>
+      <% end %>
+    end

data/lib/vagrant-invade/module/provision/ansible_local/ansible_local.rb

@@ -0,0 +1,47 @@
+module VagrantPlugins
+  module Invade
+    module InvadeModule
+      module AnsibleLocal
+
+        class AnsibleLocal <  InvadeModule
+
+          attr_reader :result
+          attr_accessor :machine_name, :ansible_local_data
+
+          def initialize(machine_name, ansible_local_data, result: nil)
+            @machine_name = machine_name
+            @ansible_local_data = ansible_local_data
+            @result = result
+          end
+
+          def build
+            b = binding
+
+            begin
+
+              # Get machine name
+              machine_name = @machine_name
+
+              # Values for ansible_local provisioner section
+              playbook = @ansible_local_data['playbook']
+              verbose = @ansible_local_data['verbose']
+              install = @ansible_local_data['install']
+              install_mode = @ansible_local_data['install_mode']
+              limit = @ansible_local_data['limit']
+              inventory_path = @ansible_local_data['inventory_path']
+              provisioning_path = @ansible_local_data['provisioning_path']
+              tmp_path = @ansible_local_data['tmp_path']
+              version = @ansible_local_data['version']
+
+              eruby = Erubis::Eruby.new(File.read(self.get_template_path(__FILE__)))
+              @result = eruby.result b
+            rescue TypeError, SyntaxError, SystemCallError => e
+              raise(e)
+            end
+          end
+        end
+
+      end
+    end
+  end
+end

data/lib/vagrant-invade/module/provision/ansible_local/rules.yml

@@ -0,0 +1,27 @@
+playbook:
+  type: String
+  default: nil
+verbose:
+  type: Boolean
+  default: nil
+install:
+  type: Boolean
+  default: nil
+install_mode:
+  type: Symbol
+  default: :default
+limit:
+  type: String
+  default: nil
+inventory_path:
+  type: String
+  default: nil
+provisioning_path:
+  type: String
+  default: nil
+tmp_path:
+  type: String
+  default: nil
+version:
+  type: String
+  default: nil

data/lib/vagrant-invade/module/provision/ansible_local/template.erb

@@ -0,0 +1,30 @@
+
+    <%= machine_name %>.vm.provision "ansible_local" do |ansible|
+      <% unless playbook.nil? %>
+      ansible.playbook = '<%= playbook %>'
+      <% end %>
+      <% unless verbose.nil? %>
+      ansible.verbose = <%= verbose %>
+      <% end %>
+      <% unless install.nil? %>
+      ansible.install = <%= install %>
+      <% end %>
+      <% unless install_mode.nil? %>
+      ansible.install_mode = <%= install_mode %>
+      <% end %>
+      <% unless limit.nil? %>
+      ansible.limit = '<%= limit %>'
+      <% end %>
+      <% unless inventory_path.nil? %>
+      ansible.inventory_path = '<%= inventory_path %>'
+      <% end %>
+      <% unless provisioning_path.nil? %>
+      ansible.provisioning_path = '<%= provisioning_path %>'
+      <% end %>
+      <% unless tmp_path.nil? %>
+      ansible.tmp_path = '<%= tmp_path %>'
+      <% end %>
+      <% unless version.nil? %>
+      ansible.version = '<%= version %>'
+      <% end %>
+    end

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

@@ -3,10 +3,12 @@ module VagrantPlugins
     module InvadeModule
       module Provision
 
-        autoload :Shell, 'vagrant-invade/module/provision/shell/shell'
+        autoload :Ansible, 'vagrant-invade/module/provision/ansible/ansible'
+        autoload :AnsibleLocal, 'vagrant-invade/module/provision/ansible_local/ansible_local'
         autoload :PuppetApply, 'vagrant-invade/module/provision/puppet_apply/puppet_apply'
         autoload :PuppetAgent, 'vagrant-invade/module/provision/puppet_agent/puppet_agent'
         autoload :Salt, 'vagrant-invade/module/provision/salt/salt'
+        autoload :Shell, 'vagrant-invade/module/provision/shell/shell'
 
       end
     end

data/lib/vagrant-invade/module/provision/salt/rules.yml

@@ -11,7 +11,7 @@ install_syncdir:
   type: Boolean
   default: false
 install_type:
-  type: String
+  type: Symbol
   default: :stable
 install_args:
   type: String

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

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

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

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

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

@@ -8,6 +8,7 @@ module VagrantPlugins
         autoload :IntegerValidator, 'vagrant-invade/validator/type/type_integer'
         autoload :StringOrArrayValidator, 'vagrant-invade/validator/type/type_string_array'
         autoload :StringValidator, 'vagrant-invade/validator/type/type_string'
+        autoload :SymbolValidator, 'vagrant-invade/validator/type/type_symbol'
       end
     end
   end

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

@@ -0,0 +1,38 @@
+module VagrantPlugins
+  module Invade
+    module Validator
+      module Type
+
+        class SymbolValidator
+
+          attr_accessor :value, :name, :default, :env
+
+          def initialize(value, name, default, env)
+            @value = value
+            @name = name
+            @default = default
+            @env = env
+          end
+
+          def validate
+
+            if @value.is_a?(Symbol)
+              @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 an Symbol. Set '#{@name}' to default value #{@default}.") unless @env[:invade_validate_quiet]
+
+              return @default
+            end
+
+            @value
+          end
+        end
+
+      end
+    end
+  end
+end

data/lib/vagrant-invade/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-invade
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.8.0
 platform: ruby
 authors:
 - Lennart Stein
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-20 00:00:00.000000000 Z
+date: 2017-01-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -61,15 +61,17 @@ files:
 - images/invade-logo-128.png
 - images/invade-logo-256.png
 - images/invade-logo-512.png
-- invade.yml.dist
+- invade-default.yml
 - lib/vagrant-invade.rb
 - lib/vagrant-invade/action.rb
+- lib/vagrant-invade/action/check.rb
 - lib/vagrant-invade/action/config.rb
 - lib/vagrant-invade/action/create.rb
 - lib/vagrant-invade/action/init.rb
 - lib/vagrant-invade/action/process.rb
 - lib/vagrant-invade/command/base.rb
 - lib/vagrant-invade/command/build.rb
+- lib/vagrant-invade/command/check.rb
 - lib/vagrant-invade/command/init.rb
 - lib/vagrant-invade/command/root.rb
 - lib/vagrant-invade/command/validate.rb
@@ -112,6 +114,12 @@ files:
 - lib/vagrant-invade/module/provider/vmware/rules.yml
 - lib/vagrant-invade/module/provider/vmware/template.erb
 - lib/vagrant-invade/module/provider/vmware/vmware.rb
+- lib/vagrant-invade/module/provision/ansible/ansible.rb
+- lib/vagrant-invade/module/provision/ansible/rules.yml
+- lib/vagrant-invade/module/provision/ansible/template.erb
+- lib/vagrant-invade/module/provision/ansible_local/ansible_local.rb
+- lib/vagrant-invade/module/provision/ansible_local/rules.yml
+- lib/vagrant-invade/module/provision/ansible_local/template.erb
 - lib/vagrant-invade/module/provision/provision.rb
 - lib/vagrant-invade/module/provision/puppet_agent/puppet_agent.rb
 - lib/vagrant-invade/module/provision/puppet_agent/rules.yml
@@ -154,6 +162,7 @@ files:
 - lib/vagrant-invade/validator/type/type_integer.rb
 - lib/vagrant-invade/validator/type/type_string.rb
 - lib/vagrant-invade/validator/type/type_string_array.rb
+- lib/vagrant-invade/validator/type/type_symbol.rb
 - lib/vagrant-invade/version.rb
 - vagrant-invade.gemspec
 homepage: https://github.com/frgmt/vagrant-invade

data/invade.yml.dist

@@ -1,102 +0,0 @@
-invade:
-  # debug: true
-
-#hostmanager:
-#  enabled: true
-
-# Machine settings. Each entry is one box
-machines:
-
-  # Machine 1 (default)
-  default:
-
-    # VM related settings
-    vm:
-      box: boxcutter/debian82
-      hostname: 'invade.vm'
-
-    # Network settings
-    network:
-      private:
-        ip: '10.42.133.7'
-
-    # SSH settings
-    ssh:
-      forward_agent: true
-
-    # Provider related settings. Performance, naming
-    provider:
-
-      vmware:
-        name: 'invade'
-        cores: 4
-        memory: 512
-
-      virtualbox:
-        name: 'invade'
-        cores: 4
-        memory: 512
-
-    # Synced Folder settings
-    # synced_folder:
-    #   www:
-    #     type: nfs
-    #     path: '/www'
-    #     source: '..'
-    #     mount_options:
-    #       - nolock
-    #
-    #   ssh:
-    #     type: nfs
-    #     path: '/home/vagrant/.ssh/'
-    #     source: '/Users/$USER/.ssh/'
-
-    # provision:
-    #   set-permissions:
-    #     type: shell-inline
-    #     inline: 'chmod 777 /tmp'
-
-    #   run-composer:
-    #     type: shell
-    #     path: '/home/vagrant/provision/shell/run-composer.sh'
-
-    #   puppet-agent:
-    #     type: 'puppet'
-    #     manifests_path: 'puppet/manifests'
-    #     manifest_file: 'init.pp'
-    #     module_path:
-    #       - 'puppet/modules'
-    #       - 'puppet/vendor'
-    #     facter:
-    #       composer: true
-    #       shared_folder_type: 'nfs'
-    #       shared_folder_path: '/www'
-    #       package_state: 'present'
-    #       apt_update: true
-
-    nfs:
-      map_uid: Process.uid
-      map_gid: Process.gid
-      #functional: true
-      #verify_installed: false
-
-    plugin:
-      #hostmanager:
-      #  aliases:
-      #    - my-1337-project.local
-
-      #winnfsd:
-      #  enabled: true
-      #  loggin: false
-
-      #r10k:
-      #  enabled: true
-      #  puppet_dir: 'puppet'
-      #  puppetfile_path: 'puppet/Puppetfile'
-      #  module_path: 'puppet/vendor'
-      #  modules:
-      #    ssh:
-      #      url: 'https://github.com/innogames/invade-puppet-ssh.git'
-      #    mysql:
-      #      url: 'https://github.com/example42/puppet-mysql.git'
-      #      version: '2.1.5'