vagrant 0.7.8 → 0.8.1

data/lib/vagrant/systems.rb

@@ -8,4 +8,5 @@ require 'vagrant/systems/solaris'
 require 'vagrant/systems/debian'
 require 'vagrant/systems/gentoo'
 require 'vagrant/systems/redhat'
+require 'vagrant/systems/suse'
 require 'vagrant/systems/ubuntu'

data/lib/vagrant/systems/base.rb

@@ -60,7 +60,7 @@ module Vagrant
       # @param [String] name The name of the shared folder.
       # @param [String] guestpath The path on the machine which the user
       #   wants the folder mounted.
-      def mount_shared_folder(ssh, name, guestpath); end
+      def mount_shared_folder(ssh, name, guestpath, owner, group); end
 
       # Mounts a shared folder via NFS. This assumes that the exports
       # via the host are already done.

data/lib/vagrant/systems/linux.rb

@@ -13,6 +13,7 @@ module Vagrant
 
           return :gentoo if ssh.test?("cat /etc/gentoo-release")
           return :redhat if ssh.test?("cat /etc/redhat-release")
+          return :suse if ssh.test?("cat /etc/SuSE-release")
         end
 
         # Can't detect the distro, assume vanilla linux
@@ -37,10 +38,10 @@ module Vagrant
         end
       end
 
-      def mount_shared_folder(ssh, name, guestpath)
+      def mount_shared_folder(ssh, name, guestpath, owner, group)
         ssh.exec!("sudo mkdir -p #{guestpath}")
-        mount_folder(ssh, name, guestpath)
-        ssh.exec!("sudo chown #{vm.env.config.ssh.username} #{guestpath}")
+        mount_folder(ssh, name, guestpath, owner, group)
+        ssh.exec!("sudo chown `id -u #{owner}`:`id -g #{group}` #{guestpath}")
       end
 
       def mount_nfs(ip, folders)
@@ -57,16 +58,13 @@ module Vagrant
       #-------------------------------------------------------------------
       # "Private" methods which assist above methods
       #-------------------------------------------------------------------
-      def mount_folder(ssh, name, guestpath, sleeptime=5)
+      def mount_folder(ssh, name, guestpath, owner, group, sleeptime=5)
         # Determine the permission string to attach to the mount command
-        perms = []
-        perms << "uid=`id -u #{vm.env.config.vm.shared_folder_uid}`"
-        perms << "gid=`id -g #{vm.env.config.vm.shared_folder_gid}`"
-        perms = " -o #{perms.join(",")}" if !perms.empty?
+        options = "-o uid=`id -u #{owner}`,gid=`id -g #{group}`"
 
         attempts = 0
         while true
-          result = ssh.exec!("sudo mount -t vboxsf#{perms} #{name} #{guestpath}") do |ch, type, data|
+          result = ssh.exec!("sudo mount -t vboxsf #{options} #{name} #{guestpath}") do |ch, type, data|
             # net/ssh returns the value in ch[:result] (based on looking at source)
             ch[:result] = !!(type == :stderr && data =~ /No such device/i)
           end

data/lib/vagrant/systems/redhat.rb

@@ -6,9 +6,9 @@ module Vagrant
         # interface file.
         vm.ssh.execute do |ssh|
           # Clear out any previous entries
-          ssh.exec!("sudo touch /etc/sysconfig/network-scripts/ifcfg-eth#{net_options[:adapter]}")
-          ssh.exec!("sudo sed -e '/^#VAGRANT-BEGIN/,/^#VAGRANT-END/ d' /etc/sysconfig/network-scripts/ifcfg-eth#{net_options[:adapter]} > /tmp/vagrant-ifcfg-eth#{net_options[:adapter]}")
-          ssh.exec!("sudo su -c 'cat /tmp/vagrant-ifcfg-eth#{net_options[:adapter]} > /etc/sysconfig/network-scripts/ifcfg-eth#{net_options[:adapter]}'")
+          ssh.exec!("sudo touch #{network_scripts_dir}/ifcfg-eth#{net_options[:adapter]}")
+          ssh.exec!("sudo sed -e '/^#VAGRANT-BEGIN/,/^#VAGRANT-END/ d' #{network_scripts_dir}/ifcfg-eth#{net_options[:adapter]} > /tmp/vagrant-ifcfg-eth#{net_options[:adapter]}")
+          ssh.exec!("sudo su -c 'cat /tmp/vagrant-ifcfg-eth#{net_options[:adapter]} > #{network_scripts_dir}/ifcfg-eth#{net_options[:adapter]}'")
         end
       end
 
@@ -20,11 +20,19 @@ module Vagrant
         vm.ssh.execute do |ssh|
           interface_up = ssh.test?("/sbin/ifconfig eth#{net_options[:adapter]} | grep 'inet addr:'")
           ssh.exec!("sudo /sbin/ifdown eth#{net_options[:adapter]} 2> /dev/null") if interface_up
-          ssh.exec!("sudo su -c 'cat /tmp/vagrant-network-entry >> /etc/sysconfig/network-scripts/ifcfg-eth#{net_options[:adapter]}'")
+          ssh.exec!("sudo su -c 'cat /tmp/vagrant-network-entry >> #{network_scripts_dir}/ifcfg-eth#{net_options[:adapter]}'")
           ssh.exec!("sudo /sbin/ifup eth#{net_options[:adapter]}")
         end
       end
 
+      # The path to the directory with the network configuration scripts.
+      # This is pulled out into its own directory since there are other
+      # operationg systems (SuSE) which behave similarly but with a different
+      # path to the network scripts.
+      def network_scripts_dir
+        '/etc/sysconfig/network-scripts/'
+      end
+
       def change_host_name(name)
         vm.ssh.execute do |ssh|
           # Only do this if the hostname is not already set

data/lib/vagrant/systems/solaris.rb

@@ -51,11 +51,16 @@ module Vagrant
         end
       end
 
-      def mount_shared_folder(ssh, name, guestpath)
+      def mount_shared_folder(ssh, name, guestpath, owner, group)
+        # Create the shared folder
         ssh.exec!("#{vm.env.config.solaris.suexec_cmd} mkdir -p #{guestpath}")
-        # Using a custom mount method here; could use improvement.
-        ssh.exec!("#{vm.env.config.solaris.suexec_cmd} /sbin/mount -F vboxfs #{name} #{guestpath}")
-        ssh.exec!("#{vm.env.config.solaris.suexec_cmd} chown #{vm.env.config.ssh.username} #{guestpath}")
+
+        # Mount the folder with the proper owner/group
+        options = "-o uid=`id -u #{owner}`,gid=`id -g #{group}`"
+        ssh.exec!("#{vm.env.config.solaris.suexec_cmd} /sbin/mount -F vboxfs #{options} #{name} #{guestpath}")
+
+        # chown the folder to the proper owner/group
+        ssh.exec!("#{vm.env.config.solaris.suexec_cmd} chown `id -u #{owner}`:`id -g #{group}` #{guestpath}")
       end
     end
   end

data/lib/vagrant/systems/suse.rb

@@ -0,0 +1,9 @@
+module Vagrant
+  module Systems
+    class Suse < Redhat
+      def network_scripts_dir
+        '/etc/sysconfig/network/'
+      end 
+    end
+  end
+end

data/lib/vagrant/ui.rb

@@ -1,5 +1,3 @@
-require 'mario'
-
 module Vagrant
   # Vagrant UIs handle communication with the outside world (typically
   # through a shell). They must respond to the typically logger methods
@@ -11,8 +9,15 @@ module Vagrant
       @env = env
     end
 
-    [:warn, :error, :info, :confirm, :say_with_vm, :report_progress, :ask, :no?, :yes?].each do |method|
-      # By default these methods don't do anything. A silent UI.
+    [:warn, :error, :info, :confirm].each do |method|
+      define_method(method) do |message|
+        # Log normal console messages
+        env.logger.info("ui") { message }
+      end
+    end
+
+    [:report_progress, :ask, :no?, :yes?].each do |method|
+      # By default do nothing, these aren't logged
       define_method(method) { |*args| }
     end
 
@@ -28,6 +33,7 @@ module Vagrant
       [[:warn, :yellow], [:error, :red], [:info, nil], [:confirm, :green]].each do |method, color|
         class_eval <<-CODE
           def #{method}(message, opts=nil)
+            super(message)
             @shell.say("\#{line_reset}\#{format_message(message, opts)}", #{color.inspect})
           end
         CODE
@@ -36,6 +42,7 @@ module Vagrant
       [:ask, :no?, :yes?].each do |method|
         class_eval <<-CODE
           def #{method}(message, opts=nil)
+            super(message)
             opts ||= {}
             @shell.send(#{method.inspect}, format_message(message, opts), opts[:color])
           end
@@ -61,7 +68,7 @@ module Vagrant
 
       def line_reset
         reset = "\r"
-        reset += "\e[0K" unless Mario::Platform.windows?
+        reset += "\e[0K" unless Util::Platform.windows?
         reset
       end
     end

data/lib/vagrant/util.rb

@@ -1,12 +1,12 @@
 module Vagrant
   module Util
     autoload :Busy,                      'vagrant/util/busy'
+    autoload :Counter,                   'vagrant/util/counter'
     autoload :GlobLoader,                'vagrant/util/glob_loader'
     autoload :HashWithIndifferentAccess, 'vagrant/util/hash_with_indifferent_access'
-    autoload :PlainLogger,               'vagrant/util/plain_logger'
     autoload :Platform,                  'vagrant/util/platform'
-    autoload :ResourceLogger,            'vagrant/util/resource_logger'
     autoload :Retryable,                 'vagrant/util/retryable'
+    autoload :SafeExec,                  'vagrant/util/safe_exec'
     autoload :StackedProcRunner,         'vagrant/util/stacked_proc_runner'
     autoload :TemplateRenderer,          'vagrant/util/template_renderer'
   end

data/lib/vagrant/util/counter.rb

@@ -0,0 +1,22 @@
+require 'thread'
+
+module Vagrant
+  module Util
+    # Atomic counter implementation. This is useful for incrementing
+    # a counter which is guaranteed to only be used once in its class.
+    module Counter
+      def get_and_update_counter
+        mutex.synchronize do
+          @__counter ||= 1
+          result = @__counter
+          @__counter += 1
+          result
+        end
+      end
+
+      def mutex
+        @__counter_mutex ||= Mutex.new
+      end
+    end
+  end
+end

data/lib/vagrant/util/platform.rb

@@ -1,5 +1,4 @@
 require 'rbconfig'
-require 'mario'
 
 module Vagrant
   module Util
@@ -53,7 +52,7 @@ module Vagrant
 
         def tar_file_options
           # create, write only, fail if the file exists, binary if windows
-          File::WRONLY|File::EXCL|File::CREAT|(Mario::Platform.windows? ? File::BINARY : 0)
+          File::WRONLY | File::EXCL | File::CREAT | (windows? ? File::BINARY : 0)
         end
 
         def platform

data/lib/vagrant/util/safe_exec.rb

@@ -0,0 +1,28 @@
+module Vagrant
+  module Util
+    # This module provies a `safe_exec` method which is a drop-in
+    # replacement for `Kernel.exec` which addresses a specific issue
+    # which manifests on OS X 10.5 and perhaps other operating systems.
+    # This issue causes `exec` to fail if there is more than one system
+    # thread. In that case, `safe_exec` automatically falls back to
+    # forking.
+    module SafeExec
+      def safe_exec(command)
+        fork_instead = false
+        begin
+          pid = nil
+          pid = fork if fork_instead
+          Kernel.exec(command) if pid.nil?
+          Process.wait(pid) if pid
+        rescue Errno::E045
+          # We retried already, raise the issue and be done
+          raise if fork_instead
+
+          # The error manifested itself, retry with a fork.
+          fork_instead = true
+          retry
+        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.8"
+  VERSION = "0.8.1"
 end

data/lib/vagrant/vm.rb

@@ -51,6 +51,7 @@ module Vagrant
     # **This method should never be called manually.**
     def load_system!(system=nil)
       system ||= env.config.vm.system
+      env.logger.info("vm: #{name}") { "Loading system: #{system}" }
 
       if system.is_a?(Class)
         raise Errors::VMSystemError, :_key => :invalid_class, :system => system.to_s if !(system <= Systems::Base)
@@ -63,6 +64,7 @@ module Vagrant
           :freebsd => Systems::FreeBSD,
           :gentoo  => Systems::Gentoo,
           :redhat  => Systems::Redhat,
+          :suse    => Systems::Suse,
           :linux   => Systems::Linux,
           :solaris => Systems::Solaris
         }

data/templates/chef_solo_solo.erb

@@ -2,12 +2,12 @@
 node_name "<%= node_name %>"
 <% end %>
 file_cache_path "<%= provisioning_path %>"
-cookbook_path <%= cookbooks_path %>
-role_path <%= roles_path %>
+cookbook_path <%= cookbooks_path.inspect %>
+role_path <%= roles_path.inspect %>
 log_level <%= log_level.inspect %>
 
-<% if data_bags_path %>
-data_bag_path <%= data_bags_path %>
+<% if data_bags_path -%>
+data_bag_path <%= data_bags_path.inspect %>
 <% end %>
 
 <% if recipe_url -%>

data/templates/commands/init/Vagrantfile.erb

@@ -33,6 +33,10 @@ Vagrant::Config.run do |config|
   #
   # An example Puppet manifest to provision the message of the day:
   #
+  # # group { "puppet":
+  # #   ensure => "present",
+  # # }
+  # #
   # # File { owner => 0, group => 0, mode => 0644 }
   # #
   # # file { '/etc/motd':

data/templates/locales/en.yml

@@ -2,6 +2,14 @@ en:
   vagrant:
     general:
       creating_home_dir: "Creating home directory since it doesn't exist: %{directory}"
+      moving_home_dir: "Moving old Vagrant home directory to new location: %{directory}"
+      home_dir_migration_failed: |-
+        Both an old and new Vagrant home directory exist. Only the new one will
+        be used. Please merge the old directory into the new directory if you'd
+        like to use the old data as well.
+
+        Old: %{old}
+        New: %{new}
 
 #-------------------------------------------------------------------------------
 # Translations for exception classes
@@ -31,6 +39,11 @@ en:
         this command in another directory. If you aren't in a home directory,
         then please rename ".vagrant" to something else, or configure Vagrant
         to use another filename by modifying `config.vagrant.dotfile_name`.
+      environment_locked: |-
+        An instance of Vagrant is already running. Only one instance of Vagrant
+        may run at any given time to avoid problems with VirtualBox inconsistencies
+        occurring. Please wait for the other instance of Vagrant to end and then
+        try again.
       interrupted: "Vagrant exited after cleanup due to external interrupt."
       multi_vm_required: "A multi-vm environment is required for name specification to this command."
       multi_vm_target_required: "`vagrant %{command}` requires a specific VM name to target in a multi-VM environment."
@@ -127,13 +140,15 @@ en:
         %{file}
       virtualbox_invalid_version: |-
         Vagrant has detected that you have VirtualBox version %{version} installed!
-        Vagrant requires that you use at least VirtualBox version 4.0. Please install
+        Vagrant requires that you use at least VirtualBox version 4.1. Please install
         a more recent version of VirtualBox to continue.
 
-        The Vagrant 0.6.x series supports VirtualBox 3.2, so if you're stuck with that
-        version, then please use the 0.6.x series of Vagrant.
+        Early versions of Vagrant support earlier versions of VirtualBox. Specifically,
+        the 0.7.x series supports VirtualBox 4.0.x and the 0.6.x series supports VirtualBox
+        3.2.x. Please use the version you need.
 
-        Any earlier versions of VirtualBox are completely unsupported. Please upgrade.
+        Any newer versions may not be supported yet. Please check the mailing list
+        for any announcements of newer versions.
       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
@@ -176,6 +191,9 @@ en:
         box_missing: "A box must be specified."
         box_not_found: "The box '%{name}' could not be found."
         shared_folder_hostpath_missing: "Shared folder host path for '%{name}' doesn't exist: %{path}"
+        shared_folder_nfs_owner_group: |-
+          Shared folder '%{name}': NFS does not support the owner/group settings.
+        provisioner_chef_server_changed: "The provisioner 'chef_server' is now 'chef_client'"
         provisioner_not_found: "The provisioner '%{shortcut}' doesn't exist."
         provisioner_invalid_class: "The provisioner '%{shortcut}' must inherit from `Vagrant::Provisioners::Base`."
 
@@ -188,7 +206,7 @@ en:
       box:
         no_installed_boxes: "There are no installed boxes! Use `vagrant box add` to add some."
       ssh:
-        execute: "Execute: %{command}"
+        command: "Command: %{command}"
       status:
         aborted: |-
           The VM is in an aborted state. This means that it was abruptly
@@ -395,7 +413,6 @@ en:
           persisting: "Persisting the VM UUID (%{uuid})..."
         provision:
           beginning: "Running provisioner: %{provisioner}..."
-          enabled: "Provisioning enabled with %{provisioner}..."
         resume:
           resuming: Resuming suspended VM...
         share_folders:
@@ -450,6 +467,11 @@ en:
           An error occurred while trying to download the specified box. This most
           often happens if there is no internet connection or the address is
           invalid.
+        status_error: |-
+          Bad status code: %{status}
+
+          Please verify that the box exists and is accessible. Also verify that
+          this computer is properly connected to the internet.
 
     hosts:
       bsd:
@@ -471,7 +493,7 @@ en:
         upload_encrypted_data_bag_secret_key: "Uploading chef encrypted data bag secret key..."
         running_client: "Running chef-client..."
         running_solo: "Running chef-solo..."
-        invalid_provisioner: "Vagrant::Provisioners::Chef is not a valid provisioner! Use ChefSolo or ChefServer instead."
+        invalid_provisioner: "Vagrant::Provisioners::Chef is not a valid provisioner! Use ChefSolo or ChefClient instead."
         not_detected: |-
           The `%{binary}` binary appears to not be in the PATH of the guest. This
           could be because the PATH is not properly setup or perhaps chef is not
@@ -509,7 +531,8 @@ en:
         running_puppetd: "Running Puppet agent..."
 
       shell:
-        path_not_set: "`path` parameter pointing to script file to execute for shell provisioner is required"
+        path_and_inline_set: "Only one of `path` or `inline` may be set."
+        no_path_or_inline: "One of `path` or `inline` must be set."
         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."
 

data/templates/ssh_config.erb

@@ -7,3 +7,9 @@ Host <%= host_key %>
   PasswordAuthentication no
   IdentityFile <%= private_key_path %>
   IdentitiesOnly yes
+<% if forward_agent -%>
+  ForwardAgent yes
+<% end -%>
+<% if forward_x11 -%>
+  ForwardX11 yes
+<% end -%>

data/test/test_helper.rb

@@ -2,7 +2,6 @@
 $:.unshift(File.dirname(__FILE__))
 
 require 'vagrant'
-require 'mario'
 require 'contest'
 require 'mocha'
 
@@ -14,8 +13,11 @@ begin
 rescue LoadError
 end
 
-# Silence Mario by sending log output to black hole
-Mario::Platform.logger(nil)
+# Set the home directory to some temporary directory
+ENV["HOME"] = Vagrant.source_root.join("test", "tmp", "home").to_s
+
+# Set the log output to nothing
+ENV["VAGRANT_LOG"] = "NULL"
 
 # Add the I18n locale for tests
 I18n.load_path << File.expand_path("../locales/en.yml", __FILE__)

data/test/vagrant/action/builder_test.rb

@@ -1,4 +1,5 @@
 require "test_helper"
+require "logger"
 
 class ActionBuilderTest < Test::Unit::TestCase
   setup do
@@ -64,6 +65,7 @@ class ActionBuilderTest < Test::Unit::TestCase
     context "flatten" do
       should "return the flattened format of the builder" do
         env = Vagrant::Action::Environment.new(nil)
+        env["logger"] = Logger.new(nil)
         env.expects(:foo).once
 
         func = lambda { |x| x.foo }
@@ -157,6 +159,7 @@ class ActionBuilderTest < Test::Unit::TestCase
     context "converting to an app" do
       should "make non-classes lambdas" do
         env = Vagrant::Action::Environment.new(nil)
+        env["logger"] = Logger.new(nil)
         env.expects(:foo).once
 
         func = lambda { |x| x.foo }
@@ -193,6 +196,7 @@ class ActionBuilderTest < Test::Unit::TestCase
         end
 
         env = Vagrant::Action::Environment.new(nil)
+        env["logger"] = Logger.new(nil)
         env[:key] = :value
 
         @instance.use(mw)