vagrant-dotvm 0.20.0 → 0.21.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 545c505f26efb5f6cb1c5942a50ef7527c43d475
-  data.tar.gz: 0fb0700ae56254b6c3ce17f00994183687c8e201
+  metadata.gz: e980d71762b2fb11dbcb58b93dda545cc84cc152
+  data.tar.gz: 162367673e933c5ecc22af25d2f1086ad1fb46c2
 SHA512:
-  metadata.gz: 945f73762362513e6ea469102603b3ef0de865405891173dcafa5b84b3102f1c6bb421b9c91fae0d17deba840f3d7cb56e9b30de90822e6198d59c7cde1d8d8a
-  data.tar.gz: 8682d1684a8eeca8023117d7a36bc939588669e9337fca88357c3d71257ebe6d6b9c536d0aeb32edd2e59c43d8adf608d2538ff70326fce34cd19f60a3315c7b
+  metadata.gz: 335d95277d7414f5994563de140fc32eda3641650782b150cd40df3b9c88506fd8c4547abc39500ef31af0c89e9c89576b827227b35d6b036616f6bcdaf63569
+  data.tar.gz: cf3cf6a12bf42df133b1fc9302b77dc072a14500ab03aae4d915b2a52da7b777c29772c5722d1a76cf76b13e61c883fb121025cb61f10eef1133e06e3f835537

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+# 0.21.0
+* Support for more options - puppet provision
+* Support for more options - vm
+* Support for more options - network
+* Fix for case when some options are missing - vm
+
 # 0.20.0
 * Now error is displayed when you specify unsupported option
 * Removal of next bunch of default parameters

data/README.md

@@ -1,6 +1,7 @@
 # DotVm
 
 [![Scrutinizer Code Quality](https://scrutinizer-ci.com/g/krzysztof-magosa/vagrant-dotvm/badges/quality-score.png?b=master)](https://scrutinizer-ci.com/g/krzysztof-magosa/vagrant-dotvm/?branch=master)
+[![Gem Version](https://badge.fury.io/rb/vagrant-dotvm.svg)](http://badge.fury.io/rb/vagrant-dotvm)
 
 ## What is that?
 DotVm is vagrant plugin for easier maintenance of multi machine configurations.

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

@@ -24,6 +24,16 @@ module VagrantPlugins
         attr_accessor :hosts
         attr_accessor :options
         attr_accessor :shared_folders
+        attr_accessor :box_download_checksum
+        attr_accessor :box_download_checksum_type
+        attr_accessor :box_download_client_cert
+        attr_accessor :box_download_ca_cert
+        attr_accessor :box_download_ca_path
+        attr_accessor :box_download_insecure
+        attr_accessor :box_download_location_trusted
+        attr_accessor :box_url
+        attr_accessor :communicator
+        attr_accessor :guest
 
         def initialize()
           @primary         = false

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

@@ -11,6 +11,10 @@ module VagrantPlugins
         attr_accessor :host
         attr_accessor :protocol
         attr_accessor :bridge
+        attr_accessor :guest_ip
+        attr_accessor :host_ip
+        attr_accessor :auto_correct
+        attr_accessor :auto_config
 
         def initialize()
           @net      = :private_network

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

@@ -13,6 +13,10 @@ module VagrantPlugins
         attr_accessor :manifest_file
         attr_accessor :privileged
         attr_accessor :run
+        attr_accessor :binary_path
+        attr_accessor :hiera_config_path
+        attr_accessor :environment
+        attr_accessor :environment_path
       end
     end
   end

data/lib/vagrant-dotvm/configinjecter.rb

@@ -11,13 +11,23 @@ module VagrantPlugins
           vc.vm.define machine_cfg.nick,
                        primary: machine_cfg.primary,
                        autostart: machine_cfg.autostart do |machine|
-            machine.vm.box                   = machine_cfg.box
-            machine.vm.hostname              = machine_cfg.name
-            machine.vm.boot_timeout          = machine_cfg.boot_timeout
-            machine.vm.box_check_update      = machine_cfg.box_check_update
-            machine.vm.box_version           = machine_cfg.box_version
-            machine.vm.graceful_halt_timeout = machine_cfg.graceful_halt_timeout
-            machine.vm.post_up_message       = machine_cfg.post_up_message
+            machine.vm.box                           = machine_cfg.box                           unless machine_cfg.box.nil?
+            machine.vm.hostname                      = machine_cfg.name                          unless machine_cfg.name.nil?
+            machine.vm.boot_timeout                  = machine_cfg.boot_timeout                  unless machine_cfg.boot_timeout.nil?
+            machine.vm.box_check_update              = machine_cfg.box_check_update              unless machine_cfg.box_check_update.nil?
+            machine.vm.box_version                   = machine_cfg.box_version                   unless machine_cfg.box_version.nil?
+            machine.vm.graceful_halt_timeout         = machine_cfg.graceful_halt_timeout         unless machine_cfg.graceful_halt_timeout.nil?
+            machine.vm.post_up_message               = machine_cfg.post_up_message               unless machine_cfg.post_up_message.nil?
+            machine.vm.box_download_checksum         = machine_cfg.box_download_checksum         unless machine_cfg.box_download_checksum.nil?
+            machine.vm.box_download_checksum_type    = machine_cfg.box_download_checksum_type    unless machine_cfg.box_download_checksum_type.nil?
+            machine.vm.box_download_client_cert      = machine_cfg.box_download_client_cert      unless machine_cfg.box_download_client_cert.nil?
+            machine.vm.box_download_ca_cert          = machine_cfg.box_download_ca_cert          unless machine_cfg.box_download_ca_cert.nil?
+            machine.vm.box_download_ca_path          = machine_cfg.box_download_ca_path          unless machine_cfg.box_download_ca_path.nil?
+            machine.vm.box_download_insecure         = machine_cfg.box_download_insecure         unless machine_cfg.box_download_insecure.nil?
+            machine.vm.box_download_location_trusted = machine_cfg.box_download_location_trusted unless machine_cfg.box_download_location_trusted.nil?
+            machine.vm.box_url                       = machine_cfg.box_url                       unless machine_cfg.box_url.nil?
+            machine.vm.communicator                  = machine_cfg.communicator                  unless machine_cfg.communicator.nil?
+            machine.vm.guest                         = machine_cfg.guest                         unless machine_cfg.guest.nil?
 
             machine.vm.provider "virtualbox" do |vb|
               vb.customize ["modifyvm", :id, "--memory",          machine_cfg.memory] unless machine_cfg.memory.nil?
@@ -32,14 +42,18 @@ module VagrantPlugins
 
             machine_cfg.networks.each do |net|
               hash = {}
-              hash[:type]               = net.type      unless net.type.nil?
-              hash[:ip]                 = net.ip        unless net.ip.nil?
-              hash[:netmask]            = net.mask      unless net.mask.nil?
-              hash[:virtualbox__intnet] = net.interface unless net.interface.nil?
-              hash[:guest]              = net.guest     unless net.guest.nil?
-              hash[:host]               = net.host      unless net.host.nil?
-              hash[:protocol]           = net.protocol  unless net.protocol.nil?
-              hash[:bridge]             = net.bridge    unless net.bridge.nil?
+              hash[:type]               = net.type         unless net.type.nil?
+              hash[:ip]                 = net.ip           unless net.ip.nil?
+              hash[:netmask]            = net.mask         unless net.mask.nil?
+              hash[:virtualbox__intnet] = net.interface    unless net.interface.nil?
+              hash[:guest]              = net.guest        unless net.guest.nil?
+              hash[:host]               = net.host         unless net.host.nil?
+              hash[:protocol]           = net.protocol     unless net.protocol.nil?
+              hash[:bridge]             = net.bridge       unless net.bridge.nil?
+              hash[:guest_ip]           = net.guest_ip     unless net.guest_ip.nil?
+              hash[:host_ip]            = net.host_ip      unless net.host_ip.nil?
+              hash[:auto_correct]       = net.auto_correct unless net.auto_correct.nil?
+              hash[:auto_config]        = net.auto_config  unless net.auto_config.nil?
 
               machine.vm.network net.net, **hash
             end
@@ -62,15 +76,19 @@ 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.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?
               end
             end
 

data/lib/vagrant-dotvm/version.rb

@@ -1,5 +1,5 @@
 module VagrantPlugins
   module Dotvm
-    VERSION = "0.20.0"
+    VERSION = "0.21.0"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-dotvm
 version: !ruby/object:Gem::Version
-  version: 0.20.0
+  version: 0.21.0
 platform: ruby
 authors:
 - Krzysztof Magosa