vagrant-invade 0.6.2 → 0.6.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dbd3d96412ec32d5a5b356a5aafba507ea052ad3
-  data.tar.gz: 14445f3fd7ed2148da40e6ab91c477a2ae35d49f
+  metadata.gz: a4c1bea715489a8245c212a230950d76a5edf15b
+  data.tar.gz: fe03ae6e9a1f448de2aa9f8d5c64161914f00151
 SHA512:
-  metadata.gz: dd3ec435c6b5c1a3dc9328ad6165f808c9e2b2ea0b2596b9be1f31f1f5b83a047e565626c567a571357d1db7124459dfd46387815d196800a583f1c5c068c8fe
-  data.tar.gz: 356f5e4443d13e1e8033cee651cf208c9e74c3a252d4b3d3d7ce060c468463b4995632230db76f7f613b35e94db7486ae34f2d493744ea62d117946d193673b4
+  metadata.gz: abd4f07f368386344eebb666843bab9cdb7cf109782bb5496d13c545f0ea40fd21a08a4adf36c83e7f0f9b2c5265b0fd3a2b70fb0b8b32026ce362c7a6b555ed
+  data.tar.gz: 6a91d43bbc87cf42e56b3ecef57cba45baaedadab1103f64e429c36a8354eddc3f962fae9912a01839b501fb1df0b98d02282195cd74cb61ca5aa86088196f0d

data/Gemfile.lock

@@ -37,7 +37,7 @@ GIT
 PATH
   remote: .
   specs:
-    vagrant-invade (0.6.1)
+    vagrant-invade (0.6.2)
 
 GEM
   remote: https://rubygems.org/

data/README.md

@@ -37,6 +37,7 @@ There are new commands you can use to init, validate and build your Vagrantfile.
 	* inline
 	* puppet-agent
 	* puppet-apply
+	* salt
 * Synced Folder
 	* VB
 	* NFS (use *vagrant-winnfsd* plugin to support Windows)

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

@@ -4,7 +4,6 @@ module VagrantPlugins
       module Provision
 
         autoload :Shell, 'vagrant-invade/module/provision/shell/shell'
-        autoload :ShellInline, 'vagrant-invade/module/provision/shell_inline/shell_inline'
         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'

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

@@ -61,4 +61,30 @@ master_pub:
   default: nil
 seed_master:
   type: String
+  default: nil
+
+# EXECUTE STATS
+run_highstate:
+  type: Boolean
+  default: nil
+
+# EXCECUTE RUNNERS
+run_overstate:
+  type: Boolean
+  default: nil
+orchestration:
+  type: Array
+  default: nil
+
+# OUTPUT CONTROL
+colorize:
+  type: Boolean
+  default: true
+log_level:
+  type: String
+  default: 'debug'
+
+# PILLAR DATA
+pillar:
+  type: Hash
   default: nil

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

@@ -47,6 +47,20 @@ module VagrantPlugins
               master_pub = @salt_data['master_pub']
               seed_master = @salt_data['seed_master']
 
+              # EXECUTE STATS
+              run_highstate = @salt_data['run_highstate']
+              
+              # EXCECUTE RUNNERS
+              run_overstate = @salt_data['run_overstate']
+              orchestration = @salt_data['orchestration']
+              
+              # OUTPUT CONTROL
+              colorize = @salt_data['colorize']
+              log_level = @salt_data['log_level']
+              
+              # PILLAR DATA
+              pillar = @salt_data['pillar']
+
               eruby = Erubis::Eruby.new(File.read(self.get_template_path(__FILE__)))
               @result = eruby.result b
             rescue TypeError, SyntaxError, SystemCallError => e

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

@@ -1,17 +1,15 @@
-
     <%= machine_name %>.vm.provision :salt do |salt|
       <% if install_master %>
-      # -- INSTALL OPTIONS -- #
       salt.install_master = <%= install_master %>
       <% end %>
       <% if no_minion %>
       salt.no_minion = <%= no_minion %>
       <% end %>
-      <% if install_syndic %>
-      salt.install_syndic = <%= install_syndic %>
+      <% if install_syncdir %>
+      salt.install_syncdir = <%= install_syncdir %>
       <% end %>
       <% if install_type %>
-      salt.install_type = <%= install_type %>
+      salt.install_type = '<%= install_type %>'
       <% end %>
       <% if install_args %>
       salt.install_args = '<%= install_args %>'
@@ -29,7 +27,6 @@
       salt.version = '<%= version %>'
       <% end %>
       <% if minion_config %>
-      # -- MINION OPTIONS -- #
       salt.minion_config = '<%= minion_config %>'
       <% end %>
       <% if minion_key %>
@@ -51,7 +48,6 @@
       salt.minion_pub = '<%= minion_pub %>'
       <% end %>
       <% if master_config %>
-      # -- MASTER OPTIONS -- #
       salt.master_config = '<%= master_config %>'
       <% end %>
       <% if master_key %>
@@ -63,5 +59,22 @@
       <% if seed_master %>
       salt.seed_master = '<%= seed_master %>'
       <% end %>
-
+      <% if run_highstate %>
+      salt.run_highstate = <%= run_highstate %>
+      <% end %>
+      <% if run_overstate %>
+      salt.run_overstate = <%= run_overstate %>
+      <% end %>
+      <% if orchestration %>
+      salt.orchestration = <%= orchestration %>
+      <% end %>
+      <% if colorize %>
+      salt.colorize = <%= colorize %>
+      <% end %>
+      <% if log_level %>
+      salt.log_level = '<%= log_level %>'
+      <% end %>
+      <% if pillar %>
+      salt.pillar = <%= pillar %>
+      <% end %>
     end

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

@@ -4,9 +4,30 @@ name:
 path:
   type: String
   default: nil
+inline:
+  type: String
+  default: nil
+args:
+  type: StringOrArray
+  default: nil
+env:
+  type: Hash
+  default: nil
 binary:
   type: Boolean
   default: nil
 privileged:
   type: Boolean
   default: nil
+upload_path:
+  type: String
+  default: nil
+keep_color:
+  type: Boolean
+  default: nil
+powershell_args:
+  type: String
+  default: nil
+powershell_elevated_interactive:
+  type: Boolean
+  default: nil

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

@@ -21,12 +21,7 @@ module VagrantPlugins
 
               # Get machine name
               machine_name = @machine_name
-
-              # Values for shell provision section
-              name = @shell_data['name']
-              path = @shell_data['path']
-              binary = @shell_data['binary']
-              privileged = @shell_data['privileged']
+              data = @shell_data
 
               eruby = Erubis::Eruby.new(File.read(self.get_template_path(__FILE__)))
               @result = eruby.result b

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

@@ -1 +1,8 @@
-    <%= machine_name %>.vm.provision "shell", path: '<%= path %>'<% if name %>, name: '<%= name %>'<% end %><% if binary %>, binary: <%= binary %><% end %><% if privileged %>, privileged: <%= privileged %><% end %>
+    <%= machine_name %>.vm.provision "shell",
+    <% data.each_with_index do |(k, v), index| %>
+      <% if k['args'] %>
+      <%= k %>: <%= v %><% unless index == data.size - 1 %>,<% end %>
+      <% else %>
+      <%= k %>: '<%= v %>'<% unless index == data.size - 1 %>,<% end %>
+      <% end %>
+    <% end %>

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

@@ -1,4 +1,5 @@
-config.vm.define :<%= machine_name %> do |<%= machine_name %>|
+  # ------- MACHINE: <%= machine_name.upcase %> ------- #
+  config.vm.define :<%= machine_name %> do |<%= machine_name %>|
 
   <% if vm %>
   <%= vm %>

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

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

data/lib/vagrant-invade/version.rb

@@ -1,5 +1,5 @@
 module VagrantPlugins
   module Invade
-    VERSION = '0.6.2'
+    VERSION = '0.6.3'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-invade
 version: !ruby/object:Gem::Version
-  version: 0.6.2
+  version: 0.6.3
 platform: ruby
 authors:
 - Lennart Stein
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-24 00:00:00.000000000 Z
+date: 2016-11-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -126,9 +126,6 @@ files:
 - lib/vagrant-invade/module/provision/shell/rules.yml
 - lib/vagrant-invade/module/provision/shell/shell.rb
 - lib/vagrant-invade/module/provision/shell/template.erb
-- lib/vagrant-invade/module/provision/shell_inline/rules.yml
-- lib/vagrant-invade/module/provision/shell_inline/shell_inline.rb
-- lib/vagrant-invade/module/provision/shell_inline/template.erb
 - lib/vagrant-invade/module/ssh/rules.yml
 - lib/vagrant-invade/module/ssh/ssh.rb
 - lib/vagrant-invade/module/ssh/template.erb

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

@@ -1,12 +0,0 @@
-name:
-  type: String
-  default: 'invade_shell_inline'
-inline:
-  type: String
-  default: nil
-binary:
-  type: Boolean
-  default: nil
-privileged:
-  type: Boolean
-  default: nil

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

@@ -1,42 +0,0 @@
-module VagrantPlugins
-  module Invade
-    module InvadeModule
-      module Provision
-
-        class ShellInline < InvadeModule
-
-          attr_reader :result
-          attr_accessor :machine_name, :shell_inline_data
-
-          def initialize(machine_name, shell_inline_data, result: nil)
-            @machine_name = machine_name
-            @shell_inline_data = shell_inline_data
-            @result = result
-          end
-
-          def build
-            b = binding
-
-            begin
-
-              # Get machine name
-              machine_name = @machine_name
-
-              # Values for shell provision section
-              name = @shell_inline_data['name']
-              inline = @shell_inline_data['inline']
-              binary = @shell_inline_data['binary']
-              privileged = @shell_inline_data['privileged']
-
-              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/shell_inline/template.erb

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