vagrant-dotvm 0.19.0 → 0.20.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fb0f0dec3b986a99a6364ff0b138895e37a8384b
-  data.tar.gz: 1c0fa33c1480785cad75d416c72a0eff5af6e491
+  metadata.gz: 545c505f26efb5f6cb1c5942a50ef7527c43d475
+  data.tar.gz: 0fb0700ae56254b6c3ce17f00994183687c8e201
 SHA512:
-  metadata.gz: 93dc3a6c824124bde2e44fd97f5611b0853f6c0e41295701e92a9d88eec0d7f08f63e2f4ce2cf9e907d5860e6d39a54d1531c74a57cdfc29fb7b10ff18905678
-  data.tar.gz: 78de418f4f68b06549c4f5669c1eac316bba0204f38f67dc9b81f44a98eb699179b5ec75c795ad3fbd674731d615d3e3c1f3b3d2e9e2f6e228f39742ecf962e6
+  metadata.gz: 945f73762362513e6ea469102603b3ef0de865405891173dcafa5b84b3102f1c6bb421b9c91fae0d17deba840f3d7cb56e9b30de90822e6198d59c7cde1d8d8a
+  data.tar.gz: 8682d1684a8eeca8023117d7a36bc939588669e9337fca88357c3d71257ebe6d6b9c536d0aeb32edd2e59c43d8adf608d2538ff70326fce34cd19f60a3315c7b

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+# 0.20.0
+* Now error is displayed when you specify unsupported option
+* Removal of next bunch of default parameters
+
 # 0.19.0
 * Ability to use inline shell provision
 

data/README.md

@@ -1,5 +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)
+
 ## What is that?
 DotVm is vagrant plugin for easier maintenance of multi machine configurations.
 DotVm joins easy syntax of YAML files with flexibility offered by configuration exploded into several small files.

data/lib/vagrant-dotvm.rb

@@ -4,6 +4,15 @@ require 'yaml'
 require 'vagrant-dotvm/plugin'
 require 'vagrant-dotvm/version'
 require 'vagrant-dotvm/dotvm'
-require 'vagrant-dotvm/defaults'
-require 'vagrant-dotvm/configparser'
 require 'vagrant-dotvm/configinjecter'
+
+require 'vagrant-dotvm/config/abstractconfig'
+require 'vagrant-dotvm/config/root'
+require 'vagrant-dotvm/config/machine'
+require 'vagrant-dotvm/config/provision'
+require 'vagrant-dotvm/config/authorizedkey'
+require 'vagrant-dotvm/config/host'
+require 'vagrant-dotvm/config/sharedfolder'
+require 'vagrant-dotvm/config/option'
+require 'vagrant-dotvm/config/route'
+require 'vagrant-dotvm/config/network'

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

@@ -0,0 +1,47 @@
+module VagrantPlugins
+  module Dotvm
+    module Config
+      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)
+          end
+        end
+
+        def replace_vars(vars, target)
+          if target.kind_of?(Array)
+            target.each do |item|
+              replace_vars(vars, item)
+            end
+          elsif target.kind_of?(Hash)
+            target.each do |name, item|
+              replace_vars(vars, item)
+            end
+          elsif target.kind_of?(String)
+            vars.each do |k, v|
+              pattern = "%#{k}%"
+              target.gsub! pattern, v
+            end
+          elsif target.kind_of?(AbstractConfig)
+            target.replace_vars!(vars)
+          end
+        end
+
+        def replace_vars!(vars)
+          instance_variables.each do |var_name|
+            var = instance_variable_get(var_name)
+            replace_vars(vars, var)
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,11 @@
+module VagrantPlugins
+  module Dotvm
+    module Config
+      class AuthorizedKey < AbstractConfig
+        attr_accessor :type
+        attr_accessor :path
+        attr_accessor :key
+      end
+    end
+  end
+end

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

@@ -0,0 +1,10 @@
+module VagrantPlugins
+  module Dotvm
+    module Config
+      class Host < AbstractConfig
+        attr_accessor :ip
+        attr_accessor :host
+      end
+    end
+  end
+end

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

@@ -0,0 +1,124 @@
+module VagrantPlugins
+  module Dotvm
+    module Config
+      class Machine < AbstractConfig
+        attr_accessor :nick
+        attr_accessor :name
+        attr_accessor :box
+        attr_accessor :memory
+        attr_accessor :cpus
+        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_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
+
+        def initialize()
+          @primary         = false
+          @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 populate_networks(data)
+          data.to_a.each do |conf|
+            item = Network.new
+            item.populate conf
+            @networks << item
+          end
+        end
+
+        def populate_routes(data)
+          data.to_a.each do |conf|
+            item = Route.new
+            item.populate conf
+            @routes << item
+          end
+        end
+
+        def populate_provision(data)
+          data.to_a.each do |conf|
+            item = Provision.new
+            item.populate conf
+            @provision << item
+          end
+        end
+
+        def populate_groups(data)
+          data.to_a.each do |item|
+            @groups << item
+          end
+        end
+
+        def populate_authorized_keys(data)
+          data.to_a.each do |conf|
+            item = AuthorizedKey.new
+            item.populate conf
+            @authorized_keys << item
+          end
+        end
+
+        def populate_hosts(data)
+          data.to_a.each do |conf|
+            item = Host.new
+            item.populate conf
+            @hosts << item
+          end
+        end
+
+        def populate_options(data)
+          data.to_h.each do |key, confs|
+            key = key.to_sym
+            raise "Invalid options category: #{key}." unless @options.has_key?(key)
+
+            confs.to_a.each do |conf|
+              item = Option.new
+              item.populate conf
+              @options[key] << item
+            end
+          end
+        end
+
+        def populate_shared_folders(data)
+          data.to_a.each do |conf|
+            item = SharedFolder.new
+            item.populate conf
+            @shared_folders << item
+          end
+        end
+
+      end
+    end
+  end
+end

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

@@ -0,0 +1,38 @@
+module VagrantPlugins
+  module Dotvm
+    module Config
+      class Network < AbstractConfig
+        attr_reader :net
+        attr_accessor :type
+        attr_accessor :ip
+        attr_accessor :mask # netmask
+        attr_accessor :interface
+        attr_accessor :guest
+        attr_accessor :host
+        attr_accessor :protocol
+        attr_accessor :bridge
+
+        def initialize()
+          @net      = :private_network
+        end
+
+        def net=(value)
+          nets = {
+            "private_network" => :private_network,
+            "private"         => :private_network,
+            "public_network"  => :public_network,
+            "public"          => :public_network,
+            "forwarded_port"  => :forwarded_port,
+            "port"            => :forwarded_port,
+          }
+
+          @net = nets[value]
+        end
+
+        def netmask=(value)
+          @mask = value
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,10 @@
+module VagrantPlugins
+  module Dotvm
+    module Config
+      class Option < AbstractConfig
+        attr_accessor :name
+        attr_accessor :value
+      end
+    end
+  end
+end

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

@@ -0,0 +1,19 @@
+module VagrantPlugins
+  module Dotvm
+    module Config
+      class Provision < AbstractConfig
+        attr_accessor :type
+        attr_accessor :source
+        attr_accessor :destination
+        attr_accessor :inline
+        attr_accessor :path
+        attr_accessor :args
+        attr_accessor :module_path
+        attr_accessor :manifests_path
+        attr_accessor :manifest_file
+        attr_accessor :privileged
+        attr_accessor :run
+      end
+    end
+  end
+end

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

@@ -0,0 +1,21 @@
+module VagrantPlugins
+  module Dotvm
+    module Config
+      class Root < AbstractConfig
+        attr_reader :machines
+
+        def initialize()
+          @machines = []
+        end
+
+        def populate_machines(data)
+          data.to_a.each do |item|
+            machine = Machine.new
+            machine.populate item
+            @machines << machine
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,10 @@
+module VagrantPlugins
+  module Dotvm
+    module Config
+      class Route < AbstractConfig
+        attr_accessor :destination
+        attr_accessor :gateway
+      end
+    end
+  end
+end

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

@@ -0,0 +1,18 @@
+module VagrantPlugins
+  module Dotvm
+    module Config
+      class SharedFolder < AbstractConfig
+        attr_accessor :host
+        attr_accessor :guest
+        attr_accessor :disabled
+        attr_accessor :create
+        attr_accessor :type
+
+        def initialize()
+          @disabled = false
+          @create   = false
+        end
+      end
+    end
+  end
+end

data/lib/vagrant-dotvm/configinjecter.rb

@@ -7,97 +7,87 @@ module VagrantPlugins
         # General settings
         vc.ssh.forward_x11 = true
 
-        config[:machines].each do |machine_cfg|
-          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]
+        config.machines.each do |machine_cfg|
+          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.provider "virtualbox" do |vb|
-              vb.customize ["modifyvm", :id, "--memory", machine_cfg[:memory]] unless machine_cfg[:memory].nil?
-              vb.customize ["modifyvm", :id, "--cpus",   machine_cfg[:cpus]] unless machine_cfg[:cpus].nil?
-              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?
+              vb.customize ["modifyvm", :id, "--memory",          machine_cfg.memory] unless machine_cfg.memory.nil?
+              vb.customize ["modifyvm", :id, "--cpus",            machine_cfg.cpus]   unless machine_cfg.cpus.nil?
+              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|
-                vb.customize ["modifyvm", :id, option[:name], option[:value]]
+              machine_cfg.options[:virtualbox].each do |option|
+                vb.customize ["modifyvm", :id, option.name, option.value]
               end
             end
 
-            machine_cfg[:networks].each do |net|
-              if net[:net] == :private_network
-                machine.vm.network net[:net],
-                                   type: net[:type],
-                                   ip: net[:ip],
-                                   netmask: net[:mask],
-                                   virtualbox__intnet: net[:interface]
-              elsif net[:net] == :public_network
-                machine.vm.network net[:net],
-                                   type: net[:type],
-                                   ip: net[:ip],
-                                   netmask: net[:mask],
-                                   bridge: net[:bridge]
-              elsif net[:net] == :forwarded_port
-                machine.vm.network net[:net],
-                                   guest: net[:guest],
-                                   host: net[:host],
-                                   protocol: net[:protocol]
-              end
+            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?
+
+              machine.vm.network net.net, **hash
             end
 
-            machine_cfg[:routes].each do |route|
+            machine_cfg.routes.each do |route|
               machine.vm.provision "shell", run: "always" do |s|
                 s.path       = File.dirname(__FILE__) + "/../../utils/setup_route.sh"
-                s.args       = [route[:destination], route[:gateway]]
+                s.args       = [route.destination, route.gateway]
                 s.privileged = true
               end
             end
 
-            machine_cfg[:hosts].each do |host|
+            machine_cfg.hosts.each do |host|
               machine.vm.provision "shell", run: "always" do |s|
                 s.path       = File.dirname(__FILE__) + "/../../utils/add_host.sh"
-                s.args       = [host[:ip], host[:host]]
+                s.args       = [host.ip, host.host]
                 s.privileged = true
               end
             end
 
-            machine_cfg[:provision].each do |provision|
-              machine.vm.provision provision[:type], run: provision[:run] do |p|
-                if provision[:type] == "shell"
-                  p.path           = provision[:path] unless provision[:path].nil?
-                  p.inline         = provision[:inline] unless provision[:inline].nil?
-                  p.args           = provision[:args]
-                  p.privileged     = provision[:privileged]
-                elsif provision[:type] == "file"
-                  p.source         = provision[:source]
-                  p.destination    = provision[:destination]
-                elsif provision[:type] == "puppet"
-                  p.module_path    = provision[:module_path]
-                  p.manifest_file  = provision[:manifest_file]
-                  p.manifests_path = provision[:manifests_path]
-                end
+            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?
               end
             end
 
-            machine_cfg[:folders].each do |folder|
-              machine.vm.synced_folder folder[:host],
-                                       folder[:guest],
-                                       disabled: folder[:disabled],
-                                       create: folder[:create],
-                                       type: folder[:type]
+            machine_cfg.shared_folders.each do |folder|
+              hash = {}
+              hash[:disabled] = folder.disabled unless folder.disabled.nil?
+              hash[:create]   = folder.create   unless folder.create.nil?
+              hash[:type]     = folder.type     unless folder.type.nil?
+
+              machine.vm.synced_folder folder.host, folder.guest, **hash
             end
 
-            machine_cfg[:authorized_keys].each do |key|
-              if key[:type] == "file"
-                pubkey = File.readlines(File.expand_path(key[:path])).first.strip
-              elsif key[:type] == "static"
-                pubkey = key[:key]
+            machine_cfg.authorized_keys.each do |key|
+              if key.type == "file"
+                pubkey = File.readlines(File.expand_path(key.path)).first.strip
+              elsif key.type == "static"
+                pubkey = key.key
               end
 
               machine.vm.provision "shell" do |s|
@@ -110,9 +100,9 @@ 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.each do |group|
                 vc.group.groups[group] = [] unless vc.group.groups.has_key?(group)
-                vc.group.groups[group] << machine_cfg[:nick]
+                vc.group.groups[group] << machine_cfg.nick
               end
             end
           end

data/lib/vagrant-dotvm/dotvm.rb

@@ -26,8 +26,16 @@ module VagrantPlugins
             vars['env.' + name] = value
           end
 
-          parser = ConfigParser.new vars
-          configs << parser.parse(yaml)
+          begin
+            conf = Config::Root.new
+            conf.populate yaml
+            conf.replace_vars! vars
+          rescue Exception => e
+            file = fname[(@path.length+"/projects/".length)..-1]
+            raise Vagrant::Errors::VagrantError.new, "DotVM: #{file}: #{e.message}"
+          end
+
+          configs << conf
         end
 
         return configs

data/lib/vagrant-dotvm/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-dotvm
 version: !ruby/object:Gem::Version
-  version: 0.19.0
+  version: 0.20.0
 platform: ruby
 authors:
 - Krzysztof Magosa
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-14 00:00:00.000000000 Z
+date: 2015-07-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -60,9 +60,17 @@ files:
 - examples/config/projects/playground/main.yaml
 - examples/config/projects/playground/modules/.gitkeep
 - lib/vagrant-dotvm.rb
+- lib/vagrant-dotvm/config/abstractconfig.rb
+- lib/vagrant-dotvm/config/authorizedkey.rb
+- lib/vagrant-dotvm/config/host.rb
+- lib/vagrant-dotvm/config/machine.rb
+- lib/vagrant-dotvm/config/network.rb
+- lib/vagrant-dotvm/config/option.rb
+- lib/vagrant-dotvm/config/provision.rb
+- lib/vagrant-dotvm/config/root.rb
+- lib/vagrant-dotvm/config/route.rb
+- lib/vagrant-dotvm/config/sharedfolder.rb
 - lib/vagrant-dotvm/configinjecter.rb
-- lib/vagrant-dotvm/configparser.rb
-- lib/vagrant-dotvm/defaults.rb
 - lib/vagrant-dotvm/dotvm.rb
 - lib/vagrant-dotvm/plugin.rb
 - lib/vagrant-dotvm/version.rb

data/lib/vagrant-dotvm/configparser.rb

@@ -1,216 +0,0 @@
-module VagrantPlugins
-  module Dotvm
-    class ConfigParser
-
-      def initialize(vars = {})
-        @vars = vars
-      end
-
-      private
-      def replace_vars(value)
-        if value.kind_of?(Hash)
-          result = {}
-          value.each do |key, val|
-            result[key] = replace_vars(val)
-          end
-        elsif value.kind_of?(Array)
-          result = value.map do |val|
-            replace_vars(val)
-          end
-        elsif value.kind_of?(String)
-          result = value.dup
-
-          @vars.each do |k, v|
-            pattern = "%#{k}%"
-            result.gsub! pattern, v
-          end
-        elsif !value.respond_to?(:duplicable) or !value.duplicable?
-          result = value
-        else
-          result = value.dup
-        end
-
-        return result
-      end
-
-      private
-      def parse_machine(machine)
-        {
-          :nick	                 => machine["nick"],
-          :name	                 => machine["name"],
-          :box                   => machine["box"],
-          :memory                => machine["memory"],
-          :cpus                  => machine["cpus"],
-          :cpucap                => machine["cpucap"],
-          :primary               => coalesce(machine["primary"], false),
-          :natnet                => machine["natnet"],
-          :networks              => [],
-          :routes                => [],
-          :provision             => [],
-          :groups                => [],
-          :authorized_keys       => [],
-          :boot_timeout          => coalesce(machine["boot_timeout"], Defaults::BOOT_TIMEOUT),
-          :box_check_update      => coalesce(machine["box_check_update"], Defaults::BOX_CHECK_UPDATE),
-          :box_version           => coalesce(machine["box_version"], Defaults::BOX_VERSION),
-          :graceful_halt_timeout => coalesce(machine["graceful_halt_timeout"], Defaults::GRACEFUL_HALT_TIMEOUT),
-          :post_up_message       => machine["post_up_message"],
-          :autostart             => coalesce(machine["autostart"], true),
-          :hosts                 => [],
-          :folders               => [
-            {
-              :host     => "%project.host%",
-              :guest    => "%project.guest%",
-              :disabled => false,
-              :create   => false,
-              :type     => nil,
-            }
-          ],
-          :options               => {
-            :virtualbox => [],
-          },
-        }
-      end
-
-      private
-      def parse_net(net)
-        nets = {
-          "private_network" => :private_network,
-          "private"         => :private_network,
-          "public_network"  => :public_network,
-          "public"          => :public_network,
-          "forwarded_port"  => :forwarded_port,
-          "port"            => :forwarded_port,
-        }
-
-        {
-          :net       => nets.has_key?(net["net"]) ? nets[net["net"]] : Defaults::NET,
-          :type      => coalesce(net["type"], Defaults::NET_TYPE),
-          :ip        => net["ip"],
-          :mask      => coalesce(net["mask"], net["netmask"], Defaults::NETMASK),
-          :interface => net["interface"],
-          :guest     => net["guest"],
-          :host      => net["host"],
-          :protocol  => coalesce(net["protocol"], Defaults::PROTOCOL),
-          :bridge    => net["bridge"],
-        }
-      end
-
-      private
-      def parse_route(route)
-        {
-          :destination => route["destination"],
-          :gateway     => route["gateway"],
-        }
-      end
-
-      private
-      def parse_provision(prv)
-        {
-          :type		  => prv["type"],
-          :source         => prv["source"],
-          :destination    => prv["destination"],
-          :inline         => prv["inline"],
-          :path		  => prv["path"],
-          :args           => prv["args"],
-          :module_path    => prv["module_path"],
-          :manifests_path => prv["manifests_path"],
-          :manifest_file  => prv["manifest_file"],
-          :privileged     => prv["privileged"].nil? ? true : prv["privileged"],
-          :run            => prv["run"],
-        }
-      end
-
-      private
-      def parse_folder(folder)
-        {
-          :host     => folder["host"],
-          :guest    => folder["guest"],
-          :disabled => coalesce(folder["disabled"], false),
-          :create   => coalesce(folder["create"], false),
-          :type     => folder["type"],
-        }
-      end
-
-      private
-      def parse_authorized_key(key)
-        {
-          :type => key["type"],
-          :path => key["path"],
-          :key  => key["key"],
-        }
-      end
-
-      private
-      def parse_option(option)
-        {
-          :name  => option["name"],
-          :value => option["value"],
-        }
-      end
-
-      private
-      def parse_host(host)
-        {
-          :ip   => host["ip"],
-          :host => host["host"],
-        }
-      end
-
-      public
-      def parse(yaml)
-        config = {
-          :machines => []
-        }
-
-        yaml["machines"].each do |machine|
-          item = parse_machine(machine)
-
-          machine["networks"].to_a.each do |net|
-            item[:networks] << parse_net(net)
-          end
-
-          machine["routes"].to_a.each do |route|
-            item[:routes] << parse_route(route)
-          end
-
-          machine["provision"].to_a.each do |prv|
-            item[:provision] << parse_provision(prv)
-          end
-
-          machine["shared_folders"].to_a.each do |folder|
-            item[:folders] << parse_folder(folder)
-          end
-
-          machine["groups"].to_a.each do |group|
-            item[:groups] << group
-          end
-
-          machine["authorized_keys"].to_a.each do |key|
-            item[:authorized_keys] << parse_authorized_key(key)
-          end
-
-          machine["options"].to_h["virtualbox"].to_a.each do |option|
-            item[:options][:virtualbox] << parse_option(option)
-          end
-
-          machine["hosts"].to_a.each do |host|
-            item[:hosts] << parse_host(host)
-          end
-
-          config[:machines] << item
-        end
-
-        replace_vars(config)
-      end
-
-      private
-      def coalesce(*args)
-        args.each do |val|
-          next if val.nil?
-          return val
-        end
-      end
-
-    end
-  end
-end

data/lib/vagrant-dotvm/defaults.rb

@@ -1,14 +0,0 @@
-module VagrantPlugins
-  module Dotvm
-    class Defaults
-      NET                   = :private_network
-      NET_TYPE              = "static"
-      NETMASK               = "255.255.255.0"
-      PROTOCOL              = "tcp"
-      BOOT_TIMEOUT          = 300
-      BOX_CHECK_UPDATE      = true
-      BOX_VERSION           = ">= 0"
-      GRACEFUL_HALT_TIMEOUT = 60
-    end # Defaults
-  end # Dotvm
-end # VagrantPlugins