vagrant 0.6.8 → 0.6.9

data/.gitignore

@@ -8,4 +8,6 @@ _site/*
 !templates/*
 *.org
 .yardoc/
-doc/
+doc/
+tags
+Gemfile.lock

data/CHANGELOG.md

@@ -1,4 +1,19 @@
-## 0.6.8 (unreleased)
+## 0.6.9 (December 21, 2010)
+
+  - Puppet provisioner. [GH-223]
+  - Solaris system configurable to use `sudo`.
+  - Solaris system registered, so it can be set with `:solaris`.
+  - `vagrant package` include can be a directory name, which will cause the
+    contents to be recursively copied into the package. [GH-241]
+  - Arbitrary options to puppet binary can be set with `config.puppet.options`. [GH-242]
+  - BSD hosts use proper GNU sed syntax for clearing NFS shares. [GH-243]
+  - Enumerate VMs in a multi-VM environment in order they were defined. [GH-244]
+  - Check for VM boot changed to use `timeout` library, which works better with Windows.
+  - Show special error if VirtualBox not detected on 64-bit Windows.
+  - Show error to Windows users attempting to use host only networking since
+    it doesn't work yet.
+
+## 0.6.8 (November 30, 2010)
 
   - Network interfaces are now up/down in distinct commands instead of just
     restarting "networking." [GH-192]

data/lib/vagrant/action.rb

@@ -94,7 +94,7 @@ module Vagrant
       callable = callable_id
       callable = Builder.new.use(callable_id) if callable_id.kind_of?(Class)
       callable = self.class.actions[callable_id] if callable_id.kind_of?(Symbol)
-      raise ArgumentError.new("Argument to run must be a callable object or registered action.") if !callable || !callable.respond_to?(:call)
+      raise ArgumentError, "Argument to run must be a callable object or registered action." if !callable || !callable.respond_to?(:call)
 
       action_environment = Action::Environment.new(env)
       action_environment.merge!(options || {})

data/lib/vagrant/action/box/download.rb

@@ -33,7 +33,7 @@ module Vagrant
             end
           end
 
-          raise Errors::BoxDownloadUnknownType.new if !@downloader
+          raise Errors::BoxDownloadUnknownType if !@downloader
 
           @downloader.prepare(@env["box"].uri)
           true

data/lib/vagrant/action/box/unpackage.rb

@@ -37,7 +37,7 @@ module Vagrant
         end
 
         def setup_box_directory
-          raise Errors::BoxAlreadyExists.new(:name => @env["box"].name) if File.directory?(@env["box"].directory)
+          raise Errors::BoxAlreadyExists, :name => @env["box"].name if File.directory?(@env["box"].directory)
 
           FileUtils.mkdir_p(@env["box"].directory)
           @box_directory = @env["box"].directory

data/lib/vagrant/action/box/verify.rb

@@ -12,7 +12,7 @@ module Vagrant
             env.ui.info I18n.t("vagrant.actions.box.verify.verifying")
             VirtualBox::Appliance.new(env["box"].ovf_file.to_s)
           rescue Exception
-            raise Errors::BoxVerificationFailed.new
+            raise Errors::BoxVerificationFailed
           end
 
           @app.call(env)

data/lib/vagrant/action/builder.rb

@@ -24,7 +24,7 @@ module Vagrant
       end
 
       # Returns the current stack of middlewares. You probably won't
-      # need to use this directly, and its recommended that you don't.
+      # need to use this directly, and it's recommended that you don't.
       #
       # @return [Array]
       def stack

data/lib/vagrant/action/general/package.rb

@@ -28,8 +28,8 @@ module Vagrant
         def call(env)
           @env = env
 
-          raise Errors::PackageOutputExists.new if File.exist?(tar_path)
-          raise Errors::PackageRequiresDirectory.new if !@env["package.directory"] || !File.directory?(@env["package.directory"])
+          raise Errors::PackageOutputExists if File.exist?(tar_path)
+          raise Errors::PackageRequiresDirectory if !@env["package.directory"] || !File.directory?(@env["package.directory"])
 
           verify_files_to_copy
           compress
@@ -57,7 +57,7 @@ module Vagrant
 
         def verify_files_to_copy
           files_to_copy.each do |file, _|
-            raise Errors::PackageIncludeMissing.new(:file => file) if !File.exist?(file)
+            raise Errors::PackageIncludeMissing, :file => file if !File.exist?(file)
           end
         end
 
@@ -68,7 +68,13 @@ module Vagrant
           files_to_copy.each do |from, to|
             @env.ui.info I18n.t("vagrant.actions.general.package.packaging", :file => from)
             FileUtils.mkdir_p(to.parent)
-            FileUtils.cp(from, to)
+
+            # Copy direcotry contents recursively.
+            if File.directory?(from)
+              FileUtils.cp_r(Dir.glob(from), to.parent)
+            else
+              FileUtils.cp(from, to)
+            end
           end
         end
 

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

@@ -12,7 +12,7 @@ module Vagrant
 
           # Start up the VM and wait for it to boot.
           boot
-          raise Errors::VMFailedToBoot.new if !wait_for_boot
+          raise Errors::VMFailedToBoot if !wait_for_boot
           @app.call(env)
         end
 

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

@@ -8,11 +8,11 @@ module Vagrant
 
         def call(env)
           box_name = env["config"].vm.box
-          raise Errors::BoxNotSpecified.new if !box_name
+          raise Errors::BoxNotSpecified if !box_name
 
           if !env.env.boxes.find(box_name)
             box_url = env["config"].vm.box_url
-            raise Errors::BoxSpecifiedDoesntExist.new(:name => box_name) if !box_url
+            raise Errors::BoxSpecifiedDoesntExist, :name => box_name if !box_url
 
             env.ui.info I18n.t("vagrant.actions.vm.check_box.not_found", :name => box_name)
             Vagrant::Box.add(env.env, box_name, box_url)

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

@@ -14,7 +14,7 @@ module Vagrant
         def call(env)
           @env = env
 
-          raise Errors::VMPowerOffToPackage.new if !@env["vm"].vm.powered_off?
+          raise Errors::VMPowerOffToPackage if !@env["vm"].vm.powered_off?
 
           setup_temp_dir
           export

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

@@ -23,7 +23,7 @@ module Vagrant
         # 1024, which causes the forwarded ports to fail.
         def threshold_check
           @env.env.config.vm.forwarded_ports.each do |name, options|
-            raise Errors::ForwardPortBelowThreshold.new if options[:hostport] <= 1024
+            raise Errors::ForwardPortBelowThreshold if options[:hostport] <= 1024
           end
         end
 
@@ -47,9 +47,9 @@ module Vagrant
           if !options[:auto]
             # Auto fixing is disabled for this port forward, so we
             # must throw an error so the user can fix it.
-            raise Errors::ForwardPortCollision.new(:name => name,
-                                                   :host_port => options[:hostport].to_s,
-                                                   :guest_port => options[:guestport].to_s)
+            raise Errors::ForwardPortCollision, :name => name,
+                                                :host_port => options[:hostport].to_s,
+                                                :guest_port => options[:guestport].to_s
           end
 
           # Get the auto port range and get rid of the used ports and
@@ -60,10 +60,10 @@ module Vagrant
           range -= existing_ports
 
           if range.empty?
-            raise Errors::ForwardPortAutolistEmpty.new(:vm_name => @env["vm"].name,
-                                                       :name => name,
-                                                       :host_port => options[:hostport].to_s,
-                                                       :guest_port => options[:guestport].to_s)
+            raise Errors::ForwardPortAutolistEmpty, :vm_name => @env["vm"].name,
+                                                    :name => name,
+                                                    :host_port => options[:hostport].to_s,
+                                                    :guest_port => options[:guestport].to_s
           end
 
           # Set the port up to be the first one and add that port to

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

@@ -15,7 +15,7 @@ module Vagrant
           end
 
           # Flag as erroneous and return if import failed
-          raise Errors::VMImportFailure.new if !env["vm"].vm
+          raise Errors::VMImportFailure if !env["vm"].vm
 
           # Import completed successfully. Continue the chain
           @app.call(env)

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

@@ -8,8 +8,12 @@ module Vagrant
           @app = app
           @env = env
 
+          if enable_network? && Util::Platform.windows?
+            raise Errors::NetworkNotImplemented
+          end
+
           env["config"].vm.network_options.compact.each do |network_options|
-            raise Errors::NetworkCollision.new if !verify_no_bridge_collision(network_options)
+            raise Errors::NetworkCollision if !verify_no_bridge_collision(network_options)
           end
         end
 
@@ -83,7 +87,7 @@ module Vagrant
             end
           end
 
-          raise Errors::NetworkNotFound.new(:name => net_options[:name]) if net_options[:name]
+          raise Errors::NetworkNotFound, :name => net_options[:name] if net_options[:name]
 
           # One doesn't exist, create it.
           @env.ui.info I18n.t("vagrant.actions.vm.network.creating")

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

@@ -147,9 +147,9 @@ module Vagrant
 
         # Verifies that the host is set and supports NFS.
         def verify_settings
-          raise Errors::NFSHostRequired.new if @env["host"].nil?
-          raise Errors::NFSNotSupported.new if !@env["host"].nfs?
-          raise Errors::NFSNoHostNetwork.new if @env["config"].vm.network_options.empty?
+          raise Errors::NFSHostRequired if @env["host"].nil?
+          raise Errors::NFSNotSupported if !@env["host"].nfs?
+          raise Errors::NFSNoHostNetwork if @env["config"].vm.network_options.empty?
         end
       end
     end

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

@@ -28,16 +28,17 @@ module Vagrant
 
           if provisioner.is_a?(Class)
             @provisioner = provisioner.new(@env)
-            raise Errors::ProvisionInvalidClass.new if !@provisioner.is_a?(Provisioners::Base)
+            raise Errors::ProvisionInvalidClass if !@provisioner.is_a?(Provisioners::Base)
           elsif provisioner.is_a?(Symbol)
             # We have a few hard coded provisioners for built-ins
             mapping = {
               :chef_solo    => Provisioners::ChefSolo,
-              :chef_server  => Provisioners::ChefServer
+              :chef_server  => Provisioners::ChefServer,
+              :puppet       => Provisioners::Puppet
             }
 
             provisioner_klass = mapping[provisioner]
-            raise Errors::ProvisionUnknownType.new(:provisioner => provisioner.to_s) if provisioner_klass.nil?
+            raise Errors::ProvisionUnknownType, :provisioner => provisioner.to_s if provisioner_klass.nil?
             @provisioner = provisioner_klass.new(@env)
           end
 

data/lib/vagrant/action/warden.rb

@@ -7,8 +7,9 @@ module Vagrant
     # exceptional events, and by providing a simple callback, can clean up
     # in any erroneous case.
     #
-    # Except for those who are curious about the internal workings of Vagrant,
-    # Warden will "just work" behind the scenes.
+    # Warden will "just work" behind the scenes, and is not of particular
+    # interest except to those who are curious about the internal workings
+    # of Vagrant.
     class Warden
       attr_accessor :actions, :stack
 
@@ -23,9 +24,9 @@ module Vagrant
         begin
           # Call the next middleware in the sequence, appending to the stack
           # of "recoverable" middlewares in case something goes wrong!
-          raise Errors::VagrantInterrupt.new if env.interrupted?
+          raise Errors::VagrantInterrupt if env.interrupted?
           @stack.unshift(@actions.shift).first.call(env)
-          raise Errors::VagrantInterrupt.new if env.interrupted?
+          raise Errors::VagrantInterrupt if env.interrupted?
         rescue SystemExit
           # This means that an "exit" or "abort" was called. In these cases,
           # we just exit immediately.

data/lib/vagrant/box.rb

@@ -57,7 +57,7 @@ module Vagrant
     # method requires that `name` and `uri` be set. The logic of this method
     # is kicked out to the `box_add` registered middleware.
     def add
-      raise Errors::BoxAlreadyExists.new(:name => name) if File.directory?(directory)
+      raise Errors::BoxAlreadyExists, :name => name if File.directory?(directory)
       env.actions.run(:box_add, { "box" => self, "validate" => false })
     end
 

data/lib/vagrant/command/box.rb

@@ -11,14 +11,14 @@ module Vagrant
       desc "remove NAME", "Remove a box from the system"
       def remove(name)
         b = env.boxes.find(name)
-        raise Errors::BoxNotFound.new(:name => name) if !b
+        raise Errors::BoxNotFound, :name => name if !b
         b.destroy
       end
 
       desc "repackage NAME", "Repackage an installed box into a `.box` file."
       def repackage(name)
         b = env.boxes.find(name)
-        raise Errors::BoxNotFound.new(:name => name) if !b
+        raise Errors::BoxNotFound, :name => name if !b
         b.repackage
       end
 

data/lib/vagrant/command/helpers.rb

@@ -4,24 +4,24 @@ module Vagrant
       # Initializes the environment by pulling the environment out of
       # the configuration hash and sets up the UI if necessary.
       def initialize_environment(args, options, config)
-        raise Errors::CLIMissingEnvironment.new if !config[:env]
+        raise Errors::CLIMissingEnvironment if !config[:env]
         @env = config[:env]
       end
 
       # This returns an array of {VM} objects depending on the arguments
       # given to the command.
       def target_vms(name=nil)
-        raise Errors::NoEnvironmentError.new if !env.root_path
+        raise Errors::NoEnvironmentError if !env.root_path
 
         name ||= self.name rescue nil
 
         @target_vms ||= begin
           if env.multivm?
-            return env.vms.values if !name
+            return env.vms_ordered if !name
             vm = env.vms[name.to_sym]
-            raise Errors::VMNotFoundError.new(:name => name) if !vm
+            raise Errors::VMNotFoundError, :name => name if !vm
           else
-            raise Errors::MultiVMEnvironmentRequired.new if name
+            raise Errors::MultiVMEnvironmentRequired if name
             vm = env.vms.values.first
           end
 

data/lib/vagrant/command/package.rb

@@ -16,14 +16,14 @@ module Vagrant
 
       def package_base
         vm = VM.find(options[:base], env)
-        raise Errors::BaseVMNotFound.new(:name => options[:base]) if !vm.created?
+        raise Errors::BaseVMNotFound, :name => options[:base] if !vm.created?
         package_vm(vm)
       end
 
       def package_target
-        raise Errors::MultiVMTargetRequired.new(:command => "package") if target_vms.length > 1
+        raise Errors::MultiVMTargetRequired, :command => "package" if target_vms.length > 1
         vm = target_vms.first
-        raise Errors::VMNotCreatedError.new if !vm.created?
+        raise Errors::VMNotCreatedError if !vm.created?
         package_vm(vm)
       end
 

data/lib/vagrant/command/ssh.rb

@@ -24,15 +24,15 @@ module Vagrant
       end
 
       def ssh_connect
-        raise Errors::VMNotCreatedError.new if !ssh_vm.created?
-        raise Errors::VMNotRunningError.new if !ssh_vm.vm.running?
+        raise Errors::VMNotCreatedError if !ssh_vm.created?
+        raise Errors::VMNotRunningError if !ssh_vm.vm.running?
         ssh_vm.ssh.connect
       end
 
       def ssh_vm
         @ssh_vm ||= begin
           vm = self.name.nil? && env.multivm? ? env.primary_vm : nil
-          raise Errors::MultiVMTargetRequired.new(:command => "ssh") if !vm && target_vms.length > 1
+          raise Errors::MultiVMTargetRequired, :command => "ssh" if !vm && target_vms.length > 1
           vm = target_vms.first if !vm
           vm
         end

data/lib/vagrant/command/ssh_config.rb

@@ -5,9 +5,9 @@ module Vagrant
       register "ssh_config", "outputs .ssh/config valid syntax for connecting to this environment via ssh"
 
       def execute
-        raise Errors::MultiVMTargetRequired.new(:command => "ssh_config") if target_vms.length > 1
+        raise Errors::MultiVMTargetRequired, :command => "ssh_config" if target_vms.length > 1
         vm = target_vms.first
-        raise Errors::VMNotCreatedError.new if !vm.created?
+        raise Errors::VMNotCreatedError if !vm.created?
 
         $stdout.puts(Util::TemplateRenderer.render("ssh_config", {
           :host_key => options[:host] || "vagrant",

data/lib/vagrant/config.rb

@@ -95,7 +95,7 @@ module Vagrant
             load item
           rescue SyntaxError => e
             # Report syntax errors in a nice way for Vagrantfiles
-            raise Errors::VagrantfileSyntaxError.new(:file => e.message)
+            raise Errors::VagrantfileSyntaxError, :file => e.message
           end
         elsif item.is_a?(Proc)
           self.class.run(&item)
@@ -159,7 +159,7 @@ module Vagrant
         end
 
         return if errors.empty?
-        raise Errors::ConfigValidationFailed.new(:messages => Util::TemplateRenderer.render("config/validation_failed", :errors => errors))
+        raise Errors::ConfigValidationFailed, :messages => Util::TemplateRenderer.render("config/validation_failed", :errors => errors)
       end
     end
   end

data/lib/vagrant/config/vm.rb

@@ -88,8 +88,15 @@ module Vagrant
         @defined_vms ||= {}
       end
 
+      # This returns the keys of the sub-vms in the order they were
+      # defined.
+      def defined_vm_keys
+        @defined_vm_keys ||= []
+      end
+
       def define(name, options=nil, &block)
         options ||= {}
+        defined_vm_keys << name
         defined_vms[name.to_sym] ||= SubVM.new
         defined_vms[name.to_sym].options.merge!(options)
         defined_vms[name.to_sym].push_proc(&block)

data/lib/vagrant/downloaders/file.rb

@@ -10,7 +10,7 @@ module Vagrant
       end
 
       def prepare(source_url)
-        raise Errors::DownloaderFileDoesntExist.new if !::File.file?(source_url)
+        raise Errors::DownloaderFileDoesntExist if !::File.file?(source_url)
       end
 
       def download!(source_url, destination_file)

data/lib/vagrant/downloaders/http.rb

@@ -48,7 +48,7 @@ module Vagrant
           end
         end
       rescue SocketError
-        raise Errors::DownloaderHTTPSocketError.new
+        raise Errors::DownloaderHTTPSocketError
       end
     end
   end

data/lib/vagrant/environment.rb

@@ -31,9 +31,17 @@ module Vagrant
       # VirtualBox installed is high enough.
       def check_virtualbox!
         version = VirtualBox.version
-        raise Errors::VirtualBoxNotDetected.new if version.nil?
-        raise Errors::VirtualBoxInvalidVersion.new(:version => version.to_s) if version.to_f < 3.2
-        raise Errors::VirtualBoxInvalidOSE.new(:version => version.to_s) if version.to_s.downcase.include?("ose")
+        raise Errors::VirtualBoxNotDetected if version.nil?
+        raise Errors::VirtualBoxInvalidVersion, :version => version.to_s if version.to_f < 3.2
+        raise Errors::VirtualBoxInvalidOSE, :version => version.to_s if version.to_s.downcase.include?("ose")
+      rescue Errors::VirtualBoxNotDetected
+        # On 64-bit Windows, show a special error. This error is a subclass
+        # of VirtualBoxNotDetected, so libraries which use Vagrant can just
+        # rescue VirtualBoxNotDetected.
+        raise Errors::VirtualBoxNotDetected_Win64 if Util::Platform.windows? && Util::Platform.bit64?
+
+        # Otherwise, reraise the old error
+        raise
       end
     end
 
@@ -126,13 +134,21 @@ module Vagrant
 
     # Returns the VMs associated with this environment.
     #
-    # @return [Array<VM>]
+    # @return [Hash<Symbol,VM>]
     def vms
       return parent.vms if parent
       load! if !loaded?
       @vms ||= load_vms!
     end
 
+    # Returns the VMs associated with this environment, in the order
+    # that they were defined.
+    #
+    # @return [Array<VM>]
+    def vms_ordered
+      @vms_enum ||= config.vm.defined_vm_keys.map {|name| @vms[name]}
+    end
+
     # Returns the primary VM associated with this environment. This
     # method is only applicable for multi-VM environments. This can
     # potentially be nil if no primary VM is specified.
@@ -352,7 +368,7 @@ module Vagrant
 
       # For any VMs which aren't created, create a blank VM instance for
       # them
-      all_keys = config.vm.defined_vms.keys
+      all_keys = config.vm.defined_vm_keys
       all_keys = [DEFAULT_VM] if all_keys.empty?
       all_keys.each do |name|
         result[name] = Vagrant::VM.new(:name => name, :env => self) if !result.has_key?(name)