vagrant 0.7.0 → 0.7.1

data/CHANGELOG.md

@@ -1,3 +1,21 @@
+## 0.7.1 (January 28, 2011)
+
+  - Change error output with references to VirtualBox 3.2 to 4.0.
+  - Internal SSH through net-ssh now uses `IdentitiesOnly` thanks to
+    upstream net-ssh fix.
+  - Fix issue causing warnings to show with `forwardx11` enabled for SSH. [GH-279]
+  - FreeBSD support for host only networks, NFS, halting, etc. [GH-275]
+  - Make SSH commands which use sudo compatible with sudo < 1.7.0. [GH-278]
+  - Fix broken puppet server provisioner which called a nonexistent
+    method.
+  - Default SSH host changed from `localhost` to `127.0.0.1` since
+    `localhost` is not always loopback.
+  - New `shell` provisioner which simply uploads and executes a script as
+    root on the VM.
+  - Gentoo host only networking no longer fails if alrady setup. [GH-286]
+  - Set the host name of your guest OS with `config.vm.host_name` [GH-273]
+  - `vagrant ssh-config` now outputs the configured `config.ssh.host`
+
 ## 0.7.0 (January 19, 2011)
 
   - VirtualBox 4.0 support. Support for VirtualBox 3.2 is _dropped_, since

data/README.md

@@ -32,7 +32,7 @@ the box doesn't already exist on your system.
 ## Getting Started Guide and Video
 
 To learn how to build a fully functional rails development environment, view the
-[getting started guide](http://vagrantup.com/getting-started/index.html).
+[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

data/config/default.rb

@@ -4,7 +4,7 @@ Vagrant::Config.run do |config|
   config.vagrant.host = :detect
 
   config.ssh.username = "vagrant"
-  config.ssh.host = "localhost"
+  config.ssh.host = "127.0.0.1"
   config.ssh.forwarded_port_key = "ssh"
   config.ssh.max_tries = 10
   config.ssh.timeout = 30

data/lib/vagrant/action/builtin.rb

@@ -21,6 +21,7 @@ module Vagrant
         use VM::NFS
         use VM::ClearSharedFolders
         use VM::ShareFolders
+        use VM::HostName
         use VM::Network
         use VM::Boot
       end)

data/lib/vagrant/action/vm.rb

@@ -15,6 +15,7 @@ module Vagrant
       autoload :Export,              'vagrant/action/vm/export'
       autoload :ForwardPorts,        'vagrant/action/vm/forward_ports'
       autoload :Halt,                'vagrant/action/vm/halt'
+      autoload :HostName,            'vagrant/action/vm/host_name'
       autoload :Import,              'vagrant/action/vm/import'
       autoload :MatchMACAddress,     'vagrant/action/vm/match_mac_address'
       autoload :Network,             'vagrant/action/vm/network'

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

@@ -0,0 +1,21 @@
+module Vagrant
+  class Action
+    module VM
+      class HostName
+        def initialize(app, env)
+          @app = app
+        end
+
+        def call(env)
+          @app.call(env)
+
+          host_name = env["config"].vm.host_name
+          if !host_name.nil?
+            env.ui.info I18n.t("vagrant.actions.vm.host_name.setting")
+            env["vm"].system.change_host_name(host_name)
+          end
+        end
+      end
+    end
+  end
+end

data/lib/vagrant/command/ssh_config.rb

@@ -9,8 +9,13 @@ module Vagrant
         vm = target_vms.first
         raise Errors::VMNotCreatedError if !vm.created?
 
+        # We need to fix the file permissions of the key if they aren't set
+        # properly, otherwise if the user attempts to SSH in, it won't work!
+        vm.ssh.check_key_permissions(vm.env.config.ssh.private_key_path)
+
         $stdout.puts(Util::TemplateRenderer.render("ssh_config", {
           :host_key => options[:host] || "vagrant",
+          :ssh_host => vm.env.config.ssh.host,
           :ssh_user => vm.env.config.ssh.username,
           :ssh_port => vm.ssh.port,
           :private_key_path => vm.env.config.ssh.private_key_path

data/lib/vagrant/config/vm.rb

@@ -14,6 +14,7 @@ module Vagrant
       attr_accessor :box_ovf
       attr_accessor :base_mac
       attr_accessor :boot_mode
+      attr_accessor :host_name
       attr_reader :forwarded_ports
       attr_reader :shared_folders
       attr_reader :network_options

data/lib/vagrant/provisioners.rb

@@ -6,3 +6,4 @@ require 'vagrant/provisioners/chef_server'
 require 'vagrant/provisioners/chef_solo'
 require 'vagrant/provisioners/puppet'
 require 'vagrant/provisioners/puppet_server'
+require 'vagrant/provisioners/shell'

data/lib/vagrant/provisioners/chef.rb

@@ -12,14 +12,14 @@ module Vagrant
         vm.ssh.execute do |ssh|
           # Checks for the existence of chef binary and error if it
           # doesn't exist.
-          ssh.exec!("sudo -i which #{binary}", :error_class => ChefError, :_key => :chef_not_detected, :binary => binary)
+          ssh.sudo!("which #{binary}", :error_class => ChefError, :_key => :chef_not_detected, :binary => binary)
         end
       end
 
       def chown_provisioning_folder
         vm.ssh.execute do |ssh|
-          ssh.exec!("sudo mkdir -p #{config.provisioning_path}")
-          ssh.exec!("sudo chown #{env.config.ssh.username} #{config.provisioning_path}")
+          ssh.sudo!("mkdir -p #{config.provisioning_path}")
+          ssh.sudo!("chown #{env.config.ssh.username} #{config.provisioning_path}")
         end
       end
 

data/lib/vagrant/provisioners/chef_server.rb

@@ -50,7 +50,7 @@ module Vagrant
         path = Pathname.new(config.client_key_path)
 
         vm.ssh.execute do |ssh|
-          ssh.exec!("sudo mkdir -p #{path.dirname}")
+          ssh.sudo!("mkdir -p #{path.dirname}")
         end
       end
 
@@ -70,13 +70,14 @@ module Vagrant
       end
 
       def run_chef_client
-        command = "sudo -i 'cd #{config.provisioning_path} && chef-client -c client.rb -j dna.json'"
+        commands = ["cd #{config.provisioning_path}",
+                    "chef-client -c client.rb -j dna.json"]
 
         env.ui.info I18n.t("vagrant.provisioners.chef.running_client")
         vm.ssh.execute do |ssh|
-          ssh.exec!(command) do |channel, type, data|
+          ssh.sudo!(commands) do |channel, type, data|
             if type == :exit_status
-              ssh.check_exit_status(data, command)
+              ssh.check_exit_status(data, commands)
             else
               env.ui.info("#{data}: #{type}")
             end

data/lib/vagrant/provisioners/chef_solo.rb

@@ -60,12 +60,12 @@ module Vagrant
       end
 
       def run_chef_solo
-        command = "sudo -i 'cd #{config.provisioning_path} && chef-solo -c solo.rb -j dna.json'"
+        commands = ["cd #{config.provisioning_path}", "chef-solo -c solo.rb -j dna.json"]
 
         env.ui.info I18n.t("vagrant.provisioners.chef.running_solo")
         vm.ssh.execute do |ssh|
-          ssh.exec!(command) do |channel, type, data|
-            ssh.check_exit_status(data, command) if type == :exit_status
+          ssh.sudo!(commands) do |channel, type, data|
+            ssh.check_exit_status(data, commands) if type == :exit_status
             env.ui.info("#{data}: #{type}") if type != :exit_status
           end
         end

data/lib/vagrant/provisioners/puppet.rb

@@ -107,7 +107,7 @@ module Vagrant
 
       def verify_binary(binary)
         vm.ssh.execute do |ssh|
-          ssh.exec!("sudo -i which #{binary}", :error_class => PuppetError, :_key => :puppet_not_detected, :binary => binary)
+          ssh.sudo!("which #{binary}", :error_class => PuppetError, :_key => :puppet_not_detected, :binary => binary)
         end
       end
 
@@ -117,14 +117,15 @@ module Vagrant
         options << config.computed_manifest_file
         options = options.join(" ")
 
-        command = "sudo -i 'cd #{manifests_guest_path}; puppet #{options}'"
+        commands = ["cd #{manifests_guest_path}",
+                    "puppet #{options}"]
 
         env.ui.info I18n.t("vagrant.provisioners.puppet.running_puppet", :manifest => config.computed_manifest_file)
 
         vm.ssh.execute do |ssh|
-          ssh.exec! command do |ch, type, data|
+          ssh.sudo! commands do |ch, type, data|
             if type == :exit_status
-              ssh.check_exit_status(data, command)
+              ssh.check_exit_status(data, commands)
             else
               env.ui.info(data)
             end

data/lib/vagrant/provisioners/puppet_server.rb

@@ -26,9 +26,7 @@ module Vagrant
 
       def verify_binary(binary)
         vm.ssh.execute do |ssh|
-          ssh.shell do |sh|
-            sh.execute("sudo -i which #{binary}", :error_class => PuppetServerError, :_key => :puppetd_not_detected, :binary => binary)
-          end
+          ssh.sudo!("which #{binary}", :error_class => PuppetServerError, :_key => :puppetd_not_detected, :binary => binary)
         end
       end
 
@@ -41,13 +39,13 @@ module Vagrant
           cn = env.config.vm.box
         end
 
-        command = "sudo -i puppetd #{options} --server #{config.puppet_server} --certname #{cn}"
+        commands = "puppetd #{options} --server #{config.puppet_server} --certname #{cn}"
 
         env.ui.info I18n.t("vagrant.provisioners.puppet_server.running_puppetd")
 
         vm.ssh.execute do |ssh|
-          ssh.exec!(command) do |channel, type, data|
-            ssh.check_exit_status(data, command) if type == :exit_status
+          ssh.sudo!(commands) do |channel, type, data|
+            ssh.check_exit_status(data, commands) if type == :exit_status
             env.ui.info(data) if type != :exit_status
           end
         end

data/lib/vagrant/provisioners/shell.rb

@@ -0,0 +1,52 @@
+module Vagrant
+  module Provisioners
+    class Shell < Base
+      register :shell
+
+      class Config < Vagrant::Config::Base
+        attr_accessor :path
+        attr_accessor :upload_path
+
+        def initialize
+          @upload_path = "/tmp/vagrant-shell"
+        end
+
+        def expanded_path
+          Pathname.new(path).expand_path(env.root_path) if path
+        end
+
+        def validate(errors)
+          super
+
+          if !path
+            errors.add(I18n.t("vagrant.provisioners.shell.path_not_set"))
+          elsif !expanded_path.file?
+            errors.add(I18n.t("vagrant.provisioners.shell.path_invalid", :path => expanded_path))
+          end
+
+          if !upload_path
+            errors.add(I18n.t("vagrant.provisioners.shell.upload_path_not_set"))
+          end
+        end
+      end
+
+      def provision!
+        commands = ["chmod +x #{config.upload_path}", config.upload_path]
+
+        # Upload the script to the VM
+        vm.ssh.upload!(config.expanded_path.to_s, config.upload_path)
+
+        # Execute it with sudo
+        vm.ssh.execute do |ssh|
+          ssh.sudo!(commands) do |ch, type, data|
+            if type == :exit_status
+              ssh.check_exit_status(data, commands)
+            else
+              env.ui.info(data)
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/vagrant/ssh.rb

@@ -44,7 +44,12 @@ module Vagrant
                          "-o StrictHostKeyChecking=no", "-o IdentitiesOnly=yes",
                          "-i #{options[:private_key_path]}"]
       command_options << "-o ForwardAgent=yes" if env.config.ssh.forward_agent
-      command_options << "-o ForwardX11=yes" if env.config.ssh.forward_x11
+
+      if env.config.ssh.forward_x11
+        # Both are required so that no warnings are shown regarding X11
+        command_options << "-o ForwardX11=yes"
+        command_options << "-o ForwardX11Trusted=yes"
+      end
 
       # Some hackery going on here. On Mac OS X Leopard (10.5), exec fails
       # (GH-51). As a workaround, we fork and wait. On all other platforms,
@@ -70,6 +75,7 @@ module Vagrant
         Net::SSH.start(env.config.ssh.host,
                        env.config.ssh.username,
                        opts.merge( :keys => [env.config.ssh.private_key_path],
+                                   :keys_only => true,
                                    :user_known_hosts_file => [],
                                    :paranoid => false,
                                    :config => false)) do |ssh|

data/lib/vagrant/ssh/session.rb

@@ -22,11 +22,55 @@ module Vagrant
         false
       end
 
+      # Executes a given command on the SSH session using `sudo` and
+      # blocks until the command completes. This takes the same parameters
+      # as {#exec!}. The only difference is that the command can be an
+      # array of commands, which will be placed into the same script.
+      #
+      # This is different than just calling {#exec!} with `sudo`, since
+      # this command is tailor-made to be compliant with older versions
+      # of `sudo`.
+      def sudo!(commands, options=nil, &block)
+        session.open_channel do |ch|
+          ch.exec("sudo -i sh") do |ch2, success|
+            # Output each command as if they were entered on the command line
+            [commands].flatten.each do |command|
+              ch2.send_data "#{command}\n"
+            end
+
+            # Remember to exit or we'll hang!
+            ch2.send_data "exit\n"
+
+            # Setup the callbacks with our options so we get all the
+            # stdout/stderr and error checking goodies
+            setup_channel_callbacks(ch2, commands, options, block)
+          end
+
+          ch.wait
+        end
+      end
+
       # Executes a given command on the SSH session and blocks until
       # the command completes. This is an almost line for line copy of
       # the actual `exec!` implementation, except that this
       # implementation also reports `:exit_status` to the block if given.
       def exec!(command, options=nil, &block)
+        retryable(:tries => 5, :on => IOError, :sleep => 0.5) do
+          metach = session.open_channel do |channel|
+            channel.exec(command) do |ch, success|
+              raise "could not execute command: #{command.inspect}" unless success
+              setup_channel_callbacks(ch, command, options, block)
+            end
+          end
+
+          metach.wait
+          metach[:result]
+        end
+      end
+
+      # Sets up the channel callbacks to properly check exit statuses and
+      # callback on stdout/stderr.
+      def setup_channel_callbacks(channel, command, options, block)
         options = { :error_check => true }.merge(options || {})
 
         block ||= Proc.new do |ch, type, data|
@@ -36,41 +80,30 @@ module Vagrant
           ch[:result] << data if [:stdout, :stderr].include?(type)
         end
 
-        retryable(:tries => 5, :on => IOError, :sleep => 0.5) do
-          metach = session.open_channel do |channel|
-            channel.exec(command) do |ch, success|
-              raise "could not execute command: #{command.inspect}" unless success
-
-              # Output stdout data to the block
-              channel.on_data do |ch2, data|
-                block.call(ch2, :stdout, data)
-              end
-
-              # Output stderr data to the block
-              channel.on_extended_data do |ch2, type, data|
-                block.call(ch2, :stderr, data)
-              end
+        # Output stdout data to the block
+        channel.on_data do |ch2, data|
+          block.call(ch2, :stdout, data)
+        end
 
-              # Output exit status information to the block
-              channel.on_request("exit-status") do |ch2, data|
-                block.call(ch2, :exit_status, data.read_long)
-              end
-            end
-          end
+        # Output stderr data to the block
+        channel.on_extended_data do |ch2, type, data|
+          block.call(ch2, :stderr, data)
+        end
 
-          metach.wait
-          metach[:result]
+        # Output exit status information to the block
+        channel.on_request("exit-status") do |ch2, data|
+          block.call(ch2, :exit_status, data.read_long)
         end
       end
 
       # Checks for an erroroneous exit status and raises an exception
       # if so.
-      def check_exit_status(exit_status, command, options=nil)
+      def check_exit_status(exit_status, commands, options=nil)
         if exit_status != 0
           options = {
             :_error_class => Errors::VagrantError,
             :_key => :ssh_bad_exit_status,
-            :command => command
+            :command => [commands].flatten.join("\n")
           }.merge(options || {})
 
           raise options[:_error_class], options

data/lib/vagrant/systems.rb

@@ -1,6 +1,7 @@
 # These can't be autoloaded because they have to register functionality
 # with Vagrant core.
 require 'vagrant/systems/base'
+require 'vagrant/systems/freebsd'
 require 'vagrant/systems/linux'
 require 'vagrant/systems/solaris'
 

data/lib/vagrant/systems/base.rb

@@ -78,6 +78,10 @@ module Vagrant
       #
       # @param [Hash] net_options The options for the network.
       def enable_host_only_network(net_options); end
+
+      def change_host_name(name)
+        raise BaseError, :_key => :unsupported_host_name
+      end
     end
   end
 end

data/lib/vagrant/systems/debian.rb

@@ -21,6 +21,15 @@ module Vagrant
           ssh.exec!("sudo /sbin/ifup eth#{net_options[:adapter]}")
         end
       end
+
+      def change_host_name(name)
+        vm.ssh.execute do |ssh|
+          if !ssh.test?("sudo hostname | grep '#{name}'")
+            ssh.exec!("sudo sed -i 's/.*$/#{name}/' /etc/hostname")
+            ssh.exec!("sudo service hostname start")
+          end
+        end
+      end
     end
   end
 end

data/lib/vagrant/systems/freebsd.rb

@@ -0,0 +1,84 @@
+module Vagrant
+  module Systems
+    # A general Vagrant system implementation for "freebsd".
+    #
+    # Contributed by Kenneth Vestergaard <kvs@binarysolutions.dk>
+    class FreeBSD < Base
+      # A custom config class which will be made accessible via `config.freebsd`
+      # This is not necessary for all system implementers, of course. However,
+      # generally, Vagrant tries to make almost every aspect of its execution
+      # configurable, and this assists that goal.
+      class FreeBSDConfig < Vagrant::Config::Base
+        configures :freebsd
+
+        attr_accessor :halt_timeout
+        attr_accessor :halt_check_interval
+
+        def initialize
+          @halt_timeout = 30
+          @halt_check_interval = 1
+        end
+      end
+
+      # Here for whenever it may be used.
+      class FreeBSDError < Errors::VagrantError
+        error_namespace("vagrant.systems.freebsd")
+      end
+
+      def halt
+        vm.env.ui.info I18n.t("vagrant.systems.freebsd.attempting_halt")
+        vm.ssh.execute do |ssh|
+          ssh.exec!("sudo shutdown -p now")
+        end
+
+        # 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.vm.state != :powered_off
+          count += 1
+
+          return if count >= vm.env.config.freebsd.halt_timeout
+          sleep vm.env.config.freebsd.halt_check_interval
+        end
+      end
+
+      # TODO: Error/warning about this.
+      # def mount_shared_folder(ssh, name, guestpath)
+      #   ssh.exec!("sudo mkdir -p #{guestpath}")
+      #   # Using a custom mount method here; could use improvement.
+      #   ssh.exec!("sudo mount -t vboxfs v-root #{guestpath}")
+      #   ssh.exec!("sudo chown #{vm.env.config.ssh.username} #{guestpath}")
+      # end
+
+      def mount_nfs(ip, folders)
+        folders.each do |name, opts|
+          vm.ssh.execute do |ssh|
+            ssh.exec!("sudo mkdir -p #{opts[:guestpath]}")
+            ssh.exec!("sudo mount #{ip}:#{opts[:hostpath]} #{opts[:guestpath]}")
+          end
+        end
+      end
+
+      def prepare_host_only_network(net_options=nil)
+        # Remove any previous host only network additions to the
+        # interface file.
+        vm.ssh.execute do |ssh|
+          # Clear out any previous entries
+          ssh.exec!("sudo sed -e '/^#VAGRANT-BEGIN/,/^#VAGRANT-END/ d' /etc/rc.conf > /tmp/rc.conf")
+          ssh.exec!("sudo mv /tmp/rc.conf /etc/rc.conf")
+        end
+      end
+
+      def enable_host_only_network(net_options)
+        entry = "#VAGRANT-BEGIN\nifconfig_em#{net_options[:adapter]}=\"inet #{net_options[:ip]} netmask #{net_options[:netmask]}\"\n#VAGRANT-END\n"
+        vm.ssh.upload!(StringIO.new(entry), "/tmp/vagrant-network-entry")
+
+        vm.ssh.execute do |ssh|
+          ssh.exec!("sudo su -m root -c 'cat /tmp/vagrant-network-entry >> /etc/rc.conf'")
+          ssh.exec!("sudo ifconfig em#{net_options[:adapter]} inet #{net_options[:ip]} netmask #{net_options[:netmask]}")
+        end
+      end
+    end
+  end
+end

data/lib/vagrant/systems/gentoo.rb

@@ -16,7 +16,7 @@ module Vagrant
         vm.ssh.upload!(StringIO.new(entry), "/tmp/vagrant-network-entry")
 
         vm.ssh.execute do |ssh|
-          ssh.exec!("sudo ln -s /etc/init.d/net.lo /etc/init.d/net.eth#{net_options[:adapter]}")
+          ssh.exec!("sudo ln -fs /etc/init.d/net.lo /etc/init.d/net.eth#{net_options[:adapter]}")
           ssh.exec!("sudo /etc/init.d/net.eth#{net_options[:adapter]} stop 2> /dev/null")
           ssh.exec!("sudo su -c 'cat /tmp/vagrant-network-entry >> /etc/conf.d/net'")
           ssh.exec!("sudo /etc/init.d/net.eth#{net_options[:adapter]} start")

data/lib/vagrant/systems/redhat.rb

@@ -23,9 +23,17 @@ module Vagrant
           ssh.exec!("sudo /sbin/ifup eth#{net_options[:adapter]}")
         end
       end
+
+      def change_host_name(name)
+        vm.ssh.execute do |ssh|
+          # Only do this if the hostname is not already set
+          if !ssh.test?("sudo hostname | grep '#{name}'")
+            ssh.exec!("sudo sed -i 's/\\(HOSTNAME=\\).*/\\1#{name}/' /etc/sysconfig/network")
+            ssh.exec!("sudo hostname #{name}")
+            ssh.exec!("sudo sed -i 's@^\\(127[.]0[.]0[.]1[[:space:]]\\+\\)@\\1#{name} @' /etc/hosts")
+          end
+        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 = "0.7.0"
+  VERSION = "0.7.1"
 end

data/lib/vagrant/vm.rb

@@ -58,10 +58,11 @@ module Vagrant
       elsif system.is_a?(Symbol)
         # Hard-coded internal systems
         mapping = {
-          :debian => Systems::Debian,
-          :gentoo => Systems::Gentoo,
-          :redhat => Systems::Redhat,
-          :linux => Systems::Linux,
+          :debian  => Systems::Debian,
+          :freebsd => Systems::FreeBSD,
+          :gentoo  => Systems::Gentoo,
+          :redhat  => Systems::Redhat,
+          :linux   => Systems::Linux,
           :solaris => Systems::Solaris
         }
 

data/templates/locales/en.yml

@@ -102,7 +102,7 @@ en:
 
         For a more detailed guide please consult:
 
-          http://vagrantup.com/docs/getting-started/windows
+          http://vagrantup.com/docs/getting-started/setup/windows.html
 
       system:
         invalid_class: |-
@@ -133,10 +133,10 @@ en:
       virtualbox_not_detected: |-
         Vagrant could not detect VirtualBox! Make sure VirtualBox is properly installed.
         If VirtualBox is installed, it may be an incorrect version. Vagrant currently
-        requires VirtualBox 3.2.x. Please install the proper version to continue.
+        requires VirtualBox 4.0.x. Please install the proper version to continue.
       virtualbox_not_detected_win64: |-
         Vagrant could not detect VirtualBox! Make sure VirtualBox is properly installed
-        with version 3.2.0 or higher.
+        with version 4.0.0 or higher.
 
         Additionally, it appears you're on 64-bit Windows. If this is the case, and
         VirtualBox is properly installed with the correct version, then please make
@@ -320,6 +320,8 @@ en:
             Skipping port forwarding '%{name}'.
         halt:
           force: Forcing shutdown of VM...
+        host_name:
+          setting: "Setting host name..."
         import:
           importing: Importing base box '%{name}'...
           failure: |-
@@ -489,6 +491,11 @@ en:
           Puppet properly installed.
         running_puppetd: "Running Puppet agent..."
 
+      shell:
+        path_not_set: "`path` parameter pointing to script file to execute for shell provisioner is required"
+        path_invalid: "`path` for shell provisioner does not exist on the host system: %{path}"
+        upload_path_not_set: "`upload_path` must be set for the shell provisioner."
+
     systems:
       base:
         unsupported_host_only: |-
@@ -499,7 +506,10 @@ en:
           Most of the time this is simply due to the fact that no one has contributed
           back the SSH commands necessary to set this up. Please report a bug and this
           will be fixed for your distro.
-
+        unsupported_host_name: |-
+          Setting host name is currently only supported on Debian, Ubuntu and RedHat.
+          If you'd like your guest OS to be supported, please open a ticket on the
+          project.
       linux:
         attempting_halt: "Attempting graceful shutdown of linux..."
         mount_fail: "Failed to mount shared folders. `vboxsf` was not available."
@@ -512,3 +522,6 @@ en:
 
       solaris:
         attempting_halt: "Attempting graceful shutdown of solaris..."
+
+      freebsd:
+        attempting_halt: "Attempting graceful shutdown of FreeBSD..."

data/templates/ssh_config.erb

@@ -1,5 +1,5 @@
 Host <%= host_key %>
-  HostName 127.0.0.1
+  HostName <%= ssh_host %>
   User <%= ssh_user %>
   Port <%= ssh_port %>
   UserKnownHostsFile /dev/null

data/test/vagrant/action/vm/host_name_test.rb

@@ -0,0 +1,36 @@
+require "test_helper"
+
+class HostNameVMActionTest < Test::Unit::TestCase
+  setup do
+    @klass = Vagrant::Action::VM::HostName
+    @app, @env = action_env
+    @instance = @klass.new(@app, @env)
+
+    @vm = mock("vm")
+    @env["vm"] = @vm
+
+    @internal_vm = mock("internal")
+    @vm.stubs(:vm).returns(@internal_vm)
+  end
+
+  should "not run anything if no host name is set" do
+    @env["config"].vm.host_name = nil
+    @env["vm"].expects(:system).never
+    @app.expects(:call).with(@env).once
+
+    @instance.call(@env)
+  end
+
+  should "change host name if set" do
+    @env["config"].vm.host_name = "foo"
+
+    system = mock("system")
+    @vm.stubs(:system).returns(system)
+
+    seq = sequence("host_seq")
+    @app.expects(:call).with(@env).in_sequence(seq)
+    system.expects(:change_host_name).with(@env["config"].vm.host_name).in_sequence(seq)
+
+    @instance.call(@env)
+  end
+end

data/test/vagrant/provisioners/chef_server_test.rb

@@ -117,7 +117,7 @@ class ChefServerProvisionerTest < Test::Unit::TestCase
 
     should "create the folder using the dirname of the path" do
       ssh = mock("ssh")
-      ssh.expects(:exec!).with("sudo mkdir -p #{@path.dirname}").once
+      ssh.expects(:sudo!).with("mkdir -p #{@path.dirname}").once
       @vm.ssh.expects(:execute).yields(ssh)
       @action.create_client_key_folder
     end
@@ -173,12 +173,12 @@ class ChefServerProvisionerTest < Test::Unit::TestCase
     end
 
     should "cd into the provisioning directory and run chef client" do
-      @ssh.expects(:exec!).with("sudo -i 'cd #{@config.provisioning_path} && chef-client -c client.rb -j dna.json'").once
+      @ssh.expects(:sudo!).with(["cd #{@config.provisioning_path}", "chef-client -c client.rb -j dna.json"]).once
       @action.run_chef_client
     end
 
     should "check the exit status if that is given" do
-      @ssh.stubs(:exec!).yields(nil, :exit_status, :foo)
+      @ssh.stubs(:sudo!).yields(nil, :exit_status, :foo)
       @ssh.expects(:check_exit_status).with(:foo, anything).once
       @action.run_chef_client
     end

data/test/vagrant/provisioners/chef_solo_test.rb

@@ -206,12 +206,12 @@ class ChefSoloProvisionerTest < Test::Unit::TestCase
     end
 
     should "cd into the provisioning directory and run chef solo" do
-      @ssh.expects(:exec!).with("sudo -i 'cd #{@config.provisioning_path} && chef-solo -c solo.rb -j dna.json'").once
+      @ssh.expects(:sudo!).with(["cd #{@config.provisioning_path}", "chef-solo -c solo.rb -j dna.json"]).once
       @action.run_chef_solo
     end
 
     should "check the exit status if that is given" do
-      @ssh.stubs(:exec!).yields(nil, :exit_status, :foo)
+      @ssh.stubs(:sudo!).yields(nil, :exit_status, :foo)
       @ssh.expects(:check_exit_status).with(:foo, anything).once
       @action.run_chef_solo
     end

data/test/vagrant/provisioners/chef_test.rb

@@ -73,7 +73,7 @@ class ChefProvisionerTest < Test::Unit::TestCase
 
     should "verify binary exists" do
       binary = "foo"
-      @ssh.expects(:exec!).with("sudo -i which #{binary}", anything)
+      @ssh.expects(:sudo!).with("which #{binary}", anything)
       @action.verify_binary(binary)
     end
   end
@@ -82,8 +82,8 @@ class ChefProvisionerTest < Test::Unit::TestCase
     should "create and chown the folder to the ssh user" do
       ssh_seq = sequence("ssh_seq")
       ssh = mock("ssh")
-      ssh.expects(:exec!).with("sudo mkdir -p #{@config.provisioning_path}").once.in_sequence(ssh_seq)
-      ssh.expects(:exec!).with("sudo chown #{@env.config.ssh.username} #{@config.provisioning_path}").once.in_sequence(ssh_seq)
+      ssh.expects(:sudo!).with("mkdir -p #{@config.provisioning_path}").once.in_sequence(ssh_seq)
+      ssh.expects(:sudo!).with("chown #{@env.config.ssh.username} #{@config.provisioning_path}").once.in_sequence(ssh_seq)
       @vm.ssh.expects(:execute).yields(ssh)
       @action.chown_provisioning_folder
     end

data/test/vagrant/provisioners/puppet_server_test.rb

@@ -25,13 +25,12 @@ class PuppetServerProvisionerTest < Test::Unit::TestCase
     setup do
       @ssh = mock("ssh")
       @shell = mock("shell")
-      @ssh.stubs(:shell).yields(@shell)
       @vm.ssh.stubs(:execute).yields(@ssh)
     end
 
     should "verify binary exists" do
       binary = "foo"
-      @shell.expects(:execute).with("sudo -i which #{binary}", anything)
+      @ssh.expects(:sudo!).with("which #{binary}", anything)
       @action.verify_binary(binary)
     end
   end
@@ -44,24 +43,24 @@ class PuppetServerProvisionerTest < Test::Unit::TestCase
     end
 
     should "run the puppetd client" do
-      @ssh.expects(:exec!).with("sudo -i puppetd  --server #{@config.puppet_server} --certname #{@cn}").once
+      @ssh.expects(:sudo!).with("puppetd  --server #{@config.puppet_server} --certname #{@cn}").once
       @action.run_puppetd_client
     end
 
     should "run puppetd with given options when given as an array" do
       @config.options = ["--modulepath", "modules", "--verbose"]
-      @ssh.expects(:exec!).with("sudo -i puppetd --modulepath modules --verbose --server #{@config.puppet_server} --certname #{@cn}").once
+      @ssh.expects(:sudo!).with("puppetd --modulepath modules --verbose --server #{@config.puppet_server} --certname #{@cn}").once
       @action.run_puppetd_client
     end
 
     should "run puppetd with the options when given as a string" do
       @config.options = "--modulepath modules --verbose"
-      @ssh.expects(:exec!).with("sudo -i puppetd --modulepath modules --verbose --server #{@config.puppet_server} --certname #{@cn}").once
+      @ssh.expects(:sudo!).with("puppetd --modulepath modules --verbose --server #{@config.puppet_server} --certname #{@cn}").once
       @action.run_puppetd_client
     end
 
     should "check the exit status if that is given" do
-      @ssh.stubs(:exec!).yields(nil, :exit_status, :foo)
+      @ssh.stubs(:sudo!).yields(nil, :exit_status, :foo)
       @ssh.expects(:check_exit_status).with(:foo, anything).once
       @action.run_puppetd_client
     end

data/test/vagrant/provisioners/puppet_test.rb

@@ -138,7 +138,7 @@ class PuppetProvisionerTest < Test::Unit::TestCase
 
     should "verify binary exists" do
       binary = "foo"
-      @ssh.expects(:exec!).with("sudo -i which #{binary}", anything)
+      @ssh.expects(:sudo!).with("which #{binary}", anything)
       @action.verify_binary(binary)
     end
   end
@@ -151,7 +151,7 @@ class PuppetProvisionerTest < Test::Unit::TestCase
     end
 
     def expect_puppet_command(command)
-      @ssh.expects(:exec!).with("sudo -i 'cd #{@action.manifests_guest_path}; #{command}'")
+      @ssh.expects(:sudo!).with(["cd #{@action.manifests_guest_path}", command])
     end
 
     should "cd into the pp_path directory and run puppet" do

data/test/vagrant/provisioners/shell_test.rb

@@ -0,0 +1,68 @@
+require "test_helper"
+
+class ShellProvisionerTest < Test::Unit::TestCase
+  setup do
+    clean_paths
+
+    @klass = Vagrant::Provisioners::Shell
+    @action_env = Vagrant::Action::Environment.new(vagrant_env.vms[:default].env)
+    @config = @klass::Config.new
+    @config.top = Vagrant::Config::Top.new(@action_env.env)
+    @action = @klass.new(@action_env, @config)
+
+    @config.path = "foo"
+  end
+
+  context "config" do
+    setup do
+      @errors = Vagrant::Config::ErrorRecorder.new
+
+      # Start in a valid state (verified by a test below)
+      @config.path = "foo"
+      File.open(@config.expanded_path, "w") { |f| f.puts "HELLO" }
+    end
+
+    should "be valid" do
+      @config.validate(@errors)
+      assert @errors.errors.empty?
+    end
+
+    should "be invalid if the path is not set" do
+      @config.path = nil
+
+      @config.validate(@errors)
+      assert !@errors.errors.empty?
+    end
+
+    should "be invalid if the path does not exist" do
+      @config.path = "bar"
+
+      @config.validate(@errors)
+      assert !@errors.errors.empty?
+    end
+
+    should "be invalid if the upload path is not set" do
+      @config.upload_path = nil
+
+      @config.validate(@errors)
+      assert !@errors.errors.empty?
+    end
+  end
+
+  context "provisioning" do
+    setup do
+      @ssh = mock("ssh")
+      @action.vm.ssh.stubs(:execute).yields(@ssh)
+    end
+
+    should "upload the file, chmod, then execute it" do
+      commands = ["chmod +x #{@config.upload_path}", @config.upload_path]
+
+      p_seq = sequence("provisioning")
+      @action.vm.ssh.expects(:upload!).with(@config.expanded_path.to_s, @config.upload_path).in_sequence(p_seq)
+      @ssh.expects(:sudo!).with(commands).in_sequence(p_seq)
+
+      @action.provision!
+    end
+  end
+end

data/test/vagrant/ssh_test.rb

@@ -147,6 +147,7 @@ class SshTest < Test::Unit::TestCase
         assert_equal @env.config.ssh.username, username
         assert_equal @ssh.port, opts[:port]
         assert_equal [@env.config.ssh.private_key_path], opts[:keys]
+        assert opts[:keys_only]
         true
       end
       @ssh.execute

data/vagrant.gemspec

@@ -18,11 +18,11 @@ Gem::Specification.new do |s|
   s.add_dependency "erubis", "~> 2.6.6"
   s.add_dependency "json", "~> 1.4.6"
   s.add_dependency "mario", "~> 0.0.6"
-  s.add_dependency "net-ssh", "~> 2.0.23"
+  s.add_dependency "net-ssh", "~> 2.1.0"
   s.add_dependency "net-scp", "~> 1.0.4"
   s.add_dependency "i18n", "~> 0.5.0"
   s.add_dependency "thor", "~> 0.14.6"
-  s.add_dependency "virtualbox", "~> 0.8.2"
+  s.add_dependency "virtualbox", "~> 0.8.3"
 
   s.add_development_dependency "rake"
   s.add_development_dependency "contest", ">= 0.1.2"

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 7
-  - 0
-  version: 0.7.0
+  - 1
+  version: 0.7.1
 platform: ruby
 authors: 
 - Mitchell Hashimoto
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-19 00:00:00 -08:00
+date: 2011-01-28 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -87,9 +87,9 @@ dependencies:
       - !ruby/object:Gem::Version 
         segments: 
         - 2
+        - 1
         - 0
-        - 23
-        version: 2.0.23
+        version: 2.1.0
   type: :runtime
   prerelease: false
   version_requirements: *id005
@@ -148,8 +148,8 @@ dependencies:
         segments: 
         - 0
         - 8
-        - 2
-        version: 0.8.2
+        - 3
+        version: 0.8.3
   type: :runtime
   prerelease: false
   version_requirements: *id009
@@ -266,6 +266,7 @@ files:
 - lib/vagrant/action/vm/forward_ports.rb
 - lib/vagrant/action/vm/forward_ports_helpers.rb
 - lib/vagrant/action/vm/halt.rb
+- lib/vagrant/action/vm/host_name.rb
 - lib/vagrant/action/vm/import.rb
 - lib/vagrant/action/vm/match_mac_address.rb
 - lib/vagrant/action/vm/network.rb
@@ -331,11 +332,13 @@ files:
 - lib/vagrant/provisioners/chef_solo.rb
 - lib/vagrant/provisioners/puppet.rb
 - lib/vagrant/provisioners/puppet_server.rb
+- lib/vagrant/provisioners/shell.rb
 - lib/vagrant/ssh.rb
 - lib/vagrant/ssh/session.rb
 - lib/vagrant/systems.rb
 - lib/vagrant/systems/base.rb
 - lib/vagrant/systems/debian.rb
+- lib/vagrant/systems/freebsd.rb
 - lib/vagrant/systems/gentoo.rb
 - lib/vagrant/systems/linux.rb
 - lib/vagrant/systems/linux/config.rb
@@ -394,6 +397,7 @@ files:
 - test/vagrant/action/vm/forward_ports_helpers_test.rb
 - test/vagrant/action/vm/forward_ports_test.rb
 - test/vagrant/action/vm/halt_test.rb
+- test/vagrant/action/vm/host_name_test.rb
 - test/vagrant/action/vm/import_test.rb
 - test/vagrant/action/vm/match_mac_address_test.rb
 - test/vagrant/action/vm/network_test.rb
@@ -437,6 +441,7 @@ files:
 - test/vagrant/provisioners/chef_test.rb
 - test/vagrant/provisioners/puppet_server_test.rb
 - test/vagrant/provisioners/puppet_test.rb
+- test/vagrant/provisioners/shell_test.rb
 - test/vagrant/ssh/session_test.rb
 - test/vagrant/ssh_test.rb
 - test/vagrant/systems/base_test.rb
@@ -466,7 +471,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -3286949326636393746
+      hash: 1780875607345345301
       segments: 
       - 0
       version: "0"