vagrantup 1.1.2 → 1.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: af927382eaead2363e3871f7aaf0320a518fadb0
-  data.tar.gz: a682a141ebf2c1a9103845c5a42b61c12cb1cdce
+  metadata.gz: d7476c603dd1783b53bf128e82fa45dd9f89951f
+  data.tar.gz: f246bcd4a9c768fad367044777a26aaa980624d0
 SHA512:
-  metadata.gz: 8fde20ba01e9cd1e2d4786efd0f79495dd86182ec8f9c6596ea326f1dd3fd8044ec86e88419a663fe334074011125269df11261622b11fc91cbe8d4ba3d06e3c
-  data.tar.gz: bb7f3ee7e718ce7feb1b12004cf7a753ea2563615d7fa8bed174ee1c0cee656eae99a7f35cdadb78770528d62960c1ab63ea93496fda9dc7f6690c9d370ae1f8
+  metadata.gz: c0fe862521f6430f0fd288a52d6a43bf44b3331c2634d3b573ca657f4a3070f1147b69dc277faa2d414c43583dd7b3086b065c4d1fbace30b17b3eb63f15081f
+  data.tar.gz: 1e96967e663421624d2fbe718adbc32ac48d124fd87547a2abd863010d8affc77ba8c020a2b17c556f61a902741f70e906b26d678d854e201787f2ee00897aa3

data/CHANGELOG.md

@@ -1,3 +1,30 @@
+## 1.1.3 (March 25, 2013)
+
+IMPROVEMENTS:
+
+  - Puppet apply provisioner now retains the default module path
+    even while specifying custom module paths. [GH-1207]
+  - Re-added DHCP support for host-only networks. [GH-1466]
+  - Ability to specify a plugin version, plugin sources, and
+    pre-release versions using `--plugin-version`, `--plugin-source`,
+    and `--plugin-prerelease`. [GH-1461]
+  - Move VirtualBox guest addition checks to after the machine
+    boots. [GH-1179]
+  - Removed `Vagrant::TestHelpers` because it doesn't really work anymore.
+  - Add PLX linux guest support. [GH-1490]
+
+BUG FIXES:
+
+  - Attempt to re-establish SSH connection on `Net::SSH::Disconnect`
+  - Allow any value that can convert to a string for `Vagrant.plugin`
+  - Chef solo `recipe_url` works properly again. [GH-1467]
+  - Port collision detection works properly in VirtualBox with
+    auto-corrected ports. [GH-1472]
+  - Fix obscure error when temp directory is world writable when
+    adding boxes.
+  - Improved error handling around network interface detection for
+    VirtualBox [GH-1480]
+
 ## 1.1.2 (March 18, 2013)
 
 BUG FIXES:

data/lib/vagrant.rb

@@ -78,7 +78,6 @@ module Vagrant
   autoload :Machine,       'vagrant/machine'
   autoload :MachineState,  'vagrant/machine_state'
   autoload :Plugin,        'vagrant/plugin'
-  autoload :TestHelpers,   'vagrant/test_helpers'
   autoload :UI,            'vagrant/ui'
   autoload :Util,          'vagrant/util'
 
@@ -144,11 +143,13 @@ module Vagrant
   # Vagrant may move it to "Vagrant::Plugins::V1" and plugins will not be
   # affected.
   #
+  # @param [String] version
+  # @param [String] component
   # @return [Class]
   def self.plugin(version, component=nil)
     # Build up the key and return a result
-    key    = version.to_sym
-    key    = [key, component.to_sym] if component
+    key    = version.to_s.to_sym
+    key    = [key, component.to_s.to_sym] if component
     result = PLUGIN_COMPONENTS.get(key)
 
     # If we found our component then we return that

data/lib/vagrant/action/builtin/handle_forwarded_port_collisions.rb

@@ -32,7 +32,7 @@ module Vagrant
         end
 
         def call(env)
-          @logger.debug("Detecting any forwarded port collisions...")
+          @logger.info("Detecting any forwarded port collisions...")
 
           # Get the extra ports we consider in use
           extra_in_use = env[:port_collision_extra_in_use] || []
@@ -43,6 +43,11 @@ module Vagrant
           # Determine the handler we'll use if we have any port collisions
           repair = !!env[:port_collision_repair]
 
+          # Log out some of our parameters
+          @logger.debug("Extra in use: #{extra_in_use.inspect}")
+          @logger.debug("Remap: #{remap.inspect}")
+          @logger.debug("Repair: #{repair.inspect}")
+
           # Determine a list of usable ports for repair
           usable_ports = Set.new(env[:machine].config.vm.usable_port_range)
           usable_ports.subtract(extra_in_use)

data/lib/vagrant/box_collection.rb

@@ -96,69 +96,69 @@ module Vagrant
 
       # Create a temporary directory since we're not sure at this point if
       # the box we're unpackaging already exists (if no provider was given)
-      Dir.mktmpdir(TEMP_PREFIX) do |temp_dir|
-        temp_dir = Pathname.new(temp_dir)
-
-        # Extract the box into a temporary directory.
-        @logger.debug("Unpacking box into temporary directory: #{temp_dir}")
-        result = Util::Subprocess.execute(
-          "bsdtar", "-v", "-x", "-C", temp_dir.to_s, "-f", path.to_s)
-        raise Errors::BoxUnpackageFailure, :output => result.stderr.to_s \
-          if result.exit_code != 0
-
-        # If we get a V1 box, we want to update it in place
-        if v1_box?(temp_dir)
-          @logger.debug("Added box is a V1 box. Upgrading in place.")
-          temp_dir = v1_upgrade(temp_dir)
-        end
+      temp_dir = Pathname.new(Dir.mktmpdir(TEMP_PREFIX))
+
+      # Extract the box into a temporary directory.
+      @logger.debug("Unpacking box into temporary directory: #{temp_dir}")
+      result = Util::Subprocess.execute(
+        "bsdtar", "-v", "-x", "-C", temp_dir.to_s, "-f", path.to_s)
+      raise Errors::BoxUnpackageFailure, :output => result.stderr.to_s if result.exit_code != 0
+
+      # If we get a V1 box, we want to update it in place
+      if v1_box?(temp_dir)
+        @logger.debug("Added box is a V1 box. Upgrading in place.")
+        temp_dir = v1_upgrade(temp_dir)
+      end
 
-        # Get an instance of the box we just added before it is finalized
-        # in the system so we can inspect and use its metadata.
-        box = Box.new(name, provider, temp_dir)
+      # Get an instance of the box we just added before it is finalized
+      # in the system so we can inspect and use its metadata.
+      box = Box.new(name, provider, temp_dir)
 
-        # Get the provider, since we'll need that to at the least add it
-        # to the system or check that it matches what is given to us.
-        box_provider = box.metadata["provider"]
+      # Get the provider, since we'll need that to at the least add it
+      # to the system or check that it matches what is given to us.
+      box_provider = box.metadata["provider"]
 
-        if provider
-          # Verify that the given provider matches what the box has.
-          if box_provider.to_sym != provider
-            @logger.error("Added box provider doesnt match expected: #{box_provider}")
-            raise Errors::BoxProviderDoesntMatch, :expected => provider, :actual => box_provider
-          end
-        else
-          # We weren't given a provider, so store this one.
-          provider = box_provider.to_sym
-
-          # Verify the box doesn't already exist
-          check_box_exists.call(provider)
+      if provider
+        # Verify that the given provider matches what the box has.
+        if box_provider.to_sym != provider
+          @logger.error("Added box provider doesnt match expected: #{box_provider}")
+          raise Errors::BoxProviderDoesntMatch, :expected => provider, :actual => box_provider
         end
+      else
+        # We weren't given a provider, so store this one.
+        provider = box_provider.to_sym
 
-        # Create the directory for this box, not including the provider
-        box_dir = @directory.join(name)
-        box_dir.mkpath
-        @logger.debug("Box directory: #{box_dir}")
+        # Verify the box doesn't already exist
+        check_box_exists.call(provider)
+      end
 
-        # This is the final directory we'll move it to
-        final_dir = box_dir.join(provider.to_s)
-        if final_dir.exist?
-          @logger.debug("Removing existing provider directory...")
-          final_dir.rmtree
-        end
+      # Create the directory for this box, not including the provider
+      box_dir = @directory.join(name)
+      box_dir.mkpath
+      @logger.debug("Box directory: #{box_dir}")
+
+      # This is the final directory we'll move it to
+      final_dir = box_dir.join(provider.to_s)
+      if final_dir.exist?
+        @logger.debug("Removing existing provider directory...")
+        final_dir.rmtree
+      end
 
-        # Move to final destination
-        final_dir.mkpath
+      # Move to final destination
+      final_dir.mkpath
 
-        # Go through each child and copy them one-by-one. This avoids
-        # an issue where on Windows cross-device directory copies are
-        # failing for some reason. [GH-1424]
-        temp_dir.children(true).each do |f|
-          destination = final_dir.join(f.basename)
-          @logger.debug("Moving: #{f} => #{destination}")
-          FileUtils.mv(f, destination)
-        end
+      # Go through each child and copy them one-by-one. This avoids
+      # an issue where on Windows cross-device directory copies are
+      # failing for some reason. [GH-1424]
+      temp_dir.children(true).each do |f|
+        destination = final_dir.join(f.basename)
+        @logger.debug("Moving: #{f} => #{destination}")
+        FileUtils.mv(f, destination)
       end
 
+      # Remove the temporary directory
+      temp_dir.rmtree
+
       # Return the box
       find(name, provider)
     end

data/lib/vagrant/errors.rb

@@ -203,6 +203,10 @@ module Vagrant
       error_key(:home_dir_not_accessible)
     end
 
+    class ForwardPortAdapterNotFound < VagrantError
+      error_key(:forward_port_adapter_not_found)
+    end
+
     class ForwardPortAutolistEmpty < VagrantError
       error_key(:auto_empty, "vagrant.actions.vm.forward_ports")
     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 = "1.1.2"
+  VERSION = "1.1.3"
 end

data/plugins/commands/plugin/action/install_gem.rb

@@ -16,15 +16,26 @@ module VagrantPlugins
 
         def call(env)
           plugin_name = env[:plugin_name]
+          prerelease  = env[:plugin_prerelease]
+          version     = env[:plugin_version]
 
           # Install the gem
+          plugin_name_label = plugin_name
+          plugin_name_label += ' --prerelease' if prerelease
+          plugin_name_label += " --version '#{version}'" if version
           env[:ui].info(I18n.t("vagrant.commands.plugin.installing",
-                               :name => plugin_name))
+                               :name => plugin_name_label))
           installed_gems = env[:gem_helper].with_environment do
-            installer = Gem::DependencyInstaller.new(:document => [])
+            # Override the list of sources by the ones set as a parameter if given
+            if env[:plugin_sources]
+              @logger.info("Custom plugin sources: #{env[:plugin_sources]}")
+              Gem.sources = env[:plugin_sources]
+            end
+
+            installer = Gem::DependencyInstaller.new(:document => [], :prerelease => prerelease)
 
             begin
-              installer.install(plugin_name)
+              installer.install(plugin_name, version)
             rescue Gem::GemNotFoundException
               raise Vagrant::Errors::PluginInstallNotFound,
                 :name => plugin_name

data/plugins/commands/plugin/command/install.rb

@@ -17,6 +17,22 @@ module VagrantPlugins
                  "The name of the entry point file for loading the plugin.") do |entry_point|
               options[:entry_point] = entry_point
             end
+
+            o.on("--plugin-prerelease",
+                 "Allow prerelease versions of this plugin.") do |plugin_prerelease|
+              options[:plugin_prerelease] = plugin_prerelease
+            end
+
+            o.on("--plugin-source PLUGIN_SOURCE", String,
+                 "Add a RubyGems repository source") do |plugin_source|
+              options[:plugin_sources] ||= []
+              options[:plugin_sources] << plugin_source
+            end
+
+            o.on("--plugin-version PLUGIN_VERSION", String,
+                 "Install a specific version of the plugin") do |plugin_version|
+              options[:plugin_version] = plugin_version
+            end
           end
 
           # Parse the options
@@ -27,6 +43,9 @@ module VagrantPlugins
           # Install the gem
           action(Action.action_install, {
             :plugin_entry_point => options[:entry_point],
+            :plugin_prerelease  => options[:plugin_prerelease],
+            :plugin_version     => options[:plugin_version],
+            :plugin_sources     => options[:plugin_sources],
             :plugin_name        => argv[0]
           })
 

data/plugins/communicators/ssh/communicator.rb

@@ -129,6 +129,9 @@ module VagrantPlugins
           rescue Errno::EHOSTUNREACH
             @logger.info("No route to host for connection. Not re-using.")
             @connection = nil
+          rescue Net::SSH::Disconnect
+            @logger.info("SSH disconnected. Not-reusing connection.")
+            @connection = nil
           rescue IOError
             @logger.info("Connection has been closed. Not re-using.")
             @connection = nil

data/plugins/communicators/ssh/plugin.rb

@@ -3,7 +3,7 @@ require "vagrant"
 module VagrantPlugins
   module CommunicatorSSH
     class Plugin < Vagrant.plugin("2")
-      name "ssh communiator"
+      name "ssh communicator"
       description <<-DESC
       This plugin allows Vagrant to communicate with remote machines using
       SSH as the underlying protocol, powered internally by Ruby's

data/plugins/guests/linux/guest.rb

@@ -29,6 +29,7 @@ module VagrantPlugins
           return :fedora if comm.test("grep 'Fedora release 1[678]' /etc/redhat-release")
           return :redhat if comm.test("cat /etc/redhat-release")
           return :suse if comm.test("cat /etc/SuSE-release")
+          return :pld if comm.test("cat /etc/pld-release")
           return :arch if comm.test("cat /etc/arch-release")
           return :solaris if comm.test("grep 'Solaris' /etc/release")
         end

data/plugins/guests/pld/guest.rb

@@ -0,0 +1,13 @@
+require "vagrant"
+
+require Vagrant.source_root.join("plugins/guests/redhat/guest")
+
+module VagrantPlugins
+  module GuestPld
+    class Guest < VagrantPlugins::GuestRedHat::Guest
+      def network_scripts_dir
+        '/etc/sysconfig/interfaces/'
+      end
+    end
+  end
+end

data/plugins/guests/pld/plugin.rb

@@ -0,0 +1,15 @@
+require "vagrant"
+
+module VagrantPlugins
+  module GuestPld
+    class Plugin < Vagrant.plugin("2")
+      name "PLD Linux guest"
+      description "PLD Linux guest support."
+
+      guest("pld") do
+        require File.expand_path("../guest", __FILE__)
+        Guest
+      end
+    end
+  end
+end

data/plugins/providers/virtualbox/action.rb

@@ -71,6 +71,7 @@ module VagrantPlugins
           b.use SaneDefaults
           b.use Customize
           b.use Boot
+          b.use CheckGuestAdditions
         end
       end
 
@@ -296,7 +297,6 @@ module VagrantPlugins
               b2.use CheckAccessible
               b2.use HandleBoxUrl
               b2.use Import
-              b2.use CheckGuestAdditions
               b2.use MatchMACAddress
             end
           end

data/plugins/providers/virtualbox/action/forward_ports.rb

@@ -50,6 +50,14 @@ module VagrantPlugins
             @env[:ui].info(I18n.t("vagrant.actions.vm.forward_ports.forwarding_entry",
                                     message_attributes))
 
+            # Verify we have the network interface to attach to
+            if !interfaces[fp.adapter]
+              raise Vagrant::Errors::ForwardPortAdapterNotFound,
+                :adapter => fp.adapter.to_s,
+                :guest => fp.guest_port.to_s,
+                :host => fp.host_port.to_s
+            end
+
             # Port forwarding requires the network interface to be a NAT interface,
             # so verify that that is the case.
             if interfaces[fp.adapter][:type] != :nat

data/plugins/providers/virtualbox/action/network.rb

@@ -209,9 +209,13 @@ module VagrantPlugins
         def hostonly_config(options)
           options = {
             :auto_config => true,
-            :netmask     => "255.255.255.0"
+            :netmask     => "255.255.255.0",
+            :type        => :static
           }.merge(options)
 
+          # Default IP is in the 20-bit private network block for DHCP based networks
+          options[:ip] = "172.28.128.1" if options[:type] == :dhcp
+
           # Calculate our network address for the given IP/netmask
           netaddr  = network_address(options[:ip], options[:netmask])
 
@@ -237,6 +241,24 @@ module VagrantPlugins
           adapter_ip[3] += 1
           options[:adapter_ip] ||= adapter_ip.join(".")
 
+          dhcp_options = {}
+          if options[:type] == :dhcp
+            # Calculate the DHCP server IP, which is the network address
+            # with the final octet + 2. So "172.28.0.0" turns into "172.28.0.2"
+            dhcp_ip    = ip_parts.dup
+            dhcp_ip[3] += 2
+            dhcp_options[:dhcp_ip] ||= dhcp_ip.join(".")
+
+            # Calculate the lower and upper bound for the DHCP server
+            dhcp_lower    = ip_parts.dup
+            dhcp_lower[3] += 3
+            dhcp_options[:dhcp_lower] ||= dhcp_lower.join(".")
+
+            dhcp_upper    = ip_parts.dup
+            dhcp_upper[3] = 254
+            dhcp_options[:dhcp_upper] ||= dhcp_upper.join(".")
+          end
+
           return {
             :adapter_ip  => options[:adapter_ip],
             :auto_config => options[:auto_config],
@@ -244,8 +266,8 @@ module VagrantPlugins
             :mac         => nil,
             :netmask     => options[:netmask],
             :nic_type    => nil,
-            :type        => :static
-          }
+            :type        => options[:type]
+          }.merge(dhcp_options)
         end
 
         def hostonly_adapter(config)
@@ -266,6 +288,24 @@ module VagrantPlugins
             @logger.info("Created network: #{interface[:name]}")
           end
 
+          if config[:type] == :dhcp
+            # Check that if there is a DHCP server attached on our interface,
+            # then it is identical. Otherwise, we can't set it.
+            if interface[:dhcp]
+              valid = interface[:dhcp][:ip] == config[:dhcp_ip] &&
+                  interface[:dhcp][:lower] == config[:dhcp_lower] &&
+                  interface[:dhcp][:upper] == config[:dhcp_upper]
+
+              raise Errors::NetworkDHCPAlreadyAttached if !valid
+
+              @logger.debug("DHCP server already properly configured")
+            else
+              # Configure the DHCP server for the network.
+              @logger.debug("Creating a DHCP server...")
+              @env[:machine].provider.driver.create_dhcp_server(interface[:name], config)
+            end
+          end
+
           return {
             :adapter  => config[:adapter],
             :hostonly => interface[:name],

data/plugins/providers/virtualbox/action/prepare_forwarded_port_collision_params.rb

@@ -21,7 +21,7 @@ module VagrantPlugins
               # If the ID matches the name of the forwarded port, then
               # remap.
               if options[:id] == name
-                remap[name] = hostport
+                remap[options[:host]] = hostport
                 break
               end
             end

data/plugins/providers/virtualbox/model/forwarded_port.rb

@@ -42,7 +42,7 @@ module VagrantPlugins
           options ||= {}
           @auto_correct = true
           @auto_correct = options[:auto_correct] if options.has_key?(:auto_correct)
-          @adapter  = options[:adapter] || 1
+          @adapter  = options[:adapter].to_i || 1
           @protocol = options[:protocol] || "tcp"
         end
 

data/plugins/provisioners/chef/config/chef_solo.rb

@@ -27,8 +27,12 @@ module VagrantPlugins
         end
 
         def finalize!
+          @recipe_url = nil if @recipe_url == UNSET_VALUE
+
           if @cookbooks_path == UNSET_VALUE
-            @cookbooks_path = [[:host, "cookbooks"], [:vm, "cookbooks"]]
+            @cookbooks_path = []
+            @cookbooks_path << [:host, "cookbooks"] if !@recipe_url
+            @cookbooks_path << [:vm, "cookbooks"]
             @__defaulted_cookbooks_path = true
           end
 
@@ -45,7 +49,6 @@ module VagrantPlugins
           @encrypted_data_bag_secret_key_path = nil if \
             @encrypted_data_bag_secret_key_path == UNSET_VALUE
           @nfs = false if @nfs == UNSET_VALUE
-          @recipe_url = nil if @recipe_url == UNSET_VALUE
         end
 
         def validate(machine)

data/plugins/provisioners/puppet/provisioner/puppet.rb

@@ -70,7 +70,14 @@ module VagrantPlugins
         def run_puppet_apply
           options = [config.options].flatten
           module_paths = @module_paths.map { |_, to| to }
-          options << "--modulepath '#{module_paths.join(':')}'" if !@module_paths.empty?
+          if !@module_paths.empty?
+            # Prepend the default module path
+            module_paths.unshift("/etc/puppet/modules")
+
+            # Add the command line switch to add the module path
+            options << "--modulepath '#{module_paths.join(':')}'"
+          end
+
           options << @manifest_file
           options = options.join(" ")
 

data/templates/locales/en.yml

@@ -130,6 +130,14 @@ en:
         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.
+      forward_port_adapter_not_found: |-
+        The adapter to attach a forwarded port to was not found. Please
+        verify that the given adapter is setup on the machine as a NAT
+        interface.
+
+        Host port: %{host}
+        Guest port: %{guest}
+        Adapter: %{adapter}
       gem_command_in_bundler: |-
         You cannot run the `vagrant plugin` command while in a bundler environment.
         This should generally never happen unless Vagrant is installed outside

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vagrantup
 version: !ruby/object:Gem::Version
-  version: 1.1.2
+  version: 1.1.3
 platform: ruby
 authors:
 - Mitchell Hashimoto
@@ -304,8 +304,6 @@ files:
 - lib/vagrant/plugin/v2.rb
 - lib/vagrant/plugin.rb
 - lib/vagrant/registry.rb
-- lib/vagrant/ssh.rb
-- lib/vagrant/test_helpers.rb
 - lib/vagrant/ui.rb
 - lib/vagrant/util/ansi_escape_code_remover.rb
 - lib/vagrant/util/busy.rb
@@ -396,6 +394,8 @@ files:
 - plugins/guests/linux/plugin.rb
 - plugins/guests/openbsd/guest.rb
 - plugins/guests/openbsd/plugin.rb
+- plugins/guests/pld/guest.rb
+- plugins/guests/pld/plugin.rb
 - plugins/guests/redhat/guest.rb
 - plugins/guests/redhat/plugin.rb
 - plugins/guests/solaris/config.rb

data/lib/vagrant/ssh.rb

@@ -1,132 +0,0 @@
-require 'log4r'
-
-require 'vagrant/util/file_util'
-require 'vagrant/util/file_mode'
-require 'vagrant/util/platform'
-require 'vagrant/util/safe_exec'
-
-module Vagrant
-  # Manages SSH connection information as well as allows opening an
-  # SSH connection.
-  class SSH
-    include Util::SafeExec
-
-    def initialize(vm)
-      @vm     = vm
-      @logger = Log4r::Logger.new("vagrant::ssh")
-    end
-
-    # Returns a hash of information necessary for accessing this
-    # virtual machine via SSH.
-    #
-    # @return [Hash]
-    def info
-      results = {
-        :host          => @vm.config.ssh.host,
-        :port          => @vm.config.ssh.port || @vm.driver.ssh_port(@vm.config.ssh.guest_port),
-        :username      => @vm.config.ssh.username,
-        :forward_agent => @vm.config.ssh.forward_agent,
-        :forward_x11   => @vm.config.ssh.forward_x11
-      }
-
-      # This can happen if no port is set and for some reason Vagrant
-      # can't detect an SSH port.
-      raise Errors::SSHPortNotDetected if !results[:port]
-
-      # Determine the private key path, which is either set by the
-      # configuration or uses just the built-in insecure key.
-      pk_path = @vm.config.ssh.private_key_path || @vm.env.default_private_key_path
-      results[:private_key_path] = File.expand_path(pk_path, @vm.env.root_path)
-
-      # We need to check and fix the private key permissions
-      # to make sure that SSH gets a key with 0600 perms.
-      check_key_permissions(results[:private_key_path])
-
-      # Return the results
-      return results
-    end
-
-    # Connects to the environment's virtual machine, replacing the ruby
-    # process with an SSH process.
-    #
-    # @param [Hash] opts Options hash
-    # @options opts [Boolean] :plain_mode If True, doesn't authenticate with
-    #   the machine, only connects, allowing the user to connect.
-    def exec(opts={})
-      # Get the SSH information and cache it here
-      ssh_info = info
-
-      # Ensure the platform supports ssh. On Windows there are several programs which
-      # include ssh, notably git, mingw and cygwin, but make sure ssh is in the path!
-      if !Util::FileUtil.which("ssh")
-        if Util::Platform.windows?
-          raise Errors::SSHUnavailableWindows, :host => ssh_info[:host],
-                                               :port => ssh_info[:port],
-                                               :username => ssh_info[:username],
-                                               :key_path => ssh_info[:private_key_path]
-        end
-        raise Errors::SSHUnavailable 
-      end
-
-      # If plain mode is enabled then we don't do any authentication (we don't
-      # set a user or an identity file)
-      plain_mode = opts[:plain_mode]
-
-      options = {}
-      options[:host] = ssh_info[:host]
-      options[:port] = ssh_info[:port]
-      options[:username] = ssh_info[:username]
-      options[:private_key_path] = ssh_info[:private_key_path]
-
-      # Command line options
-      command_options = ["-p", options[:port].to_s, "-o", "UserKnownHostsFile=/dev/null",
-                         "-o", "StrictHostKeyChecking=no", "-o", "LogLevel=QUIET"]
-
-      # Solaris/OpenSolaris/Illumos uses SunSSH which doesn't support the IdentitiesOnly option
-      # (Also don't use it in plain mode, it'll skip user agents.)
-      command_options += ["-o", "IdentitiesOnly=yes"] if !(Util::Platform.solaris? || plain_mode)
-
-      command_options += ["-i", options[:private_key_path]] if !plain_mode
-      command_options += ["-o", "ForwardAgent=yes"] if ssh_info[:forward_agent]
-
-      # If there are extra options, then we append those
-      command_options.concat(opts[:extra_args]) if opts[:extra_args]
-
-      if ssh_info[:forward_x11]
-        # Both are required so that no warnings are shown regarding X11
-        command_options += ["-o", "ForwardX11=yes"]
-        command_options += ["-o", "ForwardX11Trusted=yes"]
-      end
-
-      host_string = options[:host]
-      host_string = "#{options[:username]}@#{host_string}" if !plain_mode
-      command_options << host_string
-      @logger.info("Invoking SSH: #{command_options.inspect}")
-      safe_exec("ssh", *command_options)
-    end
-
-    # Checks the file permissions for a private key, resetting them
-    # if needed.
-    def check_key_permissions(key_path)
-      # Windows systems don't have this issue
-      return if Util::Platform.windows?
-
-      @logger.debug("Checking key permissions: #{key_path}")
-      stat = File.stat(key_path)
-
-      if stat.owned? && Util::FileMode.from_octal(stat.mode) != "600"
-        @logger.info("Attempting to correct key permissions to 0600")
-        File.chmod(0600, key_path)
-
-        stat = File.stat(key_path)
-        if Util::FileMode.from_octal(stat.mode) != "600"
-          raise Errors::SSHKeyBadPermissions, :key_path => key_path
-        end
-      end
-    rescue Errno::EPERM
-      # This shouldn't happen since we verified we own the file, but
-      # it is possible in theory, so we raise an error.
-      raise Errors::SSHKeyBadPermissions, :key_path => key_path
-    end
-  end
-end

data/lib/vagrant/test_helpers.rb

@@ -1,154 +0,0 @@
-module Vagrant
-  # Test helpers provided by Vagrant to allow for plugin developers
-  # to write automated tests for their code. This module simply provides
-  # methods which can be included into any test framework (`test/unit`,
-  # RSpec, Shoulda, etc.)
-  module TestHelpers
-    #------------------------------------------------------------
-    # Environment creation helpers
-    #------------------------------------------------------------
-    # Creates a "vagrant_app" directory in the test tmp folder
-    # which can be used for creating test Vagrant environments.
-    # Returns the root directory of the app. This typically doesn't need
-    # to be called directly unless you're setting up a custom application.
-    # See the examples for common use cases.
-    def vagrant_app(*path)
-      root = tmp_path.join("vagrant_app")
-      FileUtils.rm_rf(root)
-      FileUtils.mkdir_p(root)
-      root.join(*path)
-    end
-
-    # Creates a Vagrantfile with the given contents in the given
-    # app directory. If no app directory is specified, then a default
-    # Vagrant app is used.
-    def vagrantfile(*args)
-      path = args.shift.join("Vagrantfile") if Pathname === args.first
-      path ||= vagrant_app("Vagrantfile")
-
-      # Create this box so that it exists
-      vagrant_box("base")
-
-      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.vm.base_mac = 'foo' if !config.vm.base_mac"
-        f.puts "config.vm.box = 'base'"
-        f.puts str
-        f.puts "end"
-      end
-
-      path.parent
-    end
-
-    # Creates and _loads_ a Vagrant environment at the given path.
-    # If no path is given, then a default {#vagrantfile} is used.
-    def vagrant_env(*args)
-      path = args.shift if Pathname === args.first
-      path ||= vagrantfile
-      Vagrant::Environment.new(:cwd => path).load!
-    end
-
-    # Creates the folder to contain a vagrant box. This allows for
-    # "fake" boxes to be made with the specified name.
-    #
-    # @param [String] name
-    # @return [Pathname]
-    def vagrant_box(name)
-      result = boxes_path.join(name)
-      FileUtils.mkdir_p(result)
-      result
-    end
-
-    # Returns an instantiated downloader with a mocked tempfile
-    # which can be passed into it.
-    #
-    # @param [Class] klass The downloader class
-    # @return [Array] Returns an array of `downloader` `tempfile`
-    def vagrant_mock_downloader(klass)
-      tempfile = mock("tempfile")
-      tempfile.stubs(:write)
-
-      _, env = action_env
-      [klass.new(env), tempfile]
-    end
-
-    # Returns a blank app (callable) and action environment with the
-    # given vagrant environment. This allows for testing of middlewares.
-    def action_env(v_env = nil)
-      v_env ||= vagrant_env
-      # duplicate the Vagrant::Environment ui and get the default vm object
-      # for the new action environment from the first pair in the vms list
-      opts = {:ui => v_env.ui.dup, :vm => v_env.vms.first.last}
-      app = lambda { |env| }
-      env = Vagrant::Action::Environment.new(opts)
-      env["vagrant.test"] = true
-      [app, env]
-    end
-
-    # Utility method for capturing output streams.
-    # @example Evaluate the output
-    #   output = capture(:stdout){ env.cli("foo") }
-    #   assert_equal "bar", output
-    # @example Silence the output
-    #   silence(:stdout){ env.cli("init") }
-    # @param [:stdout, :stderr] stream The stream to capture
-    # @yieldreturn String
-    # @see https://github.com/wycats/thor/blob/master/spec/spec_helper.rb
-    def capture(stream)
-      begin
-        stream = stream.to_s
-        eval "$#{stream} = StringIO.new"
-        yield
-        result = eval("$#{stream}").string
-      ensure
-        eval("$#{stream} = #{stream.upcase}")
-      end
-
-      result
-    end
-    alias :silence :capture
-
-    #------------------------------------------------------------
-    # Path helpers
-    #------------------------------------------------------------
-    # Path to the tmp directory for the tests.
-    #
-    # @return [Pathname]
-    def tmp_path
-      result = Vagrant.source_root.join("test", "tmp")
-      FileUtils.mkdir_p(result)
-      result
-    end
-
-    # Path to the "home" directory for the tests
-    #
-    # @return [Pathname]
-    def home_path
-      result = tmp_path.join("home")
-      FileUtils.mkdir_p(result)
-      result
-    end
-
-    # Path to the boxes directory in the home directory
-    #
-    # @return [Pathname]
-    def boxes_path
-      result = home_path.join("boxes")
-      FileUtils.mkdir_p(result)
-      result
-    end
-
-    # Cleans all the test temp paths, which includes the boxes path,
-    # home path, etc. This allows for cleaning between tests.
-    def clean_paths
-      FileUtils.rm_rf(tmp_path)
-
-      # Call these methods only to rebuild the directories
-      tmp_path
-      home_path
-      boxes_path
-    end
-  end
-end