vagrant 0.7.8 → 0.8.1

data/CHANGELOG.md

@@ -1,3 +1,42 @@
+## 0.8.1 (unreleased)
+
+  - Repush of 0.8.0 to fix a Ruby 1.9.2 RubyGems issue.
+
+## 0.8.0 (July 20, 2011)
+
+  - VirtualBox 4.1 support _only_. Previous versions of VirtualBox
+    are supported by earlier versions of Vagrant.
+  - Performance optimizations in `virtualbox` gem. Huge speed gains.
+  - `:chef_server` provisioner is now `:chef_client`. [GH-359]
+  - SSH connection is now cached after first access internally,
+    speeding up `vagrant up`, `reload`, etc. quite a bit.
+  - Actions which modify the VM now occur much more quickly,
+    greatly speeding up `vagrant up`, `reload`, etc.
+  - SUSE host only networking support. [GH-369]
+  - Show nice error message for invalid HTTP responses for HTTP
+    downloader. [GH-403]
+  - New `:inline` option for shell provisioner to provide inline
+    scripts as a string. [GH-395]
+  - Host only network now properly works on multiple adapters. [GH-365]
+  - Can now specify owner/group for regular shared folders. [GH-350]
+  - `ssh_config` host name will use VM name if given. [GH-332]
+  - `ssh` `-e` flag changed to `-c` to align with `ssh` standard
+    behavior. [GH-323]
+  - Forward agent and forward X11 settings properly appear in
+    `ssh_config` output. [GH-105]
+  - Chef JSON can now be set with `chef.json =` instead of the old
+    `merge` technique. [GH-314]
+  - Provisioner configuration is no longer cleared when the box
+    needs to be downloaded during an `up`. [GH-308]
+  - Multiple Chef provisioners no longer overwrite cookbook folders. [GH-407]
+  - `package` won't delete previously existing file. [GH-408]
+  - Vagrantfile can be lowercase now. [GH-399]
+  - Only one copy of Vagrant may be running at any given time. [GH-364]
+  - Default home directory for Vagrant moved to `~/.vagrant.d` [GH-333]
+  - Specify a `forwarded_port_destination` for SSH configuration and
+    SSH port searching will fall back to that if it can't find any
+    other port. [GH-375]
+
 ## 0.7.8 (July 19, 2011)
 
   - Make sure VirtualBox version check verifies that it is 4.0.x.

data/Gemfile

@@ -4,7 +4,7 @@ gem "vagrant", :path => '.'
 
 # Use the following gems straight from git, since Vagrant dev
 # typically coincides with it
-gem "virtualbox", :git => "git://github.com/mitchellh/virtualbox.git", :ref => "038729cd89a15111106404726b75a1d463edc892"
+gem "virtualbox", :git => "git://github.com/mitchellh/virtualbox.git"
 
 # Gems required for testing only. To install run
 # gem bundle test
@@ -12,10 +12,4 @@ group :test do
   gem "rake"
   gem "contest", ">= 0.1.2"
   gem "mocha"
-
-  # For documentation
-  platforms :ruby do
-    gem "yard", "~> 0.6.1"
-    gem "bluecloth"
-  end
 end

data/Rakefile

@@ -9,14 +9,3 @@ Rake::TestTask.new do |t|
   t.libs << "test"
   t.pattern = 'test/**/*_test.rb'
 end
-
-begin
-  require 'yard'
-  YARD::Rake::YardocTask.new do |t|
-    t.options = ['--main', 'README.md', '--markup', 'markdown']
-    t.options += ['--title', 'Vagrant Developer Documentation']
-  end
-rescue LoadError
-  puts "Yard not available. Install it with: gem install yard"
-  puts "if you wish to be able to generate developer documentation."
-end

data/bin/vagrant

@@ -5,6 +5,10 @@ require 'vagrant/cli'
 env = Vagrant::Environment.new
 
 begin
+  # Begin logging early here
+  env.logger.info("vagrant") { "`vagrant` invoked: #{ARGV.inspect}" }
+
+  # Disable color if the proper argument was passed
   shell = ARGV.include?("--no-color") ? Thor::Shell::Basic.new : Thor::Base.shell.new
 
   # Set the UI early in case any errors are raised, and load

data/config/default.rb

@@ -6,6 +6,7 @@ Vagrant::Config.run do |config|
   config.ssh.username = "vagrant"
   config.ssh.host = "127.0.0.1"
   config.ssh.forwarded_port_key = "ssh"
+  config.ssh.forwarded_port_destination = 22
   config.ssh.max_tries = 10
   config.ssh.timeout = 30
   config.ssh.private_key_path = File.expand_path("keys/vagrant", Vagrant.source_root)
@@ -18,8 +19,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.shared_folder_uid = nil
-  config.vm.shared_folder_gid = nil
   config.vm.boot_mode = "vrdp"
   config.vm.system = :linux
 

data/lib/vagrant.rb

@@ -3,6 +3,10 @@ require 'json'
 require 'i18n'
 require 'virtualbox'
 
+# OpenSSL must be loaded here since when it is loaded via `autoload`
+# there are issues with ciphers not being properly loaded.
+require 'openssl'
+
 module Vagrant
   autoload :Action,        'vagrant/action'
   autoload :Box,           'vagrant/box'
@@ -15,6 +19,7 @@ module Vagrant
   autoload :Errors,        'vagrant/errors'
   autoload :Hosts,         'vagrant/hosts'
   autoload :Plugin,        'vagrant/plugin'
+  autoload :SSH,           'vagrant/ssh'
   autoload :TestHelpers,   'vagrant/test_helpers'
   autoload :UI,            'vagrant/ui'
   autoload :Util,          'vagrant/util'
@@ -27,16 +32,13 @@ module Vagrant
   end
 end
 
-# Default I18n to load the en locale
+# # Default I18n to load the en locale
 I18n.load_path << File.expand_path("templates/locales/en.yml", Vagrant.source_root)
 
-# Load the things which must be loaded before anything else. Note that
-# I'm not sure why 'vagrant/ssh' must be loaded. But if I don't, I get
-# a very scary "unsupported cipher" error from net-ssh for no apparent reason.
+# Load the things which must be loaded before anything else.
 require 'vagrant/command'
 require 'vagrant/provisioners'
 require 'vagrant/systems'
-require 'vagrant/ssh'
 require 'vagrant/version'
 Vagrant::Action.builtin!
 Vagrant::Plugin.load!

data/lib/vagrant/action.rb

@@ -128,7 +128,11 @@ module Vagrant
         @@reported_interrupt = true
       end
 
-      Busy.busy(int_callback) { callable.call(action_environment) }
+      # We place a process lock around every action that is called
+      env.logger.info "Running action: #{callable_id}"
+      env.lock do
+        Busy.busy(int_callback) { callable.call(action_environment) }
+      end
     end
   end
 end

data/lib/vagrant/action/builtin.rb

@@ -14,7 +14,6 @@ module Vagrant
       # environment.
       register(:start, Builder.new do
         use VM::CleanMachineFolder
-        use VM::Customize
         use VM::ClearForwardedPorts
         use VM::ForwardPorts
         use VM::Provision
@@ -23,6 +22,8 @@ module Vagrant
         use VM::ShareFolders
         use VM::HostName
         use VM::Network
+        use VM::Customize
+        use VM::Modify
         use VM::Boot
       end)
 
@@ -61,6 +62,7 @@ module Vagrant
       # destroy - Halts, cleans up, and destroys an existing VM
       register(:destroy, Builder.new do
         use Action[:halt], :force => true
+        use VM::ProvisionerCleanup
         use VM::ClearNFSExports
         use VM::Destroy
         use VM::CleanMachineFolder
@@ -72,6 +74,7 @@ module Vagrant
         use Action[:halt]
         use VM::ClearForwardedPorts
         use VM::ClearSharedFolders
+        use VM::Modify
         use VM::Export
         use VM::PackageVagrantfile
         use VM::Package

data/lib/vagrant/action/general/package.rb

@@ -38,8 +38,12 @@ module Vagrant
         end
 
         def recover(env)
-          # Cleanup any packaged files if the packaging failed at some point.
-          File.delete(tar_path) if File.exist?(tar_path)
+          # Don't delete the tar_path if the error is that the output already
+          # exists, since this will nuke the user's previous file.
+          if !env["vagrant.error"].is_a?(Errors::PackageOutputExists)
+						# Cleanup any packaged files if the packaging failed at some point.
+						File.delete(tar_path) if File.exist?(tar_path)
+					end
         end
 
         def files_to_copy

data/lib/vagrant/action/vm.rb

@@ -18,11 +18,13 @@ module Vagrant
       autoload :HostName,            'vagrant/action/vm/host_name'
       autoload :Import,              'vagrant/action/vm/import'
       autoload :MatchMACAddress,     'vagrant/action/vm/match_mac_address'
+      autoload :Modify,              'vagrant/action/vm/modify'
       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 :ProvisionerCleanup,  'vagrant/action/vm/provisioner_cleanup'
       autoload :Resume,              'vagrant/action/vm/resume'
       autoload :ShareFolders,        'vagrant/action/vm/share_folders'
       autoload :Suspend,             'vagrant/action/vm/suspend'

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

@@ -1,37 +1,24 @@
-require File.expand_path("../forward_ports_helpers", __FILE__)
-
 module Vagrant
   class Action
     module VM
       class ClearForwardedPorts
-        include ForwardPortsHelpers
-
         def initialize(app, env)
           @app = app
-          @env = env
         end
 
         def call(env)
-          @env = env
-          clear
-          @app.call(env)
-        end
+          proc = lambda do |vm|
+            env.ui.info I18n.t("vagrant.actions.vm.clear_forward_ports.deleting")
 
-        def clear
-          if used_ports.length > 0
-            @env.ui.info I18n.t("vagrant.actions.vm.clear_forward_ports.deleting")
-            clear_ports
-            @env["vm"].reload!
-          end
-        end
-
-        # Deletes existing forwarded ports.
-        def clear_ports
-          @env["vm"].vm.network_adapters.each do |na|
-            na.nat_driver.forwarded_ports.dup.each do |fp|
-              fp.destroy
+            vm.network_adapters.each do |na|
+              na.nat_driver.forwarded_ports.dup.each do |fp|
+                fp.destroy
+              end
             end
           end
+
+          env["vm.modify"].call(proc)
+          @app.call(env)
         end
       end
     end

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

@@ -8,23 +8,18 @@ module Vagrant
         end
 
         def call(env)
-          @env = env
-
-          clear_shared_folders
-          @app.call(env)
-        end
+          proc = lambda do |vm|
+            if vm.shared_folders.length > 0
+              env.ui.info I18n.t("vagrant.actions.vm.clear_shared_folders.deleting")
 
-        def clear_shared_folders
-          if @env["vm"].vm.shared_folders.length > 0
-            @env.ui.info I18n.t("vagrant.actions.vm.clear_shared_folders.deleting")
-
-            folders = @env["vm"].vm.shared_folders.dup
-            folders.each do |shared_folder|
-              shared_folder.destroy
+              vm.shared_folders.dup.each do |shared_folder|
+                shared_folder.destroy
+              end
             end
-
-            @env["vm"].reload!
           end
+
+          env["vm.modify"].call(proc)
+          @app.call(env)
         end
       end
     end

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

@@ -7,10 +7,15 @@ module Vagrant
         end
 
         def call(env)
-          if !env.env.config.vm.proc_stack.empty?
-            env.ui.info I18n.t("vagrant.actions.vm.customize.running")
-            env.env.config.vm.run_procs!(env["vm"].vm)
-            env["vm"].vm.save
+          if !env["config"].vm.proc_stack.empty?
+            # Create the proc which runs all of our procs
+            proc = lambda do |vm|
+              env.ui.info I18n.t("vagrant.actions.vm.customize.running")
+              env["config"].vm.run_procs!(vm)
+            end
+
+            # Add it to modify sequence
+            env["vm.modify"].call(proc)
           end
 
           @app.call(env)

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

@@ -83,14 +83,16 @@ module Vagrant
         def call(env)
           @env = env
 
-          forward_ports
+          proc = lambda do |vm|
+            env.ui.info I18n.t("vagrant.actions.vm.forward_ports.forwarding")
+            forward_ports(vm)
+          end
 
+          env["vm.modify"].call(proc)
           @app.call(env)
         end
 
-        def forward_ports
-          @env.ui.info I18n.t("vagrant.actions.vm.forward_ports.forwarding")
-
+        def forward_ports(vm)
           @env.env.config.vm.forwarded_ports.each do |name, options|
             adapter = options[:adapter]
             message_attributes = {
@@ -103,16 +105,13 @@ module Vagrant
             # Assuming the only reason to establish port forwarding is because the VM is using Virtualbox NAT networking.
             # Host-only or Bridged networking don't require port-forwarding and establishing forwarded ports on these
             # attachment types has uncertain behaviour.
-            if @env["vm"].vm.network_adapters[adapter].attachment_type == :nat
+            if vm.network_adapters[adapter].attachment_type == :nat
               @env.ui.info(I18n.t("vagrant.actions.vm.forward_ports.forwarding_entry", message_attributes))
-              forward_port(name, options)
+              forward_port(vm, name, options)
             else
               @env.ui.info(I18n.t("vagrant.actions.vm.forward_ports.non_nat", message_attributes))
             end
           end
-
-          @env["vm"].vm.save
-          @env["vm"].reload!
         end
 
         #--------------------------------------------------------------
@@ -120,13 +119,13 @@ module Vagrant
         #--------------------------------------------------------------
 
         # Forwards a port.
-        def forward_port(name, options)
+        def forward_port(vm, name, options)
           port = VirtualBox::NATForwardedPort.new
           port.name = name
           port.guestport = options[:guestport]
           port.hostport = options[:hostport]
           port.protocol = options[:protocol] || :tcp
-          @env["vm"].vm.network_adapters[options[:adapter]].nat_driver.forwarded_ports << port
+          vm.network_adapters[options[:adapter]].nat_driver.forwarded_ports << port
         end
       end
     end

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

@@ -9,9 +9,14 @@ module Vagrant
         def call(env)
           raise Errors::VMBaseMacNotSpecified if !env.env.config.vm.base_mac
 
-          env.ui.info I18n.t("vagrant.actions.vm.match_mac.matching")
-          env["vm"].vm.network_adapters.first.mac_address = env.env.config.vm.base_mac
-          env["vm"].vm.save
+          # Create the proc which we want to use to modify the virtual machine
+          proc = lambda do |vm|
+            env.ui.info I18n.t("vagrant.actions.vm.match_mac.matching")
+            vm.network_adapters.first.mac_address = env["config"].vm.base_mac
+          end
+
+          # Add the proc to the modification chain
+          env["vm.modify"].call(proc)
 
           @app.call(env)
         end

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

@@ -0,0 +1,37 @@
+module Vagrant
+  class Action
+    module VM
+      # This class allows other actions on the virtual machine object
+      # to be consolidated under a single write lock. This vastly speeds
+      # up modification of virtual machines. This should be used whereever
+      # possible when dealing with virtual machine modifications.
+      class Modify
+        include Util::StackedProcRunner
+
+        def initialize(app, env)
+          @app = app
+
+          # Initialize the proc_stack, which should already be empty
+          # but just making sure here.
+          proc_stack.clear
+
+          # Create the lambda in the environment which is to be called
+          # to add new procs to the modification sequence.
+          env["vm.modify"] = lambda do |*procs|
+            procs.each { |p| push_proc(&p) }
+          end
+        end
+
+        def call(env)
+          # Run the procs we have saved up, save the machine, and reload
+          # to verify we get the new settings
+          run_procs!(env["vm"].vm)
+          env["vm"].vm.save
+          env["vm"].reload!
+
+          @app.call(env)
+        end
+      end
+    end
+  end
+end

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

@@ -25,8 +25,15 @@ module Vagrant
 
           if enable_network?
             @env.ui.info I18n.t("vagrant.actions.vm.network.enabling")
-            @env.env.config.vm.network_options.compact.each do |network_options|
+
+            # Prepare for new networks...
+            options = @env.env.config.vm.network_options.compact
+            options.each do |network_options|
               @env["vm"].system.prepare_host_only_network(network_options)
+            end
+
+            # Then enable the networks...
+            options.each do |network_options|
               @env["vm"].system.enable_host_only_network(network_options)
             end
           end
@@ -64,7 +71,7 @@ module Vagrant
             adapter = @env["vm"].vm.network_adapters[network_options[:adapter]]
             adapter.enabled = true
             adapter.attachment_type = :host_only
-            adapter.host_interface = network_name(network_options)
+            adapter.host_only_interface = network_name(network_options)
             adapter.mac_address = network_options[:mac].gsub(':', '') if network_options[:mac]
             adapter.save
           end