tnargav 1.2.3 → 1.3.3

data/lib/vagrant/cli.rb

@@ -14,15 +14,7 @@ module Vagrant
     end
 
     def execute
-      if @main_args.include?("-v") || @main_args.include?("--version")
-        # Version short-circuits the whole thing. Just print
-        # the version and exit.
-        @env.ui.info(I18n.t("vagrant.commands.version.output",
-                            :version => Vagrant::VERSION),
-                     :prefix => false)
-
-        return 0
-      elsif @main_args.include?("-h") || @main_args.include?("--help")
+      if @main_args.include?("-h") || @main_args.include?("--help")
         # Help is next in short-circuiting everything. Print
         # the help and exit.
         help

data/lib/vagrant/config/v2/root.rb

@@ -40,6 +40,12 @@ module Vagrant
         # the Vagrant system. The "!" signifies that this is expected to
         # mutate itself.
         def finalize!
+          @config_map.each do |key, klass|
+            if !@keys.has_key?(key)
+              @keys[key] = klass.new
+            end
+          end
+
           @keys.each do |_key, instance|
             instance.finalize!
           end

data/lib/vagrant/environment.rb

@@ -74,7 +74,9 @@ module Vagrant
       opts[:cwd] ||= ENV["VAGRANT_CWD"] if ENV.has_key?("VAGRANT_CWD")
       opts[:cwd] ||= Dir.pwd
       opts[:cwd] = Pathname.new(opts[:cwd])
-      raise Errors::EnvironmentNonExistentCWD if !opts[:cwd].directory?
+      if !opts[:cwd].directory?
+        raise Errors::EnvironmentNonExistentCWD, cwd: opts[:cwd].to_s
+      end
 
       # Set the default ui class
       opts[:ui_class] ||= UI::Silent
@@ -83,9 +85,8 @@ module Vagrant
       # those continue to work as well, but anything custom will take precedence.
       opts[:vagrantfile_name] ||= ENV["VAGRANT_VAGRANTFILE"] if \
         ENV.has_key?("VAGRANT_VAGRANTFILE")
-      opts[:vagrantfile_name] ||= ["Vagrantfile", "vagrantfile"]
       opts[:vagrantfile_name] = [opts[:vagrantfile_name]] if \
-        !opts[:vagrantfile_name].is_a?(Array)
+        opts[:vagrantfile_name] && !opts[:vagrantfile_name].is_a?(Array)
 
       # Set instance variables for all the configuration parameters.
       @cwd              = opts[:cwd]
@@ -115,11 +116,10 @@ module Vagrant
       # Setup the local data directory. If a configuration path is given,
       # then it is expanded relative to the working directory. Otherwise,
       # we use the default which is expanded relative to the root path.
-      @local_data_path = nil
+      opts[:local_data_path] ||= ENV["VAGRANT_DOTFILE_PATH"]
+      opts[:local_data_path] ||= root_path.join(DEFAULT_LOCAL_DATA) if !root_path.nil?
       if opts[:local_data_path]
         @local_data_path = Pathname.new(File.expand_path(opts[:local_data_path], @cwd))
-      elsif !root_path.nil?
-        @local_data_path = root_path.join(DEFAULT_LOCAL_DATA)
       end
 
       setup_local_data_path
@@ -244,7 +244,7 @@ module Vagrant
       home_vagrantfile = nil
       root_vagrantfile = nil
       home_vagrantfile = find_vagrantfile(home_path) if home_path
-      root_vagrantfile = find_vagrantfile(root_path) if root_path
+      root_vagrantfile = find_vagrantfile(root_path, @vagrantfile_name) if root_path
 
       # Create the configuration loader and set the sources that are global.
       # We use this to load the configuration, and the list of machines we are
@@ -338,7 +338,17 @@ module Vagrant
       box_changed  = false
 
       load_box_and_overrides = lambda do
-        box = find_box(config.vm.box, box_formats) if config.vm.box
+        box = nil
+        if config.vm.box
+          begin
+            box = boxes.find(config.vm.box, box_formats)
+          rescue Errors::BoxUpgradeRequired
+            # Upgrade the box if we must
+            @logger.info("Upgrading box during config load: #{config.vm.box}")
+            boxes.upgrade(config.vm.box)
+            retry
+          end
+        end
 
         # If a box was found, then we attempt to load the Vagrantfile for
         # that box. We don't require a box since we allow providers to download
@@ -405,8 +415,9 @@ module Vagrant
           "config/messages",
           :warnings => config_warnings,
           :errors => config_errors).chomp
-          @ui.send(level, I18n.t("vagrant.general.config_upgrade_messages",
-                                 :output => output))
+        @ui.send(level, I18n.t("vagrant.general.config_upgrade_messages",
+                               name: name,
+                               :output => output))
 
           # If we had errors, then we bail
           raise Errors::ConfigUpgradeErrors if !config_errors.empty?
@@ -521,11 +532,8 @@ module Vagrant
       root_finder = lambda do |path|
         # Note: To remain compatible with Ruby 1.8, we have to use
         # a `find` here instead of an `each`.
-        found = vagrantfile_name.find do |rootfile|
-          File.exist?(File.join(path.to_s, rootfile))
-        end
-
-        return path if found
+        vf = find_vagrantfile(path, @vagrantfile_name)
+        return path if vf
         return nil if path.root? || !File.exist?(path)
         root_finder.call(path.parent)
       end
@@ -693,47 +701,15 @@ module Vagrant
       Pathname.new(path)
     end
 
-    # This finds a box for the given name and formats, or returns nil
-    # if the box isn't found.
-    #
-    # @param [String] name Name of the box
-    # @param [Array<Symbol>] formats The formats to search for the box.
-    # @return [Box]
-    def find_box(name, formats)
-      # Determine the box formats we support
-      formats = [formats] if !formats.is_a?(Array)
-
-      @logger.info("Provider-supported box formats: #{formats.inspect}")
-      formats.each do |format|
-        box = nil
-
-        begin
-          box = boxes.find(name, format.to_s)
-        rescue Errors::BoxUpgradeRequired
-          # Upgrade the box if we must
-          @logger.info("Upgrading box during config load: #{name}")
-          boxes.upgrade(name)
-          retry
-        end
-
-        # If a box was found, we exit
-        if box
-          @logger.info("Box found with format: #{format}")
-          return box
-        end
-      end
-
-      nil
-    end
-
     # Finds the Vagrantfile in the given directory.
     #
     # @param [Pathname] path Path to search in.
     # @return [Pathname]
-    def find_vagrantfile(search_path)
-      @vagrantfile_name.each do |vagrantfile|
+    def find_vagrantfile(search_path, filenames=nil)
+      filenames ||= ["Vagrantfile", "vagrantfile"]
+      filenames.each do |vagrantfile|
         current_path = search_path.join(vagrantfile)
-        return current_path if current_path.exist?
+        return current_path if current_path.file?
       end
 
       nil

data/lib/vagrant/errors.rb

@@ -87,6 +87,10 @@ module Vagrant
       error_key(:active_machine_with_different_provider)
     end
 
+    class AnsibleFailed < VagrantError
+      error_key(:ansible_failed)
+    end
+
     class AnsiblePlaybookAppNotFound < VagrantError
       error_key(:ansible_playbook_app_not_found)
     end
@@ -167,7 +171,7 @@ module Vagrant
       error_key(:command_unavailable)
     end
 
-    class CommandUnavailableWindows < VagrantError
+    class CommandUnavailableWindows < CommandUnavailable
       error_key(:command_unavailable_windows)
     end
 
@@ -183,6 +187,10 @@ module Vagrant
       error_key(:copy_private_key_failed)
     end
 
+    class DarwinNFSMountFailed < VagrantError
+      error_key(:darwin_nfs_mount_failed)
+    end
+
     class DestroyRequiresForce < VagrantError
       error_key(:destroy_requires_force)
     end
@@ -327,6 +335,10 @@ module Vagrant
       error_key(:not_found, "vagrant.actions.vm.host_only_network")
     end
 
+    class NFSCantReadExports < VagrantError
+      error_key(:nfs_cant_read_exports)
+    end
+
     class NFSNoGuestIP < VagrantError
       error_key(:nfs_no_guest_ip)
     end
@@ -367,6 +379,10 @@ module Vagrant
       error_key(:provider_not_found)
     end
 
+    class ProvisionerFlagInvalid < VagrantError
+      error_key(:provisioner_flag_invalid)
+    end
+
     class PluginGemError < VagrantError
       error_key(:plugin_gem_error)
     end
@@ -399,6 +415,10 @@ module Vagrant
       error_key(:plugin_not_found)
     end
 
+    class PluginNotInstalled < VagrantError
+      error_key(:plugin_not_installed)
+    end
+
     class SCPPermissionDenied < VagrantError
       error_key(:scp_permission_denied)
     end
@@ -507,6 +527,10 @@ module Vagrant
       error_key(:vboxmanage_not_found_error)
     end
 
+    class VirtualBoxBrokenVersion040214 < VagrantError
+      error_key(:virtualbox_broken_version_040214)
+    end
+
     class VirtualBoxInvalidVersion < VagrantError
       error_key(:virtualbox_invalid_version)
     end
@@ -531,6 +555,14 @@ module Vagrant
       error_key(:no_base_mac, "vagrant.actions.vm.match_mac")
     end
 
+    class VMBootBadState < VagrantError
+      error_key(:boot_bad_state)
+    end
+
+    class VMBootTimeout < VagrantError
+      error_key(:boot_timeout)
+    end
+
     class VMCustomizationFailed < VagrantError
       error_key(:failure, "vagrant.actions.vm.customize")
     end

data/lib/vagrant/guest.rb

@@ -84,7 +84,7 @@ module Vagrant
               @name = name
 
               # Build the proper chain of parents if there are any.
-              # This allows us to do "inheritence" of capabilities later
+              # This allows us to do "inheritance" of capabilities later
               if guest_info[1]
                 parent_name = guest_info[1]
                 parent_info = @guests[parent_name]
@@ -113,7 +113,7 @@ module Vagrant
     #
     # @return [Boolean]
     def capability?(cap_name)
-      !capability_module(cap_name).nil?
+      !capability_module(cap_name.to_sym).nil?
     end
 
     # Executes the capability with the given name, optionally passing

data/lib/vagrant/machine.rb

@@ -108,7 +108,7 @@ module Vagrant
         # Read the id file from the data directory if it exists as the
         # ID for the pre-existing physical representation of this machine.
         id_file = @data_dir.join("id")
-        @id = id_file.read if id_file.file?
+        @id = id_file.read.chomp if id_file.file?
       end
 
       # Initializes the provider last so that it has access to all the
@@ -207,6 +207,16 @@ module Vagrant
       else
         # Delete the file, since the machine is now destroyed
         id_file.delete if id_file.file?
+
+        # Delete the entire data directory contents since all state
+        # associated with the VM is now gone.
+        @data_dir.children.each do |child|
+          begin
+            child.rmtree
+          rescue Errno::EACCES
+            @logger.info("EACCESS deleting file: #{child}")
+          end
+        end
       end
 
       # Store the ID locally
@@ -275,6 +285,9 @@ module Vagrant
       info[:forward_agent] = @config.ssh.forward_agent
       info[:forward_x11]   = @config.ssh.forward_x11
 
+      # Add in provided proxy command config
+      info[:proxy_command] = @config.ssh.proxy_command if @config.ssh.proxy_command
+
       # Set the private key path. If a specific private key is given in
       # the Vagrantfile we set that. Otherwise, we use the default (insecure)
       # private key, but only if the provider didn't give us one.
@@ -302,26 +315,5 @@ module Vagrant
       raise Errors::MachineStateInvalid if !result.is_a?(MachineState)
       result
     end
-
-    protected
-
-    # Given a guest name (such as `:windows`), this will load the associated
-    # guest implementation and return an instance.
-    #
-    # @param [Symbol] guest The name of the guest implementation.
-    # @return [Object]
-    def load_guest(guest)
-      @logger.info("Loading guest: #{guest}")
-
-      klass = Vagrant.plugin("2").manager.guests[guest]
-
-      if klass.nil?
-        raise Errors::VMGuestError,
-          :_key  => :unknown_type,
-          :guest => guest.to_s
-      end
-
-      return klass.new(self)
-    end
   end
 end

data/lib/vagrant/plugin/v2/command.rb

@@ -84,6 +84,9 @@ module Vagrant
           names ||= []
           names = [names] if !names.is_a?(Array)
 
+          # Cache the active machines outside the loop
+          active_machines = @env.active_machines
+
           # This is a helper that gets a single machine with the proper
           # provider. The "proper provider" in this case depends on what was
           # given:
@@ -101,7 +104,7 @@ module Vagrant
             provider_to_use = options[:provider]
             provider_to_use = provider_to_use.to_sym if provider_to_use
 
-            @env.active_machines.each do |active_name, active_provider|
+            active_machines.each do |active_name, active_provider|
               if name == active_name
                 # We found an active machine with the same name
 

data/lib/vagrant/plugin/v2/communicator.rb

@@ -1,3 +1,5 @@
+require "timeout"
+
 module Vagrant
   module Plugin
     module V2
@@ -44,6 +46,25 @@ module Vagrant
           false
         end
 
+        # wait_for_ready waits until the communicator is ready, blocking
+        # until then. It will wait up to the given duration or raise an
+        # exception if something goes wrong.
+        def wait_for_ready(duration)
+          # By default, we implement a naive solution.
+          begin
+            Timeout.timeout(duration) do
+              while true
+                return true if ready?
+                sleep 0.5
+              end
+            end
+          rescue Timeout::Error
+            # We timed out, we failed.
+          end
+
+          return false
+        end
+
         # Download a file from the remote machine to the local machine.
         #
         # @param [String] from Path of the file on the remote machine.

data/lib/vagrant/plugin/v2/guest.rb

@@ -14,64 +14,9 @@ module Vagrant
         # is running within the machine.
         #
         # @return [Boolean]
-        def guest?(machine)
+        def detect?(machine)
           false
         end
-
-        # Halt the machine. This method should gracefully shut down the
-        # operating system. This method will cause `vagrant halt` and associated
-        # commands to _block_, meaning that if the machine doesn't halt
-        # in a reasonable amount of time, this method should just return.
-        #
-        # If when this method returns, the machine's state isn't "powered_off,"
-        # Vagrant will proceed to forcefully shut the machine down.
-        def halt
-          raise BaseError, :_key => :unsupported_halt
-        end
-
-        # Mounts a shared folder.
-        #
-        # This method should create, mount, and properly set permissions
-        # on the shared folder. This method should also properly
-        # adhere to any configuration values such as `shared_folder_uid`
-        # on `config.vm`.
-        #
-        # @param [String] name The name of the shared folder.
-        # @param [String] guestpath The path on the machine which the user
-        #   wants the folder mounted.
-        # @param [Hash] options Additional options for the shared folder
-        #   which can be honored.
-        def mount_shared_folder(name, guestpath, options)
-          raise BaseError, :_key => :unsupported_shared_folder
-        end
-
-        # Mounts a shared folder via NFS. This assumes that the exports
-        # via the host are already done.
-        def mount_nfs(ip, folders)
-          raise BaseError, :_key => :unsupported_nfs
-        end
-
-        # Configures the given list of networks on the virtual machine.
-        #
-        # The networks parameter will be an array of hashes where the hashes
-        # represent the configuration of a network interface. The structure
-        # of the hash will be roughly the following:
-        #
-        # {
-        #   :type      => :static,
-        #   :ip        => "192.168.33.10",
-        #   :netmask   => "255.255.255.0",
-        #   :interface => 1
-        # }
-        #
-        def configure_networks(networks)
-          raise BaseError, :_key => :unsupported_configure_networks
-        end
-
-        # Called to change the hostname of the virtual machine.
-        def change_host_name(name)
-          raise BaseError, :_key => :unsupported_host_name
-        end
       end
     end
   end