vagrant-dotvm 0.25.0 → 0.26.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 667d0dce371ea12db6bd6c8954ae29300bbdadaa
-  data.tar.gz: 22afb804a131c0759d0980a7b211bec543eee6da
+  metadata.gz: 761d7388cc8c79acef4962bb3612bcdc4d2d703c
+  data.tar.gz: 83c59133a04e3911572ac52be423c53851259543
 SHA512:
-  metadata.gz: fbfd7301f49c8371f0bcb91c88806ea05382cda1b0605ac4c0fc7f267d74e032b6a0715d78811b6c6f4cdd2dffbabd5609c6ee8c5893cc560aed60c5e795b7f7
-  data.tar.gz: 27d143751fe453535985fef8d6dccd4211a03f6b5a42f35ec6c1232a30c7b3ca590afc6b90418b09dbb74223148adfbe5242d015b0d29397ea3184ffb1c7a0ee
+  metadata.gz: 93aa6bf24bdd66d1b7bbfd4fc107447653bc190dbf119f8dbe5c9684c41e33425a29620b1fac336298732ac1725e2f3aa8d677d67aea2ab5785c5974ac3ddcd4
+  data.tar.gz: 3791e5d01a3589572f58e6be652a652937da623558d19a718cc6559c5572ac0f3c4b2683ea37dcd1d2865aecd636324add9855b1b2b41537664448432078f93b

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+# 0.26.0
+* Do validation of types in config
+* vCPUs and memory options are not passed to VMWare Fusion
+* Salt provision
+
 # 0.25.0
 * Ability to set global options for ssh
 * Ability to set global options for winrm

data/lib/vagrant-dotvm/config/machine.rb

@@ -68,6 +68,8 @@ module VagrantPlugins
         end
 
         def populate_networks(data)
+          raise "'networks' must be array." unless data.kind_of?(Array) || data.kind_of?(NilClass)
+
           data.to_a.each do |conf|
             item = Network.new
             item.populate conf
@@ -76,6 +78,8 @@ module VagrantPlugins
         end
 
         def populate_routes(data)
+          raise "'routes' must be array." unless data.kind_of?(Array) || data.kind_of?(NilClass)
+
           data.to_a.each do |conf|
             item = Route.new
             item.populate conf
@@ -84,6 +88,8 @@ module VagrantPlugins
         end
 
         def populate_provision(data)
+          raise "'provision' must be array." unless data.kind_of?(Array) || data.kind_of?(NilClass)
+
           data.to_a.each do |conf|
             item = Provision.new
             item.populate conf
@@ -92,12 +98,16 @@ module VagrantPlugins
         end
 
         def populate_groups(data)
+          raise "'groups' must be array." unless data.kind_of?(Array) || data.kind_of?(NilClass)
+
           data.to_a.each do |item|
             @groups << item
           end
         end
 
         def populate_authorized_keys(data)
+          raise "'authorized_keys' must be array." unless data.kind_of?(Array) || data.kind_of?(NilClass)
+
           data.to_a.each do |conf|
             item = AuthorizedKey.new
             item.populate conf
@@ -106,6 +116,8 @@ module VagrantPlugins
         end
 
         def populate_hosts(data)
+          raise "'hosts' must be array." unless data.kind_of?(Array) || data.kind_of?(NilClass)
+
           data.to_a.each do |conf|
             item = Host.new
             item.populate conf
@@ -114,6 +126,8 @@ module VagrantPlugins
         end
 
         def populate_options(data)
+          raise "'options' must be hash." unless data.kind_of?(Hash) || data.kind_of?(NilClass)
+
           data.to_h.each do |key, confs|
             key = key.to_sym
             raise "Invalid options category: #{key}." unless @options.has_key?(key)

data/lib/vagrant-dotvm/config/provision.rb

@@ -32,6 +32,32 @@ module VagrantPlugins
         attr_accessor :client_private_key_path
         attr_accessor :puppet_node
         attr_accessor :puppet_server
+        attr_accessor :minion_config
+        attr_accessor :run_highstate
+        attr_accessor :install_master
+        attr_accessor :no_minion
+        attr_accessor :install_syndic
+        attr_accessor :install_type
+        attr_accessor :install_args
+        attr_accessor :install_command
+        attr_accessor :always_install
+        attr_accessor :bootstrap_script
+        attr_accessor :bootstrap_options
+        attr_accessor :version
+        attr_accessor :minion_key
+        attr_accessor :minion_id
+        attr_accessor :minion_pub
+        attr_accessor :grains_config
+        attr_accessor :masterless
+        attr_accessor :master_config
+        attr_accessor :master_key
+        attr_accessor :master_pub
+        attr_accessor :seed_master
+        attr_accessor :run_highstate
+        attr_accessor :run_overstate
+        attr_accessor :orchestrations
+        attr_accessor :colorize
+        attr_accessor :log_level
       end
     end
   end

data/lib/vagrant-dotvm/config/root.rb

@@ -15,6 +15,8 @@ module VagrantPlugins
         end
 
         def populate_machines(data)
+          raise "'machines' must be array." unless data.kind_of?(Array) || data.kind_of?(NilClass)
+
           data.to_a.each do |item|
             machine = Machine.new
             machine.populate item
@@ -23,6 +25,8 @@ module VagrantPlugins
         end
 
         def populate_options(data)
+          raise "'options' must be hash." unless data.kind_of?(Hash) || data.kind_of?(NilClass)
+
           data.to_h.each do |key, confs|
             key = key.to_sym
             raise "Invalid options category: #{key}." unless @options.has_key?(key)

data/lib/vagrant-dotvm/configinjecter.rb

@@ -52,6 +52,11 @@ module VagrantPlugins
               end
             end
 
+            machine.vm.provider "vmware_fusion" do |vf|
+              vf.vmx["memsize"]  = machine_cfg.memory unless machine_cfg.memory.nil?
+              vf.vmz["numvcpus"] = machine_cfg.cpus   unless machine_cfg.cpus.nil?
+            end
+
             machine_cfg.networks.each do |net|
               hash = {}
               hash[:type]               = net.type         unless net.type.nil?
@@ -88,33 +93,20 @@ module VagrantPlugins
 
             machine_cfg.provision.each do |provision|
               machine.vm.provision provision.type, run: provision.run do |p|
-                p.path                    = provision.path                    unless provision.path.nil?
-                p.inline                  = provision.inline                  unless provision.inline.nil?
-                p.args                    = provision.args                    unless provision.args.nil?
-                p.privileged              = provision.privileged              unless provision.privileged.nil?
-                p.source                  = provision.source                  unless provision.source.nil?
-                p.destination             = provision.destination             unless provision.destination.nil?
-                p.module_path             = provision.module_path             unless provision.module_path.nil?
-                p.manifest_file           = provision.manifest_file           unless provision.manifest_file.nil?
-                p.manifests_path          = provision.manifests_path          unless provision.manifests_path.nil?
-                p.binary_path             = provision.binary_path             unless provision.binary_path.nil?
-                p.hiera_config_path       = provision.hiera_config_path       unless provision.hiera_config_path.nil?
-                p.environment             = provision.environment             unless provision.environment.nil?
-                p.environment_path        = provision.environment_path        unless provision.environment_path.nil?
-                p.binary                  = provision.binary                  unless provision.binary.nil?
-                p.upload_path             = provision.upload_path             unless provision.upload_path.nil?
-                p.keep_color              = provision.keep_color              unless provision.keep_color.nil?
-                p.name                    = provision.name                    unless provision.name.nil?
-                p.powershell_args         = provision.powershell_args         unless provision.powershell_args.nil?
-                p.facter                  = provision.facter                  unless provision.facter.nil?
-                p.options                 = provision.options                 unless provision.options.nil?
-                p.synced_folder_type      = provision.synced_folder_type      unless provision.synced_folder_type.nil?
-                p.temp_dir                = provision.temp_dir                unless provision.temp_dir.nil?
-                p.working_directory       = provision.working_directory       unless provision.working_directory.nil?
-                p.client_cert_path        = provision.client_cert_path        unless provision.client_cert_path.nil?
-                p.client_private_key_path = provision.client_private_key_path unless provision.client_private_key_path.nil?
-                p.puppet_node             = provision.puppet_node             unless provision.puppet_node.nil?
-                p.puppet_server           = provision.puppet_server           unless provision.puppet_server.nil?
+                [
+                  :path, :inline, :args, :privileged, :source, :destination, :module_path, :manifest_file,
+                  :manifests_path, :binary_path, :hiera_config_path, :environment, :environment_path,
+                  :binary, :upload_path, :keep_color, :name, :powershell_args, :facter, :options,
+                  :synced_folder_type, :temp_dir, :working_directory, :client_cert_path, :client_private_key_path,
+                  :puppet_node, :puppet_server, :minion_config, :run_highstate, :install_master, :no_minion,
+                  :install_syndic, :install_type, :install_args, :install_command, :always_install, :bootstrap_script,
+                  :bootstrap_options, :version, :minion_key, :minion_id, :minion_pub, :grains_config, :masterless,
+                  :master_config, :master_key, :master_pub, :seed_master, :run_highstate, :run_overstate,
+                  :orchestrations, :colorize, :log_level,
+                ].each do |opt|
+                  val = provision.send(opt)
+                  p.send("#{opt}=", val) unless val.nil?
+                end
               end
             end
 

data/lib/vagrant-dotvm/version.rb

@@ -1,5 +1,5 @@
 module VagrantPlugins
   module Dotvm
-    VERSION = "0.25.0"
+    VERSION = "0.26.0"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-dotvm
 version: !ruby/object:Gem::Version
-  version: 0.25.0
+  version: 0.26.0
 platform: ruby
 authors:
 - Krzysztof Magosa
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-21 00:00:00.000000000 Z
+date: 2015-07-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler