vagrant 1.0.1 → 1.0.2

data/CHANGELOG.md

@@ -1,5 +1,31 @@
+## 1.0.2 (March 25, 2012)
+
+  - Provisioners will still mount folders and such if `--no-provision` is
+    used, so that `vagrant provision` works. [GH-803]
+  - Nicer error message if an unsupported SSH key type is used. [GH-805]
+  - Gentoo guests can now have their host names changed. [GH-796]
+  - Relative paths can be used for the `config.ssh.private_key_path`
+    setting. [GH-808]
+  - `vagrant ssh` now works on Solaris, where `IdentitiesOnly` was not
+    an available option. [GH-820]
+  - Output works properly in the face of broken pipes. [GH-819]
+  - Enable Host IO Cache on the SATA controller by default.
+  - Chef-solo provisioner now supports encrypted data bags. [GH-816]
+  - Enable the NAT DNS proxy by default, allowing your DNS to continue
+    working when you switch networks. [GH-834]
+  - Checking for port forwarding collisions also checks for other applications
+    that are potentially listening on that port as well. [GH-821]
+  - Multiple VM names can be specified for the various commands now. For
+    example: `vagrant up web db service`. [GH-795]
+  - More robust error handling if a VM fails to boot. The error message
+    is much clearer now. [GH-825]
+
 ## 1.0.1 (March 11, 2012)
 
+  - Installers are now bundled with Ruby 1.9.3p125. Previously they were
+    bundled with 1.9.3p0. This actually fixes some IO issues with Windows.
+  - Windows installer now outputs a `vagrant` binary that will work in msys
+    or Cygwin environments.
   - Fix crashing issue which manifested itself in multi-VM environments.
   - Add missing `rubygems` require in `environment.rb` to avoid
     possible load errors. [GH-781]

data/bin/vagrant

@@ -39,8 +39,8 @@ begin
   logger.debug("Loading environment")
   env.load!
 
-  # Execute the CLI interface
-  env.cli(ARGV)
+  # Execute the CLI interface, and exit with the proper error code
+  exit(env.cli(ARGV))
 rescue Vagrant::Errors::VagrantError => e
   logger.error("Vagrant experienced an error! Details:")
   logger.error(e.inspect)

data/lib/vagrant/action.rb

@@ -54,6 +54,7 @@ module Vagrant
       autoload :ProvisionerCleanup,  'vagrant/action/vm/provisioner_cleanup'
       autoload :PruneNFSExports,     'vagrant/action/vm/prune_nfs_exports'
       autoload :Resume,              'vagrant/action/vm/resume'
+      autoload :SaneDefaults,        'vagrant/action/vm/sane_defaults'
       autoload :ShareFolders,        'vagrant/action/vm/share_folders'
       autoload :SetupPackageFiles,   'vagrant/action/vm/setup_package_files'
       autoload :Suspend,             'vagrant/action/vm/suspend'

data/lib/vagrant/action/builtin.rb

@@ -46,6 +46,7 @@ module Vagrant
             use VM::HostName
             use VM::ClearNetworkInterfaces
             use VM::Network
+            use VM::SaneDefaults
             use VM::Customize
             use VM::Boot
           end

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

@@ -35,6 +35,11 @@ module Vagrant
             # get shown
             return true if @env[:interrupted]
 
+            # If the VM is not starting or running, something went wrong
+            # and we need to show a useful error.
+            state = @env[:vm].state
+            raise Errors::VMFailedToRun if state != :starting && state != :running
+
             sleep 2 if !@env["vagrant.test"]
           end
 

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

@@ -1,9 +1,13 @@
+require "vagrant/util/is_port_open"
+
 module Vagrant
   module Action
     module VM
       # Action that checks to make sure there are no forwarded port collisions,
       # and raises an exception if there is.
       class CheckPortCollisions
+        include Util::IsPortOpen
+
         def initialize(app, env)
           @app = app
         end
@@ -29,7 +33,7 @@ module Vagrant
             hostport = options[:hostport].to_i
             hostport = current[options[:name]] if current.has_key?(options[:name])
 
-            if existing.include?(hostport)
+            if existing.include?(hostport) || is_port_open?("localhost", hostport)
               # We have a collision! Handle it
               send("handle_#{handler}".to_sym, options, existing)
             end

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

@@ -19,12 +19,10 @@ module Vagrant
           # We set this here so that even if this value is changed in the future,
           # it stays constant to what we expect here in this moment.
           enabled = env["provision.enabled"]
-          if enabled
-            # Instantiate and prepare the provisioners. Preparation must happen here
-            # so that shared folders and such can properly take effect.
-            provisioners = enabled_provisioners
-            provisioners.map { |p| p.prepare }
-          end
+          # Instantiate and prepare the provisioners. Preparation must happen here
+          # so that shared folders and such can properly take effect.
+          provisioners = enabled_provisioners
+          provisioners.map { |p| p.prepare }
 
           @app.call(env)
 

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

@@ -0,0 +1,57 @@
+require "log4r"
+
+module Vagrant
+  module Action
+    module VM
+      # This middleware enforces some sane defaults on the virtualbox
+      # VM which help with performance, stability, and in some cases
+      # behavior.
+      class SaneDefaults
+        def initialize(app, env)
+          @logger = Log4r::Logger.new("vagrant::action::vm::sanedefaults")
+          @app = app
+        end
+
+        def call(env)
+          # Set the env on an instance variable so we can access it in
+          # helpers.
+          @env = env
+
+          # Enable the host IO cache on the sata controller. Note that
+          # if this fails then its not a big deal, so we don't raise any
+          # errors. The Host IO cache vastly improves disk IO performance
+          # for VMs.
+          command = [
+            "storagectl", env[:vm].uuid,
+            "--name", "SATA Controller",
+            "--hostiocache", "on"
+          ]
+          attempt_and_log(command, "Enabling the Host I/O cache on the SATA controller...")
+
+          # Enable the DNS proxy while in NAT mode.  This shields the guest
+          # VM from external DNS changs on the host machine.
+          command = [
+            "modifyvm", env[:vm].uuid,
+            "--natdnsproxy1", "on"
+          ]
+          attempt_and_log(command, "Enable the NAT DNS proxy on adapter 1...")
+
+          @app.call(env)
+        end
+
+        protected
+
+        # This is just a helper method that executes a single command, logs
+        # the given string to the log, and also includes the exit status in
+        # the log message.
+        #
+        # @param [Array] command Command to run
+        # @param [String] log Log message to write.
+        def attempt_and_log(command, log)
+          result = @env[:vm].driver.execute_command(command)
+          @logger.info("#{log} (exit status = #{result.exit_code})")
+        end
+      end
+    end
+  end
+end

data/lib/vagrant/cli.rb

@@ -21,21 +21,27 @@ module Vagrant
                             :version => Vagrant::VERSION),
                      :prefix => false)
 
-        return
+        return 0
       elsif @main_args.include?("-h") || @main_args.include?("--help")
         # Help is next in short-circuiting everything. Print
         # the help and exit.
-        return help
+        help
+        return 0
       end
 
       # If we reached this far then we must have a subcommand. If not,
       # then we also just print the help and exit.
       command_class = Vagrant.commands.get(@sub_command.to_sym) if @sub_command
-      return help if !command_class || !@sub_command
+      if !command_class || !@sub_command
+        help
+        return 0
+      end
       @logger.debug("Invoking command class: #{command_class} #{@sub_args.inspect}")
 
-      # Initialize and execute the command class.
-      command_class.new(@sub_args, @env).execute
+      # Initialize and execute the command class, returning the exit status.
+      result = command_class.new(@sub_args, @env).execute
+      result = 0 if !result.is_a?(Fixnum)
+      return result
     end
 
     # This prints out the help for the CLI.

data/lib/vagrant/command/base.rb

@@ -1,5 +1,7 @@
 require 'log4r'
 
+require "vagrant/util/safe_puts"
+
 module Vagrant
   module Command
     # Base class for any CLI commands.
@@ -7,6 +9,8 @@ module Vagrant
     # This class provides documentation on the interface as well as helper
     # functions that a command has.
     class Base
+      include Util::SafePuts
+
       def initialize(argv, env)
         @argv = argv
         @env  = env
@@ -41,7 +45,7 @@ module Vagrant
 
         # Add the help option, which must be on every command.
         opts.on_tail("-h", "--help", "Print this help") do
-          puts opts.help
+          safe_puts(opts.help)
           return nil
         end
 
@@ -60,32 +64,38 @@ module Vagrant
       # @param [String] name The name of the VM. Nil if every VM.
       # @param [Boolean] single_target If true, then an exception will be
       #   raised if more than one target is found.
-      def with_target_vms(name=nil, options=nil)
+      def with_target_vms(names=nil, options=nil)
         # Using VMs requires a Vagrant environment to be properly setup
         raise Errors::NoEnvironmentError if !@env.root_path
 
         # Setup the options hash
         options ||= {}
 
+        # Require that names be an array
+        names ||= []
+        names = [names] if !names.is_a?(Array)
+
         # First determine the proper array of VMs.
         vms = []
-        if name
-          raise Errors::MultiVMEnvironmentRequired if !@env.multivm?
-
-          if name =~ /^\/(.+?)\/$/
-            # This is a regular expression name, so we convert to a regular
-            # expression and allow that sort of matching.
-            regex = Regexp.new($1.to_s)
-
-            @env.vms.each do |name, vm|
-              vms << vm if name =~ regex
+        if names.length > 0
+          names.each do |name|
+            raise Errors::MultiVMEnvironmentRequired if !@env.multivm?
+
+            if name =~ /^\/(.+?)\/$/
+              # This is a regular expression name, so we convert to a regular
+              # expression and allow that sort of matching.
+              regex = Regexp.new($1.to_s)
+
+              @env.vms.each do |name, vm|
+                vms << vm if name =~ regex
+              end
+
+              raise Errors::VMNoMatchError if vms.empty?
+            else
+              # String name, just look for a specific VM
+              vms << @env.vms[name.to_sym]
+              raise Errors::VMNotFoundError, :name => name if !vms[0]
             end
-
-            raise Errors::VMNoMatchError if vms.empty?
-          else
-            # String name, just look for a specific VM
-            vms << @env.vms[name.to_sym]
-            raise Errors::VMNotFoundError, :name => name if !vms[0]
           end
         else
           vms = @env.vms_ordered

data/lib/vagrant/command/box_add.rb

@@ -28,6 +28,9 @@ module Vagrant
         end
 
         @env.boxes.add(argv[0], argv[1])
+
+        # Success, exit status 0
+        0
       end
     end
   end

data/lib/vagrant/command/box_list.rb

@@ -19,7 +19,10 @@ module Vagrant
           return @env.ui.warn(I18n.t("vagrant.commands.box.no_installed_boxes"), :prefix => false)
         end
         boxes.each { |b| @env.ui.info(b.name, :prefix => false) }
-      end
+
+        # Success, exit status 0
+        0
+       end
     end
   end
 end

data/lib/vagrant/command/box_remove.rb

@@ -18,7 +18,10 @@ module Vagrant
         b = @env.boxes.find(argv[0])
         raise Errors::BoxNotFound, :name => argv[0] if !b
         b.destroy
-      end
+
+        # Success, exit status 0
+        0
+       end
     end
   end
 end

data/lib/vagrant/command/box_repackage.rb

@@ -18,7 +18,10 @@ module Vagrant
         b = @env.boxes.find(argv[0])
         raise Errors::BoxNotFound, :name => argv[0] if !b
         b.repackage
-      end
+
+        # Success, exit status 0
+        0
+       end
     end
   end
 end

data/lib/vagrant/command/destroy.rb

@@ -20,7 +20,7 @@ module Vagrant
         return if !argv
 
         @logger.debug("'Destroy' each target VM...")
-        with_target_vms(argv[0], :reverse => true) do |vm|
+        with_target_vms(argv, :reverse => true) do |vm|
           if vm.created?
             # Boolean whether we should actually go through with the destroy
             # or not. This is true only if the "--force" flag is set or if the
@@ -55,7 +55,10 @@ module Vagrant
             vm.ui.info I18n.t("vagrant.commands.common.vm_not_created")
           end
         end
-      end
+
+        # Success, exit status 0
+        0
+       end
     end
   end
 end

data/lib/vagrant/command/gem.rb

@@ -1,9 +1,13 @@
 require "rubygems"
 require "rubygems/gem_runner"
 
+require "vagrant/util/safe_puts"
+
 module Vagrant
   module Command
     class Gem < Base
+      include Util::SafePuts
+
       def execute
         # Bundler sets up its own custom gem load paths such that our
         # own gems are never loaded. Therefore, give an error if a user
@@ -20,7 +24,7 @@ module Vagrant
         if @argv.empty? || @argv.include?("-h") || @argv.include?("--help")
           @env.ui.info(I18n.t("vagrant.commands.gem.help_preamble"),
                        :prefix => false)
-          puts
+          safe_puts
         end
 
         # We just proxy the arguments onto a real RubyGems command

data/lib/vagrant/command/halt.rb

@@ -21,7 +21,7 @@ module Vagrant
         return if !argv
 
         @logger.debug("Halt command: #{argv.inspect} #{options.inspect}")
-        with_target_vms(argv[0]) do |vm|
+        with_target_vms(argv) do |vm|
           if vm.created?
             @logger.info("Halting #{vm.name}")
             vm.halt(:force => options[:force])
@@ -30,7 +30,10 @@ module Vagrant
             vm.ui.info I18n.t("vagrant.commands.common.vm_not_created")
           end
         end
-      end
+
+        # Success, exit status 0
+        0
+       end
     end
   end
 end

data/lib/vagrant/command/init.rb

@@ -31,7 +31,10 @@ module Vagrant
 
         @env.ui.info(I18n.t("vagrant.commands.init.success"),
                      :prefix => false)
-      end
+
+        # Success, exit status 0
+        0
+       end
     end
   end
 end

data/lib/vagrant/command/package.rb

@@ -39,7 +39,10 @@ module Vagrant
         else
           package_target(argv[0], options)
         end
-      end
+
+        # Success, exit status 0
+        0
+       end
 
       protected
 

data/lib/vagrant/command/provision.rb

@@ -16,7 +16,8 @@ module Vagrant
 
         # Go over each VM and provision!
         @logger.debug("'provision' each target VM...")
-        with_target_vms(argv[0]) do |vm|
+        with_target_vms(argv) do |vm|
+          
           if vm.created?
             if vm.state == :running
               @logger.info("Provisioning: #{vm.name}")
@@ -30,7 +31,10 @@ module Vagrant
             vm.ui.info I18n.t("vagrant.commands.common.vm_not_created")
           end
         end
-      end
+
+        # Success, exit status 0
+        0
+       end
     end
   end
 end

data/lib/vagrant/command/reload.rb

@@ -9,7 +9,8 @@ module Vagrant
 
       def execute
         options = {}
-        opts = OptionParser.new do |opts|
+
+          opts = OptionParser.new do |opts|
           opts.banner = "Usage: vagrant reload [vm-name]"
           opts.separator ""
           build_start_options(opts, options)
@@ -20,7 +21,7 @@ module Vagrant
         return if !argv
 
         @logger.debug("'reload' each target VM...")
-        with_target_vms(argv[0]) do |vm|
+        with_target_vms(argv) do |vm|
           if vm.created?
             @logger.info("Reloading: #{vm.name}")
             vm.reload(options)
@@ -29,7 +30,10 @@ module Vagrant
             vm.ui.info I18n.t("vagrant.commands.common.vm_not_created")
           end
         end
-      end
+
+        # Success, exit status 0
+        0
+       end
     end
   end
 end

data/lib/vagrant/command/resume.rb

@@ -15,7 +15,7 @@ module Vagrant
         return if !argv
 
         @logger.debug("'resume' each target VM...")
-        with_target_vms(argv[0]) do |vm|
+        with_target_vms(argv) do |vm|
           if vm.created?
             @logger.info("Resume: #{vm.name}")
             vm.resume
@@ -24,7 +24,10 @@ module Vagrant
             vm.ui.info I18n.t("vagrant.commands.common.vm_not_created")
           end
         end
-      end
+
+        # Success, exit status 0
+        0
+       end
     end
   end
 end

data/lib/vagrant/command/ssh.rb

@@ -36,7 +36,7 @@ module Vagrant
         argv = [] if argv == ssh_args
 
         # Execute the actual SSH
-        with_target_vms(argv[0], :single_target => true) do |vm|
+        with_target_vms(argv, :single_target => true) do |vm|
           # Basic checks that are required for proper SSH
           raise Errors::VMNotCreatedError if !vm.created?
           raise Errors::VMInaccessible if !vm.state == :inaccessible
@@ -53,7 +53,10 @@ module Vagrant
             ssh_connect(vm, opts)
           end
         end
-      end
+
+        # Success, exit status 0
+        0
+       end
 
       protected
 

data/lib/vagrant/command/ssh_config.rb

@@ -1,8 +1,12 @@
 require 'optparse'
 
+require "vagrant/util/safe_puts"
+
 module Vagrant
   module Command
     class SSHConfig < Base
+      include Util::SafePuts
+
       def execute
         options = {}
 
@@ -19,7 +23,7 @@ module Vagrant
         argv = parse_options(opts)
         return if !argv
 
-        with_target_vms(argv[0], :single_target => true) do |vm|
+        with_target_vms(argv, :single_target => true) do |vm|
           raise Errors::VMNotCreatedError if !vm.created?
           raise Errors::VMInaccessible if !vm.state == :inaccessible
 
@@ -36,9 +40,12 @@ module Vagrant
 
           # Render the template and output directly to STDOUT
           template = "commands/ssh_config/config"
-          $stdout.puts(Util::TemplateRenderer.render(template, variables))
+          safe_puts(Util::TemplateRenderer.render(template, variables))
         end
-      end
+
+        # Success, exit status 0
+        0
+       end
     end
   end
 end

data/lib/vagrant/command/status.rb

@@ -16,7 +16,7 @@ module Vagrant
 
         state = nil
         results = []
-        with_target_vms(argv[0]) do |vm|
+        with_target_vms(argv) do |vm|
           state = vm.state.to_s if !state
           results << "#{vm.name.to_s.ljust(25)}#{vm.state.to_s.gsub("_", " ")}"
         end
@@ -27,7 +27,10 @@ module Vagrant
                             :states => results.join("\n"),
                             :message => I18n.t("vagrant.commands.status.#{state}")),
                      :prefix => false)
-      end
+
+        # Success, exit status 0
+        0
+       end
     end
   end
 end

data/lib/vagrant/command/suspend.rb

@@ -15,7 +15,7 @@ module Vagrant
         return if !argv
 
         @logger.debug("'suspend' each target VM...")
-        with_target_vms(argv[0]) do |vm|
+        with_target_vms(argv) do |vm|
           if vm.created?
             @logger.info("Suspending: #{vm.name}")
             vm.suspend
@@ -24,7 +24,10 @@ module Vagrant
             vm.ui.info I18n.t("vagrant.commands.common.vm_not_created")
           end
         end
-      end
+
+        # Success, exit status 0
+        0
+       end
     end
   end
 end

data/lib/vagrant/command/up.rb

@@ -21,7 +21,7 @@ module Vagrant
 
         # Go over each VM and bring it up
         @logger.debug("'Up' each target VM...")
-        with_target_vms(argv[0]) do |vm|
+        with_target_vms(argv) do |vm|
           if vm.created?
             @logger.info("Booting: #{vm.name}")
             vm.ui.info I18n.t("vagrant.commands.up.vm_created")
@@ -31,7 +31,10 @@ module Vagrant
             vm.up(options)
           end
         end
-      end
+
+        # Success, exit status 0
+        0
+       end
     end
   end
 end

data/lib/vagrant/communication/ssh.rb

@@ -129,10 +129,24 @@ module Vagrant
         @vm.ssh.check_key_permissions(ssh_info[:private_key_path])
 
         # Connect to SSH, giving it a few tries
-        @logger.info("Connecting to SSH: #{ssh_info[:host]}:#{ssh_info[:port]}")
-        exceptions = [Errno::ECONNREFUSED, Net::SSH::Disconnect]
-        connection = retryable(:tries => @vm.config.ssh.max_tries, :on => exceptions) do
-          Net::SSH.start(ssh_info[:host], ssh_info[:username], opts)
+        connection = nil
+        begin
+          @logger.info("Connecting to SSH: #{ssh_info[:host]}:#{ssh_info[:port]}")
+          exceptions = [Errno::ECONNREFUSED, Net::SSH::Disconnect]
+          connection = retryable(:tries => @vm.config.ssh.max_tries, :on => exceptions) do
+            Net::SSH.start(ssh_info[:host], ssh_info[:username], opts)
+          end
+        rescue Net::SSH::AuthenticationFailed
+          # This happens if authentication failed. We wrap the error in our
+          # own exception.
+          raise Errors::SSHAuthenticationFailed
+        rescue Errno::ECONNREFUSED
+          # This is raised if we failed to connect the max amount of times
+          raise Errors::SSHConnectionRefused
+        rescue NotImplementedError
+          # This is raised if a private key type that Net-SSH doesn't support
+          # is used. Show a nicer error.
+          raise Errors::SSHKeyTypeNotSupported
         end
 
         @connection = connection
@@ -145,14 +159,7 @@ module Vagrant
         # Yield the connection that is ready to be used and
         # return the value of the block
         return yield connection if block_given?
-      rescue Net::SSH::AuthenticationFailed
-        # This happens if authentication failed. We wrap the error in our
-        # own exception.
-        raise Errors::SSHAuthenticationFailed
-      rescue Errno::ECONNREFUSED
-        # This is raised if we failed to connect the max amount of times
-        raise Errors::SSHConnectionRefused
-      end
+     end
 
       # Executes the command on an SSH connection within a login shell.
       def shell_execute(connection, command, sudo=false)

data/lib/vagrant/config/ssh.rb

@@ -18,7 +18,7 @@ module Vagrant
           errors.add(I18n.t("vagrant.config.common.error_empty", :field => field)) if !instance_variable_get("@#{field}".to_sym)
         end
 
-        if private_key_path && !File.file?(private_key_path)
+        if private_key_path && !File.file?(File.expand_path(private_key_path, env.root_path))
           errors.add(I18n.t("vagrant.config.ssh.private_key_missing", :path => private_key_path))
         end
       end

data/lib/vagrant/errors.rb

@@ -318,6 +318,11 @@ module Vagrant
       error_key(:ssh_key_bad_permissions)
     end
 
+    class SSHKeyTypeNotSupported < VagrantError
+      status_code(76)
+      error_key(:ssh_key_type_not_supported)
+    end
+
     class SSHPortNotDetected < VagrantError
       status_code(50)
       error_key(:ssh_port_not_detected)
@@ -388,6 +393,11 @@ module Vagrant
       error_key(:failed_to_boot, "vagrant.actions.vm.boot")
     end
 
+    class VMFailedToRun < VagrantError
+      status_code(77)
+      error_key(:failed_to_run, "vagrant.actions.vm.boot")
+    end
+
     class VMGuestError < VagrantError
       status_code(39)
       error_namespace("vagrant.errors.guest")

data/lib/vagrant/guest/gentoo.rb

@@ -33,6 +33,14 @@ module Vagrant
           vm.channel.sudo("/etc/init.d/net.eth#{network[:interface]} start")
         end
       end
+
+      def change_host_name(name)
+        if !vm.channel.test("sudo hostname --fqdn | grep '#{name}'")
+          vm.channel.sudo("echo 'hostname=#{name.split('.')[0]}' > /etc/conf.d/hostname")
+          vm.channel.sudo("sed -i 's@^\\(127[.]0[.]1[.]1[[:space:]]\\+\\)@\\1#{name} #{name.split('.')[0]} @' /etc/hosts")
+          vm.channel.sudo("hostname #{name.split('.')[0]}")
+        end
+      end
     end
   end
 end

data/lib/vagrant/provisioners/chef_solo.rb

@@ -15,6 +15,10 @@ module Vagrant
         attr_accessor :data_bags_path
         attr_accessor :recipe_url
         attr_accessor :nfs
+        attr_accessor :encrypted_data_bag_secret_key_path
+        attr_accessor :encrypted_data_bag_secret
+
+        def encrypted_data_bag_secret; @encrypted_data_bag_secret || "/tmp/encrypted_data_bag_secret"; end
 
         def initialize
           super
@@ -86,6 +90,7 @@ module Vagrant
 
         verify_binary(chef_binary_path("chef-solo"))
         chown_provisioning_folder
+        upload_encrypted_data_bag_secret if config.encrypted_data_bag_secret_key_path
         setup_json
         setup_solo_config
         run_chef_solo
@@ -155,6 +160,12 @@ module Vagrant
         end
       end
 
+      def upload_encrypted_data_bag_secret
+        env[:ui].info I18n.t("vagrant.provisioners.chef.upload_encrypted_data_bag_secret_key")
+        env[:vm].channel.upload(encrypted_data_bag_secret_key_path,
+                                config.encrypted_data_bag_secret)
+      end
+
       def setup_solo_config
         cookbooks_path = guest_paths(@cookbook_folders)
         roles_path = guest_paths(@role_folders).first
@@ -167,6 +178,7 @@ module Vagrant
           :recipe_url => config.recipe_url,
           :roles_path => roles_path,
           :data_bags_path => data_bags_path,
+          :encrypted_data_bag_secret => config.encrypted_data_bag_secret,
         })
       end
 
@@ -207,6 +219,10 @@ module Vagrant
         end
       end
 
+      def encrypted_data_bag_secret_key_path
+        File.expand_path(config.encrypted_data_bag_secret_key_path, env[:root_path])
+      end
+
       protected
 
       # Extracts only the remote paths from a list of folders

data/lib/vagrant/ssh.rb

@@ -76,8 +76,11 @@ module Vagrant
 
       # Command line options
       command_options = ["-p", options[:port].to_s, "-o", "UserKnownHostsFile=/dev/null",
-                         "-o", "StrictHostKeyChecking=no", "-o", "IdentitiesOnly=yes",
-                         "-o", "LogLevel=ERROR"]
+                         "-o", "StrictHostKeyChecking=no", "-o", "LogLevel=ERROR"]
+
+      # Solaris/OpenSolaris/Illumos uses SunSSH which doesn't support the IdentitiesOnly option
+      command_options += ["-o", "IdentitiesOnly=yes"] unless Util::Platform.solaris?
+
       command_options += ["-i", options[:private_key_path]] if !plain_mode
       command_options += ["-o", "ForwardAgent=yes"] if ssh_info[:forward_agent]
 

data/lib/vagrant/ui.rb

@@ -1,5 +1,7 @@
 require "log4r"
 
+require "vagrant/util/safe_puts"
+
 module Vagrant
   module UI
     # Vagrant UIs handle communication with the outside world (typically
@@ -43,6 +45,8 @@ module Vagrant
     # This is a UI implementation that outputs the text as is. It
     # doesn't add any color.
     class Basic < Interface
+      include Util::SafePuts
+
       # Use some light meta-programming to create the various methods to
       # output text to the UI. These all delegate the real functionality
       # to `say`.
@@ -112,7 +116,8 @@ module Vagrant
         channel = type == :error || opts[:channel] == :error ? $stderr : $stdout
 
         # Output!
-        channel.send(printer, format_message(type, message, opts))
+        safe_puts(format_message(type, message, opts),
+                  :io => channel, :printer => printer)
       end
 
       # This is called by `say` to format the message for output.

data/lib/vagrant/util/is_port_open.rb

@@ -0,0 +1,38 @@
+require "socket"
+require "timeout"
+
+module Vagrant
+  module Util
+    # Contains the method {#is_ruby_open?} to check if a port is open
+    # (listening) or closed (not in use). This method isn't completely
+    # fool-proof, but it works enough of the time to be useful.
+    module IsPortOpen
+      # Checks if a port is open (listening) on a given host and port.
+      #
+      # @param [String] host Hostname or IP address.
+      # @param [Integer] port Port to check.
+      # @return [Boolean] `true` if the port is open (listening), `false`
+      #   otherwise.
+      def is_port_open?(host, port)
+        # We wrap this in a timeout because once in awhile the TCPSocket
+        # _will_ hang, but this signals that the port is closed.
+        Timeout.timeout(1) do
+          # Attempt to make a connection
+          s = TCPSocket.new(host, port)
+
+          # A connection was made! Properly clean up the socket, not caring
+          # at all if any exception is raised, because we already know the
+          # result.
+          s.close rescue nil
+
+          # The port is open if we reached this point, since we were able
+          # to connect.
+          return true
+        end
+      rescue Timeout::Error, Errno::ECONNREFUSED, Errno::EHOSTUNREACH
+        # Any of the above exceptions signal that the port is closed.
+        return false
+      end
+    end
+  end
+end

data/lib/vagrant/util/platform.rb

@@ -14,7 +14,7 @@ module Vagrant
           platform.include?("darwin9")
         end
 
-        [:darwin, :bsd, :freebsd, :linux].each do |type|
+        [:darwin, :bsd, :freebsd, :linux, :solaris].each do |type|
           define_method("#{type}?") do
             platform.include?(type.to_s)
           end

data/lib/vagrant/util/safe_puts.rb

@@ -0,0 +1,31 @@
+module Vagrant
+  module Util
+    # This module provides a `safe_puts` method which outputs to
+    # the given IO object, and rescues any broken pipe errors and
+    # ignores them. This is useful in cases where you're outputting
+    # to stdout, for example, and the stdout is closed, but you want to
+    # keep running.
+    module SafePuts
+      # Uses `puts` on the given IO object and safely ignores any
+      # Errno::EPIPE.
+      #
+      # @param [String] message Message to output.
+      # @param [Hash] opts Options hash.
+      def safe_puts(message=nil, opts=nil)
+        message ||= ""
+        opts = {
+          :io => $stdout,
+          :printer => :puts
+        }.merge(opts || {})
+
+        begin
+          opts[:io].send(opts[:printer], message)
+        rescue Errno::EPIPE
+          # This is what makes this a `safe` puts.
+          return
+        end
+      end
+    end
+  end
+end
+

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 = "1.0.1"
+  VERSION = "1.0.2"
 end

data/lib/vagrant/vm.rb

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

data/templates/commands/init/Vagrantfile.erb

@@ -59,11 +59,14 @@ Vagrant::Config.run do |config|
   #   puppet.manifest_file  = "<%= box_name %>.pp"
   # end
 
-  # Enable provisioning with chef solo, specifying a cookbooks path (relative
-  # to this Vagrantfile), and adding some recipes and/or roles.
+  # Enable provisioning with chef solo, specifying a cookbooks path, roles
+  # path, and data_bags path (all relative to this Vagrantfile), and adding 
+  # some recipes and/or roles.
   #
   # config.vm.provision :chef_solo do |chef|
-  #   chef.cookbooks_path = "cookbooks"
+  #   chef.cookbooks_path = "../my-recipes/cookbooks"
+  #   chef.roles_path = "../my-recipes/roles"
+  #   chef.data_bags_path = "../my-recipes/data_bags"
   #   chef.add_recipe "mysql"
   #   chef.add_role "web"
   #

data/templates/locales/en.yml

@@ -124,6 +124,10 @@ en:
         permissions on the following file to 0600 and then try running this command again:
 
         %{key_path}
+      ssh_key_type_not_supported: |-
+        The private key you're attempting to use with this Vagrant box uses
+        an unsupported encryption type. The SSH library Vagrant uses does not support
+        this key type. Please use `ssh-rsa` or `ssh-dss` instead.
       ssh_port_not_detected: |-
         Vagrant couldn't determine the SSH port for your VM! Vagrant attempts to
         automatically find a forwarded port that matches your `config.ssh.guest_port`
@@ -327,6 +331,11 @@ en:
           failed_to_boot: |-
             Failed to connect to VM via SSH. Please verify the VM successfully booted
             by looking at the VirtualBox GUI.
+          failed_to_run: |-
+            The VM failed to remain in the "running" state while attempting to boot.
+            This is normally caused by a misconfiguration or host system incompatibilities.
+            Please open the VirtualBox GUI and attempt to boot the virtual machine
+            manually to get a more informative error message.
         bridged_networking:
           available: |-
             Available bridged network interfaces:

data/templates/provisioners/chef_solo/solo.erb

@@ -6,6 +6,8 @@ cookbook_path <%= cookbooks_path.inspect %>
 role_path <%= roles_path.inspect %>
 log_level <%= log_level.inspect %>
 
+encrypted_data_bag_secret "<%= encrypted_data_bag_secret %>"
+
 <% if data_bags_path -%>
 data_bag_path <%= data_bags_path.inspect %>
 <% end %>

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

@@ -33,7 +33,7 @@ describe Vagrant::Command::Base do
     ["-h", "--help"].each do |help_string|
       it "returns nil and prints the help if '#{help_string}' is given" do
         instance = klass.new([help_string], nil)
-        instance.should_receive(:puts)
+        instance.should_receive(:safe_puts)
         instance.parse_options(OptionParser.new).should be_nil
       end
     end

data/test/unit/vagrant/util/is_port_open_test.rb

@@ -0,0 +1,53 @@
+require File.expand_path("../../../base", __FILE__)
+
+require "socket"
+
+require "vagrant/util/is_port_open"
+
+describe Vagrant::Util::IsPortOpen do
+  let(:klass) do
+    Class.new do
+      extend Vagrant::Util::IsPortOpen
+    end
+  end
+
+  let(:open_port)   { 52811 }
+  let(:closed_port) { 52811 }
+
+  it "should report open ports" do
+    # Start a thread which listens on a port
+    thr = Thread.new do
+      server = TCPServer.new(open_port)
+      Thread.current[:running] = true
+
+      # Wait until we're told to die
+      Thread.current[:die]     = false
+      while !Thread.current[:die]
+        Thread.pass
+      end
+
+      # Die!
+      server.close
+    end
+
+    # Wait until the server is running
+    while !thr[:running]
+      Thread.pass
+    end
+
+    # Verify that we report the port is open
+    klass.is_port_open?("localhost", open_port).should be
+
+    # Kill the thread
+    thr[:die] = true
+    thr.join
+  end
+
+  it "should report closed ports" do
+    # This CAN fail, since port 52811 might actually be in use, but I'm
+    # not sure what to do except choose some random port and hope for the
+    # best, really.
+    klass.is_port_open?("localhost", closed_port).should_not be
+  end
+end
+

data/test/unit_legacy/vagrant/provisioners/chef_solo_test.rb

@@ -87,7 +87,8 @@ class ChefSoloProvisionerTest < Test::Unit::TestCase
         :cookbooks_path => @action.guest_paths(@action.cookbook_folders),
         :recipe_url => @config.recipe_url,
         :roles_path => @action.guest_paths(@action.role_folders).first,
-        :data_bags_path => @action.guest_paths(@action.data_bags_folders).first
+        :data_bags_path => @action.guest_paths(@action.data_bags_folders).first,
+        :encrypted_data_bag_secret => @config.encrypted_data_bag_secret
       })
 
       @action.setup_solo_config

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: vagrant
 version: !ruby/object:Gem::Version 
-  hash: 21
+  hash: 19
   prerelease: 
   segments: 
   - 1
   - 0
-  - 1
-  version: 1.0.1
+  - 2
+  version: 1.0.2
 platform: ruby
 authors: 
 - Mitchell Hashimoto
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-03-12 00:00:00 Z
+date: 2012-03-25 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: archive-tar-minitar
@@ -323,6 +323,7 @@ files:
 - lib/vagrant/action/vm/provisioner_cleanup.rb
 - lib/vagrant/action/vm/prune_nfs_exports.rb
 - lib/vagrant/action/vm/resume.rb
+- lib/vagrant/action/vm/sane_defaults.rb
 - lib/vagrant/action/vm/setup_package_files.rb
 - lib/vagrant/action/vm/share_folders.rb
 - lib/vagrant/action/vm/suspend.rb
@@ -424,11 +425,13 @@ files:
 - lib/vagrant/util/file_checksum.rb
 - lib/vagrant/util/file_mode.rb
 - lib/vagrant/util/hash_with_indifferent_access.rb
+- lib/vagrant/util/is_port_open.rb
 - lib/vagrant/util/line_ending_helpers.rb
 - lib/vagrant/util/network_ip.rb
 - lib/vagrant/util/platform.rb
 - lib/vagrant/util/retryable.rb
 - lib/vagrant/util/safe_exec.rb
+- lib/vagrant/util/safe_puts.rb
 - lib/vagrant/util/stacked_proc_runner.rb
 - lib/vagrant/util/subprocess.rb
 - lib/vagrant/util/template_renderer.rb
@@ -587,6 +590,7 @@ files:
 - test/unit/vagrant/util/ansi_escape_code_remover_test.rb
 - test/unit/vagrant/util/file_checksum_test.rb
 - test/unit/vagrant/util/hash_with_indifferent_access_test.rb
+- test/unit/vagrant/util/is_port_open_test.rb
 - test/unit/vagrant/util/line_endings_helper_test.rb
 - test/unit/vagrant/util/network_ip_test.rb
 - test/unit/vagrant/util/retryable_test.rb