vagrant-dotvm 0.30.0 → 0.31.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a6d538d3645fe69b4fda9fc292f0fdaafb222cbf
-  data.tar.gz: 4c25a64b1472dd6636f6b180872cf381e6751c48
+  metadata.gz: acc52b4f98f4aa98e7693a14a72fb982f7ee4c6a
+  data.tar.gz: 869ed4c1f28ce6bf71297322027d01b316ac0820
 SHA512:
-  metadata.gz: c3e851140912f7c3ad8372dc94477d595d7d578ff42ccefafef1fb7278aa23d0223a919ec63788b850f60b6430e6396c46f0f906227a64ef34d6fa16e1737799
-  data.tar.gz: 202f8824f810364eea87a4a08778c32be19e3c64595445d2dd323b65d6bbaca48b982b3652cb2cd76a0de2491655633cde48ca7a7f7120415c3da3b3a8b36d72
+  metadata.gz: 2c48a592dc80dc609e7188ff8a1e397b29c5fe59ec51bcfc079a44aba888e224f15ec6a6662103c72f4e841edaa86a281ed719f5c847909043793274e4b52dd5
+  data.tar.gz: 633e6bcf76edec1a5c768a0807952a64d4afa07650ba45252fe6d297b457af78470085ac58804459dfaae153c7eb902b92bc314b91104d5d5a144bff85a3c83f

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+# 0.31.0
+* Authorized keys and hosts were broken. It has been fixed.
+* Docker provision
+
 # 0.30.0
 * Ability to set pillar data
 

data/lib/vagrant-dotvm.rb

@@ -3,6 +3,7 @@ require 'yaml'
 
 require 'vagrant-dotvm/plugin'
 require 'vagrant-dotvm/version'
+require 'vagrant-dotvm/pathes'
 require 'vagrant-dotvm/dotvm'
 
 require 'vagrant-dotvm/injector/root'
@@ -24,3 +25,5 @@ require 'vagrant-dotvm/config/sharedfolder'
 require 'vagrant-dotvm/config/option'
 require 'vagrant-dotvm/config/route'
 require 'vagrant-dotvm/config/network'
+require 'vagrant-dotvm/config/buildimage'
+require 'vagrant-dotvm/config/run'

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

@@ -0,0 +1,10 @@
+module VagrantPlugins
+  module Dotvm
+    module Config
+      class BuildImage < AbstractConfig
+        attr_accessor :image
+        attr_accessor :args
+      end
+    end
+  end
+end

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

@@ -122,6 +122,35 @@ module VagrantPlugins
         attr_accessor :recipes # chef
         attr_accessor :roles # chef
         attr_accessor :pillar
+
+        attr_accessor :images
+        attr_accessor :build_images
+        attr_accessor :runs
+
+        def initialize
+          @build_images = []
+          @runs         = []
+        end
+
+        def populate_build_images(data)
+          raise "'build_images' must be array." unless data.kind_of?(Array) || data.kind_of?(NilClass)
+
+          data.to_a.each do |conf|
+            item = BuildImage.new
+            item.populate conf
+            @build_images << item
+          end
+        end
+
+        def populate_runs(data)
+          raise "'runs' must be array." unless data.kind_of?(Array) || data.kind_of?(NilClass)
+
+          data.to_a.each do |conf|
+            item = Run.new
+            item.populate conf
+            @runs << item
+          end
+        end
       end
     end
   end

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

@@ -0,0 +1,15 @@
+module VagrantPlugins
+  module Dotvm
+    module Config
+      class Run < AbstractConfig
+        attr_accessor :name
+        attr_accessor :image
+        attr_accessor :cmd
+        attr_accessor :args
+        attr_accessor :auto_assign_name
+        attr_accessor :daemonize
+        attr_accessor :restart
+      end
+    end
+  end
+end

data/lib/vagrant-dotvm/injector/authorizedkey.rb

@@ -10,7 +10,7 @@ module VagrantPlugins
           end
 
           machine.vm.provision "shell" do |s|
-            s.path       = File.dirname(__FILE__) + "/../../utils/authorize_key.sh"
+            s.path       = "#{UTILS_PATH}/authorize_key.sh"
             s.args       = [pubkey]
             s.privileged = false
           end

data/lib/vagrant-dotvm/injector/host.rb

@@ -4,7 +4,7 @@ module VagrantPlugins
       class Host
         def self.inject(host: nil, machine: nil)
           machine.vm.provision "shell", run: "always" do |s|
-            s.path       = File.dirname(__FILE__) + "/../../utils/add_host.sh"
+            s.path       = "#{UTILS_PATH}/add_host.sh"
             s.args       = [host.ip, host.host]
             s.privileged = true
           end

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

@@ -119,6 +119,16 @@ module VagrantPlugins
           :delete_node,
           :delete_client,
           :recipe,
+          :images,
+        ]
+
+        RUNS_OPTIONS = [
+          :image,
+          :cmd,
+          :args,
+          :auto_assign_name,
+          :daemonize,
+          :restart,
         ]
 
         public
@@ -138,6 +148,22 @@ module VagrantPlugins
             end
 
             p.pillar provision_cfg.pillar unless provision_cfg.pillar.nil?
+
+            provision_cfg.build_images.to_a.each do |image|
+              args = {}
+              args[:args] = image.args unless image.args.nil?
+              p.build_image image.image, **args
+            end
+
+            provision_cfg.runs.to_a.each do |run|
+              args = {}
+              RUNS_OPTIONS.each do |opt|
+                val = run.send(opt)
+                args[opt] = val unless val.nil?
+              end
+
+              p.run run.name, **args
+            end
           end
         end
       end

data/lib/vagrant-dotvm/injector/route.rb

@@ -4,7 +4,7 @@ module VagrantPlugins
       class Route
         def self.inject(route: nil, machine: nil)
           machine.vm.provision "shell", run: "always" do |s|
-            s.path       = File.dirname(__FILE__) + "/../../../utils/setup_route.sh"
+            s.path       = "#{UTILS_PATH}/setup_route.sh"
             s.args       = [route.destination, route.gateway]
             s.privileged = true
           end

data/lib/vagrant-dotvm/pathes.rb

@@ -0,0 +1,5 @@
+module VagrantPlugins
+  module Dotvm
+    UTILS_PATH = File.dirname(__FILE__) + "/../../utils"
+  end
+end

data/lib/vagrant-dotvm/version.rb

@@ -1,5 +1,5 @@
 module VagrantPlugins
   module Dotvm
-    VERSION = "0.30.0"
+    VERSION = "0.31.0"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-dotvm
 version: !ruby/object:Gem::Version
-  version: 0.30.0
+  version: 0.31.0
 platform: ruby
 authors:
 - Krzysztof Magosa
@@ -62,6 +62,7 @@ files:
 - lib/vagrant-dotvm.rb
 - lib/vagrant-dotvm/config/abstractconfig.rb
 - lib/vagrant-dotvm/config/authorizedkey.rb
+- lib/vagrant-dotvm/config/buildimage.rb
 - lib/vagrant-dotvm/config/host.rb
 - lib/vagrant-dotvm/config/machine.rb
 - lib/vagrant-dotvm/config/network.rb
@@ -69,6 +70,7 @@ files:
 - lib/vagrant-dotvm/config/provision.rb
 - lib/vagrant-dotvm/config/root.rb
 - lib/vagrant-dotvm/config/route.rb
+- lib/vagrant-dotvm/config/run.rb
 - lib/vagrant-dotvm/config/sharedfolder.rb
 - lib/vagrant-dotvm/dotvm.rb
 - lib/vagrant-dotvm/injector/authorizedkey.rb
@@ -79,6 +81,7 @@ files:
 - lib/vagrant-dotvm/injector/root.rb
 - lib/vagrant-dotvm/injector/route.rb
 - lib/vagrant-dotvm/injector/sharedfolder.rb
+- lib/vagrant-dotvm/pathes.rb
 - lib/vagrant-dotvm/plugin.rb
 - lib/vagrant-dotvm/version.rb
 - utils/add_host.sh