vagrant-unbundled 1.9.5.1 → 1.9.7.1

data/lib/vagrant/errors.rb

@@ -652,6 +652,18 @@ module Vagrant
       error_key(:shell_expand_failed)
     end
 
+    class SnapshotConflictFailed < VagrantError
+      error_key(:snapshot_force)
+    end
+
+    class SnapshotNotFound < VagrantError
+      error_key(:snapshot_not_found)
+    end
+
+    class SnapshotNotSupported < VagrantError
+      error_key(:snapshot_not_supported)
+    end
+
     class SSHAuthenticationFailed < VagrantError
       error_key(:ssh_authentication_failed)
     end

data/lib/vagrant/machine.rb

@@ -170,6 +170,8 @@ module Vagrant
       # Extra env keys are the remaining opts
       extra_env = opts.dup
 
+      check_cwd # Warns the UI if the machine was last used on a different dir
+
       # Create a deterministic ID for this machine
       vf = nil
       vf = @env.vagrantfile_name[0] if @env.vagrantfile_name
@@ -438,6 +440,8 @@ module Vagrant
       info[:keys_only] ||= @config.ssh.default.keys_only
       info[:paranoid] ||= @config.ssh.default.paranoid
       info[:username] ||= @config.ssh.default.username
+      info[:compression] ||= @config.ssh.default.compression
+      info[:dsa_authentication] ||= @config.ssh.default.dsa_authentication
 
       # We set overrides if they are set. These take precedence over
       # provider-returned data.
@@ -445,6 +449,8 @@ module Vagrant
       info[:port] = @config.ssh.port if @config.ssh.port
       info[:keys_only] = @config.ssh.keys_only
       info[:paranoid] = @config.ssh.paranoid
+      info[:compression] = @config.ssh.compression
+      info[:dsa_authentication] = @config.ssh.dsa_authentication
       info[:username] = @config.ssh.username if @config.ssh.username
       info[:password] = @config.ssh.password if @config.ssh.password
 
@@ -559,5 +565,31 @@ module Vagrant
       return nil if !@data_dir
       @data_dir.join("creator_uid")
     end
+
+    # Checks the current directory for a given machine
+    # and displays a warning if that machine has moved
+    # from its previous location on disk. If the machine
+    # has moved, it prints a warning to the user.
+    def check_cwd
+      desired_encoding = @env.root_path.to_s.encoding
+      vagrant_cwd_filepath = @data_dir.join('vagrant_cwd')
+      vagrant_cwd = if File.exist?(vagrant_cwd_filepath)
+                      File.read(vagrant_cwd_filepath,
+                        external_encoding: desired_encoding
+                      ).chomp
+                    end
+
+      if vagrant_cwd != @env.root_path.to_s
+        if vagrant_cwd
+          ui.warn(I18n.t(
+            'vagrant.moved_cwd',
+            old_wd:     "#{vagrant_cwd}",
+            current_wd: "#{@env.root_path.to_s}"))
+        end
+        File.write(vagrant_cwd_filepath, @env.root_path.to_s,
+          external_encoding: desired_encoding
+        )
+      end
+    end
   end
 end

data/lib/vagrant/plugin/manager.rb

@@ -146,7 +146,7 @@ module Vagrant
             system[k] = v.merge("system" => true)
           end
         end
-        plugin_list = system.merge(@user_file.installed_plugins)
+        plugin_list = Util::DeepMerge.deep_merge(system, @user_file.installed_plugins)
 
         # Sort plugins by name
         Hash[
@@ -161,7 +161,15 @@ module Vagrant
       #
       # @return [Array<Gem::Specification>]
       def installed_specs
-        installed = Set.new(installed_plugins.keys)
+        installed_plugin_info = installed_plugins
+        installed = Set.new(installed_plugin_info.keys)
+        installed_versions = Hash[
+          installed_plugin_info.map{|plugin_name, plugin_info|
+            gem_version = plugin_info["gem_version"].to_s
+            gem_version = "> 0" if gem_version.empty?
+            [plugin_name, Gem::Requirement.new(gem_version)]
+          }
+        ]
 
         # Go through the plugins installed in this environment and
         # get the latest version of each.
@@ -170,6 +178,9 @@ module Vagrant
           # Ignore specs that aren't in our installed list
           next if !installed.include?(spec.name)
 
+          next if installed_versions[spec.name] &&
+            !installed_versions[spec.name].satisfied_by?(spec.version)
+
           # If we already have a newer version in our list of installed,
           # then ignore it
           next if installed_map.key?(spec.name) &&

data/lib/vagrant/shared_helpers.rb

@@ -5,12 +5,12 @@ require "thread"
 module Vagrant
   @@global_lock = Mutex.new
 
-  # This is the default endpoint of the Atlas in
+  # This is the default endpoint of the Vagrant Cloud in
   # use. API calls will be made to this for various functions
   # of Vagrant that may require remote access.
   #
   # @return [String]
-  DEFAULT_SERVER_URL = "https://atlas.hashicorp.com"
+  DEFAULT_SERVER_URL = "https://vagrantcloud.com"
 
   # Max number of seconds to wait for joining an active thread.
   #
@@ -116,4 +116,17 @@ module Vagrant
   def self.prerelease?
     Gem::Version.new(Vagrant::VERSION).prerelease?
   end
+
+  # This allows control over dependency resolution when installing
+  # plugins into vagrant. When true, dependency libraries that Vagrant
+  # core relies upon will be hard constraints.
+  #
+  # @return [Boolean]
+  def self.strict_dependency_enforcement
+    if ENV["VAGRANT_DISABLE_STRICT_DEPENDENCY_ENFORCEMENT"]
+      false
+    else
+      true
+    end
+  end
 end

data/lib/vagrant/util/platform.rb

@@ -11,21 +11,12 @@ module Vagrant
     class Platform
       class << self
         def cygwin?
-          return @_cygwin if defined?(@_cygwin)
-          @_cygwin = -> {
-            # Installer detects Cygwin
-            return true if ENV["VAGRANT_DETECTED_OS"] &&
-              ENV["VAGRANT_DETECTED_OS"].downcase.include?("cygwin")
-
-            # Ruby running in Cygwin
-            return true if platform.include?("cygwin")
-
-            # Heuristic. If the path contains Cygwin, we just assume we're
-            # in Cygwin. It is generally a safe bet.
-            path = ENV["PATH"] || ""
-            return path.include?("cygwin")
-          }.call
-          return @_cygwin
+          if !defined?(@_cygwin)
+            @_cygwin = ENV["VAGRANT_DETECTED_OS"].to_s.downcase.include?("cygwin") ||
+              platform.include?("cygwin") ||
+              ENV["OSTYPE"].to_s.downcase.include?("cygwin")
+          end
+          @_cygwin
         end
 
         def wsl?

data/lib/vagrant/util/safe_exec.rb

@@ -41,14 +41,14 @@ module Vagrant
             end
           else
             if Vagrant::Util::Platform.windows?
-              @@logger.debug("Converting command and arguments to single string for exec")
+              # Re-generate strings to ensure common encoding
+              @@logger.debug("Converting command and arguments to common UTF-8 encoding for exec.")
               @@logger.debug("Command: `#{command.inspect}` Args: `#{args.inspect}`")
-              full_command = "#{command} #{args.join(" ")}"
-              @@logger.debug("Converted command: #{full_command}")
-              Kernel.exec(full_command)
-            else
-              Kernel.exec(command, *args)
+              command = "#{command}".force_encoding("UTF-8")
+              args = args.map{|arg| "#{arg}".force_encoding("UTF-8") }
+              @@logger.debug("Converted - Command: `#{command.inspect}` Args: `#{args.inspect}`")
             end
+            Kernel.exec(command, *args)
           end
         rescue *rescue_from
           # We retried already, raise the issue and be done

data/lib/vagrant/util/ssh.rb

@@ -107,10 +107,16 @@ module Vagrant
         # Command line options
         command_options = [
           "-p", options[:port].to_s,
-          "-o", "Compression=yes",
-          "-o", "DSAAuthentication=yes",
           "-o", "LogLevel=#{log_level}"]
 
+        if ssh_info[:compression]
+          command_options += ["-o", "Compression=yes"]
+        end
+
+        if ssh_info[:dsa_authentication]
+          command_options += ["-o", "DSAAuthentication=yes"]
+        end
+
         # Solaris/OpenSolaris/Illumos uses SunSSH which doesn't support the
         # IdentitiesOnly option. Also, we don't enable it in plain mode or if
         # if keys_only is false so that SSH and Net::SSH properly search our identities

data/plugins/commands/box/command/add.rb

@@ -40,7 +40,7 @@ module VagrantPlugins
             end
 
             o.separator ""
-            o.separator "The box descriptor can be the name of a box on HashiCorp's Atlas,"
+            o.separator "The box descriptor can be the name of a box on HashiCorp's Vagrant Cloud,"
             o.separator "or a URL, or a local .box file, or a local .json file containing"
             o.separator "the catalog metadata."
             o.separator ""

data/plugins/commands/login/client.rb

@@ -86,28 +86,26 @@ module VagrantPlugins
       end
 
       # Reads the access token if there is one. This will first read the
-      # `ATLAS_TOKEN` environment variable and then fallback to the stored
+      # `VAGRANT_CLOUD_TOKEN` environment variable and then fallback to the stored
       # access token on disk.
       #
       # @return [String]
       def token
-        if present?(ENV["ATLAS_TOKEN"]) && token_path.exist?
+        if present?(ENV["VAGRANT_CLOUD_TOKEN"]) && token_path.exist?
           @env.ui.warn <<-EOH.strip
-Vagrant detected both the ATLAS_TOKEN environment variable and a Vagrant login
-token are present on this system. The ATLAS_TOKEN environment variable takes
+Vagrant detected both the VAGRANT_CLOUD_TOKEN environment variable and a Vagrant login
+token are present on this system. The VAGRANT_CLOUD_TOKEN environment variable takes
 precedence over the locally stored token. To remove this error, either unset
-the ATLAS_TOKEN environment variable or remove the login token stored on disk:
+the VAGRANT_CLOUD_TOKEN environment variable or remove the login token stored on disk:
 
     ~/.vagrant.d/data/vagrant_login_token
 
-In general, the ATLAS_TOKEN is more preferred because it is respected by all
-HashiCorp products.
 EOH
         end
 
-        if present?(ENV["ATLAS_TOKEN"])
+        if present?(ENV["VAGRANT_CLOUD_TOKEN"])
           @logger.debug("Using authentication token from environment variable")
-          return ENV["ATLAS_TOKEN"]
+          return ENV["VAGRANT_CLOUD_TOKEN"]
         end
 
         if token_path.exist?
@@ -115,6 +113,11 @@ EOH
           return token_path.read.strip
         end
 
+        if present?(ENV["ATLAS_TOKEN"])
+          @logger.warn("ATLAS_TOKEN detected within environment. Using ATLAS_TOKEN in place of VAGRANT_CLOUD_TOKEN.")
+          return ENV["ATLAS_TOKEN"]
+        end
+
         @logger.debug("No authentication token in environment or #{token_path}")
 
         nil

data/plugins/commands/login/command.rb

@@ -2,7 +2,7 @@ module VagrantPlugins
   module LoginCommand
     class Command < Vagrant.plugin("2", "command")
       def self.synopsis
-        "log in to HashiCorp's Atlas"
+        "log in to HashiCorp's Vagrant Cloud"
       end
 
       def execute
@@ -19,7 +19,7 @@ module VagrantPlugins
             options[:logout] = k
           end
 
-          o.on("-t", "--token TOKEN", String, "Set the Atlas token") do |t|
+          o.on("-t", "--token TOKEN", String, "Set the Vagrant Cloud token") do |t|
             options[:token] = t
           end
         end
@@ -44,14 +44,14 @@ module VagrantPlugins
 
         # If it is a private cloud installation, show that
         if Vagrant.server_url != Vagrant::DEFAULT_SERVER_URL
-          @env.ui.output("Atlas URL: #{Vagrant.server_url}")
+          @env.ui.output("Vagrant Cloud URL: #{Vagrant.server_url}")
         end
 
         # Ask for the username
         login    = nil
         password = nil
         while !login
-          login = @env.ui.ask("Atlas Username: ")
+          login = @env.ui.ask("Vagrant Cloud Username: ")
         end
 
         while !password

data/plugins/commands/login/locales/en.yml

@@ -2,11 +2,11 @@ en:
   login_command:
     errors:
       server_error: |-
-        The Atlas server responded with an not-OK response:
+        The Vagrant Cloud server responded with an not-OK response:
 
         %{errors}
       server_unreachable: |-
-        The Atlas server is not currently accepting connections. Please check
+        The Vagrant Cloud server is not currently accepting connections. Please check
         your network connection and try again later.
 
     check_logged_in: |-
@@ -16,12 +16,12 @@ en:
       your login information to authenticate.
     command_header: |-
       In a moment we will ask for your username and password to HashiCorp's
-      Atlas. After authenticating, we will store an access token locally on
+      Vagrant Cloud. After authenticating, we will store an access token locally on
       disk. Your login details will be transmitted over a secure connection, and
       are never stored on disk locally.
 
-      If you do not have an Atlas account, sign up at
-      https://atlas.hashicorp.com.
+      If you do not have an Vagrant Cloud account, sign up at
+      https://www.vagrantcloud.com
     invalid_login: |-
       Invalid username or password. Please try again.
     invalid_token: |-

data/plugins/commands/login/middleware/add_authentication.rb

@@ -29,7 +29,8 @@ module VagrantPlugins
               # Vagrant Cloud to Atlas. This preserves access tokens
               # appending to both without leaking access tokens to
               # unsavory URLs.
-              if u.host == VCLOUD && server_uri.host == ATLAS
+              if (u.host == VCLOUD && server_uri.host == ATLAS) ||
+                  (u.host == ATLAS && server_uri.host == VCLOUD)
                 replace = true
               end
             end

data/plugins/commands/login/plugin.rb

@@ -8,7 +8,7 @@ module VagrantPlugins
     class Plugin < Vagrant.plugin("2")
       name "vagrant-login"
       description <<-DESC
-      Provides the login command and internal API access to Atlas.
+      Provides the login command and internal API access to Vagrant Cloud.
       DESC
 
       command(:login) do

data/plugins/commands/snapshot/command/delete.rb

@@ -23,7 +23,19 @@ module VagrantPlugins
 
           name = argv.pop
           with_target_vms(argv) do |vm|
-            vm.action(:snapshot_delete, snapshot_name: name)
+            if !vm.provider.capability?(:snapshot_list)
+              raise Vagrant::Errors::SnapshotNotSupported
+            end
+
+            snapshot_list = vm.provider.capability(:snapshot_list)
+
+            if snapshot_list.include? name
+              vm.action(:snapshot_delete, snapshot_name: name)
+            else
+              raise Vagrant::Errors::SnapshotNotFound,
+                snapshot_name: name,
+                machine: vm.name.to_s
+            end
           end
 
           # Success, exit status 0

data/plugins/commands/snapshot/command/list.rb

@@ -22,8 +22,7 @@ module VagrantPlugins
             end
 
             if !vm.provider.capability?(:snapshot_list)
-              vm.ui.info(I18n.t("vagrant.commands.snapshot.not_supported"))
-              next
+              raise Vagrant::Errors::SnapshotNotSupported
             end
 
             snapshots = vm.provider.capability(:snapshot_list)

data/plugins/commands/snapshot/command/restore.rb

@@ -36,7 +36,19 @@ module VagrantPlugins
           options[:snapshot_name] = name
 
           with_target_vms(argv) do |vm|
-            vm.action(:snapshot_restore, options)
+            if !vm.provider.capability?(:snapshot_list)
+              raise Vagrant::Errors::SnapshotNotSupported
+            end
+
+            snapshot_list = vm.provider.capability(:snapshot_list)
+
+            if snapshot_list.include? name
+              vm.action(:snapshot_restore, options)
+            else
+              raise Vagrant::Errors::SnapshotNotFound,
+                snapshot_name: name,
+                machine: vm.name.to_s
+            end
           end
 
           # Success, exit status 0

data/plugins/commands/snapshot/command/save.rb

@@ -6,6 +6,7 @@ module VagrantPlugins
       class Save < Vagrant.plugin("2", :command)
         def execute
           options = {}
+          options[:force] = false
 
           opts = OptionParser.new do |o|
             o.banner = "Usage: vagrant snapshot save [options] [vm-name] <name>"
@@ -16,6 +17,10 @@ module VagrantPlugins
             o.separator ""
             o.separator "Snapshots are useful for experimenting in a machine and being able"
             o.separator "to rollback quickly."
+
+            o.on("-f", "--force", "Replace snapshot without confirmation") do |f|
+              options[:force] = f
+            end
           end
 
           # Parse the options
@@ -28,7 +33,21 @@ module VagrantPlugins
 
           name = argv.pop
           with_target_vms(argv) do |vm|
-            vm.action(:snapshot_save, snapshot_name: name)
+            if !vm.provider.capability?(:snapshot_list)
+              raise Vagrant::Errors::SnapshotNotSupported
+            end
+
+            snapshot_list = vm.provider.capability(:snapshot_list)
+
+            if !snapshot_list.include? name
+              vm.action(:snapshot_save, snapshot_name: name)
+            elsif options[:force]
+              # not a unique snapshot name
+              vm.action(:snapshot_delete, snapshot_name: name)
+              vm.action(:snapshot_save, snapshot_name: name)
+            else
+              raise Vagrant::Errors::SnapshotConflictFailed
+            end
           end
 
           # Success, exit status 0