vagrant 0.7.0.beta → 0.7.0.beta2

data/lib/vagrant/systems/linux/error.rb

@@ -0,0 +1,9 @@
+module Vagrant
+  module Systems
+    class Linux < Vagrant::Systems::Base
+      class LinuxError < Errors::VagrantError
+        error_namespace("vagrant.systems.linux")
+      end
+    end
+  end
+end

data/lib/vagrant/systems/redhat.rb

@@ -0,0 +1,31 @@
+module Vagrant
+  module Systems
+    class Redhat < Linux
+      def prepare_host_only_network(net_options)
+        # 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/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]}'")
+        end
+      end
+
+      def enable_host_only_network(net_options)
+        entry = TemplateRenderer.render('network_entry_redhat', :net_options => net_options)
+
+        vm.ssh.upload!(StringIO.new(entry), "/tmp/vagrant-network-entry")
+
+        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 /sbin/ifup eth#{net_options[:adapter]}")
+        end
+      end
+    end
+  end
+end
+
+
+

data/lib/vagrant/test_helpers.rb

@@ -31,8 +31,8 @@ module Vagrant
 
       str  = args.shift || ""
       File.open(path.to_s, "w") do |f|
+        f.puts "ENV['VAGRANT_HOME'] = '#{home_path}'"
         f.puts "Vagrant::Config.run do |config|"
-        f.puts "config.vagrant.home = '#{home_path}'"
         f.puts "config.vm.base_mac = 'foo' if !config.vm.base_mac"
         f.puts "config.vm.box = 'base'"
         f.puts str

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.beta"
+  VERSION = "0.7.0.beta2"
 end

data/lib/vagrant/vm.rb

@@ -3,7 +3,6 @@ module Vagrant
     include Vagrant::Util
 
     attr_reader :env
-    attr_reader :system
     attr_reader :name
     attr_reader :vm
 
@@ -41,6 +40,8 @@ module Vagrant
         # Load the associated system.
         load_system!
       end
+
+      @loaded_system_distro = false
     end
 
     # Loads the system associated with the VM. The system class is
@@ -48,15 +49,21 @@ module Vagrant
     # can be found by reading the documentation on {Vagrant::Systems::Base}.
     #
     # **This method should never be called manually.**
-    def load_system!
-      system = env.config.vm.system
+    def load_system!(system=nil)
+      system ||= env.config.vm.system
 
       if system.is_a?(Class)
+        raise Errors::VMSystemError, :_key => :invalid_class, :system => system.to_s if !(system <= Systems::Base)
         @system = system.new(self)
-        raise Errors::VMSystemError, :_key => :invalid_class, :system => system.to_s if !@system.is_a?(Systems::Base)
       elsif system.is_a?(Symbol)
         # Hard-coded internal systems
-        mapping = { :linux => Systems::Linux, :solaris => Systems::Solaris }
+        mapping = {
+          :debian => Systems::Debian,
+          :gentoo => Systems::Gentoo,
+          :redhat => Systems::Redhat,
+          :linux => Systems::Linux,
+          :solaris => Systems::Solaris
+        }
 
         raise Errors::VMSystemError, :_key => :unknown_type, :system => system.to_s if !mapping.has_key?(system)
         @system = mapping[system].new(self)
@@ -65,6 +72,19 @@ module Vagrant
       end
     end
 
+    # Returns the system for this VM, loading the distro of the system if
+    # we can.
+    def system
+      if !@loaded_system_distro && created? && vm.running?
+        # Load the system distro for the first time
+        result = @system.distro_dispatch
+        load_system!(result)
+        @loaded_system_distro = true
+      end
+
+      @system
+    end
+
     # Access the {Vagrant::SSH} object associated with this VM.
     # On the initial call, this will initialize the object. On
     # subsequent calls it will reuse the existing object.

data/templates/chef_solo_solo.erb

@@ -4,8 +4,16 @@ node_name "<%= node_name %>"
 file_cache_path "<%= provisioning_path %>"
 cookbook_path <%= cookbooks_path %>
 role_path <%= roles_path %>
-log_level          <%= log_level.inspect %>
+log_level <%= log_level.inspect %>
 
-<% if recipe_url %>
+<% if recipe_url -%>
 recipe_url "<%= recipe_url %>"
-<% end %>
+<% end -%>
+
+http_proxy <%= http_proxy.inspect %>
+http_proxy_user <%= http_proxy_user.inspect %>
+http_proxy_pass <%= http_proxy_pass.inspect %>
+https_proxy <%= https_proxy.inspect %>
+https_proxy_user <%= https_proxy_user.inspect %>
+https_proxy_pass <%= https_proxy_pass.inspect %>
+no_proxy <%= no_proxy.inspect %>

data/templates/locales/en.yml

@@ -16,6 +16,9 @@ en:
       puppet_not_detected: |-
         The `puppet` binary was not found on the VM and is required for Puppet provisioning.
         Please verify that Puppet is installed and that the binary is available on the PATH.
+      puppetd_not_detected: |-
+        The `puppetd` binary was not found on the VM is required for Puppet Server provisioning.
+        Please verify that Puppet is installed and that the binary is available on the PATH.
       cli_missing_env: This command requires that a Vagrant environment be properly passed in as the last parameter.
       config_validation: |-
         There was a problem with the configuration of Vagrant. The error message(s)
@@ -28,10 +31,35 @@ 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`.
-      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.
-      no_env: No Vagrant environment detected. Run `vagrant init` to set one up.
+      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."
+      no_env: "No Vagrant environment detected. Run `vagrant init` to set one up."
+      provisioner_equals_not_supported: |-
+        The `config.vm.provisioner =` syntax has been removed in Vagrant 0.7.0.
+        Please change your provisioners to use the new syntax described below.
+        All of these changes are reflected on the Vagrant website as well.
+
+        Before:
+
+          config.vm.provisioner = :chef_solo
+          config.chef.cookbooks_path = "my_cookbooks"
+          config.chef.add_recipe "apache"
+
+        After:
+
+          config.vm.provision :chef_solo, :cookbooks_path => "my_cookbooks",
+                                          :run_list => ["recipe[apache]"]
+
+        Instead of just a hash, you may use a block as well to get access to the
+        configuration object:
+
+          config.vm.provision :chef_solo do |chef|
+            chef.cookbooks_path = "my_cookbooks"
+            chef.add_recipe "apache"
+          end
+
+        This error message will be removed in later versions of Vagrant.
       ssh_authentication_failed: |-
         SSH authentication failed! This is typically caused by the public/private
         keypair for the SSH user not being properly set on the guest VM. Please
@@ -89,11 +117,6 @@ en:
         message is reproduced below for convenience:
 
         %{file}
-      virtualbox_invalid_ose: |-
-        Vagrant has detected you're using an OSE ("Open Source Edition") of VirtualBox.
-        Vagrant currently doesn't support any of the OSE editions due to slight API
-        differences. Please download the regular package from virtualbox.org and install
-        to continue.
       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
@@ -142,6 +165,8 @@ 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}"
+        provisioner_not_found: "The provisioner '%{shortcut}' doesn't exist."
+        provisioner_invalid_class: "The provisioner '%{shortcut}' must inherit from `Vagrant::Provisioners::Base`."
 
 #-------------------------------------------------------------------------------
 # Translations for commands. e.g. `vagrant x`
@@ -351,16 +376,15 @@ en:
             key.
           persisting: "Persisting the VM UUID (%{uuid})..."
         provision:
-          beginning: "Beginning provisioning process..."
+          beginning: "Running provisioner: %{provisioner}..."
           enabled: "Provisioning enabled with %{provisioner}..."
-          invalid_class: "Provisioners must be an instance of Vagrant::Provisioners::Base"
-          unknown_type: "Unknown provisioner type: %{provisioner}"
         resume:
           resuming: Resuming suspended VM...
         share_folders:
           creating: Creating shared folders metadata...
           mounting: Mounting shared folders...
           mounting_entry: "-- %{name}: %{guest_path}"
+          nomount_entry: "-- %{name}: Automounting disabled."
         suspend:
           suspending: Saving VM state and suspending execution...
 
@@ -370,7 +394,6 @@ en:
         download:
           with: "Downloading with %{class}..."
           cleaning: "Cleaning up downloaded box..."
-          copying: "Copying box to temporary location..."
           unknown_type: "Unknown or unsupported URI type given for box download."
         unpackage:
           extracting: "Extracting box..."
@@ -401,8 +424,10 @@ en:
 
     downloaders:
       file:
+        download: "Copying box to temporary location..."
         file_missing: "The specified path to a file doesn't exist."
       http:
+        download: "Downloading box: %{url}"
         socket_error: |-
           An error occurred while trying to download the specified box. This most
           often happens if there is no internet connection or the address is
@@ -447,23 +472,38 @@ en:
           could be because the PATH is not properly setup or perhaps Puppet is not
           installed on this guest. Puppet provisioning can not continue without
           Puppet properly installed.
-        running_puppet: "Running Puppet..."
-        manifest_to_run: "Puppet will use the %{manifest} manifest to configure your box."
+        running_puppet: "Running Puppet with %{manifest}..."
         manifest_missing: "The Puppet %{manifest} manifest is missing. You cannot configure this box."
+        manifests_path_missing: "The manifests path specified for Puppet does not exist: %{path}"
+
+      puppet_server:
+        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 Puppet is not
+          installed on this guest. Puppet provisioning can not continue without
+          Puppet properly installed.
+        running_puppetd: "Running Puppet agent..."
 
     systems:
+      base:
+        unsupported_host_only: |-
+          Host only networking is very distro-specific. Vagrant has support for many
+          distros built-in: Debian, Ubuntu, Gentoo, and RedHat. The distro of your VM
+          couldn't be detected, or isn't supported for host only networking.
+
+          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.
+
       linux:
         attempting_halt: "Attempting graceful shutdown of linux..."
         mount_fail: "Failed to mount shared folders. `vboxsf` was not available."
-        network_not_debian: |-
-          Host only networking is only supported for Debian/Ubuntu by the built-in
-          "Linux" system. If you're using some other distro and want to implement
-          host only networking, please subclass the `Vagrant::Systems::Linux` class
-          and implement the `prepare_host_only_network` and `enable_host_only_network`
-          methods.
-
-          Otherwise, please report your distro and how to modify network interfaces
-          to the Vagrant mailing list or IRC and we'll probably be glad to add it
-          to the internal systems.
+        mount_nfs_fail: |-
+          Mounting NFS shared folders failed. This is most often caused by the NFS
+          client software not being installed on the guest machine. Please verify
+          that the NFS client software is properly installed, and consult any resources
+          specific to the linux distro you're using for more information on how to
+          do this.
+
       solaris:
         attempting_halt: "Attempting graceful shutdown of solaris..."

data/templates/network_entry_gentoo.erb

@@ -0,0 +1,7 @@
+#VAGRANT-BEGIN
+# The contents below are automatically generated by Vagrant.
+# Please do not modify any of these contents.
+config_eth<%= net_options[:adapter] %>=("<%= net_options[:ip] %> netmask <%= net_options[:netmask] %>")
+#VAGRANT-END
+~            
+

data/templates/network_entry_redhat.erb

@@ -0,0 +1,8 @@
+#VAGRANT-BEGIN
+# The contents below are automatically generated by Vagrant.
+# Please do not modify any of these contents.
+BOOTPROTO=static
+DHCPCLASS=
+IPADDR=<%= net_options[:ip] %>
+NETMASK=<%= net_options[:netmask] %>
+#VAGRANT-END

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

@@ -45,6 +45,7 @@ class CheckBoxVMActionTest < Test::Unit::TestCase
       env.env.boxes.expects(:find).returns(nil)
       Vagrant::Box.expects(:add).with(env.env, env["config"].vm.box, env["config"].vm.box_url).in_sequence(seq)
       env.env.boxes.expects(:reload!).in_sequence(seq)
+      env.env.expects(:reload_config!).in_sequence(seq)
       app.expects(:call).with(env).once.in_sequence(seq)
 
       assert_nothing_raised {

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

@@ -160,13 +160,19 @@ class NFSVMActionTest < Test::Unit::TestCase
     context "mounting folders" do
       setup do
         @instance.stubs(:host_ip).returns("foo")
-        @instance.stubs(:folders).returns(["bar"])
+        @instance.stubs(:folders).returns({ "v-data" => {:guestpath => "foo"}})
       end
 
       should "mount the folders on the system" do
         @vm.system.expects(:mount_nfs).with(@instance.host_ip, @instance.folders)
         @instance.mount_folders
       end
+
+      should "not mount folders which have no guest path" do
+        @instance.stubs(:folders).returns({ "v-data" => {}})
+        @vm.system.expects(:mount_nfs).with(@instance.host_ip, {})
+        @instance.mount_folders
+      end
     end
 
     context "getting the host IP" do

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

@@ -17,24 +17,23 @@ class ProvisionVMActionTest < Test::Unit::TestCase
 
   context "initializing" do
     setup do
-      @klass.any_instance.stubs(:load_provisioner)
+      @klass.any_instance.stubs(:load_provisioners)
     end
 
     should "load provisioner if provisioning enabled" do
-      @env["config"].vm.provisioner = :chef_solo
-      @klass.any_instance.expects(:load_provisioner).once
+      @env["config"].vm.provision :chef_solo
+      @klass.any_instance.expects(:load_provisioners).once
       @klass.new(@app, @env)
     end
 
     should "not load provisioner if disabled" do
-      @env["config"].vm.provisioner = nil
-      @klass.any_instance.expects(:load_provisioner).never
+      @klass.any_instance.expects(:load_provisioners).never
       @klass.new(@app, @env)
     end
 
     should "not load provisioner if disabled through env hash" do
       @env["provision.enabled"] = false
-      @klass.any_instance.expects(:load_provisioner).never
+      @klass.any_instance.expects(:load_provisioners).never
       @klass.new(@app, @env)
     end
   end
@@ -42,101 +41,47 @@ class ProvisionVMActionTest < Test::Unit::TestCase
   context "with an instance" do
     setup do
       # Set provisioner to nil so the provisioner isn't loaded on init
-      @env["config"].vm.provisioner = nil
+      @env["config"].vm.provisioners.clear
       @instance = @klass.new(@app, @env)
     end
 
     context "loading a provisioner" do
-      context "with a Class provisioner" do
-        setup do
-          @prov = mock("instance")
-          @prov.stubs(:is_a?).with(Vagrant::Provisioners::Base).returns(true)
-          @prov.stubs(:prepare)
-          @klass = mock("klass")
-          @klass.stubs(:is_a?).with(Class).returns(true)
-          @klass.stubs(:new).with(@env).returns(@prov)
-
-          @env["config"].vm.provisioner = @klass
-        end
-
-        should "set the provisioner to an instantiation of the class" do
-          @klass.expects(:new).with(@env).once.returns(@prov)
-          assert_equal @prov, @instance.load_provisioner
-        end
-
-        should "call prepare on the instance" do
-          @prov.expects(:prepare).once
-          @instance.load_provisioner
-        end
-
-        should "error environment if the class is not a subclass of the provisioner base" do
-          @prov.expects(:is_a?).with(Vagrant::Provisioners::Base).returns(false)
-
-          assert_raises(Vagrant::Errors::ProvisionInvalidClass) {
-            @instance.load_provisioner
-          }
-        end
+      setup do
+        Vagrant::Provisioners::ChefSolo.any_instance.expects(:prepare).at_least(0)
       end
 
-      context "with a Symbol provisioner" do
-        def provisioner_expectation(symbol, provisioner)
-          @env[:config].vm.provisioner = symbol
-
-          instance = mock("instance")
-          instance.expects(:prepare).once
-          provisioner.expects(:new).with(@env).returns(instance)
-          assert_equal instance, @instance.load_provisioner
-        end
-
-        should "raise an error if its an unknown symbol" do
-          @env["config"].vm.provisioner = :this_will_never_exist
+      should "instantiate and prepare each provisioner" do
+        @env["config"].vm.provision :chef_solo
+        @env["config"].vm.provision :chef_solo
+        @instance.load_provisioners
 
-          assert_raises(Vagrant::Errors::ProvisionUnknownType) {
-            @instance.load_provisioner
-          }
-        end
+        assert_equal 2, @instance.provisioners.length
+      end
 
-        should "set :chef_solo to the ChefSolo provisioner" do
-          provisioner_expectation(:chef_solo, Vagrant::Provisioners::ChefSolo)
+      should "set the config for each provisioner" do
+        @env["config"].vm.provision :chef_solo do |chef|
+          chef.cookbooks_path = "foo"
         end
 
-        should "set :chef_server to the ChefServer provisioner" do
-          provisioner_expectation(:chef_server, Vagrant::Provisioners::ChefServer)
-        end
+        @instance.load_provisioners
 
-        should "set :puppet to the Puppet provisioner" do
-          provisioner_expectation(:puppet, Vagrant::Provisioners::Puppet)
-        end
+        assert_equal "foo", @instance.provisioners.first.config.cookbooks_path
       end
     end
 
     context "calling" do
       setup do
         Vagrant::Provisioners::ChefSolo.any_instance.stubs(:prepare)
-        @env["config"].vm.provisioner = :chef_solo
-        @prov = @instance.load_provisioner
+        @env["config"].vm.provision :chef_solo
+        @instance.load_provisioners
       end
 
       should "provision and continue chain" do
         seq = sequence("seq")
         @app.expects(:call).with(@env).in_sequence(seq)
-        @prov.expects(:provision!).in_sequence(seq)
-
-        @instance.call(@env)
-      end
-
-      should "continue chain and not provision if not enabled" do
-        @env["config"].vm.provisioner = nil
-        @prov.expects(:provision!).never
-        @app.expects(:call).with(@env).once
-
-        @instance.call(@env)
-      end
-
-      should "continue chain and not provision if not enabled through env hash" do
-        @env["provision.enabled"] = false
-        @prov.expects(:provision!).never
-        @app.expects(:call).with(@env).once
+        @instance.provisioners.each do |prov|
+          prov.expects(:provision!).in_sequence(seq)
+        end
 
         @instance.call(@env)
       end