vagrant-dotvm 0.31.0 → 0.32.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: acc52b4f98f4aa98e7693a14a72fb982f7ee4c6a
-  data.tar.gz: 869ed4c1f28ce6bf71297322027d01b316ac0820
+  metadata.gz: 7d6eb0ece7b163748f746c29841424622f1eb0df
+  data.tar.gz: 8786686be74d5c5891de13b51d91a9b67a511515
 SHA512:
-  metadata.gz: 2c48a592dc80dc609e7188ff8a1e397b29c5fe59ec51bcfc079a44aba888e224f15ec6a6662103c72f4e841edaa86a281ed719f5c847909043793274e4b52dd5
-  data.tar.gz: 633e6bcf76edec1a5c768a0807952a64d4afa07650ba45252fe6d297b457af78470085ac58804459dfaae153c7eb902b92bc314b91104d5d5a144bff85a3c83f
+  metadata.gz: d318951e66516781853e2c70cf5307d75626d0024a0af154850c22834c7f445e5de834f6971d2473ed7d2578852e276cfb57a762cc0a7e517296ae86c4d48956
+  data.tar.gz: a7e4d57c89a1ff84b36ec2f7e1e5aa31fe210dacf005d9ea2863b498a45bd8b904228c5d46cdc2a3faf0442680cd74f04bd209a6606804cd58f5eaf528167757

data/README.md

@@ -1,5 +1,6 @@
 # DotVm
 
+[![Code Climate](https://codeclimate.com/github/vagrant-dotvm/vagrant-dotvm/badges/gpa.svg)](https://codeclimate.com/github/vagrant-dotvm/vagrant-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)
 

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

@@ -4,42 +4,43 @@ module VagrantPlugins
       class AbstractConfig
         def populate(data)
           data.each do |key, value|
-            if respond_to?("populate_#{key}")
-              m = method("populate_#{key}")
-            elsif respond_to? "#{key}="
-              m = method("#{key}=")
-            else
-              raise "Invalid configuration option: #{key}."
-            end
-
-            m.call(value)
+            raise "Invalid configuration option: #{key}." until respond_to? "#{key}="
+            send("#{key}=", value)
           end
         end
 
         def replace_vars(vars, target)
+          replaced = 0
+
           if target.kind_of?(Array)
             target.each do |item|
-              replace_vars(vars, item)
+              replaced += replace_vars(vars, item)
             end
           elsif target.kind_of?(Hash)
             target.each do |name, item|
-              replace_vars(vars, item)
+              replaced += replace_vars(vars, item)
             end
           elsif target.kind_of?(String)
             vars.each do |k, v|
               pattern = "%#{k}%"
-              target.gsub! pattern, v
+              replaced+=1 unless (target.gsub! pattern, v).kind_of?(NilClass)
             end
           elsif target.kind_of?(AbstractConfig)
-            target.replace_vars!(vars)
+            replaced += target.replace_vars!(vars)
           end
+
+          replaced
         end
 
         def replace_vars!(vars)
+          replaced = 0
+
           instance_variables.each do |var_name|
             var = instance_variable_get(var_name)
-            replace_vars(vars, var)
+            replaced += replace_vars(vars, var)
           end
+
+          replaced
         end
       end
     end

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

@@ -10,20 +10,20 @@ module VagrantPlugins
         attr_accessor :cpucap
         attr_accessor :primary
         attr_accessor :natnet
-        attr_accessor :networks
-        attr_accessor :routes
-        attr_accessor :provision
-        attr_accessor :groups
-        attr_accessor :authorized_keys
+        attr_reader :networks
+        attr_reader :routes
+        attr_reader :provision
+        attr_reader :groups
+        attr_reader :authorized_keys
         attr_accessor :boot_timeout
         attr_accessor :box_check_update
         attr_accessor :box_version
         attr_accessor :graceful_halt_timeout
         attr_accessor :post_up_message
         attr_accessor :autostart
-        attr_accessor :hosts
-        attr_accessor :options
-        attr_accessor :shared_folders
+        attr_reader :hosts
+        attr_reader :options
+        attr_reader :shared_folders
         attr_accessor :box_download_checksum
         attr_accessor :box_download_checksum_type
         attr_accessor :box_download_client_cert
@@ -36,31 +36,6 @@ module VagrantPlugins
         attr_accessor :guest
         attr_reader :usable_port_range
 
-        def initialize()
-          @networks        = []
-          @routes          = []
-          @provision       = []
-          @groups          = []
-          @authorized_keys = []
-          @hosts           = []
-          @options         = {
-            :virtualbox    => [],
-          }
-          @shared_folders  = []
-
-          populate_shared_folders(
-            [
-              {
-                "host"     => "%project.host%",
-                "guest"    => "%project.guest%",
-                "disabled" => false,
-                "create"   => false,
-                "type"     => nil,
-              }
-            ]
-          )
-        end
-
         def name=(value)
           @hostname = value
         end
@@ -71,68 +46,77 @@ module VagrantPlugins
           @usable_port_range = Range.new(m[0][0].to_i, m[0][1].to_i)
         end
 
-        def populate_networks(data)
-          raise "'networks' must be array." unless data.kind_of?(Array) || data.kind_of?(NilClass)
+        def networks=(networks)
+          raise "'networks' must be array." unless networks.kind_of?(Array) || networks.kind_of?(NilClass)
 
-          data.to_a.each do |conf|
+          @networks = []
+          networks.to_a.each do |conf|
             item = Network.new
             item.populate conf
             @networks << item
           end
         end
 
-        def populate_routes(data)
-          raise "'routes' must be array." unless data.kind_of?(Array) || data.kind_of?(NilClass)
+        def routes=(routes)
+          raise "'routes' must be array." unless routes.kind_of?(Array) || routes.kind_of?(NilClass)
 
-          data.to_a.each do |conf|
+          @routes = []
+          routes.to_a.each do |conf|
             item = Route.new
             item.populate conf
             @routes << item
           end
         end
 
-        def populate_provision(data)
-          raise "'provision' must be array." unless data.kind_of?(Array) || data.kind_of?(NilClass)
+        def provision=(provision)
+          raise "'provision' must be array." unless provision.kind_of?(Array) || provision.kind_of?(NilClass)
 
-          data.to_a.each do |conf|
+          @provision = []
+          provision.to_a.each do |conf|
             item = Provision.new
             item.populate conf
             @provision << item
           end
         end
 
-        def populate_groups(data)
-          raise "'groups' must be array." unless data.kind_of?(Array) || data.kind_of?(NilClass)
+        def groups=(groups)
+          raise "'groups' must be array." unless groups.kind_of?(Array) || groups.kind_of?(NilClass)
 
-          data.to_a.each do |item|
+          @groups = []
+          groups.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)
+        def authorized_keys=(keys)
+          raise "'authorized_keys' must be array." unless keys.kind_of?(Array) || keys.kind_of?(NilClass)
 
-          data.to_a.each do |conf|
+          @authorized_keys = []
+          keys.to_a.each do |conf|
             item = AuthorizedKey.new
             item.populate conf
             @authorized_keys << item
           end
         end
 
-        def populate_hosts(data)
-          raise "'hosts' must be array." unless data.kind_of?(Array) || data.kind_of?(NilClass)
+        def hosts=(hosts)
+          raise "'hosts' must be array." unless hosts.kind_of?(Array) || hosts.kind_of?(NilClass)
 
-          data.to_a.each do |conf|
+          @hosts = []
+          hosts.to_a.each do |conf|
             item = Host.new
             item.populate conf
             @hosts << item
           end
         end
 
-        def populate_options(data)
-          raise "'options' must be hash." unless data.kind_of?(Hash) || data.kind_of?(NilClass)
+        def options=(options)
+          raise "'options' must be hash." unless options.kind_of?(Hash) || options.kind_of?(NilClass)
 
-          data.to_h.each do |key, confs|
+          @options = {
+            :virtualbox    => [],
+          }
+          options.to_h.each do |key, confs|
             key = key.to_sym
             raise "Invalid options category: #{key}." unless @options.has_key?(key)
 
@@ -144,12 +128,24 @@ module VagrantPlugins
           end
         end
 
-        def populate_shared_folders(data)
-          data.to_a.each do |conf|
+        def shared_folders=(shared_folders)
+          @shared_folders = []
+          shared_folders.to_a.each do |conf|
             item = SharedFolder.new
             item.populate conf
             @shared_folders << item
           end
+
+          settings = {
+            "host"     => "%project.host%",
+            "guest"    => "%project.guest%",
+            "disabled" => false,
+            "create"   => false,
+            "type"     => nil,
+          }
+          item = SharedFolder.new
+          item.populate settings
+          @shared_folders << item
         end
 
       end

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

@@ -124,28 +124,25 @@ module VagrantPlugins
         attr_accessor :pillar
 
         attr_accessor :images
-        attr_accessor :build_images
-        attr_accessor :runs
+        attr_reader :build_images
+        attr_reader :runs
 
-        def initialize
-          @build_images = []
-          @runs         = []
-        end
+        def build_images=(build_images)
+          raise "'build_images' must be array." unless build_images.kind_of?(Array) || build_images.kind_of?(NilClass)
 
-        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|
+          @build_images = []
+          build_images.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)
+        def runs=(runs)
+          raise "'runs' must be array." unless runs.kind_of?(Array) || runs.kind_of?(NilClass)
 
-          data.to_a.each do |conf|
+          @runs = []
+          runs.to_a.each do |conf|
             item = Run.new
             item.populate conf
             @runs << item

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

@@ -4,30 +4,28 @@ module VagrantPlugins
       class Root < AbstractConfig
         attr_reader :machines
         attr_reader :options
+        attr_reader :vars
 
-        def initialize()
-          @machines = []
-          @options  = {
-            :ssh     => [],
-            :winrm   => [],
-            :vagrant => [],
-          }
-        end
-
-        def populate_machines(data)
-          raise "'machines' must be array." unless data.kind_of?(Array) || data.kind_of?(NilClass)
+        def machines=(machines)
+          raise "'machines' must be array." unless machines.kind_of?(Array) || machines.kind_of?(NilClass)
 
-          data.to_a.each do |item|
+          @machines = []
+          machines.to_a.each do |item|
             machine = Machine.new
             machine.populate item
             @machines << machine
           end
         end
 
-        def populate_options(data)
-          raise "'options' must be hash." unless data.kind_of?(Hash) || data.kind_of?(NilClass)
+        def options=(data)
+          raise "'options' must be hash." unless options.kind_of?(Hash) || options.kind_of?(NilClass)
 
-          data.to_h.each do |key, confs|
+          @options  = {
+            :ssh     => [],
+            :winrm   => [],
+            :vagrant => [],
+          }
+          options.to_h.each do |key, confs|
             key = key.to_sym
             raise "Invalid options category: #{key}." unless @options.has_key?(key)
 
@@ -38,6 +36,11 @@ module VagrantPlugins
             end
           end
         end
+
+        def vars=(vars)
+          raise "'vars' must be hash." unless vars.kind_of?(Hash) || vars.kind_of?(NilClass)
+          @vars = vars
+        end
       end
     end
   end

data/lib/vagrant-dotvm/dotvm.rb

@@ -10,6 +10,20 @@ module VagrantPlugins
         @path = path
       end
 
+      private
+      def get_globals
+        globals = {}
+
+        Dir[@path + "/globals/*.yaml"].each do |fname|
+          yaml = YAML::load(File.read(fname))
+          yaml.each do |name, value|
+            globals[name] = value
+          end
+        end
+
+        globals
+      end
+
       private
       def get_configs()
         configs = []
@@ -26,10 +40,24 @@ module VagrantPlugins
             vars['env.' + name] = value
           end
 
+          get_globals.each do |name, value|
+            vars['global.' + name] = value
+          end
+
           begin
             conf = Config::Root.new
             conf.populate yaml
-            conf.replace_vars! vars
+
+            conf.vars.to_h.each do |name, value|
+              vars['local.' + name] = value
+            end
+
+            for _ in (0..5)
+              last = conf.replace_vars! vars
+              break if last == 0
+            end
+
+            raise "Too deep variables relations, possible recurrence." unless last == 0
           rescue Exception => e
             file = fname[(@path.length+"/projects/".length)..-1]
             raise Vagrant::Errors::VagrantError.new, "DotVM: #{file}: #{e.message}"

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

@@ -0,0 +1,25 @@
+module VagrantPlugins
+  module Dotvm
+    module Injector
+      class AbstractInjector
+        def self.generate_hash(source, options)
+          hash = {}
+
+          options.each do |opt|
+            val = source.send(opt)
+            hash[opt] = val unless val.nil?
+          end
+
+          return hash
+        end
+
+        def self.rewrite_options(source, target, options)
+          options.each do |opt|
+            val = source.send(opt)
+            target.send("#{opt}=", val) unless val.nil?
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -1,7 +1,7 @@
 module VagrantPlugins
   module Dotvm
     module Injector
-      class AuthorizedKey
+      class AuthorizedKey < AbstractInjector
         def self.inject(key: nil, machine: nil)
           if key.type == "file"
             pubkey = File.readlines(File.expand_path(key.path)).first.strip

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

@@ -1,7 +1,7 @@
 module VagrantPlugins
   module Dotvm
     module Injector
-      class Host
+      class Host < AbstractInjector
         def self.inject(host: nil, machine: nil)
           machine.vm.provision "shell", run: "always" do |s|
             s.path       = "#{UTILS_PATH}/add_host.sh"

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

@@ -1,7 +1,7 @@
 module VagrantPlugins
   module Dotvm
     module Injector
-      class Machine
+      class Machine < AbstractInjector
         BOX_OPTIONS = [
           :box,
           :hostname,
@@ -40,7 +40,7 @@ module VagrantPlugins
               vb.customize ["modifyvm", :id, "--cpuexecutioncap", machine_cfg.cpucap] unless machine_cfg.cpucap.nil?
               vb.customize ["modifyvm", :id, "--natnet1",         machine_cfg.natnet] unless machine_cfg.natnet.nil?
 
-              machine_cfg.options[:virtualbox].each do |option|
+              machine_cfg.options.to_h[:virtualbox].to_a.each do |option|
                 vb.customize ["modifyvm", :id, option.name, option.value]
               end
             end
@@ -50,32 +50,32 @@ module VagrantPlugins
               vf.vmz["numvcpus"] = machine_cfg.cpus   unless machine_cfg.cpus.nil?
             end
 
-            machine_cfg.networks.each do |net|
+            machine_cfg.networks.to_a.each do |net|
               Network.inject net: net,
                              machine: machine
             end
 
-            machine_cfg.routes.each do |route|
+            machine_cfg.routes.to_a.each do |route|
               Route.inject route: route,
                            machine: machine
             end
 
-            machine_cfg.hosts.each do |host|
+            machine_cfg.hosts.to_a.each do |host|
               Host.inject host: host,
                        machine: machine
             end
 
-            machine_cfg.provision.each do |provision|
+            machine_cfg.provision.to_a.each do |provision|
               Provision.inject provision_cfg: provision,
                                machine: machine
             end
 
-            machine_cfg.shared_folders.each do |folder|
+            machine_cfg.shared_folders.to_a.each do |folder|
               SharedFolder.inject folder: folder,
                                   machine: machine
             end
 
-            machine_cfg.authorized_keys.each do |key|
+            machine_cfg.authorized_keys.to_a.each do |key|
               AuthorizedKey.inject key: key,
                                    machine: machine
             end
@@ -83,7 +83,7 @@ module VagrantPlugins
             if Vagrant.has_plugin?("vagrant-group")
               vc.group.groups = {} unless vc.group.groups.kind_of?(Hash)
 
-              machine_cfg.groups.each do |group|
+              machine_cfg.groups.to_a.each do |group|
                 vc.group.groups[group] = [] unless vc.group.groups.has_key?(group)
                 vc.group.groups[group] << machine_cfg.nick
               end

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

@@ -1,7 +1,7 @@
 module VagrantPlugins
   module Dotvm
     module Injector
-      class Network
+      class Network < AbstractInjector
         OPTIONS = [
           :type,
           :ip,
@@ -18,14 +18,7 @@ module VagrantPlugins
         ]
 
         def self.inject(net: nil, machine: nil)
-          hash = {}
-
-          OPTIONS.each do |opt|
-            val = net.send(opt)
-            hash[opt] = val unless val.nil?
-          end
-
-          machine.vm.network net.net, **hash
+          machine.vm.network net.net, **generate_hash(net, OPTIONS)
         end
       end
     end

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

@@ -1,7 +1,7 @@
 module VagrantPlugins
   module Dotvm
     module Injector
-      class Provision
+      class Provision < AbstractInjector
         OPTIONS = [
           :path,
           :inline,
@@ -134,10 +134,7 @@ module VagrantPlugins
         public
         def self.inject(provision_cfg: nil, machine: nil)
           machine.vm.provision provision_cfg.type, run: provision_cfg.run do |p|
-            OPTIONS.each do |opt|
-              val = provision_cfg.send(opt)
-              p.send("#{opt}=", val) unless val.nil?
-            end
+            rewrite_options(provision_cfg, p, OPTIONS)
 
             provision_cfg.recipes.to_a.each do |recipe|
               p.add_recipe(recipe)
@@ -150,19 +147,11 @@ module VagrantPlugins
             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
+              p.build_image image.image, **generate_hash(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
+              p.run run.name, **generate_hash(run, RUNS_OPTIONS)
             end
           end
         end

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

@@ -1,18 +1,12 @@
 module VagrantPlugins
   module Dotvm
     module Injector
-      class Root
+      class Root < AbstractInjector
         def self.inject(config: nil, vc: nil)
-          config.options[:ssh].each do |option|
-            vc.ssh.send("#{option.name}=", option.value)
-          end
-
-          config.options[:winrm].each do |option|
-            vc.winrm.send("#{option.name}=", option.value)
-          end
-
-          config.options[:vagrant].each do |option|
-            vc.vagrant.send("#{option.name}=", option.value)
+          config.options.to_h.each do |category, options|
+            options.to_a.each do |option|
+              vc.call(category).call("#{option.name}=", option.value)
+            end
           end
 
           config.machines.each do |machine_cfg|

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

@@ -1,7 +1,7 @@
 module VagrantPlugins
   module Dotvm
     module Injector
-      class Route
+      class Route < AbstractInjector
         def self.inject(route: nil, machine: nil)
           machine.vm.provision "shell", run: "always" do |s|
             s.path       = "#{UTILS_PATH}/setup_route.sh"

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

@@ -1,7 +1,7 @@
 module VagrantPlugins
   module Dotvm
     module Injector
-      class SharedFolder
+      class SharedFolder < AbstractInjector
         OPTIONS = [
           :disabled,
           :create,
@@ -24,14 +24,7 @@ module VagrantPlugins
         ]
 
         def self.inject(folder: nil, machine: nil)
-          hash = {}
-
-          OPTIONS.each do |opt|
-            val = folder.send(opt)
-            hash[opt] = val unless val.nil?
-          end
-
-          machine.vm.synced_folder folder.host, folder.guest, **hash
+          machine.vm.synced_folder folder.host, folder.guest, **generate_hash(folder, OPTIONS)
         end
       end
     end

data/lib/vagrant-dotvm/version.rb

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

data/lib/vagrant-dotvm.rb

@@ -6,6 +6,7 @@ require 'vagrant-dotvm/version'
 require 'vagrant-dotvm/pathes'
 require 'vagrant-dotvm/dotvm'
 
+require 'vagrant-dotvm/injector/abstractinjector'
 require 'vagrant-dotvm/injector/root'
 require 'vagrant-dotvm/injector/machine'
 require 'vagrant-dotvm/injector/provision'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-dotvm
 version: !ruby/object:Gem::Version
-  version: 0.31.0
+  version: 0.32.0
 platform: ruby
 authors:
 - Krzysztof Magosa
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-25 00:00:00.000000000 Z
+date: 2015-08-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -73,6 +73,7 @@ files:
 - lib/vagrant-dotvm/config/run.rb
 - lib/vagrant-dotvm/config/sharedfolder.rb
 - lib/vagrant-dotvm/dotvm.rb
+- lib/vagrant-dotvm/injector/abstractinjector.rb
 - lib/vagrant-dotvm/injector/authorizedkey.rb
 - lib/vagrant-dotvm/injector/host.rb
 - lib/vagrant-dotvm/injector/machine.rb