vagrant 0.9.1 → 0.9.2

data/CHANGELOG.md

@@ -1,3 +1,22 @@
+## 0.9.2 (January 20, 2012)
+
+  - Support shell expansions in shared folder guest paths again. [GH-656]
+  - Fix issue where Chef solo always expected the host to have a
+    "cookbooks" folder in their directory. [GH-638]
+  - Fix `forward_agent` not working when outside of blocks. [GH-651]
+  - Fix issue causing custom guest implementations to not load properly.
+  - Filter clear screen character out of output on SSH.
+  - Log output now goes on `stderr`, since it is utility information.
+  - Get rid of case where a `NoMethodError` could be raised while
+    determining VirtualBox version. [GH-658]
+  - Debian/Ubuntu uses `ifdown` again, instead of `ifconfig xxx down`, since
+    the behavior seems different/wrong.
+  - Give a nice error if `:vagrant` is used as a JSON key, since Vagrant
+    uses this. [GH-661]
+  - If there is only one bridgable interface, use that without asking
+    the user. [GH-655]
+  - The shell will have color output if ANSICON is installed on Windows. [GH-666]
+
 ## 0.9.1 (January 18, 2012)
 
   - Use `ifconfig device down` instead of `ifdown`. [GH-649]

data/bin/vagrant

@@ -19,7 +19,7 @@ opts = {}
 # Disable color if the proper argument was passed or if we're
 # on Windows since the default Windows terminal doesn't support
 # colors.
-if !$stdout.tty? || ARGV.include?("--no-color") || Vagrant::Util::Platform.windows?
+if ARGV.include?("--no-color") || !$stdout.tty? || !Vagrant::Util::Platform.terminal_supports_colors?
   # Delete the argument from the list so that it doesn't cause any
   # invalid arguments down the road.
   ARGV.delete("--no-color")

data/config/default.rb

@@ -11,6 +11,7 @@ Vagrant::Config.run do |config|
   config.ssh.timeout = 10
   config.ssh.forward_agent = false
   config.ssh.forward_x11 = false
+  config.ssh.shell = "bash"
 
   config.vm.auto_port_range = (2200..2250)
   config.vm.box_url = nil

data/lib/vagrant.rb

@@ -35,7 +35,7 @@ if ENV["VAGRANT_LOG"] && ENV["VAGRANT_LOG"] != ""
   # logs as long as we have a valid level.
   if level
     logger = Log4r::Logger.new("vagrant")
-    logger.outputters = Log4r::Outputter.stdout
+    logger.outputters = Log4r::Outputter.stderr
     logger.level = level
     logger = nil
   end

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

@@ -314,29 +314,40 @@ module Vagrant
         def bridged_adapter(config)
           bridgedifs = @env[:vm].driver.read_bridged_interfaces
 
-          # Output all the interfaces that are available as choices
-          @env[:ui].info I18n.t("vagrant.actions.vm.bridged_networking.available",
-                                :prefix => false)
-          bridgedifs.each_index do |index|
-            interface = bridgedifs[index]
-            @env[:ui].info("#{index + 1}) #{interface[:name]}", :prefix => false)
-          end
+          chosen_bridge = nil
+          if bridgedifs.length == 1
+            # One bridgable interface? Just use it.
+            chosen_bridge = bridgedifs[0][:name]
+          else
+            # More than one bridgable interface requires a user decision, so
+            # show options to choose from.
+            @env[:ui].info I18n.t("vagrant.actions.vm.bridged_networking.available",
+                                  :prefix => false)
+            bridgedifs.each_index do |index|
+              interface = bridgedifs[index]
+              @env[:ui].info("#{index + 1}) #{interface[:name]}", :prefix => false)
+            end
 
-          # The range of valid choices
-          valid = Range.new(1, bridgedifs.length)
+            # The range of valid choices
+            valid = Range.new(1, bridgedifs.length)
 
-          # The choice that the user has chosen as the bridging interface
-          choice = nil
-          while !valid.include?(choice)
-            choice = @env[:ui].ask("What interface should the network bridge to? ")
-            choice = choice.to_i
+            # The choice that the user has chosen as the bridging interface
+            choice = nil
+            while !valid.include?(choice)
+              choice = @env[:ui].ask("What interface should the network bridge to? ")
+              choice = choice.to_i
+            end
+
+            chosen_bridge = bridgedifs[choice - 1][:name]
           end
 
+          @logger.info("Bridging adapter #{config[:adapter]} to #{bridge}")
+
           # Given the choice we can now define the adapter we're using
           return {
             :adapter     => config[:adapter],
             :type        => :bridged,
-            :bridge      => bridgedifs[choice - 1][:name],
+            :bridge      => chosen_bridge,
             :mac_address => config[:mac]
           }
         end

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

@@ -66,7 +66,6 @@ module Vagrant
         def prepare_folders
           @folders = @folders.inject({}) do |acc, data|
             key, opts = data
-            opts[:nfs] = {} if !opts.is_a?(Hash)
             opts[:map_uid] = prepare_permission(:uid, opts)
             opts[:map_gid] = prepare_permission(:gid, opts)
 

data/lib/vagrant/communication/ssh.rb

@@ -71,6 +71,8 @@ module Vagrant
       end
 
       def upload(from, to)
+        @logger.debug("Uploading: #{from} to #{to}")
+
         # Do an SCP-based upload...
         connect do |connection|
           scp = Net::SCP.new(connection)
@@ -102,7 +104,7 @@ module Vagrant
           # If the @connection is still around, then it is valid,
           # and we use it.
           if @connection
-            @logger.info("Re-using SSH connection.")
+            @logger.debug("Re-using SSH connection.")
             return yield @connection if block_given?
             return
           end
@@ -148,13 +150,11 @@ module Vagrant
       rescue Errno::ECONNREFUSED
         # This is raised if we failed to connect the max amount of times
         raise Errors::SSHConnectionRefused
-      ensure
-        # Be sure the connection is always closed
-        # connection.close if connection && !connection.closed?
       end
 
       # Executes the command on an SSH connection within a login shell.
       def shell_execute(connection, command, sudo=false)
+        @logger.info("Execute: #{command} (sudo=#{sudo.inspect})")
         exit_status = nil
 
         # Determine the shell to execute. If we are using `sudo` then we
@@ -167,15 +167,26 @@ module Vagrant
           ch.exec(shell) do |ch2, _|
             # Setup the channel callbacks so we can get data and exit status
             ch2.on_data do |ch3, data|
-              yield :stdout, data if block_given?
+              if block_given?
+                # Filter out the clear screen command
+                data.gsub!("\e[H", "")
+                @logger.debug("stdout: #{data}")
+                yield :stdout, data
+              end
             end
 
             ch2.on_extended_data do |ch3, type, data|
-              yield :stderr, data if block_given?
+              if block_given?
+                # Filter out the clear screen command
+                data.gsub!("\e[H", "")
+                @logger.debug("stderr: #{data}")
+                yield :stderr, data
+              end
             end
 
             ch2.on_request("exit-status") do |ch3, data|
               exit_status = data.read_long
+              @logger.debug("Exit status: #{exit_status}")
             end
 
             # Set the terminal

data/lib/vagrant/config/base.rb

@@ -33,7 +33,12 @@ module Vagrant
       def merge(other)
         result = self.class.new
         instance_variables_hash.merge(other.instance_variables_hash).each do |key, value|
-          result.instance_variable_set("@#{key}".to_sym, value)
+          # Ignore keys that start with a double underscore. This allows
+          # configuration classes to still hold around internal state
+          # that isn't propagated.
+          if !key.start_with?("__")
+            result.instance_variable_set("@#{key}".to_sym, value)
+          end
         end
 
         result

data/lib/vagrant/config/ssh.rb

@@ -13,12 +13,6 @@ module Vagrant
       attr_accessor :forward_x11
       attr_accessor :shell
 
-      def initialize
-        @shell            = "bash"
-        @forward_agent    = false
-        @forward_x11      = false
-      end
-
       def forwarded_port_key=(value)
         raise Errors::DeprecationError, :message => <<-MESSAGE
 `config.ssh.forwarded_port_key` is now gone. You must now use

data/lib/vagrant/config/vm.rb

@@ -39,6 +39,14 @@ module Vagrant
         result
       end
 
+      def system=(value)
+        raise Errors::DeprecationError, :message => <<-MESSAGE
+`config.vm.system` has changed to `config.vm.guest` in Vagrant 0.9,
+since this is more clear about the use of the configuration key.
+Please change all references of `config.vm.system` to `config.vm.guest`.
+        MESSAGE
+      end
+
       def forward_port(guestport, hostport, options=nil)
         if !guestport.kind_of?(Integer)
           raise Errors::DeprecationError, :message => <<-MESSAGE

data/lib/vagrant/driver/virtualbox.rb

@@ -33,7 +33,7 @@ module Vagrant
         # Read and assign the version of VirtualBox we know which
         # specific driver to instantiate.
         begin
-          @version = read_version
+          @version = read_version || ""
         rescue Subprocess::LaunchError
           # This means that VirtualBox was not found, so we raise this
           # error here.
@@ -113,8 +113,13 @@ module Vagrant
         # * 4.1.8r1234_OSE
         # * 4.1.8_MacPortsr1234
         #
-        # Below accounts for all of these:
-        execute("--version").split("_")[0].split("r")[0]
+        # Below accounts for all of these.
+
+        # Note: We split this into multiple lines because apparently "".split("_")
+        # is [], so we have to check for an empty array in between.
+        parts = execute("--version").split("_")
+        return nil if parts.empty?
+        parts[0].split("r")[0]
       end
     end
   end

data/lib/vagrant/guest/debian.rb

@@ -38,7 +38,7 @@ module Vagrant
         # each specifically, we avoid reconfiguring eth0 (the NAT interface) so
         # SSH never dies.
         interfaces.each do |interface|
-          vm.channel.sudo("/sbin/ifconfig eth#{interface} down 2> /dev/null")
+          vm.channel.sudo("/sbin/ifdown eth#{interface} 2> /dev/null")
         end
 
         vm.channel.sudo("cat /tmp/vagrant-network-entry >> /etc/network/interfaces")

data/lib/vagrant/guest/linux.rb

@@ -1,9 +1,17 @@
+require 'log4r'
+
 require 'vagrant/guest/linux/error'
 require 'vagrant/guest/linux/config'
 
 module Vagrant
   module Guest
     class Linux < Base
+      def initialize(*args)
+        super
+
+        @logger = Log4r::Logger.new("vagrant::guest::linux")
+      end
+
       def distro_dispatch
         if @vm.channel.test("cat /etc/debian_version")
           return :debian if @vm.channel.test("cat /proc/version | grep 'Debian'")
@@ -20,32 +28,53 @@ module Vagrant
       end
 
       def halt
-        vm.channel.sudo("shutdown -h now")
+        @vm.channel.sudo("shutdown -h now")
 
         # Wait until the VM's state is actually powered off. If this doesn't
         # occur within a reasonable amount of time (15 seconds by default),
         # then simply return and allow Vagrant to kill the machine.
         count = 0
-        while vm.state != :poweroff
+        while @vm.state != :poweroff
           count += 1
 
-          return if count >= vm.config.linux.halt_timeout
-          sleep vm.config.linux.halt_check_interval
+          return if count >= @vm.config.linux.halt_timeout
+          sleep @vm.config.linux.halt_check_interval
         end
       end
 
       def mount_shared_folder(name, guestpath, options)
-        @vm.channel.sudo("mkdir -p #{guestpath}")
-        mount_folder(name, guestpath, options)
-        @vm.channel.sudo("chown `id -u #{options[:owner]}`:`id -g #{options[:group]}` #{guestpath}")
+        # Determine the real guest path. Since we use a `sudo` shell everywhere
+        # else, things like '~' don't expand properly in shared folders. We have
+        # to `echo` here to get that path.
+        real_guestpath = nil
+        @vm.channel.execute("echo #{guestpath}") do |type, data|
+          if type == :stdout
+            real_guestpath ||= ""
+            real_guestpath += data
+          end
+        end
+
+        if !real_guestpath
+          # Really strange error case if this happens. Let's throw an error,
+          # tell the user to check the echo output.
+          raise LinuxError, :_key => :guestpath_expand_fail
+        end
+
+        # Chomp off the newline if it exists
+        real_guestpath = real_guestpath.chomp
+        @logger.debug("Shell expanded guest path: #{real_guestpath}")
+
+        @vm.channel.sudo("mkdir -p #{real_guestpath}")
+        mount_folder(name, real_guestpath, options)
+        @vm.channel.sudo("chown `id -u #{options[:owner]}`:`id -g #{options[:group]}` #{real_guestpath}")
       end
 
       def mount_nfs(ip, folders)
         # TODO: Maybe check for nfs support on the guest, since its often
         # not installed by default
         folders.each do |name, opts|
-          vm.channel.sudo("mkdir -p #{opts[:guestpath]}")
-          vm.channel.sudo("mount #{ip}:'#{opts[:hostpath]}' #{opts[:guestpath]}",
+          @vm.channel.sudo("mkdir -p #{opts[:guestpath]}")
+          @vm.channel.sudo("mount #{ip}:'#{opts[:hostpath]}' #{opts[:guestpath]}",
                           :error_class => LinuxError,
                           :error_key => :mount_nfs_fail)
         end

data/lib/vagrant/provisioners/chef.rb

@@ -115,11 +115,11 @@ module Vagrant
         attr_accessor :attempts
         attr_writer :run_list
 
-        def initialize
-          @attempts = 1
-          @json = {}
-          @log_level = :info
-        end
+        # Provide defaults in such a way that they won't override the instance
+        # variable. This is so merging continues to work properly.
+        def attempts; @attempts || 1; end
+        def json; @json ||= {}; end
+        def log_level; @log_level || :info; end
 
         # This returns the json that is merged with the defaults and the
         # user set data.
@@ -147,6 +147,12 @@ module Vagrant
           run_list << name
         end
 
+        def validate(env, errors)
+          super
+
+          errors.add(I18n.t("vagrant.config.chef.vagrant_as_json_key")) if json.has_key?(:vagrant)
+        end
+
         def instance_variables_hash
           # Overridden so that the 'json' key could be removed, since its just
           # merged into the config anyways

data/lib/vagrant/provisioners/chef_client.rb

@@ -18,15 +18,13 @@ module Vagrant
         attr_accessor :encrypted_data_bag_secret_key_path
         attr_accessor :encrypted_data_bag_secret
 
-        def initialize
-          super
-
-          @validation_client_name = "chef-validator"
-          @client_key_path = "/etc/chef/client.pem"
-          @file_cache_path = "/srv/chef/file_store"
-          @file_backup_path = "/srv/chef/cache"
-          @encrypted_data_bag_secret = "/tmp/encrypted_data_bag_secret"
-        end
+        # Provide defaults in such a way that they won't override the instance
+        # variable. This is so merging continues to work properly.
+        def validation_client_name; @validation_client_name || "chef-validator"; end
+        def client_key_path; @client_key_path || "/etc/chef/client.pem"; end
+        def file_cache_path; @file_cache_path || "/srv/chef/file_store"; end
+        def file_backup_path; @file_backup_path || "/srv/chef/cache"; end
+        def encrypted_data_bag_secret; @encrypted_data_bag_secret || "/tmp/encrypted_data_bag_secret"; end
 
         def validate(env, errors)
           super

data/lib/vagrant/provisioners/chef_solo.rb

@@ -19,8 +19,24 @@ module Vagrant
         def initialize
           super
 
-          @cookbooks_path = ["cookbooks", [:vm, "cookbooks"]]
-          @nfs = false
+          @__default = ["cookbooks", [:vm, "cookbooks"]]
+        end
+
+        # Provide defaults in such a way that they won't override the instance
+        # variable. This is so merging continues to work properly.
+        def cookbooks_path
+          @cookbooks_path || _default_cookbook_path
+        end
+
+        # This stores a reference to the default cookbook path which is used
+        # later. Do not use this publicly. I apologize for not making it
+        # "protected" but it has to be called by Vagrant internals later.
+        def _default_cookbook_path
+          @__default
+        end
+
+        def nfs
+          @nfs || false
         end
 
         def validate(env, errors)
@@ -83,16 +99,27 @@ module Vagrant
         # path element which contains the folder location (:host or :vm)
         paths = [paths] if paths.is_a?(String) || paths.first.is_a?(Symbol)
 
-        paths.map do |path|
+        results = []
+        paths.each do |path|
           path = [:host, path] if !path.is_a?(Array)
           type, path = path
 
           # Create the local/remote path based on whether this is a host
           # or VM path.
           local_path = nil
-          local_path = File.expand_path(path, env[:root_path]) if type == :host
           remote_path = nil
           if type == :host
+            # Get the expanded path that the host path points to
+            local_path = File.expand_path(path, env[:root_path])
+
+            # Super hacky but if we're expanded the default cookbook paths,
+            # and one of the host paths doesn't exist, then just ignore it,
+            # because that is fine.
+            if paths.equal?(config._default_cookbook_path) && !File.directory?(local_path)
+              @logger.info("'cookbooks' folder doesn't exist on defaults. Ignoring.")
+              next
+            end
+
             # Path exists on the host, setup the remote path
             remote_path = "#{config.provisioning_path}/chef-solo-#{get_and_update_counter(:cookbooks_path)}"
           else
@@ -110,9 +137,11 @@ module Vagrant
           # If we have specified a folder name to append then append it
           remote_path += "/#{appended_folder}" if appended_folder
 
-          # Return the result
-          [type, local_path, remote_path]
+          # Append the result
+          results << [type, local_path, remote_path]
         end
+
+        results
       end
 
       # Shares the given folders with the given prefix. The folders should

data/lib/vagrant/util/platform.rb

@@ -44,6 +44,16 @@ module Vagrant
           !bit64?
         end
 
+        # Returns a boolean noting whether the terminal supports color.
+        # output.
+        def terminal_supports_colors?
+          if windows?
+            return ENV.has_key?("ANSICON")
+          end
+
+          true
+        end
+
         def tar_file_options
           # create, write only, fail if the file exists, binary if windows
           File::WRONLY | File::EXCL | File::CREAT | (windows? ? File::BINARY : 0)

data/lib/vagrant/util/subprocess.rb

@@ -69,7 +69,7 @@ module Vagrant
         stderr_writer.close
 
         # Create a dictionary to store all the output we see.
-        io_data = { stdout => "", stderr => "" }
+        io_data = { :stdout => "", :stderr => "" }
 
         # Record the start time for timeout purposes
         start_time = Time.now.to_i
@@ -94,7 +94,7 @@ module Vagrant
               io_name = r == stdout ? :stdout : :stderr
               @logger.debug("#{io_name}: #{data}")
 
-              io_data[r] += data
+              io_data[io_name] += data
               yield io_name, data if block_given?
             end
           end
@@ -133,15 +133,15 @@ module Vagrant
 
           # Log it out and accumulate
           @logger.debug(extra_data)
-          io_data[io] += extra_data
+          io_name = io == stdout ? :stdout : :stderr
+          io_data[io_name] += extra_data
 
           # Yield to any listeners any remaining data
-          io_name = io == stdout ? :stdout : :stderr
           yield io_name, extra_data if block_given?
         end
 
         # Return an exit status container
-        return Result.new(process.exit_code, io_data[stdout], io_data[stderr])
+        return Result.new(process.exit_code, io_data[:stdout], io_data[:stderr])
       end
 
       protected

data/lib/vagrant/version.rb

@@ -2,5 +2,5 @@ module Vagrant
   # This will always be up to date with the current version of Vagrant,
   # since it is used to generate the gemspec and is also the source of
   # the version for `vagrant -v`
-  VERSION = "0.9.1"
+  VERSION = "0.9.2"
 end

data/lib/vagrant/vm.rb

@@ -49,7 +49,7 @@ module Vagrant
       @logger.info("Loading guest: #{guest}")
 
       if guest.is_a?(Class)
-        raise Errors::VMGuestError, :_key => :invalid_class, :system => guest.to_s if !(guest <= Systems::Base)
+        raise Errors::VMGuestError, :_key => :invalid_class, :system => guest.to_s if !(guest <= Guest::Base)
         @guest = guest.new(self)
       elsif guest.is_a?(Symbol)
         guest_klass = Vagrant.guests.get(guest)

data/templates/locales/en.yml

@@ -188,9 +188,11 @@ en:
       common:
         error_empty: "`%{field}` must be filled in."
       chef:
-        run_list_empty: "Run list must not be empty."
         cookbooks_path_empty: "Must specify a cookbooks path for chef solo."
+        run_list_empty: "Run list must not be empty."
         server_url_empty: "Chef server URL must be populated."
+        vagrant_as_json_key: |-
+          `vagrant` cannot be a JSON key, because it is used by Vagrant already.
         validation_key_path: "Validation key path must be valid path to your chef server validation key."
       ssh:
         private_key_missing: "`private_key_path` file must exist: %{path}"
@@ -667,6 +669,11 @@ en:
           back the logic necessary to set this up. Please report a bug as well as the
           box you're using.
       linux:
+        guestpath_expand_fail: |-
+          Vagrant failed to determine the shell expansion of the guest path
+          for one of your shared folders. This is an extremely rare error case
+          and most likely indicates an unusual configuration of the guest system.
+          Please report a bug with your Vagrantfile.
         mount_fail: "Failed to mount shared folders. `vboxsf` was not available."
         mount_nfs_fail: |-
           Mounting NFS shared folders failed. This is most often caused by the NFS

data/test/acceptance/shared_folders_test.rb

@@ -0,0 +1,84 @@
+require File.expand_path("../base", __FILE__)
+require "acceptance/support/shared/command_examples"
+
+describe "vagrant shared folders" do
+  include_context "acceptance"
+
+  # This creates an initial environment that is ready for a "vagrant up"
+  def initialize_valid_environment
+    require_box("default")
+
+    assert_execute("vagrant", "box", "add", "base", box_path("default"))
+    assert_execute("vagrant", "init")
+  end
+
+  it "should have a '/vagrant' shared folder" do
+    initialize_valid_environment
+
+    # This is the file that will be created from the VM,
+    # but should then exist on the host machine
+    foofile = environment.workdir.join("foo")
+
+    assert_execute("vagrant", "up")
+    foofile.exist?.should_not be,
+        "'foo' should not exist yet."
+
+    assert_execute("vagrant", "ssh", "-c", "touch /vagrant/foo")
+    foofile.exist?.should be, "'foo' should exist since it was touched in the shared folder"
+  end
+
+  it "should create a shared folder if the :create flag is set" do
+    initialize_valid_environment
+
+    # Setup the custom Vagrantfile
+    environment.workdir.join("Vagrantfile").open("w+") do |f|
+      f.write(<<-VF)
+Vagrant::Config.run do |config|
+  config.vm.box = "base"
+  config.vm.share_folder "v-root", "/vagrant", "./data", :create => true
+end
+VF
+    end
+
+    data_dir = environment.workdir.join("data")
+
+    # Verify the directory doesn't exist prior, for sanity
+    data_dir.exist?.should_not be
+
+    # Bring up the VM
+    assert_execute("vagrant", "up")
+
+    # Verify the directory exists
+    data_dir.should be_directory
+
+    # Touch a file and verify it is shared
+    assert_execute("vagrant", "ssh", "-c", "touch /vagrant/foo")
+    data_dir.join("foo").exist?.should be
+  end
+
+  it "should properly shell expand relative directories on the guest" do
+    initialize_valid_environment
+
+    # Setup the custom Vagrantfile
+    environment.workdir.join("Vagrantfile").open("w+") do |f|
+      f.write(<<-VF)
+Vagrant::Config.run do |config|
+  config.vm.box = "base"
+  config.vm.share_folder "v-root", "~/data", "."
+end
+VF
+    end
+
+    # Sanity
+    foo_file = environment.workdir.join("foo")
+    foo_file.exist?.should_not be
+
+    # Bring up the VM
+    assert_execute("vagrant", "up")
+
+    # Touch a file in the shared folder we expect and verify
+    # it is shared.
+    assert_execute("vagrant", "ssh", "-c", "touch ~/data/foo")
+    foo_file.exist?.should be
+  end
+end

data/test/acceptance/up_basic_test.rb

@@ -30,48 +30,4 @@ describe "vagrant up", "basics" do
     foodir.mkdir
     assert_execute("vagrant", "up", :chdir => foodir.to_s)
   end
-
-  it "should have a '/vagrant' shared folder" do
-    initialize_valid_environment
-
-    # This is the file that will be created from the VM,
-    # but should then exist on the host machine
-    foofile = environment.workdir.join("foo")
-
-    assert_execute("vagrant", "up")
-    foofile.exist?.should_not be,
-        "'foo' should not exist yet."
-
-    assert_execute("vagrant", "ssh", "-c", "touch /vagrant/foo")
-    foofile.exist?.should be, "'foo' should exist since it was touched in the shared folder"
-  end
-
-  it "should create a shared folder if the :create flag is set" do
-    initialize_valid_environment
-
-    # Setup the custom Vagrantfile
-    environment.workdir.join("Vagrantfile").open("w+") do |f|
-      f.write(<<-VF)
-Vagrant::Config.run do |config|
-  config.vm.box = "base"
-  config.vm.share_folder "v-root", "/vagrant", "./data", :create => true
-end
-VF
-    end
-
-    data_dir = environment.workdir.join("data")
-
-    # Verify the directory doesn't exist prior, for sanity
-    data_dir.exist?.should_not be
-
-    # Bring up the VM
-    assert_execute("vagrant", "up")
-
-    # Verify the directory exists
-    data_dir.should be_directory
-
-    # Touch a file and verify it is shared
-    assert_execute("vagrant", "ssh", "-c", "touch /vagrant/foo")
-    data_dir.join("foo").exist?.should be
-  end
 end

data/test/unit/vagrant/config/base_test.rb

@@ -22,4 +22,26 @@ describe Vagrant::Config::Base do
     result.one.should == 2
     result.two.should == 5
   end
+
+  it "doesn't merge values that start with a double underscore" do
+    bar_class = Class.new(foo_class) do
+      @@counter = 0
+      def initialize
+        @__test = @@counter
+        @@counter += 1
+      end
+    end
+
+    one = bar_class.new
+    one.one = 2
+    one.two = 1
+
+    two = bar_class.new
+    two.two = 5
+
+    # Verify the counters
+    one.instance_variable_get(:@__test).should == 0
+    two.instance_variable_get(:@__test).should == 1
+    one.merge(two).instance_variable_get(:@__test).should == 2
+  end
 end

data/test/unit/vagrant/config/ssh_test.rb

@@ -0,0 +1,17 @@
+require File.expand_path("../../../base", __FILE__)
+
+describe Vagrant::Config::SSHConfig do
+  include_context "unit"
+
+  [:forward_agent, :forward_x11].each do |bool_setting|
+    it "merges boolean #{bool_setting} properly" do
+      a = described_class.new
+      a.send("#{bool_setting}=", true)
+
+      b = described_class.new
+
+      c = a.merge(b)
+      c.send(bool_setting).should be
+    end
+  end
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: vagrant
 version: !ruby/object:Gem::Version 
-  hash: 57
+  hash: 63
   prerelease: 
   segments: 
   - 0
   - 9
-  - 1
-  version: 0.9.1
+  - 2
+  version: 0.9.2
 platform: ruby
 authors: 
 - Mitchell Hashimoto
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-01-18 00:00:00 Z
+date: 2012-01-20 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   version_requirements: &id001 !ruby/object:Gem::Requirement 
@@ -456,6 +456,7 @@ files:
 - test/acceptance/provisioning/chef_solo_test.rb
 - test/acceptance/provisioning/shell_test.rb
 - test/acceptance/resume_test.rb
+- test/acceptance/shared_folders_test.rb
 - test/acceptance/skeletons/chef_solo_basic/README.md
 - test/acceptance/skeletons/chef_solo_basic/cookbooks/basic/recipes/default.rb
 - test/acceptance/skeletons/chef_solo_json/README.md
@@ -557,6 +558,7 @@ files:
 - test/unit/vagrant/command/base_test.rb
 - test/unit/vagrant/config/base_test.rb
 - test/unit/vagrant/config/loader_test.rb
+- test/unit/vagrant/config/ssh_test.rb
 - test/unit/vagrant/config/top_test.rb
 - test/unit/vagrant/config/vm_test.rb
 - test/unit/vagrant/config_test.rb