vagrant 0.8.7 → 0.8.8

data/.gitignore

@@ -2,6 +2,24 @@
 .DS_Store
 
 # Vagrant stuff
+acceptance_config.yml
+boxes/*
+test/buildbot/config.cfg
+test/buildbot/env
+test/buildbot/master/http.log
+test/buildbot/master/master.cfg.sample
+test/buildbot/master/twistd.log
+test/buildbot/master/twistd.pid
+test/buildbot/master/state.sqlite
+test/buildbot/master/osx-*/
+test/buildbot/master/linux-*/
+test/buildbot/master/win-*/
+test/buildbot/slave/twistd.hostname
+test/buildbot/slave/twistd.log
+test/buildbot/slave/twistd.pid
+test/buildbot/slave/osx-*/
+test/buildbot/slave/linux-*/
+test/buildbot/slave/win-*/
 Vagrantfile
 .vagrant
 
@@ -17,6 +35,9 @@ _site/*
 .yardoc/
 doc/
 
+# Python
+*.pyc
+
 # Rubinius
 *.rbc
 

data/CHANGELOG.md

@@ -1,3 +1,28 @@
+## 0.8.8 (December 1, 2011)
+
+  - Mount shared folders shortest to longest to avoid mounting
+    subfolders first. [GH-525]
+  - Support for basic HTTP auth in the URL for boxes.
+  - Solaris support for host only networks. [GH-533]
+  - `vagrant init` respects `Vagrant::Environment` cwd. [GH-528]
+  - `vagrant` commands will not output color when stdout is
+    not a TTY.
+  - Fix issue where `box_url` set with multiple VMs could cause issues. [GH-564]
+  - Chef provisioners no longer depend on a "v-root" share being
+    available. [GH-556]
+  - NFS should work for FreeBSD hosts now. [GH-510]
+  - SSH executed methods respect `config.ssh.max_tries`. [GH-508]
+  - `vagrant box add` now respects the "no_proxy" environmental variable.
+    [GH-502]
+  - Tweaks that should make "Waiting for VM to boot" slightly more
+    reliable.
+  - Add comments to Vagrantfile to make it detected as Ruby file for
+    `vi` and `emacs`. [GH-515]
+  - More correct guest addition version checking. [GH-514]
+  - Chef solo support on Windows is improved. [GH-542]
+  - Put encrypted data bag secret into `/tmp` by default so that
+    permissions are almost certainly guaranteed. [GH-512]
+
 ## 0.8.7 (September 13, 2011)
 
   - Fix regression with remote paths from chef-solo. [GH-431]

data/README.md

@@ -1,7 +1,7 @@
 # Vagrant
 
 * Website: [http://vagrantup.com](http://vagrantup.com)
-* Source: [http://github.com/mitchellh/vagrant](http://github.com/mitchellh/vagrant)
+* Source: [https://github.com/mitchellh/vagrant](https://github.com/mitchellh/vagrant)
 * IRC: `#vagrant` on Freenode
 * Mailing list: [Google Groups](http://groups.google.com/group/vagrant-up)
 
@@ -29,15 +29,11 @@ Note: The above `vagrant up` command will also trigger Vagrant to download the
 `lucid32` box via the specified URL. Vagrant only does this if it detects that
 the box doesn't already exist on your system.
 
-## Getting Started Guide and Video
+## Getting Started Guide
 
 To learn how to build a fully functional rails development environment, view the
 [getting started guide](http://vagrantup.com/docs/getting-started/index.html).
 
-There is also a fairly short (12 minute) [getting started video](http://vimeo.com/9976342) which
-explains how to build a fully functional LAMP development environment, which
-covers a few parts of Vagrant in more detail than the website guide.
-
 ## Installing the Gem from Git
 
 If you want the bleeding edge version of Vagrant, we try to keep master pretty stable
@@ -47,15 +43,49 @@ and you're welcome to give it a shot. The following is an example showing how to
 
 ## Contributing to Vagrant
 
+### Dependencies and Unit Tests
+
 To hack on vagrant, you'll need [bundler](http://github.com/carlhuda/bundler) which can
-be installed with a simple `gem install bundler --pre`. Afterwords, do the following:
+be installed with a simple `gem install bundler`. Afterwords, do the following:
 
     bundle install
     rake
 
-This will run the test suite, which should come back all green! Then you're good to go!
+This will run the unit 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
+
+### Acceptance Tests
+
+Vagrant also comes with an acceptance test suite which runs the system
+end-to-end, without mocking out any dependencies. Note that this test
+suite is **extremely slow**, with the test suite taking hours on even
+a decent system. A CI will be setup in due time to run these tests
+automatically. However, it is still useful to know how to run these
+tests since it is often useful to run a single test if you're working
+on a specific feature.
+
+The acceptance tests have absolutely _zero_ dependence on the Vagrant
+source. Instead, an external configuration file must be used to give
+the acceptance tests some parameters (such as what Vagrant version is
+running, where the Vagrant `vagrant` binary is, etc.). If you want to
+run acceptance tests against source, or just want to see an example of
+this file, you can generate it automatically for the source code:
+
+    rake acceptance:config
+
+This will drop an `acceptance_config.yml` file in your working directory.
+You can then run a specific acceptance test like so:
+
+    ACCEPTANCE_CONFIG=./acceptance_config.yml ruby test/acceptance/version_test.rb
+
+That's it!
+
+If you're developing an acceptance test and you're unsure why things
+might be failing, you can also view log output for the acceptance tests,
+which can be very verbose but are a great help in finding bugs:
+
+    ACCEPTANCE_LOGGING=debug ACCEPTANCE_CONFIG=./acceptance_config.yml ruby test/acceptance/version_test.rb

data/Rakefile

@@ -1,11 +1,18 @@
 require 'rubygems'
 require 'bundler/setup'
-require 'rake/testtask'
-Bundler::GemHelper.install_tasks
 
-task :default => :test
+# Immediately sync all stdout so that tools like buildbot can
+# immediately load in the output.
+$stdout.sync = true
+$stderr.sync = true
 
-Rake::TestTask.new do |t|
-  t.libs << "test/unit"
-  t.pattern = 'test/unit/**/*_test.rb'
+# Load all the rake tasks from the "tasks" folder. This folder
+# allows us to nicely separate rake tasks into individual files
+# based on their role, which makes development and debugging easier
+# than one monolithic file.
+task_dir = File.expand_path("../tasks", __FILE__)
+Dir["#{task_dir}/**/*.rake"].each do |task_file|
+  load task_file
 end
+
+task :default => "test:unit"

data/bin/vagrant

@@ -9,7 +9,12 @@ begin
   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
+  shell = nil
+  if !$stdout.tty? || ARGV.include?("--no-color")
+    shell = Thor::Shell::Basic.new
+  else
+    shell = Thor::Base.shell.new
+  end
 
   # Set the UI early in case any errors are raised, and load
   # the config immediately, so we gather any new commands from

data/config/default.rb

@@ -8,8 +8,8 @@ Vagrant::Config.run do |config|
   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.max_tries = 100
+  config.ssh.timeout = 7
   config.ssh.private_key_path = File.expand_path("keys/vagrant", Vagrant.source_root)
   config.ssh.forward_agent = false
   config.ssh.forward_x11 = false

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

@@ -26,13 +26,25 @@ module Vagrant
         end
 
         def instantiate_downloader
-          @env["download.classes"].each do |klass|
-            if klass.match?(@env["box"].uri)
+          # Assign to a temporary variable since this is easier to type out,
+          # since it is used so many times.
+          classes = @env["download.classes"]
+
+          # Find the class to use.
+          classes.each_index do |i|
+            klass = classes[i]
+
+            # Use the class if it matches the given URI or if this
+            # is the last class...
+            if classes.length == (i + 1) || klass.match?(@env["box"].uri)
               @env.ui.info I18n.t("vagrant.actions.box.download.with", :class => klass.to_s)
               @downloader = klass.new(@env)
+              break
             end
           end
 
+          # This line should never be reached, but we'll keep this here
+          # just in case for now.
           raise Errors::BoxDownloadUnknownType if !@downloader
 
           @downloader.prepare(@env["box"].uri)

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

@@ -14,10 +14,17 @@ module Vagrant
             box_url = env["config"].vm.box_url
             raise Errors::BoxSpecifiedDoesntExist, :name => box_name if !box_url
 
+            # Add the box then reload the box collection so that it becomes
+            # aware of it.
             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!
+
+            # Reload the configuration for all our VMs, since this box
+            # may be used for other VMs.
+            env.env.vms.each do |name, vm|
+              vm.env.reload_config!
+            end
           end
 
           @app.call(env)

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

@@ -16,10 +16,13 @@ module Vagrant
           if version.empty?
             env.ui.warn I18n.t("vagrant.actions.vm.check_guest_additions.not_detected")
           else
-            # Strip the -OSE/_OSE off from the guest additions
-            version = version.gsub(/[-_]ose/i, '')
+            # Strip the -OSE/_OSE off from the guest additions and the virtual box
+            # version since all the matters are that the version _numbers_ match up.
+            guest_version, vb_version = [version, VirtualBox.version].map do |v|
+              v.gsub(/[-_]ose/i, '')
+            end
 
-            if version != VirtualBox.version
+            if guest_version != vb_version
               env.ui.warn(I18n.t("vagrant.actions.vm.check_guest_additions.version_mismatch",
                                  :guest_version => version,
                                  :virtualbox_version => VirtualBox.version))

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

@@ -51,7 +51,18 @@ module Vagrant
           @env.ui.info I18n.t("vagrant.actions.vm.share_folders.mounting")
 
           @env["vm"].ssh.execute do |ssh|
-            shared_folders.each do |name, data|
+            # short guestpaths first, so we don't step on ourselves
+            folders = shared_folders.sort_by do |name, data|
+              if data[:guestpath]
+                data[:guestpath].length
+              else
+                # A long enough path to just do this at the end.
+                10000
+              end
+            end
+
+            # Go through each folder and mount
+            folders.each do |name, data|
               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",

data/lib/vagrant/command/init.rb

@@ -7,7 +7,7 @@ module Vagrant
       register "init [box_name] [box_url]", "Initializes the current folder for Vagrant usage"
 
       def execute
-        template "Vagrantfile.erb", "Vagrantfile"
+        template "Vagrantfile.erb", env.cwd.join("Vagrantfile")
       end
     end
   end

data/lib/vagrant/downloaders/http.rb

@@ -2,6 +2,7 @@ require 'net/http'
 require 'net/https'
 require 'open-uri'
 require 'uri'
+require 'base64'
 
 module Vagrant
   module Downloaders
@@ -15,8 +16,9 @@ module Vagrant
       end
 
       def download!(source_url, destination_file)
-        proxy_uri = URI.parse(ENV["http_proxy"] || "")
         uri = URI.parse(source_url)
+        proxy_uri = resolve_proxy(uri)
+
         http = Net::HTTP.new(uri.host, uri.port, proxy_uri.host, proxy_uri.port, proxy_uri.user, proxy_uri.password)
 
         if uri.scheme == "https"
@@ -27,7 +29,12 @@ module Vagrant
         http.start do |h|
           env.ui.info I18n.t("vagrant.downloaders.http.download", :url => source_url)
 
-          h.request_get(uri.request_uri) do |response|
+          headers = nil
+          if uri.user && uri.password
+            headers = {'Authorization' => 'Basic ' + Base64.encode64(uri.user + ':' + uri.password)}
+          end
+
+          h.request_get(uri.request_uri, headers) do |response|
             if response.is_a?(Net::HTTPRedirection)
               # Follow the HTTP redirect.
               # TODO: Error on some redirect limit
@@ -65,6 +72,26 @@ module Vagrant
       rescue SocketError
         raise Errors::DownloaderHTTPSocketError
       end
+
+      private
+
+      # This method respects the "http_proxy" and "no_proxy" environmental
+      # variables so that HTTP proxies can properly be used with Vagrant.
+      def resolve_proxy(source_uri)
+        proxy_string = ENV["http_proxy"] || ""
+        if !proxy_string.empty? && ENV.has_key?("no_proxy")
+          # Respect the "no_proxy" environmental variable which contains a list
+          # of hosts that a proxy should not be used for.
+          ENV["no_proxy"].split(",").each do |host|
+            if source_uri.host =~ /#{Regexp.quote(host.strip)}$/
+              proxy_string = ""
+              break
+            end
+          end
+        end
+
+        URI.parse(proxy_string)
+      end
     end
   end
 end

data/lib/vagrant/hosts.rb

@@ -3,6 +3,7 @@ module Vagrant
     autoload :Base,  'vagrant/hosts/base'
     autoload :Arch,  'vagrant/hosts/arch'
     autoload :BSD,   'vagrant/hosts/bsd'
+    autoload :FreeBSD,'vagrant/hosts/freebsd'
     autoload :Fedora, 'vagrant/hosts/fedora'
     autoload :Linux, 'vagrant/hosts/linux'
   end

data/lib/vagrant/hosts/bsd.rb

@@ -8,6 +8,7 @@ module Vagrant
       include Util::Retryable
 
       def self.distro_dispatch
+        return FreeBSD if Util::Platform.freebsd?
         return self if Util::Platform.darwin? || Util::Platform.bsd?
       end
 

data/lib/vagrant/hosts/freebsd.rb

@@ -0,0 +1,51 @@
+require 'vagrant/util/platform'
+
+module Vagrant
+  module Hosts
+    # Represents a FreeBSD host
+    class FreeBSD < BSD
+      include Util
+      include Util::Retryable
+
+      def nfs_export(ip, folders)
+        output = TemplateRenderer.render('nfs/exports',
+                                         :uuid => env.vm.uuid,
+                                         :ip => ip,
+                                         :folders => folders)
+
+        # The sleep ensures that the output is truly flushed before any `sudo`
+        # commands are issued.
+        env.ui.info I18n.t("vagrant.hosts.bsd.nfs_export.prepare")
+        sleep 0.5
+
+        output.split("\n").each do |line|
+          # This should only ask for administrative permission once, even
+          # though its executed in multiple subshells.
+          line = line.gsub('"', '\"')
+          system(%Q[sudo su root -c "echo '#{line}' >> /etc/exports"])
+        end
+
+        # We run restart here instead of "update" just in case nfsd
+        # is not starting
+        system("sudo /etc/rc.d/mountd onereload")
+      end
+
+    end
+
+    def nfs_cleanup
+        return if !File.exist?("/etc/exports")
+
+        retryable(:tries => 10, :on => TypeError) do
+          system("cat /etc/exports | grep 'VAGRANT-BEGIN: #{env.vm.uuid}' > /dev/null 2>&1")
+
+          if $?.to_i == 0
+            # Use sed to just strip out the block of code which was inserted
+            # by Vagrant
+            system("sudo sed -e '/^# VAGRANT-BEGIN: #{env.vm.uuid}/,/^# VAGRANT-END: #{env.vm.uuid}/ d' -ibak /etc/exports")
+          end
+
+          system("sudo /etc/rc.d/mountd onereload")
+        end
+      end
+  end
+end

data/lib/vagrant/provisioners/chef.rb

@@ -56,11 +56,12 @@ module Vagrant
       def setup_json
         env.ui.info I18n.t("vagrant.provisioners.chef.json")
 
-        # Set up initial configuration
-        data = {
-          :config => env.config.to_hash,
-          :directory => env.config.vm.shared_folders["v-root"][:guestpath],
-        }
+        # Set up our configuration that is passed to the attributes by default
+        data = { :config => env.config.to_hash }
+
+        # Add our default share directory if it exists
+        default_share = env.config.vm.shared_folders["v-root"]
+        data[:directory] = default_share[:guestpath] if default_share
 
         # And wrap it under the "vagrant" namespace
         data = { :vagrant => data }

data/lib/vagrant/provisioners/chef_client.rb

@@ -26,7 +26,7 @@ module Vagrant
           @file_cache_path = "/srv/chef/file_store"
           @file_backup_path = "/srv/chef/cache"
           @encrypted_data_bag_secret_key_path = nil
-          @encrypted_data_bag_secret = "/etc/chef/encrypted_data_bag_secret"
+          @encrypted_data_bag_secret = "/tmp/encrypted_data_bag_secret"
         end
 
         def validate(errors)