vagrantup 0.6.9 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c7232347fee6bddc63b9f9869a127edc819e7a4f
-  data.tar.gz: 260ada61414d8de2b28de0778af29db557e7ec1a
+  metadata.gz: da71b97656f3724f4d8d6085e991f250652af507
+  data.tar.gz: 7db3b07b682baa725fbcb8b06e421bea4d3259e1
 SHA512:
-  metadata.gz: 1140ff3dead7e131debb84d16c7da0f1bee3cc4109c3af3d518cd53275d5ec2050a8883fc3cd5f4f1c76b8bc7bfe9f3ba8ffd9f234bd051ec9fa130c0d05fc0a
-  data.tar.gz: f4c2492bd991fc8281e5b88a118f91dc13306e88048f5caba25e6cfdfcbce1d4d0ad236047d9c954843f019b888b54f910ea3a40431ad7b27487df7a3f3995ca
+  metadata.gz: 370cfe99493f05b73719eab98d9e2c14745bef71416c494c4875de15ca74cd52e8b70635fe081e97ba1c42b8a8d620f12e37b7610c77a7c82272d5eb3218c938
+  data.tar.gz: 0cbad4da87837a33015f07aabb07246d529ffb130e0dd74ffff7636fdd7035ccc2f08d591c9f1118c1705f05a030c7ed7696baf0369661809d9ae84937af8926

data/.gitignore

@@ -11,3 +11,5 @@ _site/*
 doc/
 tags
 Gemfile.lock
+.idea/*
+*.iml

data/CHANGELOG.md

@@ -1,3 +1,40 @@
+## 0.7.0 (January 19, 2011)
+
+  - VirtualBox 4.0 support. Support for VirtualBox 3.2 is _dropped_, since
+    the API is so different. Stay with the 0.6.x series if you have VirtualBox
+    3.2.x.
+  - Puppet server provisioner. [GH-262]
+  - Use numeric uid/gid in mounting shared folders to increase portability. [GH-252]
+  - HTTP downloading follows redirects. [GH-163]
+  - Downloaders have clearer output to note what they're doing.
+  - Shared folders with no guest path are not automounted. [GH-184]
+  - Boxes downloaded during `vagrant up` reload the Vagrantfile config, which
+    fixes a problem with box settings not being properly loaded. [GH-231]
+  - `config.ssh.forward_x11` to enable the ForwardX11 SSH option. [GH-255]
+  - Vagrant source now has a `contrib` directory where contributions of miscellaneous
+    addons for Vagrant will be added.
+  - Vagrantfiles are now loaded only once (instead of 4+ times) [GH-238]
+  - Ability to move home vagrant dir (~/.vagrant) by setting VAGRANT_HOME
+    environmental variable.
+  - Removed check and error for the "OSE" version of VirtualBox, since with
+    VirtualBox 4 this distinction no longer exists.
+  - Ability to specify proxy settings for chef. [GH-169]
+  - Helpful error message shown if NFS mounting fails. [GH-135]
+  - Gentoo guests now support host only networks. [GH-240]
+  - RedHat (CentOS included) guests now support host only networks. [GH-260]
+  - New Vagrantfile syntax for enabling and configuring provisioners. This
+    change is not backwards compatible. [GH-265]
+  - Provisioners are now RVM-friendly, meaning if you installed chef or puppet
+    with an RVM managed Ruby, Vagrant now finds then. [GH-254]
+  - Changed the unused host only network destroy mechanism to check for
+    uselessness after the VM is destroyed. This should result in more accurate
+    checks.
+  - Networks are no longer disabled upon halt/destroy. With the above
+    change, its unnecessary.
+  - Puppet supports `module_path` configuration to mount local modules directory
+    as a shared folder and configure puppet with it. [GH-270]
+  - `ssh-config` now outputs `127.0.0.1` as the host instead of `localhost`.
+
 ## 0.6.9 (December 21, 2010)
 
   - Puppet provisioner. [GH-223]

data/Gemfile

@@ -16,12 +16,4 @@ group :test do
   # For documentation
   gem "yard", "~> 0.6.1"
   gem "bluecloth"
-
-  platforms :mri_18 do
-    gem "ruby-debug"
-  end
-
-  platforms :mri_19 do
-    gem "ruby-debug19"
-  end
 end

data/README.md

@@ -54,3 +54,8 @@ be installed with a simple `gem install bundler --pre`. Afterwords, do the follo
     rake
 
 This will run the test suite, which should come back all green! Then you're good to go!
+
+If you want to run Vagrant without having to install the gem, you may use `bundle exec`,
+like so:
+
+    bundle exec bin/vagrant help

data/config/default.rb

@@ -1,17 +1,16 @@
 Vagrant::Config.run do |config|
   # default config goes here
   config.vagrant.dotfile_name = ".vagrant"
-  config.vagrant.home = "~/.vagrant"
   config.vagrant.host = :detect
 
   config.ssh.username = "vagrant"
   config.ssh.host = "localhost"
-  config.ssh.port = 22
   config.ssh.forwarded_port_key = "ssh"
   config.ssh.max_tries = 10
   config.ssh.timeout = 30
   config.ssh.private_key_path = File.expand_path("keys/vagrant", Vagrant.source_root)
   config.ssh.forward_agent = false
+  config.ssh.forward_x11 = false
 
   config.vm.auto_port_range = (2200..2250)
   config.vm.box_ovf = "box.ovf"
@@ -19,7 +18,6 @@ Vagrant::Config.run do |config|
   config.vm.base_mac = nil
   config.vm.forward_port("ssh", 22, 2222, :auto => true)
   config.vm.disk_image_format = 'VMDK'
-  config.vm.provisioner = nil
   config.vm.shared_folder_uid = nil
   config.vm.shared_folder_gid = nil
   config.vm.boot_mode = "vrdp"

data/contrib/README.md

@@ -0,0 +1,12 @@
+# Vagrant Contrib
+
+Miscellaneous contributions which assist people in using Vagrant will
+make their way into this directory. An up-to-date list of short descriptions
+for each item will be kept below.
+
+## List of Contrib Items
+
+* `emacs` - Contains a file showing how to associate `Vagrantfile` with
+  Ruby syntax highlighting.
+* `vim` - Contains a `.vim` file for enabling Ruby syntax highlighting
+  for `Vagrantfile`s.

data/contrib/emacs/vagrant.el

@@ -0,0 +1,8 @@
+;;--------------------------------------------------------------------
+;; Teach emacs to syntax highlight Vagrantfile as Ruby.
+;;
+;; Installation: Copy the line below into your emacs configuration,
+;; or drop this file anywhere in your "~/.emacs.d" directory and be
+;; sure to "load" it.
+;;--------------------------------------------------------------------
+(add-to-list 'auto-mode-alist '("Vagrantfile$" . ruby-mode))

data/contrib/vim/vagrantfile.vim

@@ -0,0 +1,9 @@
+" Teach vim to syntax highlight Vagrantfile as ruby
+"
+" Install: $HOME/.vim/plugin/vagrant.vim
+" Author: Brandon Philips <brandon@ifup.org>
+
+augroup vagrant
+	au!
+	au BufRead,BufNewFile Vagrantfile set filetype=ruby
+augroup END

data/lib/vagrant/action/box/download.rb

@@ -64,7 +64,6 @@ module Vagrant
         end
 
         def download_to(f)
-          @env.ui.info I18n.t("vagrant.actions.box.download.copying")
           @downloader.download!(@env["box"].uri, f)
         end
       end

data/lib/vagrant/action/box.rb

@@ -0,0 +1,11 @@
+module Vagrant
+  class Action
+    module Box
+      autoload :Destroy,   'vagrant/action/box/destroy'
+      autoload :Download,  'vagrant/action/box/download'
+      autoload :Package,   'vagrant/action/box/package'
+      autoload :Unpackage, 'vagrant/action/box/unpackage'
+      autoload :Verify,    'vagrant/action/box/verify'
+    end
+  end
+end

data/lib/vagrant/action/builtin.rb

@@ -30,7 +30,6 @@ module Vagrant
       register(:halt, Builder.new do
         use VM::DiscardState
         use VM::Halt
-        use VM::DisableNetworks
       end)
 
       # suspend - Suspends the VM
@@ -62,9 +61,9 @@ module Vagrant
       register(:destroy, Builder.new do
         use Action[:halt], :force => true
         use VM::ClearNFSExports
-        use VM::DestroyUnusedNetworkInterfaces
         use VM::Destroy
         use VM::CleanMachineFolder
+        use VM::DestroyUnusedNetworkInterfaces
       end)
 
       # package - Export and package the VM

data/lib/vagrant/action/env.rb

@@ -0,0 +1,7 @@
+module Vagrant
+  class Action
+    module Env
+      autoload :Set, 'vagrant/action/env/set'
+    end
+  end
+end

data/lib/vagrant/action/general.rb

@@ -0,0 +1,8 @@
+module Vagrant
+  class Action
+    module General
+      autoload :Package,  'vagrant/action/general/package'
+      autoload :Validate, 'vagrant/action/general/validate'
+    end
+  end
+end

data/lib/vagrant/action/vm/boot.rb

@@ -13,6 +13,7 @@ module Vagrant
           # Start up the VM and wait for it to boot.
           boot
           raise Errors::VMFailedToBoot if !wait_for_boot
+
           @app.call(env)
         end
 
@@ -24,7 +25,7 @@ module Vagrant
         def wait_for_boot
           @env.ui.info I18n.t("vagrant.actions.vm.boot.waiting")
 
-          @env.env.config.ssh.max_tries.to_i.times do |i|
+          @env["config"].ssh.max_tries.to_i.times do |i|
             if @env["vm"].ssh.up?
               @env.ui.info I18n.t("vagrant.actions.vm.boot.ready")
               return true
@@ -34,7 +35,7 @@ module Vagrant
             # get shown
             return true if @env.interrupted?
 
-            sleep 5 if !@env["vagrant.test"]
+            sleep 2 if !@env["vagrant.test"]
           end
 
           @env.ui.error I18n.t("vagrant.actions.vm.boot.failed")

data/lib/vagrant/action/vm/check_box.rb

@@ -17,6 +17,7 @@ module Vagrant
             env.ui.info I18n.t("vagrant.actions.vm.check_box.not_found", :name => box_name)
             Vagrant::Box.add(env.env, box_name, box_url)
             env["boxes"].reload!
+            env.env.reload_config!
           end
 
           @app.call(env)

data/lib/vagrant/action/vm/clean_machine_folder.rb

@@ -31,7 +31,7 @@ module Vagrant
             keep = Dir["#{f}/**/*"].find do |d|
               # Find a file that doesn't have ".xml-prev" as the suffix,
               # which signals that we want to keep this folder
-              File.file?(d) && !(File.basename(d) =~ /\.xml-prev$/)
+              File.file?(d) && !(File.basename(d) =~ /\.vbox-prev$/)
             end
 
             FileUtils.rm_rf(f) if !keep

data/lib/vagrant/action/vm/destroy.rb

@@ -8,7 +8,7 @@ module Vagrant
 
         def call(env)
           env.ui.info I18n.t("vagrant.actions.vm.destroy.destroying")
-          env["vm"].vm.destroy(:destroy_medium => :delete)
+          env["vm"].vm.destroy
           env["vm"].vm = nil
 
           @app.call(env)

data/lib/vagrant/action/vm/destroy_unused_network_interfaces.rb

@@ -9,20 +9,15 @@ module Vagrant
         end
 
         def call(env)
-          # We need to check if the host only network specified by any
-          # of the adapters would not have any more clients if it was
-          # destroyed. And if so, then destroy the host only network
-          # itself.
-          interfaces = env["vm"].vm.network_adapters.collect do |adapter|
-            adapter.host_interface_object
-          end
+          # Destroy all the host only network adapters which are empty.
+          VirtualBox::Global.global(true).host.network_interfaces.each do |iface|
+            # We only care about host only interfaces
+            next if iface.interface_type != :host_only
 
-          interfaces.compact.uniq.each do |interface|
-            # Destroy the network interface if there is only one
-            # attached VM (which must be this VM)
-            if interface.attached_vms.length == 1
+            # Destroy it if there is nothing attached
+            if iface.attached_vms.empty?
               env.ui.info I18n.t("vagrant.actions.vm.destroy_network.destroying")
-              interface.destroy
+              iface.destroy
             end
           end
 

data/lib/vagrant/action/vm/network.rb

@@ -25,8 +25,8 @@ module Vagrant
 
           if enable_network?
             @env.ui.info I18n.t("vagrant.actions.vm.network.enabling")
-            @env["vm"].system.prepare_host_only_network
             @env.env.config.vm.network_options.compact.each do |network_options|
+              @env["vm"].system.prepare_host_only_network(network_options)
               @env["vm"].system.enable_host_only_network(network_options)
             end
           end

data/lib/vagrant/action/vm/nfs.rb

@@ -113,7 +113,9 @@ module Vagrant
         def mount_folders
           @env.ui.info I18n.t("vagrant.actions.vm.nfs.mounting")
 
-          @env["vm"].system.mount_nfs(host_ip, folders)
+          # Only mount the folders which have a guest path specified
+          am_folders = folders.select { |name, folder| folder[:guestpath] }
+          @env["vm"].system.mount_nfs(host_ip, Hash[am_folders])
         end
 
         # Returns the IP address of the first host only network adapter

data/lib/vagrant/action/vm/provision.rb

@@ -2,49 +2,38 @@ module Vagrant
   class Action
     module VM
       class Provision
+        attr_reader :provisioners
+
         def initialize(app, env)
           @app = app
           @env = env
           @env["provision.enabled"] = true if !@env.has_key?("provision.enabled")
+          @provisioners = []
 
-          load_provisioner if provisioning_enabled?
+          load_provisioners if provisioning_enabled?
         end
 
         def call(env)
           @app.call(env)
 
-          if provisioning_enabled?
-            @env.ui.info I18n.t("vagrant.actions.vm.provision.beginning")
-            @provisioner.provision!
+          @provisioners.each do |instance|
+            @env.ui.info I18n.t("vagrant.actions.vm.provision.beginning", :provisioner => instance.class)
+            instance.provision!
           end
         end
 
         def provisioning_enabled?
-          !@env["config"].vm.provisioner.nil? && @env["provision.enabled"]
+          !@env["config"].vm.provisioners.empty? && @env["provision.enabled"]
         end
 
-        def load_provisioner
-          provisioner = @env["config"].vm.provisioner
-
-          if provisioner.is_a?(Class)
-            @provisioner = provisioner.new(@env)
-            raise Errors::ProvisionInvalidClass if !@provisioner.is_a?(Provisioners::Base)
-          elsif provisioner.is_a?(Symbol)
-            # We have a few hard coded provisioners for built-ins
-            mapping = {
-              :chef_solo    => Provisioners::ChefSolo,
-              :chef_server  => Provisioners::ChefServer,
-              :puppet       => Provisioners::Puppet
-            }
+        def load_provisioners
+          @env["config"].vm.provisioners.each do |provisioner|
+            @env.ui.info I18n.t("vagrant.actions.vm.provision.enabled", :provisioner => provisioner.shortcut)
 
-            provisioner_klass = mapping[provisioner]
-            raise Errors::ProvisionUnknownType, :provisioner => provisioner.to_s if provisioner_klass.nil?
-            @provisioner = provisioner_klass.new(@env)
+            instance = provisioner.provisioner.new(@env, provisioner.config)
+            instance.prepare
+            @provisioners << instance
           end
-
-          @env.ui.info I18n.t("vagrant.actions.vm.provision.enabled", :provisioner => @provisioner.class.to_s)
-          @provisioner.prepare
-          @provisioner
         end
       end
     end

data/lib/vagrant/action/vm/share_folders.rb

@@ -50,10 +50,17 @@ module Vagrant
 
           @env["vm"].ssh.execute do |ssh|
             shared_folders.each do |name, data|
-              @env.ui.info(I18n.t("vagrant.actions.vm.share_folders.mounting_entry",
-                           :name => name,
-                           :guest_path => data[:guestpath]))
-              @env["vm"].system.mount_shared_folder(ssh, name, data[:guestpath])
+              if data[:guestpath]
+                # Guest path specified, so mount the folder to specified point
+                @env.ui.info(I18n.t("vagrant.actions.vm.share_folders.mounting_entry",
+                                    :name => name,
+                                    :guest_path => data[:guestpath]))
+                @env["vm"].system.mount_shared_folder(ssh, name, data[:guestpath])
+              else
+                # If no guest path is specified, then automounting is disabled
+                @env.ui.info(I18n.t("vagrant.actions.vm.share_folders.nomount_entry",
+                                    :name => name))
+              end
             end
           end
         end

data/lib/vagrant/action/vm.rb

@@ -0,0 +1,30 @@
+module Vagrant
+  class Action
+    module VM
+      autoload :Boot,                'vagrant/action/vm/boot'
+      autoload :CheckBox,            'vagrant/action/vm/check_box'
+      autoload :CheckGuestAdditions, 'vagrant/action/vm/check_guest_additions'
+      autoload :CleanMachineFolder,  'vagrant/action/vm/clean_machine_folder'
+      autoload :ClearForwardedPorts, 'vagrant/action/vm/clear_forwarded_ports'
+      autoload :ClearNFSExports,     'vagrant/action/vm/clear_nfs_exports'
+      autoload :ClearSharedFolders,  'vagrant/action/vm/clear_shared_folders'
+      autoload :Customize,           'vagrant/action/vm/customize'
+      autoload :Destroy,             'vagrant/action/vm/destroy'
+      autoload :DestroyUnusedNetworkInterfaces, 'vagrant/action/vm/destroy_unused_network_interfaces'
+      autoload :DiscardState,        'vagrant/action/vm/discard_state'
+      autoload :Export,              'vagrant/action/vm/export'
+      autoload :ForwardPorts,        'vagrant/action/vm/forward_ports'
+      autoload :Halt,                'vagrant/action/vm/halt'
+      autoload :Import,              'vagrant/action/vm/import'
+      autoload :MatchMACAddress,     'vagrant/action/vm/match_mac_address'
+      autoload :Network,             'vagrant/action/vm/network'
+      autoload :NFS,                 'vagrant/action/vm/nfs'
+      autoload :Package,             'vagrant/action/vm/package'
+      autoload :PackageVagrantfile,  'vagrant/action/vm/package_vagrantfile'
+      autoload :Provision,           'vagrant/action/vm/provision'
+      autoload :Resume,              'vagrant/action/vm/resume'
+      autoload :ShareFolders,        'vagrant/action/vm/share_folders'
+      autoload :Suspend,             'vagrant/action/vm/suspend'
+    end
+  end
+end

data/lib/vagrant/action.rb

@@ -1,3 +1,12 @@
+require 'vagrant/action/builder'
+require 'vagrant/action/builtin'
+
+# The builtin middlewares
+require 'vagrant/action/box'
+require 'vagrant/action/env'
+require 'vagrant/action/general'
+require 'vagrant/action/vm'
+
 module Vagrant
   # Manages action running and registration. Every Vagrant environment
   # has an instance of {Action} to allow for running in the context of
@@ -44,6 +53,9 @@ module Vagrant
   # Where `:name` is the name of the registered action.
   #
   class Action
+    autoload :Environment, 'vagrant/action/environment'
+    autoload :Warden,      'vagrant/action/warden'
+
     include Util
     @@reported_interrupt = false
 

data/lib/vagrant/command.rb

@@ -0,0 +1,25 @@
+module Vagrant
+  module Command
+    autoload :Base,      'vagrant/command/base'
+    autoload :GroupBase, 'vagrant/command/group_base'
+    autoload :Helpers,   'vagrant/command/helpers'
+    autoload :NamedBase, 'vagrant/command/named_base'
+  end
+end
+
+# The built-in commands must always be loaded
+require 'vagrant/command/box'
+require 'vagrant/command/destroy'
+require 'vagrant/command/halt'
+require 'vagrant/command/init'
+require 'vagrant/command/package'
+require 'vagrant/command/provision'
+require 'vagrant/command/reload'
+require 'vagrant/command/resume'
+require 'vagrant/command/ssh'
+require 'vagrant/command/ssh_config'
+require 'vagrant/command/status'
+require 'vagrant/command/suspend'
+require 'vagrant/command/up'
+require 'vagrant/command/upgrade_to_060'
+require 'vagrant/command/version'

data/lib/vagrant/config/base.rb

@@ -4,9 +4,6 @@ module Vagrant
     # basic things such as the environment instance variable which all
     # config classes need as well as a basic `to_json` implementation.
     class Base
-      # {Environment} that this config belongs to
-      attr_accessor :env
-
       # {Top} of this configuration stack
       attr_accessor :top
 
@@ -32,6 +29,23 @@ module Vagrant
         end
       end
 
+      # A helper to access the environment that this configuration is for.
+      # This is obtained by getting the env from the {Top}.
+      #
+      # @return [Vagrant::Envrionment]
+      def env
+        top.env
+      end
+
+      # Allows setting options from a hash. By default this simply calls
+      # the `#{key}=` method on the config class with the value, which is
+      # the expected behavior most of the time.
+      def set_options(options)
+        options.each do |key, value|
+          send("#{key}=", value)
+        end
+      end
+
       # Called by {Top} after the configuration is loaded to validate
       # the configuaration objects. Subclasses should implement this
       # method and add any errors to the `errors` object given.

data/lib/vagrant/config/ssh.rb

@@ -5,19 +5,19 @@ module Vagrant
 
       attr_accessor :username
       attr_accessor :host
-      attr_accessor :port
       attr_accessor :forwarded_port_key
       attr_accessor :max_tries
       attr_accessor :timeout
       attr_writer :private_key_path
       attr_accessor :forward_agent
+      attr_accessor :forward_x11
 
       def private_key_path
         File.expand_path(@private_key_path, env.root_path)
       end
 
       def validate(errors)
-        [:username, :host, :port, :forwarded_port_key, :max_tries, :timeout, :private_key_path].each do |field|
+        [:username, :host, :forwarded_port_key, :max_tries, :timeout, :private_key_path].each do |field|
           errors.add(I18n.t("vagrant.config.common.error_empty", :field => field)) if !instance_variable_get("@#{field}".to_sym)
         end
 

data/lib/vagrant/config/top.rb

@@ -0,0 +1,61 @@
+module Vagrant
+  class Config
+    # This class is the "top" configure class, which handles registering
+    # other configuration classes as well as validation of all configured
+    # classes. This is the object which is returned by {Environment#config}
+    # and has accessors to all other configuration classes.
+    #
+    # If you're looking to create your own configuration class, see {Base}.
+    class Top < Base
+      @@configures = {} if !defined?(@@configures)
+
+      # The environment that this configuration is for.
+      attr_reader :env
+
+      class << self
+        # The list of registered configuration classes as well as the key
+        # they're registered under.
+        def configures_list
+          @@configures ||= {}
+        end
+
+        # Registers a configuration class with the given key. This method shouldn't
+        # be called. Instead, inherit from {Base} and call {Base.configures}.
+        def configures(key, klass)
+          configures_list[key] = klass
+          attr_reader key.to_sym
+        end
+      end
+
+      def initialize(env=nil)
+        self.class.configures_list.each do |key, klass|
+          config = klass.new
+          config.top = self
+          instance_variable_set("@#{key}".to_sym, config)
+        end
+
+        @env = env
+      end
+
+      # Validates the configuration classes of this instance and raises an
+      # exception if they are invalid. If you are implementing a custom configuration
+      # class, the method you want to implement is {Base#validate}. This is
+      # the method that checks all the validation, not one which defines
+      # validation rules.
+      def validate!
+        # Validate each of the configured classes and store the results into
+        # a hash.
+        errors = self.class.configures_list.inject({}) do |container, data|
+          key, _ = data
+          recorder = ErrorRecorder.new
+          send(key.to_sym).validate(recorder)
+          container[key.to_sym] = recorder if !recorder.errors.empty?
+          container
+        end
+
+        return if errors.empty?
+        raise Errors::ConfigValidationFailed, :messages => Util::TemplateRenderer.render("config/validation_failed", :errors => errors)
+      end
+    end
+  end
+end

data/lib/vagrant/config/vagrant.rb

@@ -4,15 +4,10 @@ module Vagrant
       configures :vagrant
 
       attr_accessor :dotfile_name
-      attr_accessor :home
       attr_accessor :host
 
-      def initialize
-        @home = nil
-      end
-
       def validate(errors)
-        [:dotfile_name, :home, :host].each do |field|
+        [:dotfile_name, :host].each do |field|
           errors.add(I18n.t("vagrant.config.common.error_empty", :field => field)) if !instance_variable_get("@#{field}".to_sym)
         end
       end