vagrant-config_builder 0.15.1 → 1.0.0.rc1

data/lib/config_builder/model/provisioner/puppet.rb

@@ -1,49 +1,59 @@
 # @see http://docs.vagrantup.com/v2/provisioning/puppet_apply.html
-class ConfigBuilder::Model::Provisioner::Puppet < ConfigBuilder::Model::Base
+class ConfigBuilder::Model::Provisioner::Puppet < ConfigBuilder::Model::Provisioner::Base
+
+  # @!attribute [rw] binary_path
+  #   @return [String] The path to Puppet's `bin` directory.
+  def_model_attribute :binary_path
 
   # @!attribute [rw] manifests_path
   #   @return [String] The path to the puppet manifests.
-  attr_accessor :manifests_path
+  def_model_attribute :manifests_path
 
   # @!attribute [rw] manifest_file
   #   @return [String] The name of the manifest to apply
-  attr_accessor :manifest_file
+  def_model_attribute :manifest_file
 
   # @!attribute [rw] module_path
   #   @return [String] A colon separated set of filesystem paths for Puppet
-  attr_accessor :module_path
+  def_model_attribute :module_path
 
   # @!attribute [rw] facter
   #   @return [Hash] A hash of values to use as facts
-  attr_accessor :facter
+  def_model_attribute :facter
 
   # @!attribute [rw] options
   #   @return [String] An arbitrary set of arguments for the `puppet` command
-  attr_accessor :options
+  def_model_attribute :options
 
   # @!attribute [rw] hiera_config_path
   #   @return [String] Path to the Hiera configuration file stored on the host
   #   @since 0.15.0
-  attr_accessor :hiera_config_path
+  def_model_attribute :hiera_config_path
 
   # @!attribute [rw] working_directory
   #   @return [String] Path in the guest that will be the working directory when Puppet is executed
   #   @since 0.15.0
-  attr_accessor :working_directory
-
-  def to_proc
-    Proc.new do |vm_config|
-      vm_config.provision :puppet do |puppet_config|
-        with_attr(:manifests_path)    { |val| puppet_config.manifests_path    = val }
-        with_attr(:manifest_file)     { |val| puppet_config.manifest_file     = val }
-        with_attr(:module_path)       { |val| puppet_config.module_path       = val }
-        with_attr(:facter)            { |val| puppet_config.facter            = val }
-        with_attr(:options)           { |val| puppet_config.options           = val }
-        with_attr(:hiera_config_path) { |val| puppet_config.hiera_config_path = val }
-        with_attr(:working_directory) { |val| puppet_config.working_directory = val }
-      end
-    end
-  end
+  def_model_attribute :working_directory
+
+  # @!attribute [rw] environment
+  #   @return [String] Name of the Puppet environment.
+  def_model_attribute :environment
+
+  # @!attribute [rw] environment_path
+  #   @return [String] Path to the directory that contains environment files on the host disk.
+  def_model_attribute :environment_path
+
+  # @!attribute [rw] synced_folder_type
+  #   @return [String] The type of synced folders to use when sharing the data required for the provisioner to work properly.
+  def_model_attribute :synced_folder_type
+
+  # @!attribute [rw] synced_folder_args
+  #   @return [Array<String>] Arguments that are passed to the folder sync.
+  def_model_attribute :synced_folder_args
+
+  # @!attribute [rw] temp_dir
+  #   @return [String] The directory where the data associated with the Puppet run will be stored on the guest machine.
+  def_model_attribute :temp_dir
 
   ConfigBuilder::Model::Provisioner.register('puppet', self)
 end

data/lib/config_builder/model/provisioner/puppet_server.rb

@@ -1,27 +1,33 @@
 # @see http://docs.vagrantup.com/v2/provisioning/puppet_agent.html
-class ConfigBuilder::Model::Provisioner::PuppetServer < ConfigBuilder::Model::Base
+class ConfigBuilder::Model::Provisioner::PuppetServer < ConfigBuilder::Model::Provisioner::Base
+
+  # @!attribute [rw] binary_path
+  #   @return [String]
+  def_model_attribute :binary_path
+
+  # @!attribute [rw] client_cert_path
+  #   @return [String]
+  def_model_attribute :client_cert_path
+
+  # @!attribute [rw] client_private_key_path
+  #   @return [String]
+  def_model_attribute :client_private_key_path
+
+  # @!attribute [rw] facter
+  #   @return [Hash]
+  def_model_attribute :facter
 
   # @!attribute [rw] puppet_server
   #   @return [String]
-  attr_accessor :puppet_server
+  def_model_attribute :puppet_server
 
-  # @!attribute [rw] node_name
+  # @!attribute [rw] puppet_node
   #   @return [String]
-  attr_accessor :node_name
+  def_model_attribute :puppet_node
 
   # @!attribute [rw] options
   #   @return [String]
-  attr_accessor :options
-
-  def to_proc
-    Proc.new do |vm_config|
-      vm_config.provision :puppet_server do |puppet_config|
-        with_attr(:puppet_server) { |val| puppet_config.puppet_server = val }
-        with_attr(:node_name)     { |val| puppet_config.node_name     = val }
-        with_attr(:options)       { |val| puppet_config.options       = val }
-      end
-    end
-  end
+  def_model_attribute :options
 
   ConfigBuilder::Model::Provisioner.register('puppet_server', self)
 end

data/lib/config_builder/model/provisioner/shell.rb

@@ -1,5 +1,5 @@
 # @see http://docs.vagrantup.com/v2/provisioning/shell.html
-class ConfigBuilder::Model::Provisioner::Shell < ConfigBuilder::Model::Base
+class ConfigBuilder::Model::Provisioner::Shell < ConfigBuilder::Model::Provisioner::Base
 
   # @!attribute [rw] inline
   #   @return [String] The inline shell command to run
@@ -13,15 +13,33 @@ class ConfigBuilder::Model::Provisioner::Shell < ConfigBuilder::Model::Base
   #   @return [String] A string acting as an argument vector to the command.
   def_model_attribute :args
 
-  def to_proc
-    Proc.new do |vm_config|
-      vm_config.provision :shell do |shell_config|
-        with_attr(:inline) { |val| shell_config.inline = val }
-        with_attr(:path)   { |val| shell_config.path   = val }
-        with_attr(:args)   { |val| shell_config.args   = val }
-      end
-    end
-  end
+  # @!attribute [rw] env
+  #   @return [Hash] A hash of values passed in as environment variables to the script.
+  def_model_attribute :env
+
+  # @!attribute [rw] binary
+  #   @return [Boolean] Whether Windows line endings are replaced with Unix line endings.
+  def_model_attribute :binary
+
+  # @!attribute [rw] privileged
+  #   @return [Boolean] Specifies whether to execute the script as a privileged user or not.
+  def_model_attribute :privileged
+
+  # @!attribute [rw] upload_path
+  #   @return [String] The remote path where the shell script will be uploaded to.
+  def_model_attribute :upload_path
+
+  # @!attribute [rw] keep_color
+  #   @return [Boolean] Whether Vagrant should use coloring for the output.
+  def_model_attribute :keep_color
+
+  # @!attribute [rw] powershell_args
+  #   @return [String] Extra arguments to pass to PowerShell if you are provisioning with PowerShell on Windows.
+  def_model_attribute :powershell_args
+
+  # @!attribute [rw] powershell_elevated_interactive
+  #   @return [Boolean] Whether to run an elevated script in interactive mode on Windows.
+  def_model_attribute :powershell_elevated_interactive
 
   ConfigBuilder::Model::Provisioner.register('shell', self)
 end

data/lib/config_builder/model/root.rb

@@ -2,11 +2,9 @@
 #
 # @see http://docs.vagrantup.com/v2/vagrantfile/index.html
 class ConfigBuilder::Model::Root < ConfigBuilder::Model::Base
-
-  include ConfigBuilder::ModelDelegator
-
   def_model_delegator :vagrant
   def_model_delegator :vms
+  def_model_delegator :vm_defaults
 
   # @!attribute [rw] ssh
   #   @return [Hash<Symbol, Object>] The ssh configuration for all VMs
@@ -18,6 +16,16 @@ class ConfigBuilder::Model::Root < ConfigBuilder::Model::Base
   #        }
   def_model_delegator :ssh
 
+  # @!attribute [rw] nfs
+  #   @return [Hash<Symbol, Object>] The nfs configuration for all VMs
+  #   @example
+  #     >> config.nfs
+  #     => {
+  #           :nfs_export  => true,
+  #           :nfs_version => 4
+  #        }
+  def_model_delegator :nfs
+
   # @!attribute [rw] winrm
   #   @return [Hash<Symbol, Object>] The winrm configuration for all VMs
   #   @example
@@ -40,10 +48,19 @@ class ConfigBuilder::Model::Root < ConfigBuilder::Model::Base
 
   private
 
+  def eval_vm_defaults(root_config)
+    with_attr(:vm_defaults) do |hash|
+      v = ConfigBuilder::Model::VM.new_from_hash(hash)
+      v.call(root_config)
+    end
+  end
+
   def eval_vms(root_config)
     attr(:vms).each do |hash|
       v = ConfigBuilder::Model::VM.new_from_hash(hash)
-      v.call(root_config)
+      root_config.vm.define(v.instance_id, v.instance_options) do |vm_config|
+        v.call(vm_config)
+      end
     end
   end
 
@@ -53,6 +70,13 @@ class ConfigBuilder::Model::Root < ConfigBuilder::Model::Base
     end
   end
 
+  def eval_nfs(root_config)
+    with_attr(:nfs) do |nfs_config|
+      f = ConfigBuilder::Model::NFS.new_from_hash(nfs_config)
+      f.call(root_config)
+    end
+  end
+
   def eval_ssh(root_config)
     with_attr(:ssh) do |ssh_config|
       f = ConfigBuilder::Model::SSH.new_from_hash(ssh_config)

data/lib/config_builder/model/ssh.rb

@@ -35,6 +35,10 @@ class ConfigBuilder::Model::SSH < ConfigBuilder::Model::Base
   #     option.
   def_model_attribute :guest_port
 
+  # @!attribute [rw] keep_alive
+  #   @return [Boolean]
+  def_model_attribute :keep_alive
+
   # @!attribute [rw] private_key_path
   #   @return [String] The path to the private key to use to SSH into the guest
   #     machine. By default this is the insecure private key that ships with
@@ -58,6 +62,11 @@ class ConfigBuilder::Model::SSH < ConfigBuilder::Model::Base
   #     enabled. Defaults to `false`.
   def_model_attribute :forward_x11
 
+  # @!attribute [rw] forward_env
+  #   @return [Array<String>] An array of host environment variables to forward
+  #     to the guest.
+  def_model_attribute :forward_env
+
   # @!attribute [rw] insert_key
   #   @return [Boolean] If `true`, Vagrant will automatically insert an insecure
   #     keypair to use for SSH. By default, this is `true`. This only has an
@@ -89,22 +98,31 @@ class ConfigBuilder::Model::SSH < ConfigBuilder::Model::Base
   #     Vagrant.
   def_model_attribute :shell
 
+  # @!attribute [rw] sudo_command
+  #   @return [String] The command to use when executing a command with sudo.
+  #     This defaults to `sudo -E -H %c`. The `%c` will be replaced by the
+  #     command that is being executed.
+  def_model_attribute :sudo_command
+
   def to_proc
     Proc.new do |global_config|
       ssh = global_config.ssh
 
-      with_attr(:username)         { |val| ssh.username = val }
-      with_attr(:password)         { |val| ssh.password = val }
-      with_attr(:host)             { |val| ssh.host = val }
-      with_attr(:port)             { |val| ssh.port = val }
-      with_attr(:guest_port)       { |val| ssh.guest_port = val }
+      with_attr(:username)         { |val| ssh.username         = val }
+      with_attr(:password)         { |val| ssh.password         = val }
+      with_attr(:host)             { |val| ssh.host             = val }
+      with_attr(:port)             { |val| ssh.port             = val }
+      with_attr(:guest_port)       { |val| ssh.guest_port       = val }
+      with_attr(:keep_alive)       { |val| ssh.keep_alive       = val }
       with_attr(:private_key_path) { |val| ssh.private_key_path = val }
-      with_attr(:forward_agent)    { |val| ssh.forward_agent = val }
-      with_attr(:forward_x11)      { |val| ssh.forward_x11 = val }
-      with_attr(:insert_key)       { |val| ssh.insert_key = val }
-      with_attr(:proxy_command)    { |val| ssh.proxy_command = val }
-      with_attr(:pty)              { |val| ssh.pty = val }
-      with_attr(:shell)            { |val| ssh.shell = val }
+      with_attr(:forward_agent)    { |val| ssh.forward_agent    = val }
+      with_attr(:forward_x11)      { |val| ssh.forward_x11      = val }
+      with_attr(:forward_env)      { |val| ssh.forward_env      = val }
+      with_attr(:insert_key)       { |val| ssh.insert_key       = val }
+      with_attr(:proxy_command)    { |val| ssh.proxy_command    = val }
+      with_attr(:pty)              { |val| ssh.pty              = val }
+      with_attr(:shell)            { |val| ssh.shell            = val }
+      with_attr(:sudo_command)     { |val| ssh.sudo_command     = val }
     end
   end
 end

data/lib/config_builder/model/synced_folder.rb

@@ -4,30 +4,82 @@
 class ConfigBuilder::Model::SyncedFolder < ConfigBuilder::Model::Base
 
   # @!attribute [rw] host_path
-  #   @return [String] The host file path to mount on the guest
+  #   @return [String] The host file path to mount on the guest.
   def_model_attribute :host_path
 
   # @!attribute [rw] guest_path
-  #   @return [String] The guest file path to be used as the mount point
+  #   @return [String] The guest file path to be used as the mount point.
   def_model_attribute :guest_path
 
-  # @!attribute [rw] extra
-  #   A set of arbitrary options to pass to the virtualbox mount command.
-  #   @return [String]
-  def_model_attribute :extra
+  # @!attribute [rw] create
+  #   @return [Boolean] If true, the host path will be created if it does not
+  #     exist.
+  def_model_attribute :create
+
+  # @!attribute [rw] mount_options
+  #   @return [Array<String>] A list of additional options to pass to the mount.
+  #     command.
+  def_model_attribute :mount_options
 
   # @!attribute [rw] disabled
   #   @return [Boolean] If the mount point should be disabled.
   def_model_attribute :disabled
 
-  # @!attribute [rw] nfs
-  #   @return [Boolean] If the mount point should use NFS
-  def_model_attribute :nfs
+  # @!attribute [rw] group
+  #   @return [String] The group that will own the synced folder. By default this
+  #     will be the SSH user.
+  def_model_attribute :group
+
+  # @!attribute [rw] owner
+  #   @return [String] The user who should be the owner of this synced folder. By
+  #     default this will be the SSH user.
+  def_model_attribute :owner
 
   # @!attribute [rw] type
   #   @return [String] The method for syncing folder to guest.
   def_model_attribute :type
 
+  # @!attribute [rw] nfs_export
+  #   @return [Boolean] Whether Vagrant should manage entries in /etc/exports.
+  def_model_attribute :nfs_export
+
+  # @!attribute [rw] nfs_export
+  #   @return [nfs_udp] Whether or not to use UDP as the transport.
+  def_model_attribute :nfs_udp
+
+  # @!attribute [rw] nfs_version
+  #   @return [Fixnum, String] The NFS protocol version to use.
+  def_model_attribute :nfs_version
+
+  # @!attribute [rw] rsync__args
+  #   @return [Array<String>] A list of arguments to supply to rsync.
+  def_model_attribute :rsync__args
+
+  # @!attribute [rw] rsync__auto
+  #   @return [Boolean] If false, then rsync-auto will not watch and
+# automatically sync this folder.
+  def_model_attribute :rsync__auto
+
+  # @!attribute [rw] rsync__chown
+  #   @return [Boolean] If false, then the owner and group options for the synced
+  #     folder are ignored and Vagrant will not execute a recursive chown.
+  def_model_attribute :rsync__chown
+
+  # @!attribute [rw] rsync__exclude
+  #   @return [String, Array<String>] A list of files or directories to exclude
+  #     from the sync.
+  def_model_attribute :rsync__exclude
+
+  # @!attribute [rw] rsync__rsync_path
+  #   @return [String] The path on the remote host where rsync is and how it is
+# executed.
+  def_model_attribute :rsync__rsync_path
+
+  # @!attribute [rw] rsync__verbose
+  #   @return [Boolean] If true, then the output from the rsync process will be
+  #     echoed to the console.
+  def_model_attribute :rsync__verbose
+
   def to_proc
     Proc.new do |vm_config|
       vm_config.synced_folder(attr(:host_path), attr(:guest_path), folder_opts)
@@ -38,11 +90,28 @@ class ConfigBuilder::Model::SyncedFolder < ConfigBuilder::Model::Base
 
   def folder_opts
     h = {}
-    with_attr(:extra)   { |val| h[:extra]    = val }
-    with_attr(:disabled) { |val| h[:disabled] = val }
-    with_attr(:nfs)     { |val| h[:nfs]      = val }
-    with_attr(:type)    { |val| h[:type]     = val }
-
+    with_attr(:create)            { |val| h[:create]            = val }
+    with_attr(:mount_options)     { |val| h[:mount_options]     = val }
+    with_attr(:disabled)          { |val| h[:disabled]          = val }
+    with_attr(:group)             { |val| h[:group]             = val }
+    with_attr(:create)            { |val| h[:create]            = val }
+    with_attr(:extra)             { |val| h[:extra]             = val }
+    with_attr(:disabled)          { |val| h[:disabled]          = val }
+    with_attr(:group)             { |val| h[:group]             = val }
+    with_attr(:nfs)               { |val| h[:nfs]               = val }
+    with_attr(:owner)             { |val| h[:owner]             = val }
+    with_attr(:type)              { |val| h[:type]              = val }
+    # NFS
+    with_attr(:nfs_export)        { |val| h[:nfs_export]        = val }
+    with_attr(:nfs_udp)           { |val| h[:nfs_udp]           = val }
+    with_attr(:nfs_version)       { |val| h[:nfs_version]       = val }
+    # RSync
+    with_attr(:rsync__args)       { |val| h[:rsync__args]       = val }
+    with_attr(:rsync__auto)       { |val| h[:rsync__auto]       = val }
+    with_attr(:rsync__chown)      { |val| h[:rsync__chown]      = val }
+    with_attr(:rsync__exclude)    { |val| h[:rsync__exclude]    = val }
+    with_attr(:rsync__rsync_path) { |val| h[:rsync__rsync_path] = val }
+    with_attr(:rsync__verbose)    { |val| h[:rsync__verbose]    = val }
     h
   end
 end

data/lib/config_builder/model/vm.rb

@@ -1,8 +1,5 @@
 # @see http://docs.vagrantup.com/v2/vagrantfile/machine_settings.html
 class ConfigBuilder::Model::VM < ConfigBuilder::Model::Base
-
-  include ConfigBuilder::ModelDelegator
-
   # @!attribute [rw] provider
   #   @return [Hash<Symbol, Object>] The provider configuration for
   #     this VM
@@ -64,6 +61,17 @@ class ConfigBuilder::Model::VM < ConfigBuilder::Model::Base
   #        ]
   def_model_delegator :private_networks
 
+  # @!attribute [rw] public_networks
+  #   @return [Array<Hash<Symbol, Object>>] A collection of IP address network
+  #     settings.
+  #   @example
+  #     >> vm.public_networks
+  #     => [
+  #           {:ip => '10.20.4.1'},
+  #           {:bridge: "en1: Wi-Fi (AirPort)"},
+  #        ]
+  def_model_delegator :public_networks
+
   # @!attribute [rw] synced_folders
   #   @return [Array<Hash<Symbol, Object>>]
   #   @example
@@ -75,9 +83,28 @@ class ConfigBuilder::Model::VM < ConfigBuilder::Model::Base
   #
   def_model_delegator :synced_folders
 
-  # @!attribute [rw] guest
-  #   @return [String] The guest type to use for this VM
-  def_model_attribute :guest
+  # @!attribute [rw] name
+  #   @return [String] The name of the instantiated box in this environment.
+  def_model_id :name
+
+  # @!attribute [rw] autostart
+  #   @return [Boolean] If true, vagrant will start the box on "vagrant up".
+  #   If false, vagrant must be given the box name explicitly or it will not
+  #   start.
+  def_model_option :autostart
+
+  # @!attribute [rw] allowed_synced_folder_types
+  #   @return [Array<String>]
+  def_model_attribute :allowed_synced_folder_types
+
+  # @!attribute [rw] base_mac
+  #   @return [String] MAC address of the NAT device.
+  def_model_attribute :base_mac
+
+  # @!attribute [rw] autostart
+  #   @return [Fixnum] The time in seconds that Vagrant will wait for the machine
+  #     to boot and be accessible. By default this is 300 seconds.
+  def_model_attribute :boot_timeout
 
   # @!attribute [rw] box
   #   @return [String] This configures what box the machine will be brought up
@@ -85,6 +112,14 @@ class ConfigBuilder::Model::VM < ConfigBuilder::Model::Base
   #     shorthand name of a box in Vagrant Cloud.
   def_model_attribute :box
 
+  # @!attribute [rw] box_check_update
+  #   @return [Boolean] If true, Vagrant will check for updates to the
+  #     configured box on every `vagrant up`. If an update is found, Vagrant
+  #     will tell the user. By default this is `true`. Updates will only be
+  #     checked for boxes that properly support updates (boxes from Vagrant
+  #     Cloud or some other versioned box).
+  def_model_attribute :box_check_update
+
   # @!attribute [rw] box_url
   #   @return [String, Array<String>] The URL that the configured box can be
   #     found at. If `box` is a shorthand to a box in Vagrant Cloud then this
@@ -99,6 +134,29 @@ class ConfigBuilder::Model::VM < ConfigBuilder::Model::Base
   #     example: "file:///tmp/test.box".
   def_model_attribute :box_url
 
+  # @!attribute [rw] box_server_url
+  #   @return [String]
+  def_model_attribute :box_server_url
+
+  # @!attribute [rw] box_version
+  #   @return [String] The version of the box to use. This defaults to ">= 0"
+  #     (the latest version available). This can contain an arbitrary list of
+  #     constraints, separated by commas, such as: >= 1.0, < 1.5. When
+  #     constraints are given, Vagrant will use the latest available box
+  #     satisfying these constraints.
+  def_model_attribute :box_version
+
+  # @!attribute [rw] box_download_ca_cert
+  #   @return [String] Path to a CA cert bundle to use when downloading a box
+  #     directly. By default, Vagrant will use the Mozilla CA cert bundle.
+  def_model_attribute :box_download_ca_cert
+
+  # @!attribute [rw] box_download_ca_path
+  #   @return [String] Path to a directory containing CA certificates for
+  #     downloading a box directly. By default, Vagrant will use the Mozilla CA
+  #     cert bundle.
+  def_model_attribute :box_download_ca_path
+
   # @!attribute [rw] box_download_checksum
   #   @return [String] The checksum of the box specified by `box_url`.
   #     If not specified, no checksum comparison will be done. If specified,
@@ -128,40 +186,42 @@ class ConfigBuilder::Model::VM < ConfigBuilder::Model::Base
   #     will be verified.
   def_model_attribute :box_download_insecure
 
-  # @!attribute [rw] box_check_update
-  #   @return [Boolean] If true, Vagrant will check for updates to the
-  #     configured box on every `vagrant up`. If an update is found, Vagrant
-  #     will tell the user. By default this is `true`. Updates will only be
-  #     checked for boxes that properly support updates (boxes from Vagrant
-  #     Cloud or some other versioned box).
-  def_model_attribute :box_check_update
+  # @!attribute [rw] box_download_location_trusted
+  #   @return [Boolean] If ´true´, then all HTTP redirects will be treated as
+  #     trusted. That means credentials used for initial URL will be used for all
+  #     subsequent redirects. By default, redirect locations are untrusted so
+  #     credentials (if specified) used only for initial HTTP request.
+  def_model_attribute :box_download_location_trusted
 
-  # @!attribute [rw] box_version
-  #   @return [String] The version of the box to use. This defaults to ">= 0"
-  #     (the latest version available). This can contain an arbitrary list of
-  #     constraints, separated by commas, such as: >= 1.0, < 1.5. When
-  #     constraints are given, Vagrant will use the latest available box
-  #     satisfying these constraints.
-  def_model_attribute :box_version
+  # @!attribute [rw] communicator
+  #   @return [String] The name of the communicator to use when sending
+  #   commands to this box. Set to 'winrm' for Windows VMs.
+  def_model_attribute :communicator
 
-  # @!attribute [rw] name
-  #   @return [String] The name of the instantiated box in this environment
-  def_model_attribute :name
+  # @!attribute [rw] graceful_halt_timeout
+  #   @return [Fixnum] The time in seconds that Vagrant will wait for the machine
+# to
+  #     gracefully halt when vagrant halt is called. Defaults to 60 seconds.
+  def_model_attribute :graceful_halt_timeout
+
+  # @!attribute [rw] guest
+  #   @return [String] The guest type to use for this VM.
+  def_model_attribute :guest
 
   # @!attribute [rw] hostname
   #   @return [String] The hostname the machine should have.
   def_model_attribute :hostname
 
-  # @!attribute [rw] communicator
-  #   @return [String] The name of the communicator to use when sending
-  #   commands to this box. Set to 'winrm' for Windows VMs.
-  def_model_attribute :communicator
+  # @!attribute [rw] post_up_message
+  #   @return [String] A message to show after vagrant up. This will be shown to
+  #     the user and is useful for containing instructions such as how to access
+  #     various components of the development environment.
+  def_model_attribute :post_up_message
 
-  # @!attribute [rw] autostart
-  #   @return [Boolean] If true, vagrant will start the box on "vagrant up".
-  #   If false, vagrant must be given the box name explicitly or it will not
-  #   start.
-  def_model_attribute :autostart
+  # @!attribute [rw] usable_port_range
+  #   @return [String] A range of ports Vagrant can use for handling port
+  #     collisions and such. Defaults to 2200..2250.
+  def_model_attribute :usable_port_range
 
   def initialize
     @defaults = {
@@ -169,35 +229,27 @@ class ConfigBuilder::Model::VM < ConfigBuilder::Model::Base
       :provisioners     => [],
       :forwarded_ports  => [],
       :private_networks => [],
+      :public_networks  => [],
       :synced_folders   => [],
       :autostart        => true,
     }
   end
 
   def to_proc
-    Proc.new do |global_config|
-      global_config.vm.define(attr(:name), autostart: attr(:autostart)) do |config|
-        vm_config = config.vm
-
-        with_attr(:box)                        { |val| vm_config.box = val }
-        with_attr(:box_url)                    { |val| vm_config.box_url = val }
-        with_attr(:box_download_checksum)      { |val| vm_config.box_download_checksum = val }
-        with_attr(:box_download_checksum_type) { |val| vm_config.box_download_checksum_type = val }
-        with_attr(:box_download_client_cert)   { |val| vm_config.box_download_client_cert = val }
-        with_attr(:box_download_insecure)      { |val| vm_config.box_download_insecure = val }
-        with_attr(:box_check_update)           { |val| vm_config.box_check_update = val }
-        with_attr(:box_version)                { |val| vm_config.box_version = val }
-
-        with_attr(:hostname) { |val| vm_config.hostname = attr(:hostname) }
-        with_attr(:guest)    { |val| vm_config.guest    = attr(:guest)    }
-
-        with_attr(:communicator) { |val| vm_config.communicator = attr(:communicator) }
-
-        eval_models(vm_config)
-      end
+    Proc.new do |config|
+      vm_config = config.vm
+
+      configure!(vm_config)
+      eval_models(vm_config)
     end
   end
 
+
+  # @private
+  def configure_usable_port_range(config, val)
+    config.usable_port_range = Range.new(*val.split('..').map(&:to_i))
+  end
+
   private
 
   def eval_provisioners(vm_config)
@@ -232,6 +284,13 @@ class ConfigBuilder::Model::VM < ConfigBuilder::Model::Base
     end
   end
 
+  def eval_public_networks(vm_config)
+    attr(:public_networks).each do |hash|
+      n = ConfigBuilder::Model::Network::PublicNetwork.new_from_hash(hash)
+      n.call(vm_config)
+    end
+  end
+
   def eval_forwarded_ports(vm_config)
     attr(:forwarded_ports).each do |hash|
       f = ConfigBuilder::Model::Network::ForwardedPort.new_from_hash(hash)